diff --git a/.bazelversion b/.bazelversion
index 91e4a9f262244..19b860c1872d5 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.3.2
+6.4.0
diff --git a/.gitattributes b/.gitattributes
index a728caf89a0b2..3d72aae39fdd6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-src/core/ext/upb-generated/** linguist-generated=true
-src/core/ext/upbdefs-generated/** linguist-generated=true
+src/core/ext/upb-gen/** linguist-generated=true
+src/core/ext/upbdefs-gen/** linguist-generated=true
 Makefile linguist-generated=true
 BUILD.gn linguist-generated=true
 CMakeLists.txt linguist-generated=true
@@ -36,4 +36,4 @@ src/core/lib/debug/stats_data.cc linguist-generated=true
 src/core/lib/experiments/experiments.h linguist-generated=true
 src/core/lib/experiments/experiments.cc linguist-generated=true
 bazel/experiments.bzl linguist-generated=true
-test/cpp/microbenchmarks/huffman_geometries/** linguist-generated=true
\ No newline at end of file
+test/cpp/microbenchmarks/huffman_geometries/** linguist-generated=true
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8eb57f336e15e..08ccbc86a8dee 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -52,9 +52,3 @@ lang/ruby:
 "lang/C#":
 - src/compiler/csharp*
 - src/csharp/**
-
-"disposition/Needs Internal Changes":
-- src/core/lib/event_engine/windows/**
-- src/core/lib/gpr/windows/**
-- src/core/lib/gprpp/windows/**
-- test/core/event_engine/windows/**
diff --git a/.github/workflows/pr-auto-fix.yaml b/.github/workflows/pr-auto-fix.yaml
index 573de52d9cb30..654f943c1d432 100644
--- a/.github/workflows/pr-auto-fix.yaml
+++ b/.github/workflows/pr-auto-fix.yaml
@@ -48,8 +48,9 @@ jobs:
         with:
           script: |
             // If you'd like not to run this code on your commits, add your github user id here:
-            NO_AUTOFIX_USERS = []
+            NO_AUTOFIX_USERS = ["copybara-service[bot]"]
             const { owner, repo } = context.repo
+            console.log("Actor: " + context.actor);
             if (NO_AUTOFIX_USERS.includes(context.actor)) {
               console.log('Cancelling');
               const run_id = "${{ github.run_id }}";
diff --git a/.github/workflows/pr-auto-tag-and-check-title.yaml b/.github/workflows/pr-auto-tag-and-check-title.yaml
deleted file mode 100644
index 2bd85cf303470..0000000000000
--- a/.github/workflows/pr-auto-tag-and-check-title.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: PR Title Check & Tag
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize, edited]
-permissions:
-  contents: read # to determine modified files (actions/labeler)
-
-jobs:
-  triage:
-    permissions:
-      contents: read # to determine modified files (actions/labeler)
-      pull-requests: write # to add labels to PRs (actions/labeler)
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v3
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: ""
-
-  title-check:
-    permissions:
-      contents: read
-      pull-requests: write
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: thehanimo/pr-title-checker@v1.3.5
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        pass_on_octokit_error: false
-        configuration_path: ".github/pr_title_checker_config.json"
diff --git a/.github/workflows/pr-auto-tag.yaml b/.github/workflows/pr-auto-tag.yaml
new file mode 100644
index 0000000000000..c0e440b7c44fb
--- /dev/null
+++ b/.github/workflows/pr-auto-tag.yaml
@@ -0,0 +1,19 @@
+name: PR Auto Tag
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, edited]
+permissions:
+  contents: read # to determine modified files (actions/labeler)
+
+jobs:
+  triage:
+    permissions:
+      contents: read # to determine modified files (actions/labeler)
+      pull-requests: write # to add labels to PRs (actions/labeler)
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v3
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: ""
diff --git a/.gitignore b/.gitignore
index bcf82223bee00..b08fa159e6933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ cython_debug/
 dist/
 htmlcov/
 py3*/
-python_build/
+pyb/
 python_pylint_venv/
 src/python/grpcio_*/=*
 src/python/grpcio_*/build/
diff --git a/BUILD b/BUILD
index 5d360a2dfc04c..d07866b8b9cd3 100644
--- a/BUILD
+++ b/BUILD
@@ -30,8 +30,8 @@ licenses(["reciprocal"])
 package(
     default_visibility = ["//visibility:public"],
     features = [
-        "layering_check",
         "-parse_headers",
+        "layering_check",
     ],
 )
 
@@ -211,11 +211,11 @@ config_setting(
 python_config_settings()
 
 # This should be updated along with build_handwritten.yaml
-g_stands_for = "gjallarhorn"  # @unused
+g_stands_for = "grand"  # @unused
 
-core_version = "36.0.0"  # @unused
+core_version = "37.0.0"  # @unused
 
-version = "1.60.0-dev"  # @unused
+version = "1.61.0-dev"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -1009,6 +1009,7 @@ grpc_cc_library(
         "absl/strings",
         "absl/types:optional",
         "absl/types:span",
+        "upb_base_lib",
         "upb_collections_lib",
         "upb_lib",
     ],
@@ -1213,6 +1214,7 @@ grpc_cc_library(
         "include/grpcpp/security/alts_util.h",
     ],
     external_deps = [
+        "upb_base_lib",
         "upb_collections_lib",
         "upb_lib",
     ],
@@ -1602,6 +1604,7 @@ grpc_cc_library(
         "//src/core:slice_refcount",
         "//src/core:socket_mutator",
         "//src/core:stats_data",
+        "//src/core:status_flag",
         "//src/core:status_helper",
         "//src/core:strerror",
         "//src/core:thread_quota",
@@ -1930,6 +1933,7 @@ grpc_cc_library(
         "absl/synchronization",
         "absl/memory",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
         "protobuf_headers",
         "absl/container:inlined_vector",
@@ -2004,6 +2008,7 @@ grpc_cc_library(
         "absl/synchronization",
         "absl/types:optional",
         "absl/memory",
+        "upb_base_lib",
         "upb_lib",
         "absl/strings:str_format",
         "protobuf_headers",
@@ -2173,6 +2178,7 @@ grpc_cc_library(
         "absl/strings",
         "absl/time",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
     ],
     language = "c++",
@@ -2936,6 +2942,7 @@ grpc_cc_library(
         "//src/core:lib/resolver/endpoint_addresses.h",
     ],
     external_deps = [
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
@@ -3063,6 +3070,7 @@ grpc_cc_library(
         "absl/strings:cord",
         "absl/types:optional",
         "absl/types:variant",
+        "upb_base_lib",
         "upb_collections_lib",
         "upb_lib",
     ],
@@ -3673,7 +3681,9 @@ grpc_cc_library(
         "absl/strings",
         "absl/strings:str_format",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
+        "upb_mem_lib",
         "upb_textformat_lib",
         "upb_json_lib",
         "upb_reflection",
@@ -3748,9 +3758,9 @@ grpc_cc_library(
     hdrs = ["//src/core:ext/filters/client_channel/resolver/fake/fake_resolver.h"],
     external_deps = [
         "absl/base:core_headers",
-        "absl/status",
-        "absl/status:statusor",
         "absl/strings",
+        "absl/time",
+        "absl/types:optional",
     ],
     language = "c++",
     visibility = [
@@ -3760,7 +3770,6 @@ grpc_cc_library(
     deps = [
         "config",
         "debug_location",
-        "endpoint_addresses",
         "gpr",
         "grpc_public_hdrs",
         "grpc_resolver",
@@ -3769,7 +3778,6 @@ grpc_cc_library(
         "uri_parser",
         "work_serializer",
         "//src/core:channel_args",
-        "//src/core:grpc_service_config",
         "//src/core:notification",
         "//src/core:ref_counted",
         "//src/core:useful",
@@ -3863,8 +3871,10 @@ grpc_cc_library(
     deps = [
         "gpr",
         "grpc_base",
+        "ref_counted_ptr",
         "//src/core:error",
         "//src/core:hpack_constants",
+        "//src/core:ref_counted",
         "//src/core:slice",
         "//src/core:status_helper",
     ],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b77d60e36637c..b9390ecccf282 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@
 cmake_minimum_required(VERSION 3.8)
 
 set(PACKAGE_NAME          "grpc")
-set(PACKAGE_VERSION       "1.60.0-dev")
-set(gRPC_CORE_VERSION     "36.0.0")
-set(gRPC_CORE_SOVERSION   "36")
-set(gRPC_CPP_VERSION      "1.60.0-dev")
-set(gRPC_CPP_SOVERSION    "1.60")
+set(PACKAGE_VERSION       "1.61.0-dev")
+set(gRPC_CORE_VERSION     "37.0.0")
+set(gRPC_CORE_SOVERSION   "37")
+set(gRPC_CPP_VERSION      "1.61.0-dev")
+set(gRPC_CPP_SOVERSION    "1.61")
 set(PACKAGE_STRING        "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME       "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT     "https://github.com/grpc/grpc/issues/")
@@ -441,9 +441,9 @@ if(BUILD_SHARED_LIBS AND WIN32)
 # for DLL builds - and should be completely removed when source files are
 # generated with the necessary __declspec annotations.
 set(gRPC_UPB_GEN_DUPL_SRC
-  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+  src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
 )
 set(gRPC_ADDITIONAL_DLL_SRC
   src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
@@ -822,6 +822,9 @@ 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(
+  test/core/util/fuzz_config_vars.proto test/core/util/fuzz_config_vars.proto
+)
 
 if(gRPC_BUILD_TESTS)
   add_custom_target(buildtests_c)
@@ -943,6 +946,9 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx client_channel_service_config_test)
   add_dependencies(buildtests_cxx client_channel_test)
   add_dependencies(buildtests_cxx client_context_test_peer_test)
+  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+    add_dependencies(buildtests_cxx client_fork_test)
+  endif()
   add_dependencies(buildtests_cxx client_interceptors_end2end_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx client_lb_end2end_test)
@@ -951,6 +957,7 @@ if(gRPC_BUILD_TESTS)
     add_dependencies(buildtests_cxx client_ssl_test)
   endif()
   add_dependencies(buildtests_cxx client_streaming_test)
+  add_dependencies(buildtests_cxx client_transport_error_test)
   add_dependencies(buildtests_cxx client_transport_test)
   add_dependencies(buildtests_cxx cmdline_test)
   add_dependencies(buildtests_cxx codegen_test_full)
@@ -980,6 +987,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx default_host_test)
   add_dependencies(buildtests_cxx delegating_channel_test)
   add_dependencies(buildtests_cxx destroy_grpclb_channel_with_active_connect_stress_test)
+  add_dependencies(buildtests_cxx directory_reader_test)
   add_dependencies(buildtests_cxx disappearing_server_test)
   add_dependencies(buildtests_cxx dns_resolver_cooldown_test)
   add_dependencies(buildtests_cxx dns_resolver_test)
@@ -1101,6 +1109,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx init_test)
   add_dependencies(buildtests_cxx initial_settings_frame_bad_client_test)
   add_dependencies(buildtests_cxx insecure_security_connector_test)
+  add_dependencies(buildtests_cxx inter_activity_latch_test)
   add_dependencies(buildtests_cxx inter_activity_pipe_test)
   add_dependencies(buildtests_cxx interceptor_list_test)
   add_dependencies(buildtests_cxx interop_client)
@@ -1203,6 +1212,9 @@ if(gRPC_BUILD_TESTS)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx posix_event_engine_connect_test)
   endif()
+  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
+    add_dependencies(buildtests_cxx posix_event_engine_native_dns_test)
+  endif()
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx posix_event_engine_test)
   endif()
@@ -1211,6 +1223,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx promise_endpoint_test)
   add_dependencies(buildtests_cxx promise_factory_test)
   add_dependencies(buildtests_cxx promise_map_test)
+  add_dependencies(buildtests_cxx promise_mutex_test)
   add_dependencies(buildtests_cxx promise_test)
   add_dependencies(buildtests_cxx proto_buffer_reader_test)
   add_dependencies(buildtests_cxx proto_buffer_writer_test)
@@ -1219,6 +1232,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx proxy_auth_test)
   add_dependencies(buildtests_cxx qps_json_driver)
   add_dependencies(buildtests_cxx qps_worker)
+  add_dependencies(buildtests_cxx query_extensions_test)
   add_dependencies(buildtests_cxx race_test)
   add_dependencies(buildtests_cxx random_early_detection_test)
   add_dependencies(buildtests_cxx raw_end2end_test)
@@ -1346,6 +1360,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx static_stride_scheduler_test)
   add_dependencies(buildtests_cxx stats_test)
   add_dependencies(buildtests_cxx status_conversion_test)
+  add_dependencies(buildtests_cxx status_flag_test)
   add_dependencies(buildtests_cxx status_helper_test)
   add_dependencies(buildtests_cxx status_util_test)
   add_dependencies(buildtests_cxx stream_leak_with_queued_flow_control_update_test)
@@ -1412,6 +1427,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx timer_manager_test)
   add_dependencies(buildtests_cxx timer_test)
   add_dependencies(buildtests_cxx tls_certificate_verifier_test)
+  add_dependencies(buildtests_cxx tls_credentials_test)
   add_dependencies(buildtests_cxx tls_key_export_test)
   add_dependencies(buildtests_cxx tls_security_connector_test)
   add_dependencies(buildtests_cxx too_many_pings_test)
@@ -1851,319 +1867,319 @@ add_library(grpc
   src/core/ext/transport/inproc/inproc_plugin.cc
   src/core/ext/transport/inproc/inproc_transport.cc
   src/core/ext/transport/inproc/legacy_inproc_transport.cc
-  src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c
-  src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c
-  src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
-  src/core/ext/upb-generated/envoy/annotations/resource.upb.c
-  src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
-  src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c
-  src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
-  src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
-  src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
-  src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
-  src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
-  src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
-  src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
-  src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
-  src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
-  src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
-  src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
-  src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c
-  src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
-  src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c
-  src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c
-  src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c
-  src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
-  src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c
-  src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c
-  src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c
-  src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c
-  src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
-  src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c
-  src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c
-  src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c
-  src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c
-  src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c
-  src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c
-  src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
-  src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
-  src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
-  src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
-  src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c
-  src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
-  src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
-  src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
-  src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c
-  src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c
-  src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
-  src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
-  src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/http.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/range.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
-  src/core/ext/upb-generated/google/api/annotations.upb.c
-  src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
-  src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
-  src/core/ext/upb-generated/google/api/http.upb.c
-  src/core/ext/upb-generated/google/api/httpbody.upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
-  src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c
-  src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
-  src/core/ext/upb-generated/udpa/annotations/security.upb.c
-  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
-  src/core/ext/upb-generated/udpa/annotations/status.upb.c
-  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
-  src/core/ext/upb-generated/xds/core/v3/authority.upb.c
-  src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
-  src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
-  src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
-  src/core/ext/upb-generated/xds/core/v3/extension.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
-  src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
-  src/core/ext/upb-generated/xds/type/v3/cel.upb.c
-  src/core/ext/upb-generated/xds/type/v3/range.upb.c
-  src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
-  src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c
-  src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
-  src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c
-  src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c
-  src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
-  src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
-  src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
-  src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c
-  src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
-  src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
-  src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
-  src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
-  src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
-  src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
-  src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c
-  src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
+  src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
+  src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
+  src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
+  src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
+  src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
+  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/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
+  src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c
+  src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
+  src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
+  src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
+  src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
+  src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
+  src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
+  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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
+  src/core/ext/upb-gen/validate/validate.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c
+  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/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
+  src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c
+  src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c
+  src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c
+  src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c
+  src/core/ext/upbdefs-gen/google/api/http.upbdefs.c
+  src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c
+  src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c
+  src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c
+  src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c
+  src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
+  src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c
+  src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c
+  src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c
+  src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c
+  src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c
+  src/core/ext/upbdefs-gen/validate/validate.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c
+  src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c
+  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/ext/xds/certificate_provider_store.cc
   src/core/ext/xds/file_watcher_certificate_provider_factory.cc
   src/core/ext/xds/xds_api.cc
@@ -2226,12 +2242,12 @@ add_library(grpc
   src/core/lib/event_engine/default_event_engine_factory.cc
   src/core/lib/event_engine/event_engine.cc
   src/core/lib/event_engine/forkable.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -2256,6 +2272,7 @@ add_library(grpc
   src/core/lib/event_engine/time_util.cc
   src/core/lib/event_engine/trace.cc
   src/core/lib/event_engine/utils.cc
+  src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -2266,11 +2283,13 @@ add_library(grpc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/load_file.cc
   src/core/lib/gprpp/per_cpu.cc
+  src/core/lib/gprpp/posix/directory_reader.cc
   src/core/lib/gprpp/ref_counted_string.cc
   src/core/lib/gprpp/status_helper.cc
   src/core/lib/gprpp/time.cc
   src/core/lib/gprpp/time_averaged_stats.cc
   src/core/lib/gprpp/validation_errors.cc
+  src/core/lib/gprpp/windows/directory_reader.cc
   src/core/lib/gprpp/work_serializer.cc
   src/core/lib/handshaker/proxy_mapper_registry.cc
   src/core/lib/http/format_request.cc
@@ -2556,9 +2575,11 @@ target_include_directories(grpc
 )
 target_link_libraries(grpc
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  ${_gRPC_RE2_LIBRARIES}
+  upb_collections_lib
   upb_json_lib
   upb_textformat_lib
+  upb
+  ${_gRPC_RE2_LIBRARIES}
   ${_gRPC_ZLIB_LIBRARIES}
   absl::algorithm_container
   absl::cleanup
@@ -2894,25 +2915,25 @@ add_library(grpc_unsecure
   src/core/ext/transport/inproc/inproc_plugin.cc
   src/core/ext/transport/inproc/inproc_transport.cc
   src/core/ext/transport/inproc/legacy_inproc_transport.cc
-  src/core/ext/upb-generated/google/api/annotations.upb.c
-  src/core/ext/upb-generated/google/api/http.upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
-  src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
-  src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
+  src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
+  src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
+  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/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
   src/core/lib/backoff/backoff.cc
@@ -2949,12 +2970,12 @@ add_library(grpc_unsecure
   src/core/lib/event_engine/default_event_engine_factory.cc
   src/core/lib/event_engine/event_engine.cc
   src/core/lib/event_engine/forkable.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -2979,6 +3000,7 @@ add_library(grpc_unsecure
   src/core/lib/event_engine/time_util.cc
   src/core/lib/event_engine/trace.cc
   src/core/lib/event_engine/utils.cc
+  src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -3183,7 +3205,13 @@ add_library(grpc_unsecure
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
   ${gRPC_ADDITIONAL_DLL_SRC}
 )
 
@@ -3226,6 +3254,7 @@ target_link_libraries(grpc_unsecure
   ${_gRPC_ALLTARGETS_LIBRARIES}
   upb_collections_lib
   upb
+  utf8_range_lib
   ${_gRPC_ZLIB_LIBRARIES}
   absl::algorithm_container
   absl::cleanup
@@ -3417,25 +3446,8 @@ endif()
 
 add_library(upb ${_gRPC_STATIC_WIN32}
   third_party/upb/upb/base/status.c
-  third_party/upb/upb/collections/array.c
-  third_party/upb/upb/collections/map.c
-  third_party/upb/upb/collections/map_sorter.c
-  third_party/upb/upb/hash/common.c
-  third_party/upb/upb/lex/atoi.c
-  third_party/upb/upb/lex/round_trip.c
-  third_party/upb/upb/lex/strtod.c
-  third_party/upb/upb/lex/unicode.c
   third_party/upb/upb/mem/alloc.c
   third_party/upb/upb/mem/arena.c
-  third_party/upb/upb/message/message.c
-  third_party/upb/upb/mini_table/extension_registry.c
-  third_party/upb/upb/mini_table/internal/message.c
-  third_party/upb/upb/mini_table/message.c
-  third_party/upb/upb/wire/decode.c
-  third_party/upb/upb/wire/decode_fast.c
-  third_party/upb/upb/wire/encode.c
-  third_party/upb/upb/wire/eps_copy_input_stream.c
-  third_party/upb/upb/wire/reader.c
 )
 
 target_compile_features(upb PUBLIC cxx_std_14)
@@ -3471,7 +3483,6 @@ target_include_directories(upb
 )
 target_link_libraries(upb
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  utf8_range_lib
 )
 
 
@@ -3489,12 +3500,12 @@ endif()
 
 add_library(upb_collections_lib ${_gRPC_STATIC_WIN32}
   third_party/upb/upb/base/status.c
-  third_party/upb/upb/collections/array.c
-  third_party/upb/upb/collections/map.c
-  third_party/upb/upb/collections/map_sorter.c
   third_party/upb/upb/hash/common.c
   third_party/upb/upb/mem/alloc.c
   third_party/upb/upb/mem/arena.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
   third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_table/extension_registry.c
   third_party/upb/upb/mini_table/internal/message.c
@@ -3550,16 +3561,30 @@ endif()
 
 
 add_library(upb_json_lib ${_gRPC_STATIC_WIN32}
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  third_party/upb/upb/base/status.c
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/json/decode.c
   third_party/upb/upb/json/encode.c
+  third_party/upb/upb/lex/atoi.c
+  third_party/upb/upb/lex/round_trip.c
+  third_party/upb/upb/lex/strtod.c
+  third_party/upb/upb/lex/unicode.c
+  third_party/upb/upb/mem/alloc.c
+  third_party/upb/upb/mem/arena.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
   third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
-  third_party/upb/upb/reflection/def_builder.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
   third_party/upb/upb/reflection/def_pool.c
   third_party/upb/upb/reflection/def_type.c
   third_party/upb/upb/reflection/desc_state.c
@@ -3569,12 +3594,19 @@ add_library(upb_json_lib ${_gRPC_STATIC_WIN32}
   third_party/upb/upb/reflection/extension_range.c
   third_party/upb/upb/reflection/field_def.c
   third_party/upb/upb/reflection/file_def.c
+  third_party/upb/upb/reflection/internal/def_builder.c
+  third_party/upb/upb/reflection/internal/strdup2.c
   third_party/upb/upb/reflection/message.c
   third_party/upb/upb/reflection/message_def.c
   third_party/upb/upb/reflection/message_reserved_range.c
   third_party/upb/upb/reflection/method_def.c
   third_party/upb/upb/reflection/oneof_def.c
   third_party/upb/upb/reflection/service_def.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 
 target_compile_features(upb_json_lib PUBLIC cxx_std_14)
@@ -3610,8 +3642,7 @@ target_include_directories(upb_json_lib
 )
 target_link_libraries(upb_json_lib
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  upb_collections_lib
-  upb
+  utf8_range_lib
 )
 
 
@@ -3628,14 +3659,28 @@ endif()
 
 
 add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32}
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  third_party/upb/upb/base/status.c
+  third_party/upb/upb/hash/common.c
+  third_party/upb/upb/lex/atoi.c
+  third_party/upb/upb/lex/round_trip.c
+  third_party/upb/upb/lex/strtod.c
+  third_party/upb/upb/lex/unicode.c
+  third_party/upb/upb/mem/alloc.c
+  third_party/upb/upb/mem/arena.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
   third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
-  third_party/upb/upb/reflection/def_builder.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
   third_party/upb/upb/reflection/def_pool.c
   third_party/upb/upb/reflection/def_type.c
   third_party/upb/upb/reflection/desc_state.c
@@ -3645,6 +3690,8 @@ add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32}
   third_party/upb/upb/reflection/extension_range.c
   third_party/upb/upb/reflection/field_def.c
   third_party/upb/upb/reflection/file_def.c
+  third_party/upb/upb/reflection/internal/def_builder.c
+  third_party/upb/upb/reflection/internal/strdup2.c
   third_party/upb/upb/reflection/message.c
   third_party/upb/upb/reflection/message_def.c
   third_party/upb/upb/reflection/message_reserved_range.c
@@ -3652,6 +3699,11 @@ add_library(upb_textformat_lib ${_gRPC_STATIC_WIN32}
   third_party/upb/upb/reflection/oneof_def.c
   third_party/upb/upb/reflection/service_def.c
   third_party/upb/upb/text/encode.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 
 target_compile_features(upb_textformat_lib PUBLIC cxx_std_14)
@@ -3687,8 +3739,7 @@ target_include_directories(upb_textformat_lib
 )
 target_link_libraries(upb_textformat_lib
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  upb_collections_lib
-  upb
+  utf8_range_lib
 )
 
 
@@ -4865,12 +4916,12 @@ endif()
 
 
 add_library(grpc_authorization_provider
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  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/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
   src/core/lib/backoff/backoff.cc
@@ -4907,12 +4958,12 @@ add_library(grpc_authorization_provider
   src/core/lib/event_engine/default_event_engine_factory.cc
   src/core/lib/event_engine/event_engine.cc
   src/core/lib/event_engine/forkable.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -4937,6 +4988,7 @@ add_library(grpc_authorization_provider
   src/core/lib/event_engine/time_util.cc
   src/core/lib/event_engine/trace.cc
   src/core/lib/event_engine/utils.cc
+  src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -5126,11 +5178,25 @@ add_library(grpc_authorization_provider
   src/core/tsi/alts/handshaker/transport_security_common_api.cc
   src/core/tsi/transport_security.cc
   src/core/tsi/transport_security_grpc.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 
 target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14)
@@ -5167,8 +5233,9 @@ target_include_directories(grpc_authorization_provider
 )
 target_link_libraries(grpc_authorization_provider
   ${_gRPC_ALLTARGETS_LIBRARIES}
-  ${_gRPC_RE2_LIBRARIES}
   upb
+  ${_gRPC_RE2_LIBRARIES}
+  utf8_range_lib
   ${_gRPC_ZLIB_LIBRARIES}
   absl::cleanup
   absl::flat_hash_map
@@ -8047,93 +8114,93 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(cel_authorization_engine_test
-  src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
-  src/core/ext/upb-generated/envoy/annotations/resource.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
-  src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
-  src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
-  src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
-  src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
-  src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
-  src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/http.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/range.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
-  src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
-  src/core/ext/upb-generated/google/api/annotations.upb.c
-  src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
-  src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
-  src/core/ext/upb-generated/google/api/http.upb.c
-  src/core/ext/upb-generated/google/api/httpbody.upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
-  src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
-  src/core/ext/upb-generated/udpa/annotations/security.upb.c
-  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
-  src/core/ext/upb-generated/udpa/annotations/status.upb.c
-  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
-  src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
-  src/core/ext/upb-generated/xds/core/v3/authority.upb.c
-  src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
-  src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
-  src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
-  src/core/ext/upb-generated/xds/core/v3/extension.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
-  src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
-  src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
-  src/core/ext/upb-generated/xds/type/v3/cel.upb.c
-  src/core/ext/upb-generated/xds/type/v3/range.upb.c
-  src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
+  src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
+  src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
+  src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
+  src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
+  src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
+  src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
+  src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
+  src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
+  src/core/ext/upb-gen/validate/validate.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
+  src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
+  src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
+  src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
   src/core/lib/security/authorization/cel_authorization_engine.cc
   test/core/security/cel_authorization_engine_test.cc
   test/core/util/cmdline.cc
@@ -8667,6 +8734,7 @@ add_executable(channelz_service_test
   ${_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/event_engine/event_engine_test_utils.cc
   test/cpp/end2end/channelz_service_test.cc
   test/cpp/end2end/test_service_impl.cc
 )
@@ -8788,11 +8856,10 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(chunked_vector_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/status_helper.cc
@@ -8816,11 +8883,25 @@ add_executable(chunked_vector_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/gprpp/chunked_vector_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(chunked_vector_test PUBLIC cxx_std_14)
 target_include_directories(chunked_vector_test
@@ -8846,6 +8927,7 @@ target_link_libraries(chunked_vector_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::type_traits
@@ -9144,6 +9226,63 @@ target_link_libraries(client_context_test_peer_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+
+  add_executable(client_fork_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/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/cpp/end2end/client_fork_test.cc
+  )
+  target_compile_features(client_fork_test PUBLIC cxx_std_14)
+  target_include_directories(client_fork_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(client_fork_test
+    ${_gRPC_ALLTARGETS_LIBRARIES}
+    gtest
+    grpc++
+    grpc_test_util
+    grpc++_test_config
+  )
+
+
+endif()
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -9337,6 +9476,49 @@ target_link_libraries(client_streaming_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(client_transport_error_test
+  ${_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/core/ext/transport/chaotic_good/client_transport.cc
+  src/core/ext/transport/chaotic_good/frame.cc
+  src/core/ext/transport/chaotic_good/frame_header.cc
+  src/core/lib/transport/promise_endpoint.cc
+  test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+  test/core/transport/chaotic_good/client_transport_error_test.cc
+)
+target_compile_features(client_transport_error_test PUBLIC cxx_std_14)
+target_include_directories(client_transport_error_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(client_transport_error_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -10296,6 +10478,39 @@ target_link_libraries(destroy_grpclb_channel_with_active_connect_stress_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(directory_reader_test
+  test/core/gprpp/directory_reader_test.cc
+)
+target_compile_features(directory_reader_test PUBLIC cxx_std_14)
+target_include_directories(directory_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(directory_reader_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -11244,9 +11459,9 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(exec_ctx_wakeup_scheduler_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
@@ -11264,11 +11479,25 @@ add_executable(exec_ctx_wakeup_scheduler_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/promise/exec_ctx_wakeup_scheduler_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(exec_ctx_wakeup_scheduler_test PUBLIC cxx_std_14)
 target_include_directories(exec_ctx_wakeup_scheduler_test
@@ -11294,6 +11523,7 @@ target_link_libraries(exec_ctx_wakeup_scheduler_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::hash
   absl::type_traits
   absl::statusor
@@ -11922,11 +12152,10 @@ if(gRPC_BUILD_TESTS)
 add_executable(flow_control_test
   src/core/ext/transport/chttp2/transport/flow_control.cc
   src/core/ext/transport/chttp2/transport/http2_settings.cc
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/status_helper.cc
@@ -11951,11 +12180,25 @@ add_executable(flow_control_test
   src/core/lib/transport/bdp_estimator.cc
   src/core/lib/transport/pid_controller.cc
   test/core/transport/chttp2/flow_control_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(flow_control_test PUBLIC cxx_std_14)
 target_include_directories(flow_control_test
@@ -11981,6 +12224,7 @@ target_link_libraries(flow_control_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::type_traits
@@ -11993,11 +12237,10 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(for_each_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/status_helper.cc
@@ -12021,11 +12264,25 @@ add_executable(for_each_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/promise/for_each_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(for_each_test PUBLIC cxx_std_14)
 target_include_directories(for_each_test
@@ -12051,6 +12308,7 @@ target_link_libraries(for_each_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::type_traits
@@ -13425,6 +13683,16 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(grpc_tls_crl_provider_test
+  ${_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}/test/core/util/fuzz_config_vars.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/test/core/util/fuzz_config_vars.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/test/core/util/fuzz_config_vars.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/test/core/util/fuzz_config_vars.grpc.pb.h
+  test/core/event_engine/event_engine_test_utils.cc
+  test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
   test/core/security/grpc_tls_crl_provider_test.cc
 )
 target_compile_features(grpc_tls_crl_provider_test PUBLIC cxx_std_14)
@@ -13450,6 +13718,7 @@ target_include_directories(grpc_tls_crl_provider_test
 target_link_libraries(grpc_tls_crl_provider_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  ${_gRPC_PROTOBUF_LIBRARIES}
   grpc_test_util
 )
 
@@ -14669,6 +14938,39 @@ target_link_libraries(insecure_security_connector_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(inter_activity_latch_test
+  test/core/promise/inter_activity_latch_test.cc
+)
+target_compile_features(inter_activity_latch_test PUBLIC cxx_std_14)
+target_include_directories(inter_activity_latch_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(inter_activity_latch_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -14712,11 +15014,10 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(interceptor_list_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/status_helper.cc
@@ -14740,11 +15041,25 @@ add_executable(interceptor_list_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/promise/interceptor_list_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(interceptor_list_test PUBLIC cxx_std_14)
 target_include_directories(interceptor_list_test
@@ -14770,6 +15085,7 @@ target_link_libraries(interceptor_list_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::type_traits
@@ -15621,11 +15937,10 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(map_pipe_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
   src/core/lib/gprpp/status_helper.cc
@@ -15649,11 +15964,25 @@ add_executable(map_pipe_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/promise/map_pipe_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(map_pipe_test PUBLIC cxx_std_14)
 target_include_directories(map_pipe_test
@@ -15679,6 +16008,7 @@ target_link_libraries(map_pipe_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::type_traits
@@ -17311,9 +17641,9 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(periodic_update_test
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   src/core/lib/debug/trace.cc
   src/core/lib/experiments/config.cc
   src/core/lib/experiments/experiments.cc
@@ -17331,11 +17661,25 @@ add_executable(periodic_update_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   test/core/resource_quota/periodic_update_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(periodic_update_test PUBLIC cxx_std_14)
 target_include_directories(periodic_update_test
@@ -17361,6 +17705,7 @@ target_link_libraries(periodic_update_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   absl::function_ref
   absl::hash
   absl::statusor
@@ -17928,6 +18273,48 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
   )
 
 
+endif()
+endif()
+if(gRPC_BUILD_TESTS)
+if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
+
+  add_executable(posix_event_engine_native_dns_test
+    test/core/event_engine/event_engine_test_utils.cc
+    test/core/event_engine/test_suite/event_engine_test_framework.cc
+    test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
+    test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
+    test/core/event_engine/test_suite/tests/dns_test.cc
+    test/core/util/fake_udp_and_tcp_server.cc
+    test/cpp/util/get_grpc_test_runfile_dir.cc
+    test/cpp/util/windows/manifest_file.cc
+  )
+  target_compile_features(posix_event_engine_native_dns_test PUBLIC cxx_std_14)
+  target_include_directories(posix_event_engine_native_dns_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(posix_event_engine_native_dns_test
+    ${_gRPC_ALLTARGETS_LIBRARIES}
+    gtest
+    grpc++_test_util
+  )
+
+
 endif()
 endif()
 if(gRPC_BUILD_TESTS)
@@ -17944,6 +18331,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     test/core/event_engine/test_suite/tests/timer_test.cc
     test/core/util/fake_udp_and_tcp_server.cc
     test/cpp/util/get_grpc_test_runfile_dir.cc
+    test/cpp/util/windows/manifest_file.cc
   )
   target_compile_features(posix_event_engine_test PUBLIC cxx_std_14)
   target_include_directories(posix_event_engine_test
@@ -18186,6 +18574,45 @@ target_link_libraries(promise_map_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(promise_mutex_test
+  src/core/lib/debug/trace.cc
+  src/core/lib/promise/activity.cc
+  src/core/lib/promise/trace.cc
+  test/core/promise/promise_mutex_test.cc
+)
+target_compile_features(promise_mutex_test PUBLIC cxx_std_14)
+target_include_directories(promise_mutex_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(promise_mutex_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::hash
+  absl::type_traits
+  absl::statusor
+  gpr
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -18552,6 +18979,40 @@ target_link_libraries(qps_worker
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(query_extensions_test
+  test/core/event_engine/query_extensions_test.cc
+)
+target_compile_features(query_extensions_test PUBLIC cxx_std_14)
+target_include_directories(query_extensions_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(query_extensions_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::statusor
+  gpr
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -22916,6 +23377,40 @@ target_link_libraries(status_conversion_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(status_flag_test
+  test/core/promise/status_flag_test.cc
+)
+target_compile_features(status_flag_test PUBLIC cxx_std_14)
+target_include_directories(status_flag_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(status_flag_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::status
+  absl::statusor
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -24100,12 +24595,12 @@ add_executable(test_core_transport_chaotic_good_frame_test
   src/core/ext/transport/chttp2/transport/http_trace.cc
   src/core/ext/transport/chttp2/transport/huffsyms.cc
   src/core/ext/transport/chttp2/transport/varint.cc
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
-  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/rpc/status.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  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/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
   src/core/lib/backoff/backoff.cc
@@ -24142,12 +24637,12 @@ add_executable(test_core_transport_chaotic_good_frame_test
   src/core/lib/event_engine/default_event_engine_factory.cc
   src/core/lib/event_engine/event_engine.cc
   src/core/lib/event_engine/forkable.cc
-  src/core/lib/event_engine/memory_allocator.cc
   src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -24172,6 +24667,7 @@ add_executable(test_core_transport_chaotic_good_frame_test
   src/core/lib/event_engine/time_util.cc
   src/core/lib/event_engine/trace.cc
   src/core/lib/event_engine/utils.cc
+  src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -24332,11 +24828,25 @@ add_executable(test_core_transport_chaotic_good_frame_test
   src/core/lib/uri/uri_parser.cc
   src/core/tsi/alts/handshaker/transport_security_common_api.cc
   test/core/transport/chaotic_good/frame_test.cc
+  third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
+  third_party/upb/upb/message/array.c
+  third_party/upb/upb/message/map.c
+  third_party/upb/upb/message/map_sorter.c
+  third_party/upb/upb/message/message.c
   third_party/upb/upb/mini_descriptor/build_enum.c
   third_party/upb/upb/mini_descriptor/decode.c
   third_party/upb/upb/mini_descriptor/internal/base92.c
+  third_party/upb/upb/mini_descriptor/internal/encode.c
   third_party/upb/upb/mini_descriptor/link.c
+  third_party/upb/upb/mini_table/extension_registry.c
+  third_party/upb/upb/mini_table/internal/message.c
+  third_party/upb/upb/mini_table/message.c
+  third_party/upb/upb/wire/decode.c
+  third_party/upb/upb/wire/decode_fast.c
+  third_party/upb/upb/wire/encode.c
+  third_party/upb/upb/wire/eps_copy_input_stream.c
+  third_party/upb/upb/wire/reader.c
 )
 target_compile_features(test_core_transport_chaotic_good_frame_test PUBLIC cxx_std_14)
 target_include_directories(test_core_transport_chaotic_good_frame_test
@@ -24362,6 +24872,7 @@ target_link_libraries(test_core_transport_chaotic_good_frame_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
   upb
+  utf8_range_lib
   ${_gRPC_ZLIB_LIBRARIES}
   absl::cleanup
   absl::flat_hash_map
@@ -25097,6 +25608,56 @@ target_link_libraries(tls_certificate_verifier_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(tls_credentials_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/cpp/end2end/test_service_impl.cc
+  test/cpp/end2end/tls_credentials_test.cc
+)
+target_compile_features(tls_credentials_test PUBLIC cxx_std_14)
+target_include_directories(tls_credentials_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(tls_credentials_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc++_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -29945,7 +30506,7 @@ generate_pkgconfig(
   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
   "libcares openssl re2 zlib"
   "-lgrpc"
-  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb -lutf8_range_lib -lupb_collections_lib"
+  "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib"
   "grpc.pc")
 
 # grpc_unsecure .pc file
@@ -29956,7 +30517,7 @@ generate_pkgconfig(
   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr"
   "libcares zlib"
   "-lgrpc_unsecure"
-  "-laddress_sorting -lupb -lutf8_range_lib -lupb_collections_lib"
+  "-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib"
   "grpc_unsecure.pc")
 
 # grpc++ .pc file
@@ -29967,7 +30528,7 @@ generate_pkgconfig(
   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc"
   "libcares openssl re2 zlib"
   "-lgrpc++"
-  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb -lutf8_range_lib -lupb_collections_lib"
+  "-laddress_sorting -lupb -lupb_textformat_lib -lupb_json_lib -lutf8_range_lib -lupb_collections_lib"
   "grpc++.pc")
 
 # grpc++_unsecure .pc file
@@ -29978,5 +30539,5 @@ generate_pkgconfig(
   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure"
   "libcares zlib"
   "-lgrpc++_unsecure"
-  "-laddress_sorting -lupb -lutf8_range_lib -lupb_collections_lib"
+  "-laddress_sorting -lutf8_range_lib -lupb -lupb_collections_lib"
   "grpc++_unsecure.pc")
diff --git a/Makefile b/Makefile
index cab8c8dbe46bd..6df49a7bac0ff 100644
--- a/Makefile
+++ b/Makefile
@@ -328,7 +328,7 @@ CXXFLAGS += -stdlib=libc++
 LDFLAGS += -framework CoreFoundation
 endif
 CFLAGS += -g
-CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2 -Ithird_party/upb -Isrc/core/ext/upb-generated -Isrc/core/ext/upbdefs-generated -Ithird_party/utf8_range -Ithird_party/xxhash
+CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2 -Ithird_party/upb -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range -Ithird_party/xxhash
 COREFLAGS += -fno-exceptions
 LDFLAGS += -g
 
@@ -410,8 +410,8 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 36.0.0
-CPP_VERSION = 1.60.0-dev
+CORE_VERSION = 37.0.0
+CPP_VERSION = 1.61.0-dev
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -447,7 +447,7 @@ SHARED_EXT_CORE = dll
 SHARED_EXT_CPP = dll
 
 SHARED_PREFIX =
-SHARED_VERSION_CORE = -36
+SHARED_VERSION_CORE = -37
 SHARED_VERSION_CPP = -1
 else ifeq ($(SYSTEM),Darwin)
 EXECUTABLE_SUFFIX =
@@ -814,8 +814,8 @@ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.36 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.37 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -938,8 +938,8 @@ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OB
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.36 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.37 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(GRPC_ABSEIL_MERGE_LIBS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -951,8 +951,8 @@ endif
 
 
 # start of build recipe for library "grpc" (generated by makelib(lib) template function)
-# deps: ['re2', 'upb_json_lib', 'upb_textformat_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting']
-# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'upb_textformat_lib', 'upb_json_lib', 'upb', 'utf8_range_lib', 'upb_collections_lib', 're2', 'libssl']
+# deps: ['upb_collections_lib', 'upb_json_lib', 'upb_textformat_lib', 'upb', 're2', 'z', 'grpc_abseil', 'cares', 'gpr', 'libssl', 'address_sorting']
+# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 're2', 'upb', 'upb_textformat_lib', 'upb_json_lib', 'utf8_range_lib', 'upb_collections_lib', 'libssl']
 LIBGRPC_SRC = \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
@@ -1069,319 +1069,319 @@ LIBGRPC_SRC = \
     src/core/ext/transport/inproc/inproc_plugin.cc \
     src/core/ext/transport/inproc/inproc_transport.cc \
     src/core/ext/transport/inproc/legacy_inproc_transport.cc \
-    src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
-    src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
-    src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c \
-    src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c \
-    src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
-    src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c \
-    src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
-    src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
-    src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
-    src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/api/httpbody.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
-    src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/security.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/status.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/security.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/status.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/cidr.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-    src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-    src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c \
+    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/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 \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+    src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+    src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c \
+    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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/validate/validate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
+    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/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 \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/validate/validate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c \
+    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/ext/xds/certificate_provider_store.cc \
     src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
     src/core/ext/xds/xds_api.cc \
@@ -1444,12 +1444,12 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/default_event_engine_factory.cc \
     src/core/lib/event_engine/event_engine.cc \
     src/core/lib/event_engine/forkable.cc \
-    src/core/lib/event_engine/memory_allocator.cc \
     src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \
     src/core/lib/event_engine/posix_engine/ev_poll_posix.cc \
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
+    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -1474,6 +1474,7 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/time_util.cc \
     src/core/lib/event_engine/trace.cc \
     src/core/lib/event_engine/utils.cc \
+    src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
@@ -1484,11 +1485,13 @@ LIBGRPC_SRC = \
     src/core/lib/experiments/experiments.cc \
     src/core/lib/gprpp/load_file.cc \
     src/core/lib/gprpp/per_cpu.cc \
+    src/core/lib/gprpp/posix/directory_reader.cc \
     src/core/lib/gprpp/ref_counted_string.cc \
     src/core/lib/gprpp/status_helper.cc \
     src/core/lib/gprpp/time.cc \
     src/core/lib/gprpp/time_averaged_stats.cc \
     src/core/lib/gprpp/validation_errors.cc \
+    src/core/lib/gprpp/windows/directory_reader.cc \
     src/core/lib/gprpp/work_serializer.cc \
     src/core/lib/handshaker/proxy_mapper_registry.cc \
     src/core/lib/http/format_request.cc \
@@ -1823,30 +1826,30 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE
 else
 
 # static library for "grpc"
-$(LIBDIR)/$(CONFIG)/libgrpc.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LIBRE2_OBJS) $(OPENSSL_MERGE_OBJS)
+$(LIBDIR)/$(CONFIG)/libgrpc.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP) $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LIBRE2_OBJS) $(OPENSSL_MERGE_OBJS)
+	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBRE2_OBJS) $(LIBUPB_OBJS) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(OPENSSL_MERGE_OBJS)
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc.a
 endif
 
 # shared library for "grpc"
 ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_DEP)
+$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_DEP)
+$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_DEP)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.36 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBDIR)/$(CONFIG)/libre2.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.37 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libre2.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -1862,8 +1865,8 @@ endif
 
 
 # start of build recipe for library "grpc_unsecure" (generated by makelib(lib) template function)
-# deps: ['upb_collections_lib', 'upb', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
-# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'upb', 'utf8_range_lib', 'upb_collections_lib']
+# deps: ['upb_collections_lib', 'upb', 'utf8_range_lib', 'z', 'grpc_abseil', 'cares', 'gpr', 'address_sorting']
+# transitive_deps: ['address_sorting', 'gpr', 'grpc_abseil', 'cares', 'z', 'utf8_range_lib', 'upb', 'upb_collections_lib']
 LIBGRPC_UNSECURE_SRC = \
     src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
     src/core/ext/filters/census/grpc_context.cc \
@@ -1964,25 +1967,25 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/ext/transport/inproc/inproc_plugin.cc \
     src/core/ext/transport/inproc/inproc_transport.cc \
     src/core/ext/transport/inproc/legacy_inproc_transport.cc \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-    src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
+    src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+    src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+    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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+    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/lib/address_utils/parse_address.cc \
     src/core/lib/address_utils/sockaddr_utils.cc \
     src/core/lib/backoff/backoff.cc \
@@ -2019,12 +2022,12 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/event_engine/default_event_engine_factory.cc \
     src/core/lib/event_engine/event_engine.cc \
     src/core/lib/event_engine/forkable.cc \
-    src/core/lib/event_engine/memory_allocator.cc \
     src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \
     src/core/lib/event_engine/posix_engine/ev_poll_posix.cc \
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
+    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -2049,6 +2052,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/event_engine/time_util.cc \
     src/core/lib/event_engine/trace.cc \
     src/core/lib/event_engine/utils.cc \
+    src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
@@ -2253,7 +2257,13 @@ LIBGRPC_UNSECURE_SRC = \
     third_party/upb/upb/mini_descriptor/build_enum.c \
     third_party/upb/upb/mini_descriptor/decode.c \
     third_party/upb/upb/mini_descriptor/internal/base92.c \
+    third_party/upb/upb/mini_descriptor/internal/encode.c \
     third_party/upb/upb/mini_descriptor/link.c \
+    third_party/upb/upb/wire/decode.c \
+    third_party/upb/upb/wire/decode_fast.c \
+    third_party/upb/upb/wire/encode.c \
+    third_party/upb/upb/wire/eps_copy_input_stream.c \
+    third_party/upb/upb/wire/reader.c \
 
 PUBLIC_HEADERS_C += \
     include/grpc/byte_buffer.h \
@@ -2332,30 +2342,30 @@ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(base
 
 
 # static library for "grpc_unsecure"
-$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
-	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBADDRESS_SORTING_OBJS) $(LIBGPR_OBJS) $(LIBGRPC_ABSEIL_OBJS) $(LIBCARES_OBJS) $(ZLIB_MERGE_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
 endif
 
 # shared library for "grpc_unsecure"
 ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
 else
-$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_DEP) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_DEP) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.36 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.37 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(GRPC_ABSEIL_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libcares.a $(ZLIB_MERGE_LIBS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2421,8 +2431,8 @@ $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBRE2_OB
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libre2.so.36 -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libre2.so.37 -o $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBRE2_OBJS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)re2$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libre2$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2434,29 +2444,12 @@ endif
 
 
 # start of build recipe for library "upb" (generated by makelib(lib) template function)
-# deps: ['utf8_range_lib']
-# transitive_deps: ['utf8_range_lib']
+# deps: []
+# transitive_deps: []
 LIBUPB_SRC = \
     third_party/upb/upb/base/status.c \
-    third_party/upb/upb/collections/array.c \
-    third_party/upb/upb/collections/map.c \
-    third_party/upb/upb/collections/map_sorter.c \
-    third_party/upb/upb/hash/common.c \
-    third_party/upb/upb/lex/atoi.c \
-    third_party/upb/upb/lex/round_trip.c \
-    third_party/upb/upb/lex/strtod.c \
-    third_party/upb/upb/lex/unicode.c \
     third_party/upb/upb/mem/alloc.c \
     third_party/upb/upb/mem/arena.c \
-    third_party/upb/upb/message/message.c \
-    third_party/upb/upb/mini_table/extension_registry.c \
-    third_party/upb/upb/mini_table/internal/message.c \
-    third_party/upb/upb/mini_table/message.c \
-    third_party/upb/upb/wire/decode.c \
-    third_party/upb/upb/wire/decode_fast.c \
-    third_party/upb/upb/wire/encode.c \
-    third_party/upb/upb/wire/eps_copy_input_stream.c \
-    third_party/upb/upb/wire/reader.c \
 
 PUBLIC_HEADERS_C += \
 
@@ -2464,30 +2457,30 @@ LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIB
 
 
 # static library for "upb"
-$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
+$(LIBDIR)/$(CONFIG)/libupb.a: $(LIBUPB_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a
-	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
+	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) 
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb.a
 endif
 
 # shared library for "upb"
 ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
+$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LDLIBS)
 else
-$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
+$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS)
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.36 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.37 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2503,12 +2496,12 @@ endif
 # transitive_deps: []
 LIBUPB_COLLECTIONS_LIB_SRC = \
     third_party/upb/upb/base/status.c \
-    third_party/upb/upb/collections/array.c \
-    third_party/upb/upb/collections/map.c \
-    third_party/upb/upb/collections/map_sorter.c \
     third_party/upb/upb/hash/common.c \
     third_party/upb/upb/mem/alloc.c \
     third_party/upb/upb/mem/arena.c \
+    third_party/upb/upb/message/array.c \
+    third_party/upb/upb/message/map.c \
+    third_party/upb/upb/message/map_sorter.c \
     third_party/upb/upb/message/message.c \
     third_party/upb/upb/mini_table/extension_registry.c \
     third_party/upb/upb/mini_table/internal/message.c \
@@ -2542,8 +2535,8 @@ $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CO
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_collections_lib.so.36 -o $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_collections_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_COLLECTIONS_LIB_OBJS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)upb_collections_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_collections_lib$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2555,19 +2548,33 @@ endif
 
 
 # start of build recipe for library "upb_json_lib" (generated by makelib(lib) template function)
-# deps: ['upb_collections_lib', 'upb']
-# transitive_deps: ['upb', 'utf8_range_lib', 'upb_collections_lib']
+# deps: ['utf8_range_lib']
+# transitive_deps: ['utf8_range_lib']
 LIBUPB_JSON_LIB_SRC = \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    third_party/upb/upb/base/status.c \
+    third_party/upb/upb/hash/common.c \
     third_party/upb/upb/json/decode.c \
     third_party/upb/upb/json/encode.c \
+    third_party/upb/upb/lex/atoi.c \
+    third_party/upb/upb/lex/round_trip.c \
+    third_party/upb/upb/lex/strtod.c \
+    third_party/upb/upb/lex/unicode.c \
+    third_party/upb/upb/mem/alloc.c \
+    third_party/upb/upb/mem/arena.c \
     third_party/upb/upb/message/accessors.c \
+    third_party/upb/upb/message/array.c \
+    third_party/upb/upb/message/map.c \
+    third_party/upb/upb/message/map_sorter.c \
+    third_party/upb/upb/message/message.c \
     third_party/upb/upb/mini_descriptor/build_enum.c \
     third_party/upb/upb/mini_descriptor/decode.c \
     third_party/upb/upb/mini_descriptor/internal/base92.c \
     third_party/upb/upb/mini_descriptor/internal/encode.c \
     third_party/upb/upb/mini_descriptor/link.c \
-    third_party/upb/upb/reflection/def_builder.c \
+    third_party/upb/upb/mini_table/extension_registry.c \
+    third_party/upb/upb/mini_table/internal/message.c \
+    third_party/upb/upb/mini_table/message.c \
     third_party/upb/upb/reflection/def_pool.c \
     third_party/upb/upb/reflection/def_type.c \
     third_party/upb/upb/reflection/desc_state.c \
@@ -2577,12 +2584,19 @@ LIBUPB_JSON_LIB_SRC = \
     third_party/upb/upb/reflection/extension_range.c \
     third_party/upb/upb/reflection/field_def.c \
     third_party/upb/upb/reflection/file_def.c \
+    third_party/upb/upb/reflection/internal/def_builder.c \
+    third_party/upb/upb/reflection/internal/strdup2.c \
     third_party/upb/upb/reflection/message.c \
     third_party/upb/upb/reflection/message_def.c \
     third_party/upb/upb/reflection/message_reserved_range.c \
     third_party/upb/upb/reflection/method_def.c \
     third_party/upb/upb/reflection/oneof_def.c \
     third_party/upb/upb/reflection/service_def.c \
+    third_party/upb/upb/wire/decode.c \
+    third_party/upb/upb/wire/decode_fast.c \
+    third_party/upb/upb/wire/encode.c \
+    third_party/upb/upb/wire/eps_copy_input_stream.c \
+    third_party/upb/upb/wire/reader.c \
 
 PUBLIC_HEADERS_C += \
 
@@ -2590,30 +2604,30 @@ LIBUPB_JSON_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basen
 
 
 # static library for "upb_json_lib"
-$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+$(LIBDIR)/$(CONFIG)/libupb_json_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
-	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a $(LIBUPB_JSON_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_json_lib.a
 endif
 
 # shared library for "upb_json_lib"
 ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
 else
-$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.36 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_json_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_JSON_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)upb_json_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_json_lib$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2625,17 +2639,31 @@ endif
 
 
 # start of build recipe for library "upb_textformat_lib" (generated by makelib(lib) template function)
-# deps: ['upb_collections_lib', 'upb']
-# transitive_deps: ['upb', 'utf8_range_lib', 'upb_collections_lib']
+# deps: ['utf8_range_lib']
+# transitive_deps: ['utf8_range_lib']
 LIBUPB_TEXTFORMAT_LIB_SRC = \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    third_party/upb/upb/base/status.c \
+    third_party/upb/upb/hash/common.c \
+    third_party/upb/upb/lex/atoi.c \
+    third_party/upb/upb/lex/round_trip.c \
+    third_party/upb/upb/lex/strtod.c \
+    third_party/upb/upb/lex/unicode.c \
+    third_party/upb/upb/mem/alloc.c \
+    third_party/upb/upb/mem/arena.c \
     third_party/upb/upb/message/accessors.c \
+    third_party/upb/upb/message/array.c \
+    third_party/upb/upb/message/map.c \
+    third_party/upb/upb/message/map_sorter.c \
+    third_party/upb/upb/message/message.c \
     third_party/upb/upb/mini_descriptor/build_enum.c \
     third_party/upb/upb/mini_descriptor/decode.c \
     third_party/upb/upb/mini_descriptor/internal/base92.c \
     third_party/upb/upb/mini_descriptor/internal/encode.c \
     third_party/upb/upb/mini_descriptor/link.c \
-    third_party/upb/upb/reflection/def_builder.c \
+    third_party/upb/upb/mini_table/extension_registry.c \
+    third_party/upb/upb/mini_table/internal/message.c \
+    third_party/upb/upb/mini_table/message.c \
     third_party/upb/upb/reflection/def_pool.c \
     third_party/upb/upb/reflection/def_type.c \
     third_party/upb/upb/reflection/desc_state.c \
@@ -2645,6 +2673,8 @@ LIBUPB_TEXTFORMAT_LIB_SRC = \
     third_party/upb/upb/reflection/extension_range.c \
     third_party/upb/upb/reflection/field_def.c \
     third_party/upb/upb/reflection/file_def.c \
+    third_party/upb/upb/reflection/internal/def_builder.c \
+    third_party/upb/upb/reflection/internal/strdup2.c \
     third_party/upb/upb/reflection/message.c \
     third_party/upb/upb/reflection/message_def.c \
     third_party/upb/upb/reflection/message_reserved_range.c \
@@ -2652,6 +2682,11 @@ LIBUPB_TEXTFORMAT_LIB_SRC = \
     third_party/upb/upb/reflection/oneof_def.c \
     third_party/upb/upb/reflection/service_def.c \
     third_party/upb/upb/text/encode.c \
+    third_party/upb/upb/wire/decode.c \
+    third_party/upb/upb/wire/decode_fast.c \
+    third_party/upb/upb/wire/encode.c \
+    third_party/upb/upb/wire/eps_copy_input_stream.c \
+    third_party/upb/upb/wire/reader.c \
 
 PUBLIC_HEADERS_C += \
 
@@ -2659,30 +2694,30 @@ LIBUPB_TEXTFORMAT_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $
 
 
 # static library for "upb_textformat_lib"
-$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+$(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a: $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
-	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUPB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS) $(LIBUPB_COLLECTIONS_LIB_OBJS)
+	$(Q) $(AR) $(ARFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBUTF8_RANGE_LIB_OBJS)
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(RANLIB) $(RANLIBFLAGS) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib.a
 endif
 
 # shared library for "upb_textformat_lib"
 ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
 else
-$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a
+$(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
 ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.36 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LIBDIR)/$(CONFIG)/libupb_collections_lib.a $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb_textformat_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_TEXTFORMAT_LIB_OBJS) $(LIBDIR)/$(CONFIG)/libutf8_range_lib.a $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)upb_textformat_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb_textformat_lib$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -2729,8 +2764,8 @@ $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libutf8_range_lib.so.36 -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so.36
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libutf8_range_lib.so.37 -o $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUTF8_RANGE_LIB_OBJS) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so.37
 	$(Q) ln -sf $(SHARED_PREFIX)utf8_range_lib$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libutf8_range_lib$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -3343,300 +3378,300 @@ src/core/ext/filters/stateful_session/stateful_session_filter.cc: $(OPENSSL_DEP)
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc: $(OPENSSL_DEP)
 src/core/ext/gcp/metadata_query.cc: $(OPENSSL_DEP)
 src/core/ext/transport/chttp2/alpn/alpn.cc: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/annotations/resource.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/http.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/percent.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/range.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/google/api/httpbody.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/annotations/migrate.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/annotations/security.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/annotations/status.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/udpa/annotations/versioning.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/annotations/v3/security.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/annotations/v3/status.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/authority.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/cidr.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/context_params.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/extension.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/resource.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/v3/cel.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/v3/range.upb.c: $(OPENSSL_DEP)
-src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/api/http.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/api/http.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/validate/validate.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/xds/certificate_provider_store.cc: $(OPENSSL_DEP)
 src/core/ext/xds/file_watcher_certificate_provider_factory.cc: $(OPENSSL_DEP)
 src/core/ext/xds/xds_api.cc: $(OPENSSL_DEP)
@@ -3663,6 +3698,8 @@ src/core/ext/xds/xds_route_config.cc: $(OPENSSL_DEP)
 src/core/ext/xds/xds_routing.cc: $(OPENSSL_DEP)
 src/core/ext/xds/xds_server_config_fetcher.cc: $(OPENSSL_DEP)
 src/core/ext/xds/xds_transport_grpc.cc: $(OPENSSL_DEP)
+src/core/lib/gprpp/posix/directory_reader.cc: $(OPENSSL_DEP)
+src/core/lib/gprpp/windows/directory_reader.cc: $(OPENSSL_DEP)
 src/core/lib/http/httpcli_security_connector.cc: $(OPENSSL_DEP)
 src/core/lib/json/json_util.cc: $(OPENSSL_DEP)
 src/core/lib/matchers/matchers.cc: $(OPENSSL_DEP)
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index cdbc4bec0edb1..0000000000000
--- a/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-# Top level ownership
-@markdroth **/OWNERS
-@a11r **/OWNERS
diff --git a/Package.swift b/Package.swift
index d80643d568336..7c9d9ce10e9e2 100644
--- a/Package.swift
+++ b/Package.swift
@@ -332,632 +332,795 @@ let package = Package(
         "src/core/ext/transport/inproc/inproc_transport.h",
         "src/core/ext/transport/inproc/legacy_inproc_transport.cc",
         "src/core/ext/transport/inproc/legacy_inproc_transport.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h",
-        "src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c",
-        "src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h",
-        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c",
-        "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h",
-        "src/core/ext/upb-generated/envoy/annotations/resource.upb.c",
-        "src/core/ext/upb-generated/envoy/annotations/resource.upb.h",
-        "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c",
-        "src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c",
-        "src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c",
-        "src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h",
-        "src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c",
-        "src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h",
-        "src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c",
-        "src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c",
-        "src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c",
-        "src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c",
-        "src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c",
-        "src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h",
-        "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c",
-        "src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h",
-        "src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c",
-        "src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h",
-        "src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c",
-        "src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h",
-        "src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c",
-        "src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h",
-        "src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c",
-        "src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c",
-        "src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h",
-        "src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c",
-        "src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c",
-        "src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h",
-        "src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c",
-        "src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h",
-        "src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c",
-        "src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h",
-        "src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c",
-        "src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c",
-        "src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h",
-        "src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c",
-        "src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h",
-        "src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c",
-        "src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c",
-        "src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h",
-        "src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c",
-        "src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h",
-        "src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c",
-        "src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/http.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/http.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/percent.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/percent.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/range.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/range.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h",
-        "src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c",
-        "src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h",
-        "src/core/ext/upb-generated/google/api/annotations.upb.c",
-        "src/core/ext/upb-generated/google/api/annotations.upb.h",
-        "src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c",
-        "src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h",
-        "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c",
-        "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h",
-        "src/core/ext/upb-generated/google/api/http.upb.c",
-        "src/core/ext/upb-generated/google/api/http.upb.h",
-        "src/core/ext/upb-generated/google/api/httpbody.upb.c",
-        "src/core/ext/upb-generated/google/api/httpbody.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/any.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/any.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/duration.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/duration.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/empty.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h",
-        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c",
-        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h",
-        "src/core/ext/upb-generated/google/rpc/status.upb.c",
-        "src/core/ext/upb-generated/google/rpc/status.upb.h",
-        "src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c",
-        "src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h",
-        "src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c",
-        "src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h",
-        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.c",
-        "src/core/ext/upb-generated/udpa/annotations/migrate.upb.h",
-        "src/core/ext/upb-generated/udpa/annotations/security.upb.c",
-        "src/core/ext/upb-generated/udpa/annotations/security.upb.h",
-        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c",
-        "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h",
-        "src/core/ext/upb-generated/udpa/annotations/status.upb.c",
-        "src/core/ext/upb-generated/udpa/annotations/status.upb.h",
-        "src/core/ext/upb-generated/udpa/annotations/versioning.upb.c",
-        "src/core/ext/upb-generated/udpa/annotations/versioning.upb.h",
-        "src/core/ext/upb-generated/validate/validate.upb.c",
-        "src/core/ext/upb-generated/validate/validate.upb.h",
-        "src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c",
-        "src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h",
-        "src/core/ext/upb-generated/xds/annotations/v3/security.upb.c",
-        "src/core/ext/upb-generated/xds/annotations/v3/security.upb.h",
-        "src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c",
-        "src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h",
-        "src/core/ext/upb-generated/xds/annotations/v3/status.upb.c",
-        "src/core/ext/upb-generated/xds/annotations/v3/status.upb.h",
-        "src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c",
-        "src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/authority.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/authority.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/cidr.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/cidr.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/context_params.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/context_params.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/extension.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/extension.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/resource.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/resource.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h",
-        "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c",
-        "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h",
-        "src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c",
-        "src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h",
-        "src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c",
-        "src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c",
-        "src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h",
-        "src/core/ext/upb-generated/xds/type/v3/cel.upb.c",
-        "src/core/ext/upb-generated/xds/type/v3/cel.upb.h",
-        "src/core/ext/upb-generated/xds/type/v3/range.upb.c",
-        "src/core/ext/upb-generated/xds/type/v3/range.upb.h",
-        "src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c",
-        "src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h",
-        "src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c",
-        "src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h",
+        "src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h",
+        "src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/annotations/resource.upb.h",
+        "src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h",
+        "src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h",
+        "src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h",
+        "src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h",
+        "src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h",
+        "src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h",
+        "src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h",
+        "src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h",
+        "src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h",
+        "src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h",
+        "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/pick_first/v3/pick_first.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h",
+        "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/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.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/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",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h",
+        "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/common.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h",
+        "src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h",
+        "src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h",
+        "src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h",
+        "src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h",
+        "src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h",
+        "src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/http.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/percent.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/range.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h",
+        "src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h",
+        "src/core/ext/upb-gen/google/api/annotations.upb.h",
+        "src/core/ext/upb-gen/google/api/annotations.upb_minitable.c",
+        "src/core/ext/upb-gen/google/api/annotations.upb_minitable.h",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c",
+        "src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h",
+        "src/core/ext/upb-gen/google/api/http.upb.h",
+        "src/core/ext/upb-gen/google/api/http.upb_minitable.c",
+        "src/core/ext/upb-gen/google/api/http.upb_minitable.h",
+        "src/core/ext/upb-gen/google/api/httpbody.upb.h",
+        "src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c",
+        "src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/any.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/descriptor.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/duration.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/empty.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/struct.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/timestamp.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h",
+        "src/core/ext/upb-gen/google/protobuf/wrappers.upb.h",
+        "src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c",
+        "src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h",
+        "src/core/ext/upb-gen/google/rpc/status.upb.h",
+        "src/core/ext/upb-gen/google/rpc/status.upb_minitable.c",
+        "src/core/ext/upb-gen/google/rpc/status.upb_minitable.h",
+        "src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h",
+        "src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c",
+        "src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c",
+        "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.c",
+        "src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c",
+        "src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c",
+        "src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c",
+        "src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h",
+        "src/core/ext/upb-gen/udpa/annotations/migrate.upb.h",
+        "src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c",
+        "src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h",
+        "src/core/ext/upb-gen/udpa/annotations/security.upb.h",
+        "src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c",
+        "src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h",
+        "src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h",
+        "src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c",
+        "src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h",
+        "src/core/ext/upb-gen/udpa/annotations/status.upb.h",
+        "src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c",
+        "src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h",
+        "src/core/ext/upb-gen/udpa/annotations/versioning.upb.h",
+        "src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c",
+        "src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h",
+        "src/core/ext/upb-gen/validate/validate.upb.h",
+        "src/core/ext/upb-gen/validate/validate.upb_minitable.c",
+        "src/core/ext/upb-gen/validate/validate.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/security.upb.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/status.upb.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h",
+        "src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/authority.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/cidr.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/context_params.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/extension.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h",
+        "src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h",
+        "src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c",
+        "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.c",
+        "src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/v3/cel.upb.h",
+        "src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/v3/range.upb.h",
+        "src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h",
+        "src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h",
+        "src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c",
+        "src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c",
+        "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.c",
+        "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/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",
+        "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.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/api/http.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/api/http.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h",
+        "src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c",
+        "src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h",
+        "src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c",
+        "src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h",
+        "src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c",
+        "src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h",
+        "src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c",
+        "src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h",
+        "src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c",
+        "src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h",
+        "src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c",
+        "src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h",
+        "src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c",
+        "src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h",
+        "src/core/ext/upbdefs-gen/validate/validate.upbdefs.c",
+        "src/core/ext/upbdefs-gen/validate/validate.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h",
+        "src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c",
+        "src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h",
+        "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/ext/xds/certificate_provider_store.cc",
         "src/core/ext/xds/certificate_provider_store.h",
         "src/core/ext/xds/file_watcher_certificate_provider_factory.cc",
@@ -1097,7 +1260,6 @@ let package = Package(
         "src/core/lib/event_engine/forkable.h",
         "src/core/lib/event_engine/grpc_polled_fd.h",
         "src/core/lib/event_engine/handle_containers.h",
-        "src/core/lib/event_engine/memory_allocator.cc",
         "src/core/lib/event_engine/memory_allocator_factory.h",
         "src/core/lib/event_engine/nameser.h",
         "src/core/lib/event_engine/poller.h",
@@ -1114,6 +1276,8 @@ let package = Package(
         "src/core/lib/event_engine/posix_engine/internal_errqueue.h",
         "src/core/lib/event_engine/posix_engine/lockfree_event.cc",
         "src/core/lib/event_engine/posix_engine/lockfree_event.h",
+        "src/core/lib/event_engine/posix_engine/native_dns_resolver.cc",
+        "src/core/lib/event_engine/posix_engine/native_dns_resolver.h",
         "src/core/lib/event_engine/posix_engine/posix_endpoint.cc",
         "src/core/lib/event_engine/posix_engine/posix_endpoint.h",
         "src/core/lib/event_engine/posix_engine/posix_engine.cc",
@@ -1140,6 +1304,7 @@ let package = Package(
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h",
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc",
         "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h",
+        "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h",
         "src/core/lib/event_engine/resolved_address.cc",
         "src/core/lib/event_engine/resolved_address_internal.h",
         "src/core/lib/event_engine/shim.cc",
@@ -1164,6 +1329,8 @@ let package = Package(
         "src/core/lib/event_engine/trace.h",
         "src/core/lib/event_engine/utils.cc",
         "src/core/lib/event_engine/utils.h",
+        "src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc",
+        "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h",
         "src/core/lib/event_engine/windows/iocp.cc",
         "src/core/lib/event_engine/windows/iocp.h",
         "src/core/lib/event_engine/windows/win_socket.cc",
@@ -1223,6 +1390,7 @@ let package = Package(
         "src/core/lib/gprpp/crash.cc",
         "src/core/lib/gprpp/crash.h",
         "src/core/lib/gprpp/debug_location.h",
+        "src/core/lib/gprpp/directory_reader.h",
         "src/core/lib/gprpp/dual_ref_counted.h",
         "src/core/lib/gprpp/env.h",
         "src/core/lib/gprpp/examine_stack.cc",
@@ -1247,6 +1415,7 @@ let package = Package(
         "src/core/lib/gprpp/packed_table.h",
         "src/core/lib/gprpp/per_cpu.cc",
         "src/core/lib/gprpp/per_cpu.h",
+        "src/core/lib/gprpp/posix/directory_reader.cc",
         "src/core/lib/gprpp/posix/env.cc",
         "src/core/lib/gprpp/posix/stat.cc",
         "src/core/lib/gprpp/posix/thd.cc",
@@ -1276,6 +1445,7 @@ let package = Package(
         "src/core/lib/gprpp/unique_type_name.h",
         "src/core/lib/gprpp/validation_errors.cc",
         "src/core/lib/gprpp/validation_errors.h",
+        "src/core/lib/gprpp/windows/directory_reader.cc",
         "src/core/lib/gprpp/windows/env.cc",
         "src/core/lib/gprpp/windows/stat.cc",
         "src/core/lib/gprpp/windows/thd.cc",
@@ -1484,6 +1654,7 @@ let package = Package(
         "src/core/lib/promise/seq.h",
         "src/core/lib/promise/sleep.cc",
         "src/core/lib/promise/sleep.h",
+        "src/core/lib/promise/status_flag.h",
         "src/core/lib/promise/trace.cc",
         "src/core/lib/promise/trace.h",
         "src/core/lib/promise/try_seq.h",
@@ -1832,29 +2003,12 @@ let package = Package(
         "third_party/re2/util/strutil.h",
         "third_party/re2/util/utf.h",
         "third_party/re2/util/util.h",
-        "third_party/upb/upb/alloc.h",
-        "third_party/upb/upb/arena.h",
-        "third_party/upb/upb/array.h",
         "third_party/upb/upb/base/descriptor_constants.h",
-        "third_party/upb/upb/base/log2.h",
+        "third_party/upb/upb/base/internal/log2.h",
         "third_party/upb/upb/base/status.c",
         "third_party/upb/upb/base/status.h",
+        "third_party/upb/upb/base/status.hpp",
         "third_party/upb/upb/base/string_view.h",
-        "third_party/upb/upb/collections/array.c",
-        "third_party/upb/upb/collections/array.h",
-        "third_party/upb/upb/collections/array_internal.h",
-        "third_party/upb/upb/collections/map.c",
-        "third_party/upb/upb/collections/map.h",
-        "third_party/upb/upb/collections/map_gencode_util.h",
-        "third_party/upb/upb/collections/map_internal.h",
-        "third_party/upb/upb/collections/map_sorter.c",
-        "third_party/upb/upb/collections/map_sorter_internal.h",
-        "third_party/upb/upb/collections/message_value.h",
-        "third_party/upb/upb/decode.h",
-        "third_party/upb/upb/def.h",
-        "third_party/upb/upb/def.hpp",
-        "third_party/upb/upb/encode.h",
-        "third_party/upb/upb/extension_registry.h",
         "third_party/upb/upb/generated_code_support.h",
         "third_party/upb/upb/hash/common.c",
         "third_party/upb/upb/hash/common.h",
@@ -1872,21 +2026,33 @@ let package = Package(
         "third_party/upb/upb/lex/strtod.h",
         "third_party/upb/upb/lex/unicode.c",
         "third_party/upb/upb/lex/unicode.h",
-        "third_party/upb/upb/map.h",
         "third_party/upb/upb/mem/alloc.c",
         "third_party/upb/upb/mem/alloc.h",
         "third_party/upb/upb/mem/arena.c",
         "third_party/upb/upb/mem/arena.h",
-        "third_party/upb/upb/mem/arena_internal.h",
+        "third_party/upb/upb/mem/arena.hpp",
+        "third_party/upb/upb/mem/internal/arena.h",
         "third_party/upb/upb/message/accessors.c",
         "third_party/upb/upb/message/accessors.h",
-        "third_party/upb/upb/message/accessors_internal.h",
-        "third_party/upb/upb/message/extension_internal.h",
-        "third_party/upb/upb/message/internal.h",
+        "third_party/upb/upb/message/array.c",
+        "third_party/upb/upb/message/array.h",
+        "third_party/upb/upb/message/internal/accessors.h",
+        "third_party/upb/upb/message/internal/array.h",
+        "third_party/upb/upb/message/internal/extension.h",
+        "third_party/upb/upb/message/internal/map.h",
         "third_party/upb/upb/message/internal/map_entry.h",
+        "third_party/upb/upb/message/internal/map_sorter.h",
+        "third_party/upb/upb/message/internal/message.h",
+        "third_party/upb/upb/message/internal/types.h",
+        "third_party/upb/upb/message/map.c",
+        "third_party/upb/upb/message/map.h",
+        "third_party/upb/upb/message/map_gencode_util.h",
+        "third_party/upb/upb/message/map_sorter.c",
         "third_party/upb/upb/message/message.c",
         "third_party/upb/upb/message/message.h",
         "third_party/upb/upb/message/tagged_ptr.h",
+        "third_party/upb/upb/message/types.h",
+        "third_party/upb/upb/message/value.h",
         "third_party/upb/upb/mini_descriptor/build_enum.c",
         "third_party/upb/upb/mini_descriptor/build_enum.h",
         "third_party/upb/upb/mini_descriptor/decode.c",
@@ -1917,82 +2083,76 @@ let package = Package(
         "third_party/upb/upb/mini_table/message.c",
         "third_party/upb/upb/mini_table/message.h",
         "third_party/upb/upb/mini_table/sub.h",
-        "third_party/upb/upb/msg.h",
         "third_party/upb/upb/port/atomic.h",
         "third_party/upb/upb/port/def.inc",
         "third_party/upb/upb/port/undef.inc",
         "third_party/upb/upb/port/vsnprintf_compat.h",
-        "third_party/upb/upb/reflection.h",
-        "third_party/upb/upb/reflection.hpp",
         "third_party/upb/upb/reflection/common.h",
         "third_party/upb/upb/reflection/def.h",
         "third_party/upb/upb/reflection/def.hpp",
-        "third_party/upb/upb/reflection/def_builder.c",
-        "third_party/upb/upb/reflection/def_builder_internal.h",
         "third_party/upb/upb/reflection/def_pool.c",
         "third_party/upb/upb/reflection/def_pool.h",
-        "third_party/upb/upb/reflection/def_pool_internal.h",
         "third_party/upb/upb/reflection/def_type.c",
         "third_party/upb/upb/reflection/def_type.h",
         "third_party/upb/upb/reflection/desc_state.c",
-        "third_party/upb/upb/reflection/desc_state_internal.h",
         "third_party/upb/upb/reflection/enum_def.c",
         "third_party/upb/upb/reflection/enum_def.h",
-        "third_party/upb/upb/reflection/enum_def_internal.h",
         "third_party/upb/upb/reflection/enum_reserved_range.c",
         "third_party/upb/upb/reflection/enum_reserved_range.h",
-        "third_party/upb/upb/reflection/enum_reserved_range_internal.h",
         "third_party/upb/upb/reflection/enum_value_def.c",
         "third_party/upb/upb/reflection/enum_value_def.h",
-        "third_party/upb/upb/reflection/enum_value_def_internal.h",
         "third_party/upb/upb/reflection/extension_range.c",
         "third_party/upb/upb/reflection/extension_range.h",
-        "third_party/upb/upb/reflection/extension_range_internal.h",
         "third_party/upb/upb/reflection/field_def.c",
         "third_party/upb/upb/reflection/field_def.h",
-        "third_party/upb/upb/reflection/field_def_internal.h",
         "third_party/upb/upb/reflection/file_def.c",
         "third_party/upb/upb/reflection/file_def.h",
-        "third_party/upb/upb/reflection/file_def_internal.h",
+        "third_party/upb/upb/reflection/internal/def_builder.c",
+        "third_party/upb/upb/reflection/internal/def_builder.h",
+        "third_party/upb/upb/reflection/internal/def_pool.h",
+        "third_party/upb/upb/reflection/internal/desc_state.h",
+        "third_party/upb/upb/reflection/internal/enum_def.h",
+        "third_party/upb/upb/reflection/internal/enum_reserved_range.h",
+        "third_party/upb/upb/reflection/internal/enum_value_def.h",
+        "third_party/upb/upb/reflection/internal/extension_range.h",
+        "third_party/upb/upb/reflection/internal/field_def.h",
+        "third_party/upb/upb/reflection/internal/file_def.h",
+        "third_party/upb/upb/reflection/internal/message_def.h",
+        "third_party/upb/upb/reflection/internal/message_reserved_range.h",
+        "third_party/upb/upb/reflection/internal/method_def.h",
+        "third_party/upb/upb/reflection/internal/oneof_def.h",
+        "third_party/upb/upb/reflection/internal/service_def.h",
+        "third_party/upb/upb/reflection/internal/strdup2.c",
+        "third_party/upb/upb/reflection/internal/strdup2.h",
         "third_party/upb/upb/reflection/message.c",
         "third_party/upb/upb/reflection/message.h",
         "third_party/upb/upb/reflection/message.hpp",
         "third_party/upb/upb/reflection/message_def.c",
         "third_party/upb/upb/reflection/message_def.h",
-        "third_party/upb/upb/reflection/message_def_internal.h",
         "third_party/upb/upb/reflection/message_reserved_range.c",
         "third_party/upb/upb/reflection/message_reserved_range.h",
-        "third_party/upb/upb/reflection/message_reserved_range_internal.h",
         "third_party/upb/upb/reflection/method_def.c",
         "third_party/upb/upb/reflection/method_def.h",
-        "third_party/upb/upb/reflection/method_def_internal.h",
         "third_party/upb/upb/reflection/oneof_def.c",
         "third_party/upb/upb/reflection/oneof_def.h",
-        "third_party/upb/upb/reflection/oneof_def_internal.h",
         "third_party/upb/upb/reflection/service_def.c",
         "third_party/upb/upb/reflection/service_def.h",
-        "third_party/upb/upb/reflection/service_def_internal.h",
-        "third_party/upb/upb/status.h",
-        "third_party/upb/upb/string_view.h",
         "third_party/upb/upb/text/encode.c",
         "third_party/upb/upb/text/encode.h",
-        "third_party/upb/upb/text_encode.h",
-        "third_party/upb/upb/upb.h",
         "third_party/upb/upb/upb.hpp",
-        "third_party/upb/upb/wire/common.h",
-        "third_party/upb/upb/wire/common_internal.h",
         "third_party/upb/upb/wire/decode.c",
         "third_party/upb/upb/wire/decode.h",
         "third_party/upb/upb/wire/decode_fast.c",
         "third_party/upb/upb/wire/decode_fast.h",
-        "third_party/upb/upb/wire/decode_internal.h",
         "third_party/upb/upb/wire/encode.c",
         "third_party/upb/upb/wire/encode.h",
         "third_party/upb/upb/wire/eps_copy_input_stream.c",
         "third_party/upb/upb/wire/eps_copy_input_stream.h",
+        "third_party/upb/upb/wire/internal/constants.h",
+        "third_party/upb/upb/wire/internal/decode.h",
+        "third_party/upb/upb/wire/internal/swap.h",
         "third_party/upb/upb/wire/reader.c",
         "third_party/upb/upb/wire/reader.h",
-        "third_party/upb/upb/wire/swap_internal.h",
         "third_party/upb/upb/wire/types.h",
         "third_party/utf8_range/naive.c",
         "third_party/utf8_range/range2-neon.c",
@@ -2008,8 +2168,8 @@ let package = Package(
         .headerSearchPath("third_party/upb/"),
         .headerSearchPath("third_party/utf8_range/"),
         .headerSearchPath("third_party/xxhash/"),
-        .headerSearchPath("src/core/ext/upb-generated/"),
-        .headerSearchPath("src/core/ext/upbdefs-generated/"),
+        .headerSearchPath("src/core/ext/upb-gen/"),
+        .headerSearchPath("src/core/ext/upbdefs-gen/"),
         .define("GRPC_ARES", to: "0"),
       ],
       linkerSettings: [
@@ -2051,7 +2211,7 @@ let package = Package(
         .headerSearchPath("./"),
         .headerSearchPath("include/"),
         .headerSearchPath("third_party/upb/"),
-        .headerSearchPath("src/core/ext/upb-generated"),
+        .headerSearchPath("src/core/ext/upb-gen"),
       ]
     ),
     .testTarget(
diff --git a/WORKSPACE b/WORKSPACE
index 118bae2aab595..39ec89b02c579 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -66,7 +66,7 @@ pip_install(
     requirements = "@com_github_grpc_grpc//:requirements.bazel.txt",
 )
 
-load("@upb//bazel:system_python.bzl", "system_python")
+load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
 
 system_python(
     name = "system_python",
@@ -77,9 +77,9 @@ load("@system_python//:pip.bzl", "pip_parse")
 
 pip_parse(
     name = "pip_deps",
-    requirements = "@upb//python:requirements.txt",
+    requirements = "@com_google_protobuf//python:requirements.txt",
     requirements_overrides = {
-        "3.11": "@upb//python:requirements_311.txt",
+        "3.11": "@com_google_protobuf//python:requirements_311.txt",
     },
 )
 
diff --git a/_metadata.py b/_metadata.py
index a21f0695e23ad..cdc48b2f27685 100644
--- a/_metadata.py
+++ b/_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
 
-__version__ = """1.60.0.dev0"""
+__version__ = """1.61.0.dev0"""
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 753a7955c6614..e5f402426956b 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -16,6 +16,47 @@
 
 """Dictionary of tags to experiments so we know when to test different experiments."""
 
+EXPERIMENT_ENABLES = {
+    "call_status_override_on_cancellation": "call_status_override_on_cancellation",
+    "canary_client_privacy": "canary_client_privacy",
+    "client_idleness": "client_idleness",
+    "client_privacy": "client_privacy",
+    "event_engine_client": "event_engine_client",
+    "event_engine_dns": "event_engine_dns",
+    "event_engine_listener": "event_engine_listener",
+    "free_large_allocator": "free_large_allocator",
+    "http2_stats_fix": "http2_stats_fix",
+    "keepalive_fix": "keepalive_fix",
+    "keepalive_server_fix": "keepalive_server_fix",
+    "memory_pressure_controller": "memory_pressure_controller",
+    "monitoring_experiment": "monitoring_experiment",
+    "multiping": "multiping",
+    "overload_protection": "overload_protection",
+    "peer_state_based_framing": "peer_state_based_framing",
+    "pending_queue_cap": "pending_queue_cap",
+    "pick_first_happy_eyeballs": "pick_first_happy_eyeballs",
+    "promise_based_client_call": "promise_based_client_call",
+    "promise_based_inproc_transport": "promise_based_inproc_transport",
+    "promise_based_server_call": "promise_based_server_call",
+    "red_max_concurrent_streams": "red_max_concurrent_streams",
+    "registered_method_lookup_in_transport": "registered_method_lookup_in_transport",
+    "registered_methods_map": "registered_methods_map",
+    "rfc_max_concurrent_streams": "rfc_max_concurrent_streams",
+    "round_robin_delegate_to_pick_first": "round_robin_delegate_to_pick_first",
+    "rstpit": "rstpit",
+    "schedule_cancellation_over_write": "schedule_cancellation_over_write",
+    "server_privacy": "server_privacy",
+    "tcp_frame_size_tuning": "tcp_frame_size_tuning",
+    "tcp_rcv_lowat": "tcp_rcv_lowat",
+    "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",
+    "write_size_policy": "write_size_policy",
+    "write_size_cap": "write_size_cap,write_size_policy",
+    "wrr_delegate_to_pick_first": "wrr_delegate_to_pick_first",
+}
+
 EXPERIMENTS = {
     "windows": {
         "dbg": {
@@ -65,17 +106,9 @@ EXPERIMENTS = {
             ],
         },
         "on": {
-            "bad_client_test": [
-                "block_excessive_requests_before_settings_ack",
-                "tarpit",
-            ],
             "core_end2end_test": [
                 "event_engine_listener",
             ],
-            "cpp_end2end_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-            ],
             "cpp_lb_end2end_test": [
                 "pick_first_happy_eyeballs",
                 "round_robin_delegate_to_pick_first",
@@ -85,9 +118,6 @@ EXPERIMENTS = {
                 "event_engine_listener",
             ],
             "flow_control_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-                "lazier_stream_updates",
                 "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
@@ -155,23 +185,12 @@ EXPERIMENTS = {
             ],
         },
         "on": {
-            "bad_client_test": [
-                "block_excessive_requests_before_settings_ack",
-                "tarpit",
-            ],
-            "cpp_end2end_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-            ],
             "cpp_lb_end2end_test": [
                 "pick_first_happy_eyeballs",
                 "round_robin_delegate_to_pick_first",
                 "wrr_delegate_to_pick_first",
             ],
             "flow_control_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-                "lazier_stream_updates",
                 "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
@@ -249,17 +268,9 @@ EXPERIMENTS = {
             ],
         },
         "on": {
-            "bad_client_test": [
-                "block_excessive_requests_before_settings_ack",
-                "tarpit",
-            ],
             "core_end2end_test": [
                 "event_engine_listener",
             ],
-            "cpp_end2end_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-            ],
             "cpp_lb_end2end_test": [
                 "pick_first_happy_eyeballs",
                 "round_robin_delegate_to_pick_first",
@@ -269,9 +280,6 @@ EXPERIMENTS = {
                 "event_engine_listener",
             ],
             "flow_control_test": [
-                "chttp2_batch_requests",
-                "chttp2_offload_on_rst_stream",
-                "lazier_stream_updates",
                 "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
diff --git a/bazel/googleapis.BUILD b/bazel/googleapis.BUILD
index dc7e05f742428..ee9473b1526f0 100644
--- a/bazel/googleapis.BUILD
+++ b/bazel/googleapis.BUILD
@@ -15,7 +15,7 @@
 licenses(["notice"])
 
 package(
-    default_visibility = ["//visibility:public"]
+    default_visibility = ["//visibility:public"],
 )
 
 # This is needed for the dependency on google_cloud_cpp to work.
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 5948a1cd151c6..abff3d2adc2ca 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -29,11 +29,11 @@ Contains macros used throughout the repo.
 
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
-load("//bazel:experiments.bzl", "EXPERIMENTS")
-load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS")
-load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
+load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES")
+load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES")
 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:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 
 # The set of pollers to test against if a test exercises polling
 POLLERS = ["epoll1", "poll"]
@@ -204,8 +204,8 @@ def grpc_cc_library(
         includes = [
             "api/include",
             "include",
-            "src/core/ext/upb-generated",  # Once upb code-gen issue is resolved, remove this.
-            "src/core/ext/upbdefs-generated",  # Once upb code-gen issue is resolved, remove this.
+            "src/core/ext/upb-gen",  # Once upb code-gen issue is resolved, remove this.
+            "src/core/ext/upbdefs-gen",  # Once upb code-gen issue is resolved, remove this.
         ],
         alwayslink = alwayslink,
         data = data,
@@ -418,6 +418,7 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
         return tags
 
     experiment_config = list(poller_config)
+    experiment_enables = {k: v for k, v in EXPERIMENT_ENABLES.items() + TEST_EXPERIMENT_ENABLES.items()}
     for mode, config in mode_config.items():
         enabled_tags, disabled_tags = config
         if enabled_tags != None:
@@ -426,7 +427,7 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
                     config = dict(config)
                     config["name"] = config["name"] + "@experiment=" + experiment
                     env = dict(config["env"])
-                    env["GRPC_EXPERIMENTS"] = experiment
+                    env["GRPC_EXPERIMENTS"] = experiment_enables[experiment]
                     env["GRPC_CI_EXPERIMENTS"] = "1"
                     config["env"] = env
                     tags = config["tags"] + ["experiment_variation"]
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index ca0a519bf74b3..1f64e9fe5b43e 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -22,42 +22,57 @@ def grpc_deps():
 
     native.bind(
         name = "upb_lib",
-        actual = "@upb//:upb",
+        actual = "@com_google_protobuf//upb",
+    )
+
+    native.bind(
+        name = "upb_amalgamation_lib",
+        actual = "@com_google_protobuf//upb:amalgamation",
+    )
+
+    native.bind(
+        name = "upb_base_lib",
+        actual = "@com_google_protobuf//upb/base",
     )
 
     native.bind(
         name = "upb_collections_lib",
-        actual = "@upb//:collections",
+        actual = "@com_google_protobuf//upb/collections",
+    )
+
+    native.bind(
+        name = "upb_mem_lib",
+        actual = "@com_google_protobuf//upb/mem",
     )
 
     native.bind(
         name = "upb_reflection",
-        actual = "@upb//:reflection",
+        actual = "@com_google_protobuf//upb:reflection",
     )
 
     native.bind(
         name = "upb_lib_descriptor",
-        actual = "@upb//:descriptor_upb_proto",
+        actual = "@com_google_protobuf//upb:descriptor_upb_proto",
     )
 
     native.bind(
         name = "upb_lib_descriptor_reflection",
-        actual = "@upb//:descriptor_upb_proto_reflection",
+        actual = "@com_google_protobuf//upb:descriptor_upb_proto_reflection",
     )
 
     native.bind(
         name = "upb_textformat_lib",
-        actual = "@upb//:textformat",
+        actual = "@com_google_protobuf//upb/text",
     )
 
     native.bind(
         name = "upb_json_lib",
-        actual = "@upb//:json",
+        actual = "@com_google_protobuf//upb/json",
     )
 
     native.bind(
         name = "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        actual = "@upb//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        actual = "@com_google_protobuf//upb:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
     )
 
     native.bind(
@@ -243,12 +258,12 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "660ce016f987550bc1ccec4a6ee4199afb871799b696227098e3641476a7d566",
-            strip_prefix = "protobuf-b2b7a51158418f41cff0520894836c15b1738721",
+            sha256 = "7ed5fc41fe1614e551025f8e14b79b026a015b3ed337d38920c586f3ea35d818",
+            strip_prefix = "protobuf-6b5d8db01fe47478e8d400f550e797e6230d464e",
             urls = [
-                # https://github.com/protocolbuffers/protobuf/commits/v24.3
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/b2b7a51158418f41cff0520894836c15b1738721.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/b2b7a51158418f41cff0520894836c15b1738721.tar.gz",
+                # https://github.com/protocolbuffers/protobuf/commits/v25.0
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
             ],
             patches = [
                 "@com_github_grpc_grpc//third_party:protobuf.patch",
@@ -380,18 +395,6 @@ def grpc_deps():
             ],
         )
 
-    if "upb" not in native.existing_rules():
-        http_archive(
-            name = "upb",
-            sha256 = "5147e0ab6a28421d1e49004f4a205d84f06b924585e15eaa884cfe13289165b7",
-            strip_prefix = "upb-42cd08932e364a4cde35033b73f15c30250d7c2e",
-            urls = [
-                # https://github.com/protocolbuffers/upb/commits/24.x
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz",
-                "https://github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz",
-            ],
-        )
-
     if "envoy_api" not in native.existing_rules():
         http_archive(
             name = "envoy_api",
@@ -509,11 +512,11 @@ def grpc_deps():
     if "io_opentelemetry_cpp" not in native.existing_rules():
         http_archive(
             name = "io_opentelemetry_cpp",
-            sha256 = "f30cd88bf898a5726d245eba882b8e81012021eb00df34109f4dfb203f005cea",
-            strip_prefix = "opentelemetry-cpp-1.11.0",
+            sha256 = "149f076cc7a79bbd3a3c34fb3ab61d3a3e8dcfe2b9596f79153e17123c32f897",
+            strip_prefix = "opentelemetry-cpp-064fef0d871c57ffac6739d3311659a5770a9db4",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.11.0.tar.gz",
-                "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.11.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/064fef0d871c57ffac6739d3311659a5770a9db4.tar.gz",
+                "https://github.com/open-telemetry/opentelemetry-cpp/archive/064fef0d871c57ffac6739d3311659a5770a9db4.tar.gz",
             ],
         )
 
diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl
index e57aa968eaffc..2ad8a69325f55 100644
--- a/bazel/grpc_extra_deps.bzl
+++ b/bazel/grpc_extra_deps.bzl
@@ -22,7 +22,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
 load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 
 def grpc_extra_deps(ignore_version_differences = False):
     """Loads the extra dependencies.
@@ -49,8 +48,6 @@ def grpc_extra_deps(ignore_version_differences = False):
     """
     protobuf_deps()
 
-    upb_deps()
-
     api_dependencies()
 
     go_rules_dependencies()
diff --git a/bazel/supported_versions.txt b/bazel/supported_versions.txt
index b35d8c6ca5d4a..19b860c1872d5 100644
--- a/bazel/supported_versions.txt
+++ b/bazel/supported_versions.txt
@@ -1,2 +1 @@
-6.3.2
-5.4.1
+6.4.0
diff --git a/bazel/test_experiments.bzl b/bazel/test_experiments.bzl
index 21c52e747ad60..593d2dc468306 100644
--- a/bazel/test_experiments.bzl
+++ b/bazel/test_experiments.bzl
@@ -16,6 +16,13 @@
 
 """Dictionary of tags to experiments so we know when to test different experiments."""
 
+TEST_EXPERIMENT_ENABLES = {
+    "test_experiment_1": "test_experiment_1",
+    "test_experiment_2": "test_experiment_2",
+    "test_experiment_3": "test_experiment_3",
+    "test_experiment_4": "test_experiment_4",
+}
+
 TEST_EXPERIMENTS = {
     "windows": {
         "dbg": {
diff --git a/bazel/update_mirror.sh b/bazel/update_mirror.sh
index 0764874612ace..b2677283c3550 100755
--- a/bazel/update_mirror.sh
+++ b/bazel/update_mirror.sh
@@ -57,17 +57,9 @@ function upload {
 # upload "github.com/google/boringssl/archive/1c2769383f027befac5b75b6cedd25daf3bf4dcf.tar.gz"
 
 # bazel binaries used by the tools/bazel wrapper script
-upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-windows-x86_64.exe
-
-upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-windows-x86_64.exe
-
-upload github.com/bazelbuild/bazel/releases/download/6.3.2/bazel-6.3.2-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.3.2/bazel-6.3.2-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.3.2/bazel-6.3.2-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-windows-x86_64.exe
 
 # Collect the github archives to mirror from grpc_deps.bzl
 grep -o '"https://github.com/[^"]*"' bazel/grpc_deps.bzl | sed 's/^"https:\/\///' | sed 's/"$//' | while read -r line ; do
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 3b647faef7c25..f5ea18449e226 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -318,319 +318,482 @@ libs:
   - src/core/ext/transport/chttp2/transport/write_size_policy.h
   - src/core/ext/transport/inproc/inproc_transport.h
   - src/core/ext/transport/inproc/legacy_inproc_transport.h
-  - src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h
-  - src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h
-  - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
-  - src/core/ext/upb-generated/envoy/annotations/resource.upb.h
-  - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
-  - src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
-  - src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h
-  - src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h
-  - src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h
-  - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h
-  - src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h
-  - src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h
-  - src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
-  - src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h
-  - src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h
-  - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h
-  - src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h
-  - src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h
-  - src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h
-  - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/http.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/percent.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/range.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h
-  - src/core/ext/upb-generated/google/api/annotations.upb.h
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h
-  - src/core/ext/upb-generated/google/api/http.upb.h
-  - src/core/ext/upb-generated/google/api/httpbody.upb.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.h
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.h
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.h
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
-  - src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/security.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/status.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
-  - src/core/ext/upb-generated/validate/validate.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/security.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/status.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/authority.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/cidr.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/extension.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
-  - src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h
-  - src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/cel.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/range.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h
-  - src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/api/http.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h
-  - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h
-  - src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
-  - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h
-  - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h
-  - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h
-  - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h
-  - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h
-  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h
-  - src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h
+  - src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
+  - src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb.h
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
+  - src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
+  - src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
+  - src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
+  - src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
+  - src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
+  - src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
+  - src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
+  - 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/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
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
+  - src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
+  - src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
+  - src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
+  - src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/annotations.upb.h
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/http.upb.h
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/httpbody.upb.h
+  - src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+  - src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
+  - src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
+  - 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/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/security.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/status.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
+  - src/core/ext/upb-gen/validate/validate.upb.h
+  - src/core/ext/upb-gen/validate/validate.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
+  - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
+  - 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/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/range.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
+  - 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/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
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
+  - src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
+  - src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
+  - src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
+  - src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
+  - src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
+  - src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
+  - src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
+  - src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
+  - 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/ext/xds/certificate_provider_store.h
   - src/core/ext/xds/file_watcher_certificate_provider_factory.h
   - src/core/ext/xds/upb_utils.h
@@ -714,6 +877,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -728,6 +892,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
   - src/core/lib/event_engine/tcp_socket_utils.h
@@ -738,6 +903,7 @@ libs:
   - src/core/lib/event_engine/time_util.h
   - src/core/lib/event_engine/trace.h
   - src/core/lib/event_engine/utils.h
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
@@ -752,6 +918,7 @@ libs:
   - src/core/lib/gprpp/bitset.h
   - src/core/lib/gprpp/chunked_vector.h
   - src/core/lib/gprpp/cpp_impl_of.h
+  - src/core/lib/gprpp/directory_reader.h
   - src/core/lib/gprpp/dual_ref_counted.h
   - src/core/lib/gprpp/if_list.h
   - src/core/lib/gprpp/load_file.h
@@ -885,6 +1052,7 @@ libs:
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
   - src/core/lib/promise/sleep.h
+  - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/trace.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resolver/endpoint_addresses.h
@@ -1035,8 +1203,6 @@ libs:
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
   - third_party/upb/upb/generated_code_support.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
   - third_party/xxhash/xxhash.h
   src:
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -1154,319 +1320,319 @@ libs:
   - src/core/ext/transport/inproc/inproc_plugin.cc
   - src/core/ext/transport/inproc/inproc_transport.cc
   - src/core/ext/transport/inproc/legacy_inproc_transport.cc
-  - src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c
-  - src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c
-  - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
-  - src/core/ext/upb-generated/envoy/annotations/resource.upb.c
-  - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
-  - src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
-  - src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
-  - src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
-  - src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c
-  - src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c
-  - src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c
-  - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
-  - src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c
-  - src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c
-  - src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
-  - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c
-  - src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
-  - src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
-  - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
-  - src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c
-  - src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c
-  - src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
-  - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/http.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/range.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
-  - src/core/ext/upb-generated/google/api/annotations.upb.c
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
-  - src/core/ext/upb-generated/google/api/http.upb.c
-  - src/core/ext/upb-generated/google/api/httpbody.upb.c
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
-  - src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/security.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/status.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
-  - src/core/ext/upb-generated/validate/validate.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/authority.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/extension.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  - src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
-  - src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/cel.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/range.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
-  - src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
-  - src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
-  - src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
-  - src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
-  - src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
-  - src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
-  - src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
-  - src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
-  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c
-  - src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
+  - src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
+  - 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/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
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  - src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
+  - 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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
+  - src/core/ext/upb-gen/validate/validate.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c
+  - 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/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
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/api/http.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c
+  - src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c
+  - src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
+  - src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c
+  - src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c
+  - src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c
+  - src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c
+  - src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c
+  - src/core/ext/upbdefs-gen/validate/validate.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c
+  - src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c
+  - 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/ext/xds/certificate_provider_store.cc
   - src/core/ext/xds/file_watcher_certificate_provider_factory.cc
   - src/core/ext/xds/xds_api.cc
@@ -1529,12 +1695,12 @@ libs:
   - src/core/lib/event_engine/default_event_engine_factory.cc
   - src/core/lib/event_engine/event_engine.cc
   - src/core/lib/event_engine/forkable.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -1559,6 +1725,7 @@ libs:
   - src/core/lib/event_engine/time_util.cc
   - src/core/lib/event_engine/trace.cc
   - src/core/lib/event_engine/utils.cc
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -1569,11 +1736,13 @@ libs:
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/load_file.cc
   - src/core/lib/gprpp/per_cpu.cc
+  - src/core/lib/gprpp/posix/directory_reader.cc
   - src/core/lib/gprpp/ref_counted_string.cc
   - src/core/lib/gprpp/status_helper.cc
   - src/core/lib/gprpp/time.cc
   - src/core/lib/gprpp/time_averaged_stats.cc
   - src/core/lib/gprpp/validation_errors.cc
+  - src/core/lib/gprpp/windows/directory_reader.cc
   - src/core/lib/gprpp/work_serializer.cc
   - src/core/lib/handshaker/proxy_mapper_registry.cc
   - src/core/lib/http/format_request.cc
@@ -1821,9 +1990,11 @@ libs:
   - src/core/tsi/transport_security.cc
   - src/core/tsi/transport_security_grpc.cc
   deps:
-  - re2
+  - upb_collections_lib
   - upb_json_lib
   - upb_textformat_lib
+  - upb
+  - re2
   - z
   - absl/algorithm:container
   - absl/cleanup:cleanup
@@ -2071,25 +2242,44 @@ libs:
   - src/core/ext/transport/chttp2/transport/write_size_policy.h
   - src/core/ext/transport/inproc/inproc_transport.h
   - src/core/ext/transport/inproc/legacy_inproc_transport.h
-  - src/core/ext/upb-generated/google/api/annotations.upb.h
-  - src/core/ext/upb-generated/google/api/http.upb.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.h
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.h
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.h
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h
-  - src/core/ext/upb-generated/validate/validate.upb.h
-  - src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h
-  - src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h
+  - src/core/ext/upb-gen/google/api/annotations.upb.h
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/http.upb.h
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
+  - 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/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
+  - src/core/ext/upb-gen/validate/validate.upb.h
+  - src/core/ext/upb-gen/validate/validate.upb_minitable.h
+  - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
+  - 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/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
   - src/core/lib/avl/avl.h
@@ -2143,6 +2333,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -2157,6 +2348,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
   - src/core/lib/event_engine/tcp_socket_utils.h
@@ -2167,6 +2359,7 @@ libs:
   - src/core/lib/event_engine/time_util.h
   - src/core/lib/event_engine/trace.h
   - src/core/lib/event_engine/utils.h
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
@@ -2310,6 +2503,7 @@ libs:
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
   - src/core/lib/promise/sleep.h
+  - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/trace.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resolver/endpoint_addresses.h
@@ -2407,16 +2601,25 @@ libs:
   - src/core/tsi/transport_security_interface.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/internal/accessors.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
   - src/core/ext/filters/backend_metrics/backend_metric_filter.cc
   - src/core/ext/filters/census/grpc_context.cc
@@ -2517,25 +2720,25 @@ libs:
   - src/core/ext/transport/inproc/inproc_plugin.cc
   - src/core/ext/transport/inproc/inproc_transport.cc
   - src/core/ext/transport/inproc/legacy_inproc_transport.cc
-  - src/core/ext/upb-generated/google/api/annotations.upb.c
-  - src/core/ext/upb-generated/google/api/http.upb.c
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
-  - src/core/ext/upb-generated/validate/validate.upb.c
-  - src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
-  - src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  - 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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+  - src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
+  - src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
+  - 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/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
   - src/core/lib/backoff/backoff.cc
@@ -2572,12 +2775,12 @@ libs:
   - src/core/lib/event_engine/default_event_engine_factory.cc
   - src/core/lib/event_engine/event_engine.cc
   - src/core/lib/event_engine/forkable.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -2602,6 +2805,7 @@ libs:
   - src/core/lib/event_engine/time_util.cc
   - src/core/lib/event_engine/trace.cc
   - src/core/lib/event_engine/utils.cc
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -2806,10 +3010,17 @@ libs:
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - upb_collections_lib
   - upb
+  - utf8_range_lib
   - z
   - absl/algorithm:container
   - absl/cleanup:cleanup
@@ -2958,122 +3169,57 @@ libs:
   language: c
   public_headers: []
   headers:
-  - third_party/upb/upb/alloc.h
-  - third_party/upb/upb/arena.h
-  - third_party/upb/upb/array.h
   - third_party/upb/upb/base/descriptor_constants.h
-  - third_party/upb/upb/base/log2.h
   - third_party/upb/upb/base/status.h
+  - third_party/upb/upb/base/status.hpp
   - third_party/upb/upb/base/string_view.h
-  - third_party/upb/upb/collections/array.h
-  - third_party/upb/upb/collections/array_internal.h
-  - third_party/upb/upb/collections/map.h
-  - third_party/upb/upb/collections/map_gencode_util.h
-  - third_party/upb/upb/collections/map_internal.h
-  - third_party/upb/upb/collections/map_sorter_internal.h
-  - third_party/upb/upb/collections/message_value.h
-  - third_party/upb/upb/decode.h
-  - third_party/upb/upb/encode.h
-  - third_party/upb/upb/extension_registry.h
-  - third_party/upb/upb/hash/common.h
-  - third_party/upb/upb/hash/int_table.h
-  - third_party/upb/upb/hash/str_table.h
-  - third_party/upb/upb/lex/atoi.h
-  - third_party/upb/upb/lex/round_trip.h
-  - third_party/upb/upb/lex/strtod.h
-  - third_party/upb/upb/lex/unicode.h
-  - third_party/upb/upb/map.h
   - third_party/upb/upb/mem/alloc.h
   - third_party/upb/upb/mem/arena.h
-  - third_party/upb/upb/mem/arena_internal.h
-  - third_party/upb/upb/message/accessors_internal.h
-  - third_party/upb/upb/message/extension_internal.h
-  - third_party/upb/upb/message/internal.h
-  - third_party/upb/upb/message/internal/map_entry.h
-  - third_party/upb/upb/message/message.h
-  - third_party/upb/upb/message/tagged_ptr.h
-  - third_party/upb/upb/mini_table/enum.h
-  - third_party/upb/upb/mini_table/extension.h
-  - third_party/upb/upb/mini_table/extension_registry.h
-  - third_party/upb/upb/mini_table/field.h
-  - third_party/upb/upb/mini_table/file.h
-  - third_party/upb/upb/mini_table/internal/enum.h
-  - third_party/upb/upb/mini_table/internal/extension.h
-  - third_party/upb/upb/mini_table/internal/field.h
-  - third_party/upb/upb/mini_table/internal/file.h
-  - third_party/upb/upb/mini_table/internal/message.h
-  - third_party/upb/upb/mini_table/internal/sub.h
-  - third_party/upb/upb/mini_table/message.h
-  - third_party/upb/upb/mini_table/sub.h
-  - third_party/upb/upb/msg.h
+  - third_party/upb/upb/mem/arena.hpp
+  - third_party/upb/upb/mem/internal/arena.h
   - third_party/upb/upb/port/atomic.h
   - third_party/upb/upb/port/def.inc
   - third_party/upb/upb/port/undef.inc
   - third_party/upb/upb/port/vsnprintf_compat.h
-  - third_party/upb/upb/status.h
-  - third_party/upb/upb/string_view.h
-  - third_party/upb/upb/upb.h
   - third_party/upb/upb/upb.hpp
-  - third_party/upb/upb/wire/common.h
-  - third_party/upb/upb/wire/common_internal.h
-  - third_party/upb/upb/wire/decode.h
-  - third_party/upb/upb/wire/decode_fast.h
-  - third_party/upb/upb/wire/decode_internal.h
-  - third_party/upb/upb/wire/encode.h
-  - third_party/upb/upb/wire/eps_copy_input_stream.h
-  - third_party/upb/upb/wire/reader.h
-  - third_party/upb/upb/wire/swap_internal.h
-  - third_party/upb/upb/wire/types.h
   src:
   - third_party/upb/upb/base/status.c
-  - third_party/upb/upb/collections/array.c
-  - third_party/upb/upb/collections/map.c
-  - third_party/upb/upb/collections/map_sorter.c
-  - third_party/upb/upb/hash/common.c
-  - third_party/upb/upb/lex/atoi.c
-  - third_party/upb/upb/lex/round_trip.c
-  - third_party/upb/upb/lex/strtod.c
-  - third_party/upb/upb/lex/unicode.c
   - third_party/upb/upb/mem/alloc.c
   - third_party/upb/upb/mem/arena.c
-  - third_party/upb/upb/message/message.c
-  - third_party/upb/upb/mini_table/extension_registry.c
-  - third_party/upb/upb/mini_table/internal/message.c
-  - third_party/upb/upb/mini_table/message.c
-  - third_party/upb/upb/wire/decode.c
-  - third_party/upb/upb/wire/decode_fast.c
-  - third_party/upb/upb/wire/encode.c
-  - third_party/upb/upb/wire/eps_copy_input_stream.c
-  - third_party/upb/upb/wire/reader.c
-  deps:
-  - utf8_range_lib
+  deps: []
 - name: upb_collections_lib
   build: all
   language: c
   public_headers: []
   headers:
   - third_party/upb/upb/base/descriptor_constants.h
-  - third_party/upb/upb/base/log2.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/base/status.h
+  - third_party/upb/upb/base/status.hpp
   - third_party/upb/upb/base/string_view.h
   - third_party/upb/upb/collections/array.h
-  - third_party/upb/upb/collections/array_internal.h
   - third_party/upb/upb/collections/map.h
-  - third_party/upb/upb/collections/map_gencode_util.h
-  - third_party/upb/upb/collections/map_internal.h
-  - third_party/upb/upb/collections/map_sorter_internal.h
-  - third_party/upb/upb/collections/message_value.h
   - third_party/upb/upb/hash/common.h
   - third_party/upb/upb/hash/int_table.h
   - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/mem/alloc.h
   - third_party/upb/upb/mem/arena.h
-  - third_party/upb/upb/mem/arena_internal.h
-  - third_party/upb/upb/message/extension_internal.h
-  - third_party/upb/upb/message/internal.h
+  - third_party/upb/upb/mem/arena.hpp
+  - third_party/upb/upb/mem/internal/arena.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
   - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
   - third_party/upb/upb/message/message.h
   - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_table/enum.h
   - third_party/upb/upb/mini_table/extension.h
   - third_party/upb/upb/mini_table/extension_registry.h
@@ -3093,12 +3239,12 @@ libs:
   - third_party/upb/upb/port/vsnprintf_compat.h
   src:
   - third_party/upb/upb/base/status.c
-  - third_party/upb/upb/collections/array.c
-  - third_party/upb/upb/collections/map.c
-  - third_party/upb/upb/collections/map_sorter.c
   - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/mem/alloc.c
   - third_party/upb/upb/mem/arena.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
   - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_table/extension_registry.c
   - third_party/upb/upb/mini_table/internal/message.c
@@ -3109,13 +3255,41 @@ libs:
   language: c
   public_headers: []
   headers:
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - third_party/upb/upb/def.h
-  - third_party/upb/upb/def.hpp
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - third_party/upb/upb/base/descriptor_constants.h
+  - third_party/upb/upb/base/internal/log2.h
+  - third_party/upb/upb/base/status.h
+  - third_party/upb/upb/base/status.hpp
+  - third_party/upb/upb/base/string_view.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/json/decode.h
   - third_party/upb/upb/json/encode.h
+  - third_party/upb/upb/lex/atoi.h
+  - third_party/upb/upb/lex/round_trip.h
+  - third_party/upb/upb/lex/strtod.h
+  - third_party/upb/upb/lex/unicode.h
+  - third_party/upb/upb/mem/alloc.h
+  - third_party/upb/upb/mem/arena.h
+  - third_party/upb/upb/mem/arena.hpp
+  - third_party/upb/upb/mem/internal/arena.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
@@ -3125,51 +3299,90 @@ libs:
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/reflection.h
-  - third_party/upb/upb/reflection.hpp
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/port/atomic.h
+  - third_party/upb/upb/port/def.inc
+  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/port/vsnprintf_compat.h
   - third_party/upb/upb/reflection/common.h
   - third_party/upb/upb/reflection/def.h
   - third_party/upb/upb/reflection/def.hpp
-  - third_party/upb/upb/reflection/def_builder_internal.h
   - third_party/upb/upb/reflection/def_pool.h
-  - third_party/upb/upb/reflection/def_pool_internal.h
   - third_party/upb/upb/reflection/def_type.h
-  - third_party/upb/upb/reflection/desc_state_internal.h
   - third_party/upb/upb/reflection/enum_def.h
-  - third_party/upb/upb/reflection/enum_def_internal.h
   - third_party/upb/upb/reflection/enum_reserved_range.h
-  - third_party/upb/upb/reflection/enum_reserved_range_internal.h
   - third_party/upb/upb/reflection/enum_value_def.h
-  - third_party/upb/upb/reflection/enum_value_def_internal.h
   - third_party/upb/upb/reflection/extension_range.h
-  - third_party/upb/upb/reflection/extension_range_internal.h
   - third_party/upb/upb/reflection/field_def.h
-  - third_party/upb/upb/reflection/field_def_internal.h
   - third_party/upb/upb/reflection/file_def.h
-  - third_party/upb/upb/reflection/file_def_internal.h
+  - third_party/upb/upb/reflection/internal/def_builder.h
+  - third_party/upb/upb/reflection/internal/def_pool.h
+  - third_party/upb/upb/reflection/internal/desc_state.h
+  - third_party/upb/upb/reflection/internal/enum_def.h
+  - third_party/upb/upb/reflection/internal/enum_reserved_range.h
+  - third_party/upb/upb/reflection/internal/enum_value_def.h
+  - third_party/upb/upb/reflection/internal/extension_range.h
+  - third_party/upb/upb/reflection/internal/field_def.h
+  - third_party/upb/upb/reflection/internal/file_def.h
+  - third_party/upb/upb/reflection/internal/message_def.h
+  - third_party/upb/upb/reflection/internal/message_reserved_range.h
+  - third_party/upb/upb/reflection/internal/method_def.h
+  - third_party/upb/upb/reflection/internal/oneof_def.h
+  - third_party/upb/upb/reflection/internal/service_def.h
+  - third_party/upb/upb/reflection/internal/strdup2.h
   - third_party/upb/upb/reflection/message.h
   - third_party/upb/upb/reflection/message.hpp
   - third_party/upb/upb/reflection/message_def.h
-  - third_party/upb/upb/reflection/message_def_internal.h
   - third_party/upb/upb/reflection/message_reserved_range.h
-  - third_party/upb/upb/reflection/message_reserved_range_internal.h
   - third_party/upb/upb/reflection/method_def.h
-  - third_party/upb/upb/reflection/method_def_internal.h
   - third_party/upb/upb/reflection/oneof_def.h
-  - third_party/upb/upb/reflection/oneof_def_internal.h
   - third_party/upb/upb/reflection/service_def.h
-  - third_party/upb/upb/reflection/service_def_internal.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - third_party/upb/upb/base/status.c
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/json/decode.c
   - third_party/upb/upb/json/encode.c
+  - third_party/upb/upb/lex/atoi.c
+  - third_party/upb/upb/lex/round_trip.c
+  - third_party/upb/upb/lex/strtod.c
+  - third_party/upb/upb/lex/unicode.c
+  - third_party/upb/upb/mem/alloc.c
+  - third_party/upb/upb/mem/arena.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
   - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
-  - third_party/upb/upb/reflection/def_builder.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
   - third_party/upb/upb/reflection/def_pool.c
   - third_party/upb/upb/reflection/def_type.c
   - third_party/upb/upb/reflection/desc_state.c
@@ -3179,25 +3392,59 @@ libs:
   - third_party/upb/upb/reflection/extension_range.c
   - third_party/upb/upb/reflection/field_def.c
   - third_party/upb/upb/reflection/file_def.c
+  - third_party/upb/upb/reflection/internal/def_builder.c
+  - third_party/upb/upb/reflection/internal/strdup2.c
   - third_party/upb/upb/reflection/message.c
   - third_party/upb/upb/reflection/message_def.c
   - third_party/upb/upb/reflection/message_reserved_range.c
   - third_party/upb/upb/reflection/method_def.c
   - third_party/upb/upb/reflection/oneof_def.c
   - third_party/upb/upb/reflection/service_def.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
-  - upb_collections_lib
-  - upb
+  - utf8_range_lib
 - name: upb_textformat_lib
   build: all
   language: c
   public_headers: []
   headers:
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - third_party/upb/upb/def.h
-  - third_party/upb/upb/def.hpp
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - third_party/upb/upb/base/descriptor_constants.h
+  - third_party/upb/upb/base/internal/log2.h
+  - third_party/upb/upb/base/status.h
+  - third_party/upb/upb/base/status.hpp
+  - third_party/upb/upb/base/string_view.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
+  - third_party/upb/upb/lex/atoi.h
+  - third_party/upb/upb/lex/round_trip.h
+  - third_party/upb/upb/lex/strtod.h
+  - third_party/upb/upb/lex/unicode.h
+  - third_party/upb/upb/mem/alloc.h
+  - third_party/upb/upb/mem/arena.h
+  - third_party/upb/upb/mem/arena.hpp
+  - third_party/upb/upb/mem/internal/arena.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
@@ -3207,51 +3454,89 @@ libs:
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/reflection.h
-  - third_party/upb/upb/reflection.hpp
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/port/atomic.h
+  - third_party/upb/upb/port/def.inc
+  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/port/vsnprintf_compat.h
   - third_party/upb/upb/reflection/common.h
   - third_party/upb/upb/reflection/def.h
   - third_party/upb/upb/reflection/def.hpp
-  - third_party/upb/upb/reflection/def_builder_internal.h
   - third_party/upb/upb/reflection/def_pool.h
-  - third_party/upb/upb/reflection/def_pool_internal.h
   - third_party/upb/upb/reflection/def_type.h
-  - third_party/upb/upb/reflection/desc_state_internal.h
   - third_party/upb/upb/reflection/enum_def.h
-  - third_party/upb/upb/reflection/enum_def_internal.h
   - third_party/upb/upb/reflection/enum_reserved_range.h
-  - third_party/upb/upb/reflection/enum_reserved_range_internal.h
   - third_party/upb/upb/reflection/enum_value_def.h
-  - third_party/upb/upb/reflection/enum_value_def_internal.h
   - third_party/upb/upb/reflection/extension_range.h
-  - third_party/upb/upb/reflection/extension_range_internal.h
   - third_party/upb/upb/reflection/field_def.h
-  - third_party/upb/upb/reflection/field_def_internal.h
   - third_party/upb/upb/reflection/file_def.h
-  - third_party/upb/upb/reflection/file_def_internal.h
+  - third_party/upb/upb/reflection/internal/def_builder.h
+  - third_party/upb/upb/reflection/internal/def_pool.h
+  - third_party/upb/upb/reflection/internal/desc_state.h
+  - third_party/upb/upb/reflection/internal/enum_def.h
+  - third_party/upb/upb/reflection/internal/enum_reserved_range.h
+  - third_party/upb/upb/reflection/internal/enum_value_def.h
+  - third_party/upb/upb/reflection/internal/extension_range.h
+  - third_party/upb/upb/reflection/internal/field_def.h
+  - third_party/upb/upb/reflection/internal/file_def.h
+  - third_party/upb/upb/reflection/internal/message_def.h
+  - third_party/upb/upb/reflection/internal/message_reserved_range.h
+  - third_party/upb/upb/reflection/internal/method_def.h
+  - third_party/upb/upb/reflection/internal/oneof_def.h
+  - third_party/upb/upb/reflection/internal/service_def.h
+  - third_party/upb/upb/reflection/internal/strdup2.h
   - third_party/upb/upb/reflection/message.h
   - third_party/upb/upb/reflection/message.hpp
   - third_party/upb/upb/reflection/message_def.h
-  - third_party/upb/upb/reflection/message_def_internal.h
   - third_party/upb/upb/reflection/message_reserved_range.h
-  - third_party/upb/upb/reflection/message_reserved_range_internal.h
   - third_party/upb/upb/reflection/method_def.h
-  - third_party/upb/upb/reflection/method_def_internal.h
   - third_party/upb/upb/reflection/oneof_def.h
-  - third_party/upb/upb/reflection/oneof_def_internal.h
   - third_party/upb/upb/reflection/service_def.h
-  - third_party/upb/upb/reflection/service_def_internal.h
   - third_party/upb/upb/text/encode.h
-  - third_party/upb/upb/text_encode.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - third_party/upb/upb/base/status.c
+  - third_party/upb/upb/hash/common.c
+  - third_party/upb/upb/lex/atoi.c
+  - third_party/upb/upb/lex/round_trip.c
+  - third_party/upb/upb/lex/strtod.c
+  - third_party/upb/upb/lex/unicode.c
+  - third_party/upb/upb/mem/alloc.c
+  - third_party/upb/upb/mem/arena.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
   - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
-  - third_party/upb/upb/reflection/def_builder.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
   - third_party/upb/upb/reflection/def_pool.c
   - third_party/upb/upb/reflection/def_type.c
   - third_party/upb/upb/reflection/desc_state.c
@@ -3261,6 +3546,8 @@ libs:
   - third_party/upb/upb/reflection/extension_range.c
   - third_party/upb/upb/reflection/field_def.c
   - third_party/upb/upb/reflection/file_def.c
+  - third_party/upb/upb/reflection/internal/def_builder.c
+  - third_party/upb/upb/reflection/internal/strdup2.c
   - third_party/upb/upb/reflection/message.c
   - third_party/upb/upb/reflection/message_def.c
   - third_party/upb/upb/reflection/message_reserved_range.c
@@ -3268,9 +3555,13 @@ libs:
   - third_party/upb/upb/reflection/oneof_def.c
   - third_party/upb/upb/reflection/service_def.c
   - third_party/upb/upb/text/encode.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
-  - upb_collections_lib
-  - upb
+  - utf8_range_lib
 - name: utf8_range_lib
   build: all
   language: c
@@ -4114,12 +4405,17 @@ libs:
   - include/grpc/support/workaround_list.h
   headers:
   - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
+  - 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/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
   - src/core/lib/avl/avl.h
@@ -4173,6 +4469,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -4187,6 +4484,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
   - src/core/lib/event_engine/tcp_socket_utils.h
@@ -4197,6 +4495,7 @@ libs:
   - src/core/lib/event_engine/time_util.h
   - src/core/lib/event_engine/trace.h
   - src/core/lib/event_engine/utils.h
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
@@ -4332,6 +4631,7 @@ libs:
   - src/core/lib/promise/promise.h
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
+  - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/trace.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resolver/endpoint_addresses.h
@@ -4423,25 +4723,65 @@ libs:
   - src/core/tsi/transport_security.h
   - src/core/tsi/transport_security_grpc.h
   - src/core/tsi/transport_security_interface.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  - 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/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
   - src/core/lib/backoff/backoff.cc
@@ -4478,12 +4818,12 @@ libs:
   - src/core/lib/event_engine/default_event_engine_factory.cc
   - src/core/lib/event_engine/event_engine.cc
   - src/core/lib/event_engine/forkable.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -4508,6 +4848,7 @@ libs:
   - src/core/lib/event_engine/time_util.cc
   - src/core/lib/event_engine/trace.cc
   - src/core/lib/event_engine/utils.cc
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -4697,14 +5038,29 @@ libs:
   - src/core/tsi/alts/handshaker/transport_security_common_api.cc
   - src/core/tsi/transport_security.cc
   - src/core/tsi/transport_security_grpc.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
-  - re2
   - upb
+  - re2
+  - utf8_range_lib
   - z
   - absl/cleanup:cleanup
   - absl/container:flat_hash_map
@@ -6271,93 +6627,180 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
-  - src/core/ext/upb-generated/envoy/annotations/resource.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h
-  - src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h
-  - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h
-  - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h
-  - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/http.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/percent.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/range.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h
-  - src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h
-  - src/core/ext/upb-generated/google/api/annotations.upb.h
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h
-  - src/core/ext/upb-generated/google/api/http.upb.h
-  - src/core/ext/upb-generated/google/api/httpbody.upb.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.h
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.h
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.h
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/security.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/status.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
-  - src/core/ext/upb-generated/validate/validate.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/security.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/status.upb.h
-  - src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/authority.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/cidr.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/extension.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
-  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h
-  - src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/cel.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/range.upb.h
-  - src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb.h
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/annotations.upb.h
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/http.upb.h
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.h
+  - src/core/ext/upb-gen/google/api/httpbody.upb.h
+  - src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb.h
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb.h
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb.h
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/security.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/status.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
+  - src/core/ext/upb-gen/validate/validate.upb.h
+  - src/core/ext/upb-gen/validate/validate.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/range.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
   - src/core/lib/security/authorization/cel_authorization_engine.h
   - src/core/lib/security/authorization/mock_cel/activation.h
   - src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
@@ -6378,93 +6821,93 @@ targets:
   - test/core/util/slice_splitter.h
   - test/core/util/tracer_util.h
   src:
-  - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
-  - src/core/ext/upb-generated/envoy/annotations/resource.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
-  - src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
-  - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
-  - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
-  - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/http.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/range.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
-  - src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
-  - src/core/ext/upb-generated/google/api/annotations.upb.c
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
-  - src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
-  - src/core/ext/upb-generated/google/api/http.upb.c
-  - src/core/ext/upb-generated/google/api/httpbody.upb.c
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  - src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  - src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  - src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/security.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/status.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
-  - src/core/ext/upb-generated/validate/validate.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
-  - src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/authority.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/extension.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
-  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
-  - src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/cel.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/range.upb.c
-  - src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
+  - src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/http.upb_minitable.c
+  - src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
+  - src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
+  - src/core/ext/upb-gen/validate/validate.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
+  - src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
+  - src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
+  - src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
   - src/core/lib/security/authorization/cel_authorization_engine.cc
   - test/core/security/cel_authorization_engine_test.cc
   - test/core/util/cmdline.cc
@@ -6674,12 +7117,14 @@ targets:
   build: test
   language: c++
   headers:
+  - test/core/event_engine/event_engine_test_utils.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/event_engine/event_engine_test_utils.cc
   - test/cpp/end2end/channelz_service_test.cc
   - test/cpp/end2end/test_service_impl.cc
   deps:
@@ -6755,9 +7200,11 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -6803,24 +7250,63 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/status_helper.cc
@@ -6844,14 +7330,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/gprpp/chunked_vector_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/meta:type_traits
@@ -6971,6 +7472,27 @@ targets:
   deps:
   - grpc++_test
   - grpc++_test_util
+- name: client_fork_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  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/orca_load_report.proto
+  - test/cpp/end2end/client_fork_test.cc
+  deps:
+  - gtest
+  - grpc++
+  - grpc_test_util
+  - grpc++_test_config
+  platforms:
+  - linux
+  - posix
+  - mac
 - name: client_interceptors_end2end_test
   gtest: true
   build: test
@@ -7067,6 +7589,36 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
+- name: client_transport_error_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/chaotic_good/client_transport.h
+  - src/core/ext/transport/chaotic_good/frame.h
+  - src/core/ext/transport/chaotic_good/frame_header.h
+  - src/core/lib/promise/detail/join_state.h
+  - src/core/lib/promise/event_engine_wakeup_scheduler.h
+  - src/core/lib/promise/inter_activity_pipe.h
+  - src/core/lib/promise/join.h
+  - src/core/lib/promise/mpsc.h
+  - src/core/lib/promise/try_join.h
+  - src/core/lib/promise/wait_set.h
+  - src/core/lib/transport/promise_endpoint.h
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
+  src:
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
+  - src/core/ext/transport/chaotic_good/client_transport.cc
+  - src/core/ext/transport/chaotic_good/frame.cc
+  - src/core/ext/transport/chaotic_good/frame_header.cc
+  - src/core/lib/transport/promise_endpoint.cc
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+  - test/core/transport/chaotic_good/client_transport_error_test.cc
+  deps:
+  - gtest
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: client_transport_test
   gtest: true
   build: test
@@ -7077,12 +7629,13 @@ targets:
   - src/core/ext/transport/chaotic_good/frame_header.h
   - src/core/lib/promise/detail/join_state.h
   - src/core/lib/promise/event_engine_wakeup_scheduler.h
+  - src/core/lib/promise/inter_activity_pipe.h
   - src/core/lib/promise/join.h
   - src/core/lib/promise/mpsc.h
+  - src/core/lib/promise/try_join.h
   - src/core/lib/promise/wait_set.h
   - src/core/lib/transport/promise_endpoint.h
   - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
-  - test/core/promise/test_wakeup_schedulers.h
   src:
   - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
   - src/core/ext/transport/chaotic_good/client_transport.cc
@@ -7529,6 +8082,17 @@ targets:
   deps:
   - gtest
   - grpc++_test_util
+- name: directory_reader_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/gprpp/directory_reader_test.cc
+  deps:
+  - gtest
+  - grpc_test_util
+  uses_polling: false
 - name: disappearing_server_test
   gtest: true
   build: test
@@ -8073,9 +8637,11 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -8106,22 +8672,62 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
@@ -8139,14 +8745,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/promise/exec_ctx_wakeup_scheduler_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/hash:hash
   - absl/meta:type_traits
   - absl/status:statusor
@@ -8560,9 +9181,11 @@ targets:
   headers:
   - src/core/ext/transport/chttp2/transport/flow_control.h
   - src/core/ext/transport/chttp2/transport/http2_settings.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -8609,26 +9232,65 @@ targets:
   - src/core/lib/transport/bdp_estimator.h
   - src/core/lib/transport/http2_errors.h
   - src/core/lib/transport/pid_controller.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
   - src/core/ext/transport/chttp2/transport/flow_control.cc
   - src/core/ext/transport/chttp2/transport/http2_settings.cc
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/status_helper.cc
@@ -8653,14 +9315,29 @@ targets:
   - src/core/lib/transport/bdp_estimator.cc
   - src/core/lib/transport/pid_controller.cc
   - test/core/transport/chttp2/flow_control_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/meta:type_traits
@@ -8672,9 +9349,11 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -8728,24 +9407,63 @@ targets:
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
   - test/core/promise/test_wakeup_schedulers.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/status_helper.cc
@@ -8769,14 +9487,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/promise/for_each_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/meta:type_traits
@@ -9469,11 +10202,18 @@ targets:
   gtest: true
   build: test
   language: c++
-  headers: []
+  headers:
+  - test/core/event_engine/event_engine_test_utils.h
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
   src:
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
+  - test/core/util/fuzz_config_vars.proto
+  - test/core/event_engine/event_engine_test_utils.cc
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
   - test/core/security/grpc_tls_crl_provider_test.cc
   deps:
   - gtest
+  - protobuf
   - grpc_test_util
 - name: grpc_tool_test
   gtest: true
@@ -10101,6 +10841,20 @@ targets:
   deps:
   - gtest
   - grpc_test_util
+- name: inter_activity_latch_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/lib/promise/event_engine_wakeup_scheduler.h
+  - src/core/lib/promise/inter_activity_latch.h
+  - src/core/lib/promise/wait_set.h
+  src:
+  - test/core/promise/inter_activity_latch_test.cc
+  deps:
+  - gtest
+  - grpc
+  uses_polling: false
 - name: inter_activity_pipe_test
   gtest: true
   build: test
@@ -10140,9 +10894,11 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -10189,24 +10945,63 @@ targets:
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
   - test/core/promise/test_context.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/status_helper.cc
@@ -10230,14 +11025,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/promise/interceptor_list_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/meta:type_traits
@@ -10707,9 +11517,11 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -10763,24 +11575,63 @@ targets:
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
   - test/core/promise/test_wakeup_schedulers.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
   - src/core/lib/gprpp/status_helper.cc
@@ -10804,14 +11655,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/promise/map_pipe_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/meta:type_traits
@@ -11586,7 +12452,9 @@ targets:
   gtest: true
   build: test
   language: c++
-  headers: []
+  headers:
+  - src/core/lib/promise/inter_activity_latch.h
+  - src/core/lib/promise/wait_set.h
   src:
   - test/core/promise/party_test.cc
   deps:
@@ -11646,9 +12514,11 @@ targets:
   run: false
   language: c++
   headers:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
   - src/core/lib/debug/trace.h
   - src/core/lib/experiments/config.h
   - src/core/lib/experiments/experiments.h
@@ -11669,22 +12539,62 @@ targets:
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_refcount.h
   - src/core/lib/slice/slice_string_helpers.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
   - src/core/lib/debug/trace.cc
   - src/core/lib/experiments/config.cc
   - src/core/lib/experiments/experiments.cc
@@ -11702,14 +12612,29 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - test/core/resource_quota/periodic_update_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - absl/functional:function_ref
   - absl/hash:hash
   - absl/status:statusor
@@ -12046,6 +12971,33 @@ targets:
   platforms:
   - linux
   - posix
+- name: posix_event_engine_native_dns_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - test/core/event_engine/event_engine_test_utils.h
+  - test/core/event_engine/test_suite/event_engine_test_framework.h
+  - test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
+  - test/core/event_engine/test_suite/tests/dns_test.h
+  - test/core/util/fake_udp_and_tcp_server.h
+  - test/cpp/util/get_grpc_test_runfile_dir.h
+  - test/cpp/util/windows/manifest_file.h
+  src:
+  - test/core/event_engine/event_engine_test_utils.cc
+  - test/core/event_engine/test_suite/event_engine_test_framework.cc
+  - test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
+  - test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
+  - test/core/event_engine/test_suite/tests/dns_test.cc
+  - test/core/util/fake_udp_and_tcp_server.cc
+  - test/cpp/util/get_grpc_test_runfile_dir.cc
+  - test/cpp/util/windows/manifest_file.cc
+  deps:
+  - gtest
+  - grpc++_test_util
+  platforms:
+  - linux
+  - posix
 - name: posix_event_engine_test
   gtest: true
   build: test
@@ -12060,6 +13012,7 @@ targets:
   - test/core/event_engine/test_suite/tests/timer_test.h
   - test/core/util/fake_udp_and_tcp_server.h
   - test/cpp/util/get_grpc_test_runfile_dir.h
+  - test/cpp/util/windows/manifest_file.h
   src:
   - test/core/event_engine/event_engine_test_utils.cc
   - test/core/event_engine/test_suite/event_engine_test_framework.cc
@@ -12071,6 +13024,7 @@ targets:
   - test/core/event_engine/test_suite/tests/timer_test.cc
   - test/core/util/fake_udp_and_tcp_server.cc
   - test/cpp/util/get_grpc_test_runfile_dir.cc
+  - test/cpp/util/windows/manifest_file.cc
   deps:
   - gtest
   - grpc++_test_util
@@ -12168,6 +13122,44 @@ targets:
   - absl/meta:type_traits
   - gpr
   uses_polling: false
+- name: promise_mutex_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/lib/debug/trace.h
+  - src/core/lib/gprpp/atomic_utils.h
+  - src/core/lib/gprpp/bitset.h
+  - src/core/lib/gprpp/orphanable.h
+  - src/core/lib/gprpp/ref_counted.h
+  - src/core/lib/gprpp/ref_counted_ptr.h
+  - src/core/lib/promise/activity.h
+  - src/core/lib/promise/context.h
+  - src/core/lib/promise/detail/basic_seq.h
+  - src/core/lib/promise/detail/join_state.h
+  - src/core/lib/promise/detail/promise_factory.h
+  - src/core/lib/promise/detail/promise_like.h
+  - src/core/lib/promise/detail/seq_state.h
+  - src/core/lib/promise/detail/status.h
+  - src/core/lib/promise/join.h
+  - src/core/lib/promise/map.h
+  - src/core/lib/promise/poll.h
+  - src/core/lib/promise/promise.h
+  - src/core/lib/promise/promise_mutex.h
+  - src/core/lib/promise/seq.h
+  - src/core/lib/promise/trace.h
+  - test/core/promise/test_wakeup_schedulers.h
+  src:
+  - src/core/lib/debug/trace.cc
+  - src/core/lib/promise/activity.cc
+  - src/core/lib/promise/trace.cc
+  - test/core/promise/promise_mutex_test.cc
+  deps:
+  - gtest
+  - absl/hash:hash
+  - absl/meta:type_traits
+  - absl/status:statusor
+  - gpr
 - name: promise_test
   gtest: true
   build: test
@@ -12348,6 +13340,19 @@ targets:
   deps:
   - grpc++_test_config
   - grpc++_test_util
+- name: query_extensions_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/lib/event_engine/query_extensions.h
+  src:
+  - test/core/event_engine/query_extensions_test.cc
+  deps:
+  - gtest
+  - absl/status:statusor
+  - gpr
+  uses_polling: false
 - name: race_test
   gtest: true
   build: test
@@ -15068,6 +16073,20 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
+- name: status_flag_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/lib/promise/detail/status.h
+  - src/core/lib/promise/status_flag.h
+  src:
+  - test/core/promise/status_flag_test.cc
+  deps:
+  - gtest
+  - absl/status:status
+  - absl/status:statusor
+  uses_polling: false
 - name: status_helper_test
   gtest: true
   build: test
@@ -15740,12 +16759,17 @@ targets:
   - src/core/ext/transport/chttp2/transport/huffsyms.h
   - src/core/ext/transport/chttp2/transport/legacy_frame.h
   - src/core/ext/transport/chttp2/transport/varint.h
-  - src/core/ext/upb-generated/google/protobuf/any.upb.h
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-generated/google/rpc/status.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb.h
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb.h
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
+  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
+  - 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/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
   - src/core/lib/avl/avl.h
@@ -15799,6 +16823,7 @@ targets:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -15813,6 +16838,7 @@ targets:
   - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
   - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+  - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
   - src/core/lib/event_engine/resolved_address_internal.h
   - src/core/lib/event_engine/shim.h
   - src/core/lib/event_engine/tcp_socket_utils.h
@@ -15823,6 +16849,7 @@ targets:
   - src/core/lib/event_engine/time_util.h
   - src/core/lib/event_engine/trace.h
   - src/core/lib/event_engine/utils.h
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
@@ -15956,6 +16983,7 @@ targets:
   - src/core/lib/promise/promise.h
   - src/core/lib/promise/race.h
   - src/core/lib/promise/seq.h
+  - src/core/lib/promise/status_flag.h
   - src/core/lib/promise/trace.h
   - src/core/lib/promise/try_seq.h
   - src/core/lib/resolver/endpoint_addresses.h
@@ -16018,18 +17046,58 @@ targets:
   - src/core/lib/transport/transport_fwd.h
   - src/core/lib/uri/uri_parser.h
   - src/core/tsi/alts/handshaker/transport_security_common_api.h
+  - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
+  - third_party/upb/upb/hash/common.h
+  - third_party/upb/upb/hash/int_table.h
+  - third_party/upb/upb/hash/str_table.h
   - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/accessors_internal.h
+  - third_party/upb/upb/message/array.h
+  - third_party/upb/upb/message/internal/accessors.h
+  - third_party/upb/upb/message/internal/array.h
+  - third_party/upb/upb/message/internal/extension.h
+  - third_party/upb/upb/message/internal/map.h
+  - third_party/upb/upb/message/internal/map_entry.h
+  - third_party/upb/upb/message/internal/map_sorter.h
+  - third_party/upb/upb/message/internal/message.h
+  - third_party/upb/upb/message/internal/types.h
+  - third_party/upb/upb/message/map.h
+  - third_party/upb/upb/message/map_gencode_util.h
+  - third_party/upb/upb/message/message.h
+  - third_party/upb/upb/message/tagged_ptr.h
+  - third_party/upb/upb/message/types.h
+  - third_party/upb/upb/message/value.h
   - third_party/upb/upb/mini_descriptor/build_enum.h
   - third_party/upb/upb/mini_descriptor/decode.h
   - third_party/upb/upb/mini_descriptor/internal/base92.h
   - third_party/upb/upb/mini_descriptor/internal/decoder.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.h
+  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
   - third_party/upb/upb/mini_descriptor/internal/modifiers.h
   - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
   - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/port/def.inc
-  - third_party/upb/upb/port/undef.inc
+  - third_party/upb/upb/mini_table/enum.h
+  - third_party/upb/upb/mini_table/extension.h
+  - third_party/upb/upb/mini_table/extension_registry.h
+  - third_party/upb/upb/mini_table/field.h
+  - third_party/upb/upb/mini_table/file.h
+  - third_party/upb/upb/mini_table/internal/enum.h
+  - third_party/upb/upb/mini_table/internal/extension.h
+  - third_party/upb/upb/mini_table/internal/field.h
+  - third_party/upb/upb/mini_table/internal/file.h
+  - third_party/upb/upb/mini_table/internal/message.h
+  - third_party/upb/upb/mini_table/internal/sub.h
+  - third_party/upb/upb/mini_table/message.h
+  - third_party/upb/upb/mini_table/sub.h
+  - third_party/upb/upb/wire/decode.h
+  - third_party/upb/upb/wire/decode_fast.h
+  - third_party/upb/upb/wire/encode.h
+  - third_party/upb/upb/wire/eps_copy_input_stream.h
+  - third_party/upb/upb/wire/internal/constants.h
+  - third_party/upb/upb/wire/internal/decode.h
+  - third_party/upb/upb/wire/internal/swap.h
+  - third_party/upb/upb/wire/reader.h
+  - third_party/upb/upb/wire/types.h
   src:
   - src/core/ext/transport/chaotic_good/frame.cc
   - src/core/ext/transport/chaotic_good/frame_header.cc
@@ -16043,12 +17111,12 @@ targets:
   - src/core/ext/transport/chttp2/transport/http_trace.cc
   - src/core/ext/transport/chttp2/transport/huffsyms.cc
   - src/core/ext/transport/chttp2/transport/varint.cc
-  - src/core/ext/upb-generated/google/protobuf/any.upb.c
-  - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  - src/core/ext/upb-generated/google/rpc/status.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
-  - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
+  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+  - 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/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
   - src/core/lib/backoff/backoff.cc
@@ -16085,12 +17153,12 @@ targets:
   - src/core/lib/event_engine/default_event_engine_factory.cc
   - src/core/lib/event_engine/event_engine.cc
   - src/core/lib/event_engine/forkable.cc
-  - src/core/lib/event_engine/memory_allocator.cc
   - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
   - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
+  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -16115,6 +17183,7 @@ targets:
   - src/core/lib/event_engine/time_util.cc
   - src/core/lib/event_engine/trace.cc
   - src/core/lib/event_engine/utils.cc
+  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -16275,14 +17344,29 @@ targets:
   - src/core/lib/uri/uri_parser.cc
   - src/core/tsi/alts/handshaker/transport_security_common_api.cc
   - test/core/transport/chaotic_good/frame_test.cc
+  - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
+  - third_party/upb/upb/message/array.c
+  - third_party/upb/upb/message/map.c
+  - third_party/upb/upb/message/map_sorter.c
+  - third_party/upb/upb/message/message.c
   - third_party/upb/upb/mini_descriptor/build_enum.c
   - third_party/upb/upb/mini_descriptor/decode.c
   - third_party/upb/upb/mini_descriptor/internal/base92.c
+  - third_party/upb/upb/mini_descriptor/internal/encode.c
   - third_party/upb/upb/mini_descriptor/link.c
+  - third_party/upb/upb/mini_table/extension_registry.c
+  - third_party/upb/upb/mini_table/internal/message.c
+  - third_party/upb/upb/mini_table/message.c
+  - third_party/upb/upb/wire/decode.c
+  - third_party/upb/upb/wire/decode_fast.c
+  - third_party/upb/upb/wire/encode.c
+  - third_party/upb/upb/wire/eps_copy_input_stream.c
+  - third_party/upb/upb/wire/reader.c
   deps:
   - gtest
   - upb
+  - utf8_range_lib
   - z
   - absl/cleanup:cleanup
   - absl/container:flat_hash_map
@@ -16616,6 +17700,22 @@ targets:
   - gtest
   - grpc++
   - grpc_test_util
+- name: tls_credentials_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - 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/cpp/end2end/test_service_impl.cc
+  - test/cpp/end2end/tls_credentials_test.cc
+  deps:
+  - gtest
+  - grpc++_test_util
 - name: tls_key_export_test
   gtest: true
   build: test
diff --git a/build_config.rb b/build_config.rb
index 43b209efe7b4d..a0dce5c6bc802 100644
--- a/build_config.rb
+++ b/build_config.rb
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module GrpcBuildConfig
-  CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-36.dll'
+  CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-37.dll'
 end
diff --git a/build_handwritten.yaml b/build_handwritten.yaml
index 66f04c3755c25..a700fdd2da754 100644
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@@ -12,11 +12,11 @@ settings:
   '#08': Use "-preN" suffixes to identify pre-release versions
   '#09': Per-language overrides are possible with (eg) ruby_version tag here
   '#10': See the expand_version.py for all the quirks here
-  core_version: 36.0.0
+  core_version: 37.0.0
   csharp_major_version: 2
-  g_stands_for: gjallarhorn
-  protobuf_version: 3.24.3
-  version: 1.60.0-dev
+  g_stands_for: grand
+  protobuf_version: 3.25.0
+  version: 1.61.0-dev
 configs:
   asan:
     CC: clang
@@ -149,8 +149,8 @@ defaults:
     CFLAGS: -g
     COREFLAGS: -fno-exceptions
     CPPFLAGS: -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2
-      -Ithird_party/upb -Isrc/core/ext/upb-generated -Isrc/core/ext/upbdefs-generated
-      -Ithird_party/utf8_range -Ithird_party/xxhash
+      -Ithird_party/upb -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range
+      -Ithird_party/xxhash
     LDFLAGS: -g
   zlib:
     CFLAGS: -fvisibility=hidden
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
index 72630fee21245..9156e5f48f982 100644
--- a/cmake/upb.cmake
+++ b/cmake/upb.cmake
@@ -15,6 +15,6 @@
 set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
 
 set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range")
-set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen")
 
 set(_gRPC_UPB_LIBRARIES upb)
diff --git a/config.m4 b/config.m4
index dbe3f16207e65..f4f52a0044c52 100644
--- a/config.m4
+++ b/config.m4
@@ -6,8 +6,8 @@ if test "$PHP_GRPC" != "no"; then
 
   dnl # --with-grpc -> add include path
   PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-generated)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-generated)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-gen)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-gen)
   PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
   PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/abseil-cpp)
   PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/address_sorting/include)
@@ -156,319 +156,319 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/transport/inproc/inproc_plugin.cc \
     src/core/ext/transport/inproc/inproc_transport.cc \
     src/core/ext/transport/inproc/legacy_inproc_transport.cc \
-    src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
-    src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
-    src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c \
-    src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c \
-    src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
-    src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c \
-    src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
-    src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
-    src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
-    src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/api/httpbody.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
-    src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/security.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/status.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/security.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/status.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/cidr.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-    src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-    src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c \
+    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/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 \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+    src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+    src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c \
+    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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/validate/validate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
+    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/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 \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/validate/validate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c \
+    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/ext/xds/certificate_provider_store.cc \
     src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
     src/core/ext/xds/xds_api.cc \
@@ -534,12 +534,12 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/event_engine/default_event_engine_factory.cc \
     src/core/lib/event_engine/event_engine.cc \
     src/core/lib/event_engine/forkable.cc \
-    src/core/lib/event_engine/memory_allocator.cc \
     src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \
     src/core/lib/event_engine/posix_engine/ev_poll_posix.cc \
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
+    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -565,6 +565,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/event_engine/time_util.cc \
     src/core/lib/event_engine/trace.cc \
     src/core/lib/event_engine/utils.cc \
+    src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
@@ -608,6 +609,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/gprpp/load_file.cc \
     src/core/lib/gprpp/mpscq.cc \
     src/core/lib/gprpp/per_cpu.cc \
+    src/core/lib/gprpp/posix/directory_reader.cc \
     src/core/lib/gprpp/posix/env.cc \
     src/core/lib/gprpp/posix/stat.cc \
     src/core/lib/gprpp/posix/thd.cc \
@@ -619,6 +621,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/gprpp/time_averaged_stats.cc \
     src/core/lib/gprpp/time_util.cc \
     src/core/lib/gprpp/validation_errors.cc \
+    src/core/lib/gprpp/windows/directory_reader.cc \
     src/core/lib/gprpp/windows/env.cc \
     src/core/lib/gprpp/windows/stat.cc \
     src/core/lib/gprpp/windows/thd.cc \
@@ -1292,9 +1295,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/re2/util/rune.cc \
     third_party/re2/util/strutil.cc \
     third_party/upb/upb/base/status.c \
-    third_party/upb/upb/collections/array.c \
-    third_party/upb/upb/collections/map.c \
-    third_party/upb/upb/collections/map_sorter.c \
     third_party/upb/upb/hash/common.c \
     third_party/upb/upb/json/decode.c \
     third_party/upb/upb/json/encode.c \
@@ -1305,6 +1305,9 @@ if test "$PHP_GRPC" != "no"; then
     third_party/upb/upb/mem/alloc.c \
     third_party/upb/upb/mem/arena.c \
     third_party/upb/upb/message/accessors.c \
+    third_party/upb/upb/message/array.c \
+    third_party/upb/upb/message/map.c \
+    third_party/upb/upb/message/map_sorter.c \
     third_party/upb/upb/message/message.c \
     third_party/upb/upb/mini_descriptor/build_enum.c \
     third_party/upb/upb/mini_descriptor/decode.c \
@@ -1314,7 +1317,6 @@ if test "$PHP_GRPC" != "no"; then
     third_party/upb/upb/mini_table/extension_registry.c \
     third_party/upb/upb/mini_table/internal/message.c \
     third_party/upb/upb/mini_table/message.c \
-    third_party/upb/upb/reflection/def_builder.c \
     third_party/upb/upb/reflection/def_pool.c \
     third_party/upb/upb/reflection/def_type.c \
     third_party/upb/upb/reflection/desc_state.c \
@@ -1324,6 +1326,8 @@ if test "$PHP_GRPC" != "no"; then
     third_party/upb/upb/reflection/extension_range.c \
     third_party/upb/upb/reflection/field_def.c \
     third_party/upb/upb/reflection/file_def.c \
+    third_party/upb/upb/reflection/internal/def_builder.c \
+    third_party/upb/upb/reflection/internal/strdup2.c \
     third_party/upb/upb/reflection/message.c \
     third_party/upb/upb/reflection/message_def.c \
     third_party/upb/upb/reflection/message_reserved_range.c \
@@ -1344,7 +1348,7 @@ if test "$PHP_GRPC" != "no"; then
     -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
     -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
     -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.60.0dev\""')
+    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.61.0dev\""')
 
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
@@ -1387,106 +1391,106 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/inproc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/admin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/bootstrap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/cluster/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/common/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/endpoint/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/listener/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/metrics/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/overload/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/route/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/tap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/trace/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/data/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/discovery/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/load_stats/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/status/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/http/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/metadata/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/tracing/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/api)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/api/expr/v1alpha1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/protobuf)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/rpc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/opencensus/proto/trace/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/gcp)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/health/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lb/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lookup/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/annotations/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/data/orca/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/service/orca/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/admin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/cluster/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/listener/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/metrics/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/overload/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/route/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/tap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/trace/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/discovery/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/status/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/http/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/metadata/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/tracing/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/protobuf)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/rpc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/validate)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/annotations/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/admin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/bootstrap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/cluster/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/common/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/endpoint/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/listener/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/metrics/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/overload/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/route/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/tap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/trace/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/data/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3)
+  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/tls/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/discovery/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/load_stats/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/status/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/http/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/metadata/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/tracing/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/api)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/api/expr/v1alpha1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/protobuf)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/rpc)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/opencensus/proto/trace/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/gcp)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/health/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/lb/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/lookup/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/udpa/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/annotations/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/data/orca/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/service/orca/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/admin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/cluster/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/listener/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/metrics/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/overload/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/route/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/tap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/trace/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3)
+  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/tls/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/discovery/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/status/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/http/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/metadata/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/tracing/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/api)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/protobuf)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/rpc)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/udpa/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/annotations/v3)
+  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/ext/xds)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
@@ -1634,7 +1638,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/base)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/collections)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/hash)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/json)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/lex)
@@ -1645,6 +1648,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_table)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_table/internal)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection/internal)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/text)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire)
   PHP_ADD_BUILD_DIR($ext_builddir/third_party/utf8_range)
diff --git a/config.w32 b/config.w32
index 9ff76d86af308..52ac38f12049a 100644
--- a/config.w32
+++ b/config.w32
@@ -121,319 +121,319 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\transport\\inproc\\inproc_plugin.cc " +
     "src\\core\\ext\\transport\\inproc\\inproc_transport.cc " +
     "src\\core\\ext\\transport\\inproc\\legacy_inproc_transport.cc " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\certs.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\clusters.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\config_dump.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\config_dump_shared.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\init_dump.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\listeners.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\memory.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\metrics.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\mutex_stats.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\server_info.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\admin\\v3\\tap.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\annotations\\deprecation.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\annotations\\resource.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\accesslog\\v3\\accesslog.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\bootstrap\\v3\\bootstrap.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\cluster\\v3\\circuit_breaker.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\cluster\\v3\\cluster.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\cluster\\v3\\filter.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\cluster\\v3\\outlier_detection.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\common\\matcher\\v3\\matcher.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\address.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\backoff.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\base.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\config_source.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\event_service_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\extension.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\grpc_method_list.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\grpc_service.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\health_check.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\http_uri.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\protocol.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\proxy_protocol.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\resolver.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\socket_option.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\substitution_format_string.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3\\udp_socket_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\endpoint\\v3\\endpoint.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\endpoint\\v3\\endpoint_components.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\endpoint\\v3\\load_report.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3\\api_listener.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3\\listener.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3\\listener_components.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3\\quic_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3\\udp_listener_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\metrics\\v3\\metrics_service.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\metrics\\v3\\stats.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\overload\\v3\\overload.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\rbac\\v3\\rbac.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\route\\v3\\route.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\route\\v3\\route_components.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\route\\v3\\scoped_route.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\tap\\v3\\common.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\datadog.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\dynamic_ot.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\http_tracer.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\lightstep.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\opencensus.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\opentelemetry.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\service.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\skywalking.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\trace.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\xray.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3\\zipkin.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\data\\accesslog\\v3\\accesslog.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\clusters\\aggregate\\v3\\cluster.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\common\\fault\\v3\\fault.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\fault\\v3\\fault.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\rbac\\v3\\rbac.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\router\\v3\\router.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\stateful_session\\v3\\stateful_session.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3\\http_connection_manager.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\http\\stateful_session\\cookie\\v3\\cookie.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin\\v3\\client_side_weighted_round_robin.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\common\\v3\\common.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\pick_first\\v3\\pick_first.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\ring_hash\\v3\\ring_hash.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\wrr_locality\\v3\\wrr_locality.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\cert.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\common.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\secret.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls_spiffe_validator_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\service\\discovery\\v3\\ads.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\service\\discovery\\v3\\discovery.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\service\\load_stats\\v3\\lrs.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\service\\status\\v3\\csds.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\http\\v3\\cookie.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\http\\v3\\path_transformation.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\filter_state.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\http_inputs.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\metadata.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\node.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\number.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\path.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\regex.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\status_code_input.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\string.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\struct.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3\\value.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\metadata\\v3\\metadata.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\tracing\\v3\\custom_tag.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\hash_policy.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\http.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\http_status.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\percent.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\range.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\ratelimit_strategy.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\ratelimit_unit.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\semantic_version.upb.c " +
-    "src\\core\\ext\\upb-generated\\envoy\\type\\v3\\token_bucket.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\api\\annotations.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\api\\expr\\v1alpha1\\checked.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\api\\expr\\v1alpha1\\syntax.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\api\\http.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\api\\httpbody.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\any.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\descriptor.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\duration.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\empty.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\struct.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\timestamp.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\protobuf\\wrappers.upb.c " +
-    "src\\core\\ext\\upb-generated\\google\\rpc\\status.upb.c " +
-    "src\\core\\ext\\upb-generated\\opencensus\\proto\\trace\\v1\\trace_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\gcp\\altscontext.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\gcp\\handshaker.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\gcp\\transport_security_common.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\health\\v1\\health.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lb\\v1\\load_balancer.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lookup\\v1\\rls.upb.c " +
-    "src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lookup\\v1\\rls_config.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\annotations\\migrate.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\annotations\\security.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\annotations\\sensitive.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\annotations\\status.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\annotations\\versioning.upb.c " +
-    "src\\core\\ext\\upb-generated\\validate\\validate.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\annotations\\v3\\migrate.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\annotations\\v3\\security.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\annotations\\v3\\sensitive.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\annotations\\v3\\status.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\annotations\\v3\\versioning.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\authority.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\cidr.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\collection_entry.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\context_params.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\extension.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource_locator.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource_name.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\data\\orca\\v3\\orca_load_report.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\service\\orca\\v3\\orca.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\cel.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\domain.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\http_inputs.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\ip.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\matcher.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\range.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\regex.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3\\string.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\v3\\cel.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\v3\\range.upb.c " +
-    "src\\core\\ext\\upb-generated\\xds\\type\\v3\\typed_struct.upb.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\certs.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\clusters.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\config_dump.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\config_dump_shared.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\init_dump.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\listeners.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\memory.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\metrics.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\mutex_stats.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\server_info.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3\\tap.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\deprecation.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\resource.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog\\v3\\accesslog.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\bootstrap\\v3\\bootstrap.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\circuit_breaker.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\cluster.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\filter.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3\\outlier_detection.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\common\\matcher\\v3\\matcher.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\address.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\backoff.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\base.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\config_source.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\event_service_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\extension.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\grpc_method_list.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\grpc_service.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\health_check.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\http_uri.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\protocol.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\proxy_protocol.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\resolver.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\socket_option.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\substitution_format_string.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3\\udp_socket_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\endpoint_components.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3\\load_report.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\api_listener.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\listener.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\listener_components.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\quic_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3\\udp_listener_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\metrics\\v3\\metrics_service.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\metrics\\v3\\stats.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\overload\\v3\\overload.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\rbac\\v3\\rbac.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\route.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\route_components.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3\\scoped_route.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\tap\\v3\\common.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\datadog.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\dynamic_ot.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\http_tracer.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\lightstep.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\opencensus.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\opentelemetry.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\service.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\skywalking.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\trace.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\xray.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3\\zipkin.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\data\\accesslog\\v3\\accesslog.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\clusters\\aggregate\\v3\\cluster.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\common\\fault\\v3\\fault.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\fault\\v3\\fault.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\rbac\\v3\\rbac.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\router\\v3\\router.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\stateful_session\\v3\\stateful_session.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3\\http_connection_manager.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\http\\stateful_session\\cookie\\v3\\cookie.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\cert.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\common.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\secret.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls_spiffe_validator_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3\\ads.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3\\discovery.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats\\v3\\lrs.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\service\\status\\v3\\csds.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\http\\v3\\cookie.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\http\\v3\\path_transformation.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\filter_state.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\http_inputs.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\metadata.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\node.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\number.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\path.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\regex.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\status_code_input.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\string.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\struct.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3\\value.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata\\v3\\metadata.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3\\custom_tag.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\hash_policy.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\http.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\http_status.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\percent.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\range.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\ratelimit_strategy.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\ratelimit_unit.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\semantic_version.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3\\token_bucket.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\api\\annotations.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\api\\expr\\v1alpha1\\checked.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\api\\expr\\v1alpha1\\syntax.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\api\\http.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\api\\httpbody.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\any.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\descriptor.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\duration.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\empty.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\struct.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\timestamp.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\protobuf\\wrappers.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\google\\rpc\\status.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\opencensus\\proto\\trace\\v1\\trace_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\src\\proto\\grpc\\lookup\\v1\\rls_config.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\migrate.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\security.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\sensitive.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\status.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\udpa\\annotations\\versioning.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\validate\\validate.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3\\migrate.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3\\security.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3\\sensitive.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3\\status.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3\\versioning.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\authority.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\cidr.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\collection_entry.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\context_params.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\extension.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource_locator.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource_name.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\cel.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\domain.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\http_inputs.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\ip.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\matcher.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\range.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\regex.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\string.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\v3\\cel.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\v3\\range.upbdefs.c " +
-    "src\\core\\ext\\upbdefs-generated\\xds\\type\\v3\\typed_struct.upbdefs.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\certs.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\clusters.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\config_dump.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\config_dump_shared.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\init_dump.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\listeners.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\memory.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\metrics.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\mutex_stats.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\server_info.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\tap.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\annotations\\deprecation.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\annotations\\resource.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\accesslog\\v3\\accesslog.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\bootstrap\\v3\\bootstrap.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\cluster\\v3\\circuit_breaker.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\cluster\\v3\\cluster.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\cluster\\v3\\filter.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\cluster\\v3\\outlier_detection.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\common\\matcher\\v3\\matcher.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\address.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\backoff.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\base.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\config_source.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\event_service_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\extension.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\grpc_method_list.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\grpc_service.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\health_check.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\http_uri.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\protocol.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\proxy_protocol.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\resolver.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\socket_option.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\substitution_format_string.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3\\udp_socket_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\endpoint\\v3\\endpoint.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\endpoint\\v3\\endpoint_components.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\endpoint\\v3\\load_report.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3\\api_listener.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3\\listener.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3\\listener_components.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3\\quic_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3\\udp_listener_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\metrics\\v3\\metrics_service.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\metrics\\v3\\stats.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\overload\\v3\\overload.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\rbac\\v3\\rbac.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\route\\v3\\route.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\route\\v3\\route_components.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\route\\v3\\scoped_route.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\tap\\v3\\common.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\datadog.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\dynamic_ot.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\http_tracer.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\lightstep.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\opencensus.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\opentelemetry.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\service.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\skywalking.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\trace.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\xray.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3\\zipkin.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\data\\accesslog\\v3\\accesslog.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\clusters\\aggregate\\v3\\cluster.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\common\\fault\\v3\\fault.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\fault\\v3\\fault.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\rbac\\v3\\rbac.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\router\\v3\\router.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\stateful_session\\v3\\stateful_session.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3\\http_connection_manager.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\http\\stateful_session\\cookie\\v3\\cookie.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin\\v3\\client_side_weighted_round_robin.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\common\\v3\\common.upb_minitable.c " +
+    "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\\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 " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls_spiffe_validator_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\service\\discovery\\v3\\ads.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\service\\discovery\\v3\\discovery.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\service\\load_stats\\v3\\lrs.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\service\\status\\v3\\csds.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\http\\v3\\cookie.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\http\\v3\\path_transformation.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\filter_state.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\http_inputs.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\metadata.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\node.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\number.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\path.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\regex.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\status_code_input.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\string.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\struct.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3\\value.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\metadata\\v3\\metadata.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\tracing\\v3\\custom_tag.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\hash_policy.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\http.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\http_status.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\percent.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\range.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\ratelimit_strategy.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\ratelimit_unit.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\semantic_version.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\type\\v3\\token_bucket.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\api\\annotations.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\api\\expr\\v1alpha1\\checked.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\api\\expr\\v1alpha1\\syntax.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\api\\http.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\api\\httpbody.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\any.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\descriptor.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\duration.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\empty.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\struct.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\timestamp.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\protobuf\\wrappers.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\google\\rpc\\status.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\opencensus\\proto\\trace\\v1\\trace_config.upb_minitable.c " +
+    "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\\ext\\upb-gen\\src\\proto\\grpc\\health\\v1\\health.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lb\\v1\\load_balancer.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lookup\\v1\\rls.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lookup\\v1\\rls_config.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\udpa\\annotations\\migrate.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\udpa\\annotations\\security.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\udpa\\annotations\\sensitive.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\udpa\\annotations\\status.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\udpa\\annotations\\versioning.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\validate\\validate.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\annotations\\v3\\migrate.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\annotations\\v3\\security.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\annotations\\v3\\sensitive.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\annotations\\v3\\status.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\annotations\\v3\\versioning.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\authority.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\cidr.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\collection_entry.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\context_params.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\extension.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\resource.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\resource_locator.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\core\\v3\\resource_name.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\\ext\\upb-gen\\xds\\type\\matcher\\v3\\cel.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\domain.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\http_inputs.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\ip.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\matcher.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\range.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\regex.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3\\string.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\v3\\cel.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\v3\\range.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\xds\\type\\v3\\typed_struct.upb_minitable.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\certs.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\clusters.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\config_dump.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\config_dump_shared.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\init_dump.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\listeners.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\memory.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\metrics.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\mutex_stats.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\server_info.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3\\tap.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\annotations\\deprecation.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\annotations\\resource.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\accesslog\\v3\\accesslog.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\bootstrap\\v3\\bootstrap.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster\\v3\\circuit_breaker.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster\\v3\\cluster.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster\\v3\\filter.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster\\v3\\outlier_detection.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\common\\matcher\\v3\\matcher.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\address.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\backoff.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\base.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\config_source.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\event_service_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\extension.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\grpc_method_list.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\grpc_service.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\health_check.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\http_uri.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\protocol.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\proxy_protocol.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\resolver.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\socket_option.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\substitution_format_string.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3\\udp_socket_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\endpoint\\v3\\endpoint.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\endpoint\\v3\\endpoint_components.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\endpoint\\v3\\load_report.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3\\api_listener.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3\\listener.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3\\listener_components.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3\\quic_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3\\udp_listener_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\metrics\\v3\\metrics_service.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\metrics\\v3\\stats.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\overload\\v3\\overload.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\rbac\\v3\\rbac.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\route\\v3\\route.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\route\\v3\\route_components.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\route\\v3\\scoped_route.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\tap\\v3\\common.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\datadog.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\dynamic_ot.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\http_tracer.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\lightstep.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\opencensus.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\opentelemetry.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\service.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\skywalking.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\trace.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\xray.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3\\zipkin.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\data\\accesslog\\v3\\accesslog.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\clusters\\aggregate\\v3\\cluster.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\common\\fault\\v3\\fault.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\fault\\v3\\fault.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\rbac\\v3\\rbac.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\router\\v3\\router.upbdefs.c " +
+    "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\\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 " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\tls_spiffe_validator_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\service\\discovery\\v3\\ads.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\service\\discovery\\v3\\discovery.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\service\\load_stats\\v3\\lrs.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\service\\status\\v3\\csds.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\http\\v3\\cookie.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\http\\v3\\path_transformation.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\filter_state.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\http_inputs.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\metadata.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\node.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\number.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\path.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\regex.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\status_code_input.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\string.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\struct.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3\\value.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\metadata\\v3\\metadata.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\tracing\\v3\\custom_tag.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\hash_policy.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\http.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\http_status.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\percent.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\range.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\ratelimit_strategy.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\ratelimit_unit.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\semantic_version.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3\\token_bucket.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\api\\annotations.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\api\\expr\\v1alpha1\\checked.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\api\\expr\\v1alpha1\\syntax.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\api\\http.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\api\\httpbody.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\any.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\descriptor.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\duration.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\empty.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\struct.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\timestamp.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\protobuf\\wrappers.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\google\\rpc\\status.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\opencensus\\proto\\trace\\v1\\trace_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\src\\proto\\grpc\\lookup\\v1\\rls_config.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\udpa\\annotations\\migrate.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\udpa\\annotations\\security.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\udpa\\annotations\\sensitive.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\udpa\\annotations\\status.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\udpa\\annotations\\versioning.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\validate\\validate.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3\\migrate.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3\\security.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3\\sensitive.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3\\status.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3\\versioning.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\authority.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\cidr.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\collection_entry.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\context_params.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\extension.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\resource.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\resource_locator.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\core\\v3\\resource_name.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\cel.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\domain.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\http_inputs.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\ip.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\matcher.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\range.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\regex.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3\\string.upbdefs.c " +
+    "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\\ext\\xds\\certificate_provider_store.cc " +
     "src\\core\\ext\\xds\\file_watcher_certificate_provider_factory.cc " +
     "src\\core\\ext\\xds\\xds_api.cc " +
@@ -499,12 +499,12 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\event_engine\\default_event_engine_factory.cc " +
     "src\\core\\lib\\event_engine\\event_engine.cc " +
     "src\\core\\lib\\event_engine\\forkable.cc " +
-    "src\\core\\lib\\event_engine\\memory_allocator.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\ev_epoll1_linux.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\ev_poll_posix.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\event_poller_posix_default.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\internal_errqueue.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\lockfree_event.cc " +
+    "src\\core\\lib\\event_engine\\posix_engine\\native_dns_resolver.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_endpoint.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_engine.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_engine_listener.cc " +
@@ -530,6 +530,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\event_engine\\time_util.cc " +
     "src\\core\\lib\\event_engine\\trace.cc " +
     "src\\core\\lib\\event_engine\\utils.cc " +
+    "src\\core\\lib\\event_engine\\windows\\grpc_polled_fd_windows.cc " +
     "src\\core\\lib\\event_engine\\windows\\iocp.cc " +
     "src\\core\\lib\\event_engine\\windows\\win_socket.cc " +
     "src\\core\\lib\\event_engine\\windows\\windows_endpoint.cc " +
@@ -573,6 +574,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\gprpp\\load_file.cc " +
     "src\\core\\lib\\gprpp\\mpscq.cc " +
     "src\\core\\lib\\gprpp\\per_cpu.cc " +
+    "src\\core\\lib\\gprpp\\posix\\directory_reader.cc " +
     "src\\core\\lib\\gprpp\\posix\\env.cc " +
     "src\\core\\lib\\gprpp\\posix\\stat.cc " +
     "src\\core\\lib\\gprpp\\posix\\thd.cc " +
@@ -584,6 +586,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\gprpp\\time_averaged_stats.cc " +
     "src\\core\\lib\\gprpp\\time_util.cc " +
     "src\\core\\lib\\gprpp\\validation_errors.cc " +
+    "src\\core\\lib\\gprpp\\windows\\directory_reader.cc " +
     "src\\core\\lib\\gprpp\\windows\\env.cc " +
     "src\\core\\lib\\gprpp\\windows\\stat.cc " +
     "src\\core\\lib\\gprpp\\windows\\thd.cc " +
@@ -1257,9 +1260,6 @@ if (PHP_GRPC != "no") {
     "third_party\\re2\\util\\rune.cc " +
     "third_party\\re2\\util\\strutil.cc " +
     "third_party\\upb\\upb\\base\\status.c " +
-    "third_party\\upb\\upb\\collections\\array.c " +
-    "third_party\\upb\\upb\\collections\\map.c " +
-    "third_party\\upb\\upb\\collections\\map_sorter.c " +
     "third_party\\upb\\upb\\hash\\common.c " +
     "third_party\\upb\\upb\\json\\decode.c " +
     "third_party\\upb\\upb\\json\\encode.c " +
@@ -1270,6 +1270,9 @@ if (PHP_GRPC != "no") {
     "third_party\\upb\\upb\\mem\\alloc.c " +
     "third_party\\upb\\upb\\mem\\arena.c " +
     "third_party\\upb\\upb\\message\\accessors.c " +
+    "third_party\\upb\\upb\\message\\array.c " +
+    "third_party\\upb\\upb\\message\\map.c " +
+    "third_party\\upb\\upb\\message\\map_sorter.c " +
     "third_party\\upb\\upb\\message\\message.c " +
     "third_party\\upb\\upb\\mini_descriptor\\build_enum.c " +
     "third_party\\upb\\upb\\mini_descriptor\\decode.c " +
@@ -1279,7 +1282,6 @@ if (PHP_GRPC != "no") {
     "third_party\\upb\\upb\\mini_table\\extension_registry.c " +
     "third_party\\upb\\upb\\mini_table\\internal\\message.c " +
     "third_party\\upb\\upb\\mini_table\\message.c " +
-    "third_party\\upb\\upb\\reflection\\def_builder.c " +
     "third_party\\upb\\upb\\reflection\\def_pool.c " +
     "third_party\\upb\\upb\\reflection\\def_type.c " +
     "third_party\\upb\\upb\\reflection\\desc_state.c " +
@@ -1289,6 +1291,8 @@ if (PHP_GRPC != "no") {
     "third_party\\upb\\upb\\reflection\\extension_range.c " +
     "third_party\\upb\\upb\\reflection\\field_def.c " +
     "third_party\\upb\\upb\\reflection\\file_def.c " +
+    "third_party\\upb\\upb\\reflection\\internal\\def_builder.c " +
+    "third_party\\upb\\upb\\reflection\\internal\\strdup2.c " +
     "third_party\\upb\\upb\\reflection\\message.c " +
     "third_party\\upb\\upb\\reflection\\message_def.c " +
     "third_party\\upb\\upb\\reflection\\message_reserved_range.c " +
@@ -1321,8 +1325,8 @@ if (PHP_GRPC != "no") {
     "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
     "/I"+configure_module_dirname+" "+
     "/I"+configure_module_dirname+"\\include "+
-    "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-generated "+
-    "/I"+configure_module_dirname+"\\src\\core\\ext\\upbdefs-generated "+
+    "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-gen "+
+    "/I"+configure_module_dirname+"\\src\\core\\ext\\upbdefs-gen "+
     "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
     "/I"+configure_module_dirname+"\\third_party\\abseil-cpp "+
     "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include "+
@@ -1383,242 +1387,242 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport\\chttp2\\server");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport\\chttp2\\transport");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport\\inproc");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\admin");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\admin\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\accesslog");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\accesslog\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\bootstrap");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\bootstrap\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\cluster");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\cluster\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\common");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\common\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\common\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\core\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\endpoint");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\endpoint\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\listener");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\listener\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\metrics");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\metrics\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\overload");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\overload\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\rbac");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\rbac\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\route");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\route\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\tap");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\tap\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\trace");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\config\\trace\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\data");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\data\\accesslog");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\data\\accesslog\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\clusters");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\clusters\\aggregate");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\clusters\\aggregate\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\common");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\common\\fault");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\common\\fault\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\fault");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\fault\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\rbac");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\rbac\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\router");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\router\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\stateful_session");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\http\\stateful_session\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\network");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\network\\http_connection_manager");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\http\\stateful_session");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\http\\stateful_session\\cookie");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\http\\stateful_session\\cookie\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\common");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\common\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\pick_first");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\pick_first\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\ring_hash");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\ring_hash\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\wrr_locality");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\load_balancing_policies\\wrr_locality\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\extensions\\transport_sockets\\tls\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\discovery");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\discovery\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\load_stats");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\load_stats\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\status");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\service\\status\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\http\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\metadata");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\metadata\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\tracing");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\tracing\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\envoy\\type\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google\\api");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google\\api\\expr");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google\\api\\expr\\v1alpha1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google\\protobuf");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\google\\rpc");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\opencensus");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\opencensus\\proto");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\opencensus\\proto\\trace");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\opencensus\\proto\\trace\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\gcp");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\health");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\health\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lb");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lb\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lookup");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lookup\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\validate");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\annotations\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\core\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\data");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\data\\orca");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\data\\orca\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\service");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\service\\orca");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\service\\orca\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\type");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\type\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\type\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\type\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\admin");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\admin\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\bootstrap");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\bootstrap\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\cluster\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\common");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\common\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\common\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\core\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\endpoint\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\listener\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\metrics");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\metrics\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\overload");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\overload\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\rbac");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\rbac\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\route");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\route\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\tap");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\tap\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\config\\trace\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\data");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\data\\accesslog");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\data\\accesslog\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\clusters");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\clusters\\aggregate");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\clusters\\aggregate\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\common");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\common\\fault");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\common\\fault\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\fault");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\fault\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\rbac");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\rbac\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\router");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\router\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\stateful_session");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\http\\stateful_session\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\http\\stateful_session");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\http\\stateful_session\\cookie");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\http\\stateful_session\\cookie\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\extensions\\transport_sockets\\tls\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\discovery\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\load_stats\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\status");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\service\\status\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\http");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\http\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\metadata\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\tracing\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\type\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\api");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\api\\expr");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\api\\expr\\v1alpha1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\protobuf");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\rpc");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\opencensus");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\opencensus\\proto");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\opencensus\\proto\\trace");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\opencensus\\proto\\trace\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\src");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\src\\proto");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\src\\proto\\grpc");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\src\\proto\\grpc\\lookup");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\src\\proto\\grpc\\lookup\\v1");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\validate");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\annotations\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\core\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\type");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\type\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\admin");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\admin\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\accesslog");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\accesslog\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\bootstrap");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\bootstrap\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\cluster");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\cluster\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\common");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\common\\matcher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\common\\matcher\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\core\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\endpoint");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\endpoint\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\listener");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\listener\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\metrics");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\metrics\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\overload");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\overload\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\rbac");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\rbac\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\route");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\route\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\tap");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\tap\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\trace");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\config\\trace\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\data");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\data\\accesslog");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\data\\accesslog\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\clusters");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\clusters\\aggregate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\clusters\\aggregate\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\common");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\common\\fault");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\common\\fault\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\fault");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\fault\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\rbac");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\rbac\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\router");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\router\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\stateful_session");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\http\\stateful_session\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\network");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\network\\http_connection_manager");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\http\\stateful_session");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\http\\stateful_session\\cookie");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\http\\stateful_session\\cookie\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\client_side_weighted_round_robin\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\common");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\common\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\pick_first");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\pick_first\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\ring_hash");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\ring_hash\\v3");
+  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\\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\\service");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\discovery");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\discovery\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\load_stats");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\load_stats\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\status");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\service\\status\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\http\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\matcher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\matcher\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\metadata");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\metadata\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\tracing");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\tracing\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\type\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google\\api");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google\\api\\expr");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google\\api\\expr\\v1alpha1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google\\protobuf");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\google\\rpc");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\opencensus");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\opencensus\\proto");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\opencensus\\proto\\trace");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\opencensus\\proto\\trace\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\gcp");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\health");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\health\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lb");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lb\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lookup");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\src\\proto\\grpc\\lookup\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\udpa");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\udpa\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\validate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\annotations\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\core\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\data");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\data\\orca");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\data\\orca\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\service");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\service\\orca");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\service\\orca\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\type");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\type\\matcher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\type\\matcher\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\xds\\type\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\admin");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\admin\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\accesslog");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\accesslog\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\bootstrap");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\bootstrap\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\cluster\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\common");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\common\\matcher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\common\\matcher\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\core\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\endpoint");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\endpoint\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\listener\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\metrics");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\metrics\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\overload");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\overload\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\rbac");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\rbac\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\route");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\route\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\tap");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\tap\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\config\\trace\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\data");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\data\\accesslog");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\data\\accesslog\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\clusters");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\clusters\\aggregate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\clusters\\aggregate\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\common");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\common\\fault");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\common\\fault\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\fault");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\fault\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\rbac");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\rbac\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\router");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\router\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\stateful_session");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\stateful_session\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\network");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\network\\http_connection_manager");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\http\\stateful_session");
+  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\\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\\service");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\discovery");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\discovery\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\load_stats");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\load_stats\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\status");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\service\\status\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\http");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\http\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\matcher\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\metadata");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\metadata\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\tracing");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\tracing\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\type\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google\\api");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google\\api\\expr");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google\\api\\expr\\v1alpha1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google\\protobuf");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\google\\rpc");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\opencensus");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\opencensus\\proto");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\opencensus\\proto\\trace");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\opencensus\\proto\\trace\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\src");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\src\\proto");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\src\\proto\\grpc");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\src\\proto\\grpc\\lookup");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\src\\proto\\grpc\\lookup\\v1");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\udpa");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\udpa\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\validate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\annotations");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\annotations\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\core\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type");
+  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\\ext\\xds");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils");
@@ -1784,7 +1788,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\base");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\collections");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\hash");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\json");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\lex");
@@ -1795,6 +1798,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mini_table");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mini_table\\internal");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\reflection");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\reflection\\internal");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\text");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\wire");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\utf8_range");
diff --git a/doc/bazel_support.md b/doc/bazel_support.md
index 36029942c2b87..d51dfebd996c3 100644
--- a/doc/bazel_support.md
+++ b/doc/bazel_support.md
@@ -34,10 +34,13 @@ grpc_extra_deps()
 
 ## Supported Versions
 
-In general, gRPC supports building with the latest patch release of the two most
-recent LTS versions of Bazel. However individual releases may have a broader
+gRPC supports building with the latest stable release of Bazel,
+as well as the previous major version release for at least 6 months
+after it transitions into maintenance mode.
+This is consistent with the supported build systems of
+[the Google Foundational C++ Support Policy](https://opensource.google/documentation/policies/cplusplus-support).
+However individual releases may have a broader
 compatibility range. The currently supported versions are captured by the
 following list:
 
-- [`6.3.2`](https://github.com/bazelbuild/bazel/releases/tag/6.3.2)
-- [`5.4.1`](https://github.com/bazelbuild/bazel/releases/tag/5.4.1)
+- [`6.4.0`](https://github.com/bazelbuild/bazel/releases/tag/6.4.0)
diff --git a/doc/g_stands_for.md b/doc/g_stands_for.md
index 1278143e2f055..6c4ab1010817c 100644
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@@ -59,4 +59,5 @@
 - 1.57 'g' stands for ['grounded'](https://github.com/grpc/grpc/tree/v1.57.x)
 - 1.58 'g' stands for ['goku'](https://github.com/grpc/grpc/tree/v1.58.x)
 - 1.59 'g' stands for ['generative'](https://github.com/grpc/grpc/tree/v1.59.x)
-- 1.60 'g' stands for ['gjallarhorn'](https://github.com/grpc/grpc/tree/master)
+- 1.60 'g' stands for ['gjallarhorn'](https://github.com/grpc/grpc/tree/v1.60.x)
+- 1.61 'g' stands for ['grand'](https://github.com/grpc/grpc/tree/master)
diff --git a/doc/service_config.md b/doc/service_config.md
index 57f5e1989e820..6312cda7f6285 100644
--- a/doc/service_config.md
+++ b/doc/service_config.md
@@ -62,12 +62,12 @@ DNS](https://github.com/grpc/proposal/blob/master/A2-service-configs-in-dns.md).
 
 Here is an example service config in protobuf form:
 
-```
+```textproto
 {
-  // Use round_robin LB policy.
+  # Use round_robin LB policy.
   load_balancing_config: { round_robin: {} }
-  // This method config applies to method "foo/bar" and to all methods
-  // of service "baz".
+  # This method config applies to method "foo/bar" and to all methods
+  # of service "baz".
   method_config: {
     name: {
       service: "foo"
@@ -76,7 +76,7 @@ Here is an example service config in protobuf form:
     name: {
       service: "baz"
     }
-    // Default timeout for matching methods.
+    # Default timeout for matching methods.
     timeout: {
       seconds: 1
       nanos: 1
@@ -87,7 +87,7 @@ Here is an example service config in protobuf form:
 
 Here is the same example service config in JSON form:
 
-```
+```json
 {
   "loadBalancingConfig": [ { "round_robin": {} } ],
   "methodConfig": [
diff --git a/examples/cpp/debugging/BUILD b/examples/cpp/debugging/BUILD
new file mode 100644
index 0000000000000..c75995395d159
--- /dev/null
+++ b/examples/cpp/debugging/BUILD
@@ -0,0 +1,42 @@
+# Copyright 2023 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.
+
+licenses(["notice"])
+
+cc_binary(
+    name = "crashing_greeter_client",
+    srcs = ["crashing_greeter_client.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//examples/protos:helloworld_cc_grpc",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/flags:parse",
+    ],
+)
+
+cc_binary(
+    name = "greeter_callback_server_admin",
+    srcs = ["greeter_callback_server_admin.cc"],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//:grpc++",
+        "//:grpc++_reflection",
+        "//:grpcpp_admin",
+        "//examples/protos:helloworld_cc_grpc",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/flags:parse",
+        "@com_google_absl//absl/strings:str_format",
+    ],
+)
diff --git a/examples/cpp/debugging/README.md b/examples/cpp/debugging/README.md
new file mode 100644
index 0000000000000..09a75146d467c
--- /dev/null
+++ b/examples/cpp/debugging/README.md
@@ -0,0 +1,132 @@
+# gRPC C++ Debugging Example
+
+This example demonstrates a handful of ways you can debug your gRPC C++ applications.
+
+## Enabling Trace Logs
+
+gRPC allows you to configure more detailed log output for various aspects of gRPC behavior. The tracing log generation might have a large overhead and result in significantly larger log file sizes, especially when you try to trace transport or timer_check. But it is a powerful tool in your debugging toolkit.
+
+### The Most Verbose Logging
+
+Specify environment variables, then run your application:
+
+```
+GRPC_VERBOSITY=debug
+GRPC_TRACE=all
+```
+
+For more granularity, please see
+[environment_variables](https://github.com/grpc/grpc/blob/master/doc/environment_variables.md).
+
+### Debug Transport Protocol
+
+```
+GRPC_VERBOSITY=debug
+GRPC_TRACE=tcp,http,secure_endpoint,transport_security
+```
+
+### Debug Connection Behavior
+
+```
+GRPC_VERBOSITY=debug
+GRPC_TRACE=call_error,connectivity_state,pick_first,round_robin,glb
+```
+
+## GDB and other debuggers
+
+`gdb` (and the like) are tools that lets you inspect your application while it is running, view stack traces on exceptions, pause and step through code at specified points or under certain conditions, etc. See https://www.sourceware.org/gdb/
+
+### Inspecting errors
+
+```
+bazel build --config=dbg examples/cpp/debugging:crashing_greeter_client
+gdb -ex run \
+    --args ./bazel-bin/examples/cpp/debugging/crashing_greeter_client \
+            --crash_on_errors=true \
+            --target=localhork:50051
+```
+
+Once the exception is thrown, you can use `bt` to see the stack trace and examine the crash, `info threads` to get the set of threads, etc. See the [GDB documentation](https://sourceware.org/gdb/current/onlinedocs/gdb.html/) for a more complete list of available features and commands.
+
+### Breaking inside a function
+
+After building the application above, this will break inside gRPC generated stub code:
+
+```
+gdb -ex 'b helloworld::Greeter::Stub::SayHello' \
+    -ex run \
+    --args ./bazel-bin/examples/cpp/debugging/crashing_greeter_client \
+            --crash_on_errors=true \
+            --target=localhork:50051
+```
+
+## gRPC Admin Interface: Live Channel Tracing
+
+The [gRPC Admin Service](https://github.com/grpc/proposal/blob/master/A38-admin-interface-api.md)
+provides a convenient API in each gRPC language to improve the usability of
+creating a gRPC server with admin services to expose states in the gRPC library.
+This includes channelz, which is a channel tracing feature; it tracks statistics
+like how many messages have been sent, how many of them failed, what are the
+connected sockets. See the [Channelz design doc](https://github.com/grpc/proposal/blob/master/A14-channelz.md).
+
+### Integrating the gRPC Admin Service Into Your Server
+
+As seen in the `greeter_callback_admin_server` target, you canenable admin services by using the `AddAdminServices` method.
+
+```
+grpc::ServerBuilder builder;
+grpc::AddAdminServices(&builder);
+builder.AddListeningPort(":50051", grpc::ServerCredentials(...));
+std::unique_ptr<grpc::Server> server(builder.BuildAndStart());
+```
+
+### Using grpcdebug
+
+grpcdebug is a tool created to access the metrics from channelz and health services.
+
+#### Installing the grpcdebug tool
+
+The source code is located in a github project
+[grpc-ecosystem/grpcdebug](https://github.com/grpc-ecosystem/grpcdebug). You
+can either download [the latest built version]
+(https://github.com/grpc-ecosystem/grpcdebug/releases/latest) (recommended) or
+follow the README.md to build it yourself.
+
+#### Running the grpcdebug tool
+##### Usage
+`grpcdebug <target address> [flags] channelz <command> [argument]`
+
+
+| Command    |       Argument       | Description                                       |
+| :--------- | :------------------: | :------------------------------------------------ |
+| channel    | \<channel id or URL> | Display channel states in a human readable way.   |
+| channels   |                      | Lists client channels for the target application. |
+| server     |     \<server ID>     | Displays server state in a human readable way.    |
+| servers    |                      | Lists servers in a human readable way.            |
+| socket     |     \<socket ID>     | Displays socket states in a human readable way.   |
+| subchannel |        \<id>         | Display subchannel states in human readable way.  |
+
+Generally, you will start with either `servers` or `channels` and then work down
+to the details
+
+##### Getting overall server info
+
+To begin with, build and run the server binary in the background
+
+```
+bazel build --config=dbg examples/cpp/debugging:all
+./bazel-bin/examples/cpp/debugging/greeter_callback_server_admin&
+```
+
+You can then inspect the server
+```bash
+grpcdebug localhost:50051 channelz servers
+```
+
+This will show you the server ids with their activity
+```text
+Server ID   Listen Addresses   Calls(Started/Succeeded/Failed)   Last Call Started
+1           [[::]:50051]       38/34/3                           now
+```
+
+For more information about `grpcdebug` features, please see [the grpcdebug documentation](https://github.com/grpc-ecosystem/grpcdebug)
diff --git a/examples/cpp/debugging/crashing_greeter_client.cc b/examples/cpp/debugging/crashing_greeter_client.cc
new file mode 100644
index 0000000000000..732535539f153
--- /dev/null
+++ b/examples/cpp/debugging/crashing_greeter_client.cc
@@ -0,0 +1,92 @@
+// Copyright 2023 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 <iostream>
+#include <memory>
+#include <string>
+
+#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
+#include "helloworld.grpc.pb.h"
+#endif
+
+ABSL_FLAG(bool, crash_on_errors, false,
+          "Crash the application on client errors");
+ABSL_FLAG(std::string, target, "localhost:50051", "Server address");
+
+using grpc::Channel;
+using grpc::ClientContext;
+using grpc::Status;
+using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
+
+class GreeterClient {
+ public:
+  GreeterClient(std::shared_ptr<Channel> channel)
+      : stub_(Greeter::NewStub(channel)) {}
+
+  // Assembles the client's payload, sends it and presents the response back
+  // from the server.
+  std::string SayHello(const std::string& user) {
+    // Data we are sending to the server.
+    HelloRequest request;
+    request.set_name(user);
+
+    // Container for the data we expect from the server.
+    HelloReply reply;
+
+    // Context for the client. It could be used to convey extra information to
+    // the server and/or tweak certain RPC behaviors.
+    ClientContext context;
+
+    // The actual RPC.
+    Status status = stub_->SayHello(&context, request, &reply);
+
+    // Act upon the status of the actual RPC.
+    if (absl::GetFlag(FLAGS_crash_on_errors)) {
+      assert(status.ok());
+    }
+    if (status.ok()) {
+      return reply.message();
+    } else {
+      return "RPC failed";
+    }
+  }
+
+ private:
+  std::unique_ptr<Greeter::Stub> stub_;
+};
+
+int main(int argc, char** argv) {
+  absl::ParseCommandLine(argc, argv);
+  // Instantiate the client. It requires a channel, out of which the actual RPCs
+  // are created. This channel models a connection to an endpoint specified by
+  // the argument "--target=" which is the only expected argument.
+  // We indicate that the channel isn't authenticated (use of
+  // InsecureChannelCredentials()).
+  GreeterClient greeter(grpc::CreateChannel(
+      absl::GetFlag(FLAGS_target), grpc::InsecureChannelCredentials()));
+  std::string user("world");
+  std::string reply = greeter.SayHello(user);
+  std::cout << "Greeter received: " << reply << std::endl;
+
+  return 0;
+}
diff --git a/examples/cpp/debugging/greeter_callback_server_admin.cc b/examples/cpp/debugging/greeter_callback_server_admin.cc
new file mode 100644
index 0000000000000..397503f4e6d95
--- /dev/null
+++ b/examples/cpp/debugging/greeter_callback_server_admin.cc
@@ -0,0 +1,86 @@
+// Copyright 2023 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 <iostream>
+#include <memory>
+#include <string>
+
+#include "absl/flags/flag.h"
+#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
+#include "helloworld.grpc.pb.h"
+#endif
+
+ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
+
+using grpc::CallbackServerContext;
+using grpc::Server;
+using grpc::ServerBuilder;
+using grpc::ServerUnaryReactor;
+using grpc::Status;
+using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
+
+// Logic and data behind the server's behavior.
+class GreeterServiceImpl final : public Greeter::CallbackService {
+  ServerUnaryReactor* SayHello(CallbackServerContext* context,
+                               const HelloRequest* request,
+                               HelloReply* reply) override {
+    std::string prefix("Hello ");
+    reply->set_message(prefix + request->name());
+
+    ServerUnaryReactor* reactor = context->DefaultReactor();
+    reactor->Finish(Status::OK);
+    return reactor;
+  }
+};
+
+void RunServer(uint16_t port) {
+  std::string server_address = absl::StrFormat("0.0.0.0:%d", port);
+  GreeterServiceImpl service;
+
+  grpc::EnableDefaultHealthCheckService(true);
+  grpc::reflection::InitProtoReflectionServerBuilderPlugin();
+  ServerBuilder builder;
+  // Enable gRPC Admin Services
+  grpc::AddAdminServices(&builder);
+  // Listen on the given address without any authentication mechanism.
+  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+  // Register "service" as the instance through which we'll communicate with
+  // clients. In this case it corresponds to an *synchronous* service.
+  builder.RegisterService(&service);
+  // Finally assemble the server.
+  std::unique_ptr<Server> server(builder.BuildAndStart());
+  std::cout << "Server listening on " << server_address << std::endl;
+
+  // Wait for the server to shutdown. Note that some other thread must be
+  // responsible for shutting down the server for this call to ever return.
+  server->Wait();
+}
+
+int main(int argc, char** argv) {
+  absl::ParseCommandLine(argc, argv);
+  RunServer(absl::GetFlag(FLAGS_port));
+  return 0;
+}
diff --git a/fuzztest/core/transport/chttp2/BUILD b/fuzztest/core/transport/chttp2/BUILD
index b95ff53e77416..02142a7074e66 100644
--- a/fuzztest/core/transport/chttp2/BUILD
+++ b/fuzztest/core/transport/chttp2/BUILD
@@ -24,3 +24,25 @@ grpc_fuzz_test(
     ],
     deps = ["//src/core:write_size_policy"],
 )
+
+grpc_fuzz_test(
+    name = "hpack_encoder_timeout_test",
+    srcs = ["hpack_encoder_timeout_test.cc"],
+    external_deps = [
+        "absl/random",
+        "fuzztest",
+        "fuzztest_main",
+        "gtest",
+    ],
+    deps = [
+        "//:grpc_base",
+        "//:hpack_encoder",
+        "//:hpack_parser",
+        "//:ref_counted_ptr",
+        "//src/core:arena",
+        "//src/core:memory_quota",
+        "//src/core:resource_quota",
+        "//src/core:slice_buffer",
+        "//src/core:time",
+    ],
+)
diff --git a/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc
new file mode 100644
index 0000000000000..37a686c8b7b76
--- /dev/null
+++ b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc
@@ -0,0 +1,79 @@
+// Copyright 2023 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.
+
+// Test to verify Fuzztest integration
+
+#include <grpc/event_engine/memory_allocator.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+#include <memory>
+#include <optional>
+
+#include "absl/random/random.h"
+#include "fuzztest/fuzztest.h"
+#include "gtest/gtest.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/memory_quota.h"
+#include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/transport/metadata_batch.h"
+
+namespace grpc_core {
+
+void EncodeTimeouts(std::vector<uint32_t> timeouts) {
+  absl::BitGen bitgen;
+  ScopedTimeCache time_cache;
+  time_cache.TestOnlySetNow(Timestamp::ProcessEpoch());
+  hpack_encoder_detail::TimeoutCompressorImpl timeout_compressor;
+  HPackCompressor compressor;
+  HPackParser parser;
+  MemoryAllocator memory_allocator = MemoryAllocator(
+      ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator("test"));
+  auto arena = MakeScopedArena(1024, &memory_allocator);
+  for (size_t i = 0; i < timeouts.size(); i++) {
+    SliceBuffer encoded;
+    hpack_encoder_detail::Encoder encoder(&compressor, false, encoded);
+    timeout_compressor.EncodeWith(
+        "grpc-timeout",
+        Timestamp::ProcessEpoch() + Duration::Milliseconds(timeouts[i]),
+        &encoder);
+    grpc_metadata_batch b(arena.get());
+    const uint32_t kMetadataSizeLimit = 3u * 1024 * 1024 * 1024;
+    parser.BeginFrame(
+        &b, kMetadataSizeLimit, kMetadataSizeLimit, HPackParser::Boundary::None,
+        HPackParser::Priority::None,
+        HPackParser::LogInfo{1, HPackParser::LogInfo::kHeaders, false});
+    for (size_t j = 0; j < encoded.Count(); j++) {
+      EXPECT_TRUE(parser
+                      .Parse(encoded.c_slice_at(j), j == encoded.Count() - 1,
+                             bitgen, nullptr)
+                      .ok());
+    }
+    auto parsed = b.get(GrpcTimeoutMetadata());
+    ASSERT_TRUE(parsed.has_value());
+    EXPECT_GE(*parsed,
+              Timestamp::ProcessEpoch() + Duration::Milliseconds(timeouts[i]));
+    EXPECT_LE(*parsed, Timestamp::ProcessEpoch() +
+                           Duration::Milliseconds(timeouts[i]) * 1.05 +
+                           Duration::Milliseconds(1));
+  }
+}
+FUZZ_TEST(MyTestSuite, EncodeTimeouts);
+
+}  // namespace grpc_core
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 567042b81c468..14b9978f503b6 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -22,7 +22,7 @@
 Pod::Spec.new do |s|
   s.name     = 'gRPC-C++'
   # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  version = '1.60.0-dev'
+  version = '1.61.0-dev'
   s.version  = version
   s.summary  = 'gRPC C++ library'
   s.homepage = 'https://grpc.io'
@@ -53,8 +53,8 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
     'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'\
-        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-generated"'\
-        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-generated"'\
+        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'\
+        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/re2"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/upb"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/xxhash"',
@@ -389,319 +389,482 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                       'src/core/ext/transport/inproc/inproc_transport.h',
                       'src/core/ext/transport/inproc/legacy_inproc_transport.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h',
-                      'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
-                      'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h',
-                      'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/http.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/percent.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/range.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h',
-                      'src/core/ext/upb-generated/google/api/annotations.upb.h',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h',
-                      'src/core/ext/upb-generated/google/api/http.upb.h',
-                      'src/core/ext/upb-generated/google/api/httpbody.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/any.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/duration.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/empty.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/struct.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h',
-                      'src/core/ext/upb-generated/google/rpc/status.upb.h',
-                      'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/migrate.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/security.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
-                      'src/core/ext/upb-generated/validate/validate.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/security.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/status.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/cidr.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/extension.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                      'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h',
-                      'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/cel.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/range.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h',
+                      'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/annotations/resource.upb.h',
+                      'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h',
+                      'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
+                      '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/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',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/percent.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/range.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/annotations.upb.h',
+                      'src/core/ext/upb-gen/google/api/annotations.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/http.upb.h',
+                      'src/core/ext/upb-gen/google/api/http.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/httpbody.upb.h',
+                      'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/any.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/descriptor.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/duration.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/empty.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/struct.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/timestamp.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/wrappers.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/rpc/status.upb.h',
+                      'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
+                      'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
+                      '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/migrate.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/security.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/status.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/versioning.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h',
+                      'src/core/ext/upb-gen/validate/validate.upb.h',
+                      'src/core/ext/upb-gen/validate/validate.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/security.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/status.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/authority.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/cidr.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/context_params.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/extension.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h',
+                      '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/ext/upb-gen/xds/type/matcher/v3/cel.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/cel.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/range.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
+                      '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/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',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/http.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/validate/validate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h',
+                      '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/ext/xds/certificate_provider_store.h',
                       'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
                       'src/core/ext/xds/upb_utils.h',
@@ -788,6 +951,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.h',
+                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -802,6 +966,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                      'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                       'src/core/lib/event_engine/resolved_address_internal.h',
                       'src/core/lib/event_engine/shim.h',
                       'src/core/lib/event_engine/tcp_socket_utils.h',
@@ -813,6 +978,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/time_util.h',
                       'src/core/lib/event_engine/trace.h',
                       'src/core/lib/event_engine/utils.h',
+                      'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                       'src/core/lib/event_engine/windows/iocp.h',
                       'src/core/lib/event_engine/windows/win_socket.h',
                       'src/core/lib/event_engine/windows/windows_endpoint.h',
@@ -836,6 +1002,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/gprpp/cpp_impl_of.h',
                       'src/core/lib/gprpp/crash.h',
                       'src/core/lib/gprpp/debug_location.h',
+                      'src/core/lib/gprpp/directory_reader.h',
                       'src/core/lib/gprpp/dual_ref_counted.h',
                       'src/core/lib/gprpp/env.h',
                       'src/core/lib/gprpp/examine_stack.h',
@@ -982,6 +1149,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/promise/race.h',
                       'src/core/lib/promise/seq.h',
                       'src/core/lib/promise/sleep.h',
+                      'src/core/lib/promise/status_flag.h',
                       'src/core/lib/promise/trace.h',
                       'src/core/lib/promise/try_seq.h',
                       'src/core/lib/resolver/endpoint_addresses.h',
@@ -1210,25 +1378,13 @@ Pod::Spec.new do |s|
                       'third_party/re2/util/strutil.h',
                       'third_party/re2/util/utf.h',
                       'third_party/re2/util/util.h',
-                      'third_party/upb/upb/alloc.h',
-                      'third_party/upb/upb/arena.h',
-                      'third_party/upb/upb/array.h',
                       'third_party/upb/upb/base/descriptor_constants.h',
-                      'third_party/upb/upb/base/log2.h',
+                      'third_party/upb/upb/base/internal/log2.h',
                       'third_party/upb/upb/base/status.h',
+                      'third_party/upb/upb/base/status.hpp',
                       'third_party/upb/upb/base/string_view.h',
                       'third_party/upb/upb/collections/array.h',
-                      'third_party/upb/upb/collections/array_internal.h',
                       'third_party/upb/upb/collections/map.h',
-                      'third_party/upb/upb/collections/map_gencode_util.h',
-                      'third_party/upb/upb/collections/map_internal.h',
-                      'third_party/upb/upb/collections/map_sorter_internal.h',
-                      'third_party/upb/upb/collections/message_value.h',
-                      'third_party/upb/upb/decode.h',
-                      'third_party/upb/upb/def.h',
-                      'third_party/upb/upb/def.hpp',
-                      'third_party/upb/upb/encode.h',
-                      'third_party/upb/upb/extension_registry.h',
                       'third_party/upb/upb/generated_code_support.h',
                       'third_party/upb/upb/hash/common.h',
                       'third_party/upb/upb/hash/int_table.h',
@@ -1239,17 +1395,26 @@ Pod::Spec.new do |s|
                       'third_party/upb/upb/lex/round_trip.h',
                       'third_party/upb/upb/lex/strtod.h',
                       'third_party/upb/upb/lex/unicode.h',
-                      'third_party/upb/upb/map.h',
                       'third_party/upb/upb/mem/alloc.h',
                       'third_party/upb/upb/mem/arena.h',
-                      'third_party/upb/upb/mem/arena_internal.h',
+                      'third_party/upb/upb/mem/arena.hpp',
+                      'third_party/upb/upb/mem/internal/arena.h',
                       'third_party/upb/upb/message/accessors.h',
-                      'third_party/upb/upb/message/accessors_internal.h',
-                      'third_party/upb/upb/message/extension_internal.h',
-                      'third_party/upb/upb/message/internal.h',
+                      'third_party/upb/upb/message/array.h',
+                      'third_party/upb/upb/message/internal/accessors.h',
+                      'third_party/upb/upb/message/internal/array.h',
+                      'third_party/upb/upb/message/internal/extension.h',
+                      'third_party/upb/upb/message/internal/map.h',
                       'third_party/upb/upb/message/internal/map_entry.h',
+                      'third_party/upb/upb/message/internal/map_sorter.h',
+                      'third_party/upb/upb/message/internal/message.h',
+                      'third_party/upb/upb/message/internal/types.h',
+                      'third_party/upb/upb/message/map.h',
+                      'third_party/upb/upb/message/map_gencode_util.h',
                       'third_party/upb/upb/message/message.h',
                       'third_party/upb/upb/message/tagged_ptr.h',
+                      'third_party/upb/upb/message/types.h',
+                      'third_party/upb/upb/message/value.h',
                       'third_party/upb/upb/mini_descriptor/build_enum.h',
                       'third_party/upb/upb/mini_descriptor/decode.h',
                       'third_party/upb/upb/mini_descriptor/internal/base92.h',
@@ -1272,60 +1437,53 @@ Pod::Spec.new do |s|
                       'third_party/upb/upb/mini_table/internal/sub.h',
                       'third_party/upb/upb/mini_table/message.h',
                       'third_party/upb/upb/mini_table/sub.h',
-                      'third_party/upb/upb/msg.h',
                       'third_party/upb/upb/port/atomic.h',
                       'third_party/upb/upb/port/def.inc',
                       'third_party/upb/upb/port/undef.inc',
                       'third_party/upb/upb/port/vsnprintf_compat.h',
-                      'third_party/upb/upb/reflection.h',
-                      'third_party/upb/upb/reflection.hpp',
                       'third_party/upb/upb/reflection/common.h',
                       'third_party/upb/upb/reflection/def.h',
                       'third_party/upb/upb/reflection/def.hpp',
-                      'third_party/upb/upb/reflection/def_builder_internal.h',
                       'third_party/upb/upb/reflection/def_pool.h',
-                      'third_party/upb/upb/reflection/def_pool_internal.h',
                       'third_party/upb/upb/reflection/def_type.h',
-                      'third_party/upb/upb/reflection/desc_state_internal.h',
                       'third_party/upb/upb/reflection/enum_def.h',
-                      'third_party/upb/upb/reflection/enum_def_internal.h',
                       'third_party/upb/upb/reflection/enum_reserved_range.h',
-                      'third_party/upb/upb/reflection/enum_reserved_range_internal.h',
                       'third_party/upb/upb/reflection/enum_value_def.h',
-                      'third_party/upb/upb/reflection/enum_value_def_internal.h',
                       'third_party/upb/upb/reflection/extension_range.h',
-                      'third_party/upb/upb/reflection/extension_range_internal.h',
                       'third_party/upb/upb/reflection/field_def.h',
-                      'third_party/upb/upb/reflection/field_def_internal.h',
                       'third_party/upb/upb/reflection/file_def.h',
-                      'third_party/upb/upb/reflection/file_def_internal.h',
+                      'third_party/upb/upb/reflection/internal/def_builder.h',
+                      'third_party/upb/upb/reflection/internal/def_pool.h',
+                      'third_party/upb/upb/reflection/internal/desc_state.h',
+                      'third_party/upb/upb/reflection/internal/enum_def.h',
+                      'third_party/upb/upb/reflection/internal/enum_reserved_range.h',
+                      'third_party/upb/upb/reflection/internal/enum_value_def.h',
+                      'third_party/upb/upb/reflection/internal/extension_range.h',
+                      'third_party/upb/upb/reflection/internal/field_def.h',
+                      'third_party/upb/upb/reflection/internal/file_def.h',
+                      'third_party/upb/upb/reflection/internal/message_def.h',
+                      'third_party/upb/upb/reflection/internal/message_reserved_range.h',
+                      'third_party/upb/upb/reflection/internal/method_def.h',
+                      'third_party/upb/upb/reflection/internal/oneof_def.h',
+                      'third_party/upb/upb/reflection/internal/service_def.h',
+                      'third_party/upb/upb/reflection/internal/strdup2.h',
                       'third_party/upb/upb/reflection/message.h',
                       'third_party/upb/upb/reflection/message.hpp',
                       'third_party/upb/upb/reflection/message_def.h',
-                      'third_party/upb/upb/reflection/message_def_internal.h',
                       'third_party/upb/upb/reflection/message_reserved_range.h',
-                      'third_party/upb/upb/reflection/message_reserved_range_internal.h',
                       'third_party/upb/upb/reflection/method_def.h',
-                      'third_party/upb/upb/reflection/method_def_internal.h',
                       'third_party/upb/upb/reflection/oneof_def.h',
-                      'third_party/upb/upb/reflection/oneof_def_internal.h',
                       'third_party/upb/upb/reflection/service_def.h',
-                      'third_party/upb/upb/reflection/service_def_internal.h',
-                      'third_party/upb/upb/status.h',
-                      'third_party/upb/upb/string_view.h',
                       'third_party/upb/upb/text/encode.h',
-                      'third_party/upb/upb/text_encode.h',
-                      'third_party/upb/upb/upb.h',
                       'third_party/upb/upb/upb.hpp',
-                      'third_party/upb/upb/wire/common.h',
-                      'third_party/upb/upb/wire/common_internal.h',
                       'third_party/upb/upb/wire/decode.h',
                       'third_party/upb/upb/wire/decode_fast.h',
-                      'third_party/upb/upb/wire/decode_internal.h',
                       'third_party/upb/upb/wire/encode.h',
                       'third_party/upb/upb/wire/eps_copy_input_stream.h',
+                      'third_party/upb/upb/wire/internal/constants.h',
+                      'third_party/upb/upb/wire/internal/decode.h',
+                      'third_party/upb/upb/wire/internal/swap.h',
                       'third_party/upb/upb/wire/reader.h',
-                      'third_party/upb/upb/wire/swap_internal.h',
                       'third_party/upb/upb/wire/types.h',
                       'third_party/utf8_range/utf8_range.h',
                       'third_party/xxhash/xxhash.h',
@@ -1465,319 +1623,482 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                               'src/core/ext/transport/inproc/inproc_transport.h',
                               'src/core/ext/transport/inproc/legacy_inproc_transport.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h',
-                              'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
-                              'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h',
-                              'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/http.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/percent.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/range.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h',
-                              'src/core/ext/upb-generated/google/api/annotations.upb.h',
-                              'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h',
-                              'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h',
-                              'src/core/ext/upb-generated/google/api/http.upb.h',
-                              'src/core/ext/upb-generated/google/api/httpbody.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/any.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/duration.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/empty.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/struct.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h',
-                              'src/core/ext/upb-generated/google/rpc/status.upb.h',
-                              'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/migrate.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/security.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
-                              'src/core/ext/upb-generated/validate/validate.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/security.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/status.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/cidr.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/extension.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                              'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h',
-                              'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/cel.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/range.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h',
+                              'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/annotations/resource.upb.h',
+                              'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h',
+                              'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
+                              '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/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',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/percent.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/range.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/annotations.upb.h',
+                              'src/core/ext/upb-gen/google/api/annotations.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/http.upb.h',
+                              'src/core/ext/upb-gen/google/api/http.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/httpbody.upb.h',
+                              'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/any.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/descriptor.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/duration.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/empty.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/struct.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/timestamp.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/wrappers.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/rpc/status.upb.h',
+                              'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
+                              'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
+                              '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/migrate.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/security.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/status.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/versioning.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h',
+                              'src/core/ext/upb-gen/validate/validate.upb.h',
+                              'src/core/ext/upb-gen/validate/validate.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/security.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/status.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/authority.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/cidr.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/context_params.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/extension.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h',
+                              '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/ext/upb-gen/xds/type/matcher/v3/cel.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/cel.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/range.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
+                              '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/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',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/http.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/validate/validate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h',
+                              '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/ext/xds/certificate_provider_store.h',
                               'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
                               'src/core/ext/xds/upb_utils.h',
@@ -1864,6 +2185,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                               'src/core/lib/event_engine/posix_engine/lockfree_event.h',
+                              'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
                               'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -1878,6 +2200,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                              'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                               'src/core/lib/event_engine/resolved_address_internal.h',
                               'src/core/lib/event_engine/shim.h',
                               'src/core/lib/event_engine/tcp_socket_utils.h',
@@ -1889,6 +2212,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/time_util.h',
                               'src/core/lib/event_engine/trace.h',
                               'src/core/lib/event_engine/utils.h',
+                              'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                               'src/core/lib/event_engine/windows/iocp.h',
                               'src/core/lib/event_engine/windows/win_socket.h',
                               'src/core/lib/event_engine/windows/windows_endpoint.h',
@@ -1912,6 +2236,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/gprpp/cpp_impl_of.h',
                               'src/core/lib/gprpp/crash.h',
                               'src/core/lib/gprpp/debug_location.h',
+                              'src/core/lib/gprpp/directory_reader.h',
                               'src/core/lib/gprpp/dual_ref_counted.h',
                               'src/core/lib/gprpp/env.h',
                               'src/core/lib/gprpp/examine_stack.h',
@@ -2058,6 +2383,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/promise/race.h',
                               'src/core/lib/promise/seq.h',
                               'src/core/lib/promise/sleep.h',
+                              'src/core/lib/promise/status_flag.h',
                               'src/core/lib/promise/trace.h',
                               'src/core/lib/promise/try_seq.h',
                               'src/core/lib/resolver/endpoint_addresses.h',
@@ -2239,25 +2565,13 @@ Pod::Spec.new do |s|
                               'third_party/re2/util/strutil.h',
                               'third_party/re2/util/utf.h',
                               'third_party/re2/util/util.h',
-                              'third_party/upb/upb/alloc.h',
-                              'third_party/upb/upb/arena.h',
-                              'third_party/upb/upb/array.h',
                               'third_party/upb/upb/base/descriptor_constants.h',
-                              'third_party/upb/upb/base/log2.h',
+                              'third_party/upb/upb/base/internal/log2.h',
                               'third_party/upb/upb/base/status.h',
+                              'third_party/upb/upb/base/status.hpp',
                               'third_party/upb/upb/base/string_view.h',
                               'third_party/upb/upb/collections/array.h',
-                              'third_party/upb/upb/collections/array_internal.h',
                               'third_party/upb/upb/collections/map.h',
-                              'third_party/upb/upb/collections/map_gencode_util.h',
-                              'third_party/upb/upb/collections/map_internal.h',
-                              'third_party/upb/upb/collections/map_sorter_internal.h',
-                              'third_party/upb/upb/collections/message_value.h',
-                              'third_party/upb/upb/decode.h',
-                              'third_party/upb/upb/def.h',
-                              'third_party/upb/upb/def.hpp',
-                              'third_party/upb/upb/encode.h',
-                              'third_party/upb/upb/extension_registry.h',
                               'third_party/upb/upb/generated_code_support.h',
                               'third_party/upb/upb/hash/common.h',
                               'third_party/upb/upb/hash/int_table.h',
@@ -2268,17 +2582,26 @@ Pod::Spec.new do |s|
                               'third_party/upb/upb/lex/round_trip.h',
                               'third_party/upb/upb/lex/strtod.h',
                               'third_party/upb/upb/lex/unicode.h',
-                              'third_party/upb/upb/map.h',
                               'third_party/upb/upb/mem/alloc.h',
                               'third_party/upb/upb/mem/arena.h',
-                              'third_party/upb/upb/mem/arena_internal.h',
+                              'third_party/upb/upb/mem/arena.hpp',
+                              'third_party/upb/upb/mem/internal/arena.h',
                               'third_party/upb/upb/message/accessors.h',
-                              'third_party/upb/upb/message/accessors_internal.h',
-                              'third_party/upb/upb/message/extension_internal.h',
-                              'third_party/upb/upb/message/internal.h',
+                              'third_party/upb/upb/message/array.h',
+                              'third_party/upb/upb/message/internal/accessors.h',
+                              'third_party/upb/upb/message/internal/array.h',
+                              'third_party/upb/upb/message/internal/extension.h',
+                              'third_party/upb/upb/message/internal/map.h',
                               'third_party/upb/upb/message/internal/map_entry.h',
+                              'third_party/upb/upb/message/internal/map_sorter.h',
+                              'third_party/upb/upb/message/internal/message.h',
+                              'third_party/upb/upb/message/internal/types.h',
+                              'third_party/upb/upb/message/map.h',
+                              'third_party/upb/upb/message/map_gencode_util.h',
                               'third_party/upb/upb/message/message.h',
                               'third_party/upb/upb/message/tagged_ptr.h',
+                              'third_party/upb/upb/message/types.h',
+                              'third_party/upb/upb/message/value.h',
                               'third_party/upb/upb/mini_descriptor/build_enum.h',
                               'third_party/upb/upb/mini_descriptor/decode.h',
                               'third_party/upb/upb/mini_descriptor/internal/base92.h',
@@ -2301,60 +2624,53 @@ Pod::Spec.new do |s|
                               'third_party/upb/upb/mini_table/internal/sub.h',
                               'third_party/upb/upb/mini_table/message.h',
                               'third_party/upb/upb/mini_table/sub.h',
-                              'third_party/upb/upb/msg.h',
                               'third_party/upb/upb/port/atomic.h',
                               'third_party/upb/upb/port/def.inc',
                               'third_party/upb/upb/port/undef.inc',
                               'third_party/upb/upb/port/vsnprintf_compat.h',
-                              'third_party/upb/upb/reflection.h',
-                              'third_party/upb/upb/reflection.hpp',
                               'third_party/upb/upb/reflection/common.h',
                               'third_party/upb/upb/reflection/def.h',
                               'third_party/upb/upb/reflection/def.hpp',
-                              'third_party/upb/upb/reflection/def_builder_internal.h',
                               'third_party/upb/upb/reflection/def_pool.h',
-                              'third_party/upb/upb/reflection/def_pool_internal.h',
                               'third_party/upb/upb/reflection/def_type.h',
-                              'third_party/upb/upb/reflection/desc_state_internal.h',
                               'third_party/upb/upb/reflection/enum_def.h',
-                              'third_party/upb/upb/reflection/enum_def_internal.h',
                               'third_party/upb/upb/reflection/enum_reserved_range.h',
-                              'third_party/upb/upb/reflection/enum_reserved_range_internal.h',
                               'third_party/upb/upb/reflection/enum_value_def.h',
-                              'third_party/upb/upb/reflection/enum_value_def_internal.h',
                               'third_party/upb/upb/reflection/extension_range.h',
-                              'third_party/upb/upb/reflection/extension_range_internal.h',
                               'third_party/upb/upb/reflection/field_def.h',
-                              'third_party/upb/upb/reflection/field_def_internal.h',
                               'third_party/upb/upb/reflection/file_def.h',
-                              'third_party/upb/upb/reflection/file_def_internal.h',
+                              'third_party/upb/upb/reflection/internal/def_builder.h',
+                              'third_party/upb/upb/reflection/internal/def_pool.h',
+                              'third_party/upb/upb/reflection/internal/desc_state.h',
+                              'third_party/upb/upb/reflection/internal/enum_def.h',
+                              'third_party/upb/upb/reflection/internal/enum_reserved_range.h',
+                              'third_party/upb/upb/reflection/internal/enum_value_def.h',
+                              'third_party/upb/upb/reflection/internal/extension_range.h',
+                              'third_party/upb/upb/reflection/internal/field_def.h',
+                              'third_party/upb/upb/reflection/internal/file_def.h',
+                              'third_party/upb/upb/reflection/internal/message_def.h',
+                              'third_party/upb/upb/reflection/internal/message_reserved_range.h',
+                              'third_party/upb/upb/reflection/internal/method_def.h',
+                              'third_party/upb/upb/reflection/internal/oneof_def.h',
+                              'third_party/upb/upb/reflection/internal/service_def.h',
+                              'third_party/upb/upb/reflection/internal/strdup2.h',
                               'third_party/upb/upb/reflection/message.h',
                               'third_party/upb/upb/reflection/message.hpp',
                               'third_party/upb/upb/reflection/message_def.h',
-                              'third_party/upb/upb/reflection/message_def_internal.h',
                               'third_party/upb/upb/reflection/message_reserved_range.h',
-                              'third_party/upb/upb/reflection/message_reserved_range_internal.h',
                               'third_party/upb/upb/reflection/method_def.h',
-                              'third_party/upb/upb/reflection/method_def_internal.h',
                               'third_party/upb/upb/reflection/oneof_def.h',
-                              'third_party/upb/upb/reflection/oneof_def_internal.h',
                               'third_party/upb/upb/reflection/service_def.h',
-                              'third_party/upb/upb/reflection/service_def_internal.h',
-                              'third_party/upb/upb/status.h',
-                              'third_party/upb/upb/string_view.h',
                               'third_party/upb/upb/text/encode.h',
-                              'third_party/upb/upb/text_encode.h',
-                              'third_party/upb/upb/upb.h',
                               'third_party/upb/upb/upb.hpp',
-                              'third_party/upb/upb/wire/common.h',
-                              'third_party/upb/upb/wire/common_internal.h',
                               'third_party/upb/upb/wire/decode.h',
                               'third_party/upb/upb/wire/decode_fast.h',
-                              'third_party/upb/upb/wire/decode_internal.h',
                               'third_party/upb/upb/wire/encode.h',
                               'third_party/upb/upb/wire/eps_copy_input_stream.h',
+                              'third_party/upb/upb/wire/internal/constants.h',
+                              'third_party/upb/upb/wire/internal/decode.h',
+                              'third_party/upb/upb/wire/internal/swap.h',
                               'third_party/upb/upb/wire/reader.h',
-                              'third_party/upb/upb/wire/swap_internal.h',
                               'third_party/upb/upb/wire/types.h',
                               'third_party/utf8_range/utf8_range.h',
                               'third_party/xxhash/xxhash.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 9b966afbc7c36..303ac9ad5b295 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.60.0-dev'
+  version = '1.61.0-dev'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'https://grpc.io'
@@ -74,8 +74,8 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
     'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'\
-        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-generated"'\
-        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-generated"'\
+        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'\
+        ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/re2"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/upb"'\
         ' "$(PODS_TARGET_SRCROOT)/third_party/utf8_range"'\
@@ -435,632 +435,795 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/inproc/inproc_transport.h',
                       'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
                       'src/core/ext/transport/inproc/legacy_inproc_transport.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h',
-                      'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c',
-                      'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h',
-                      'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
-                      'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
-                      'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
-                      'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c',
-                      'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h',
-                      'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c',
-                      'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c',
-                      'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c',
-                      'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
-                      'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
-                      'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
-                      'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/http.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/http.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/percent.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/range.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h',
-                      'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c',
-                      'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h',
-                      'src/core/ext/upb-generated/google/api/annotations.upb.c',
-                      'src/core/ext/upb-generated/google/api/annotations.upb.h',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
-                      'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h',
-                      'src/core/ext/upb-generated/google/api/http.upb.c',
-                      'src/core/ext/upb-generated/google/api/http.upb.h',
-                      'src/core/ext/upb-generated/google/api/httpbody.upb.c',
-                      'src/core/ext/upb-generated/google/api/httpbody.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/any.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/duration.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/empty.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/struct.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h',
-                      'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-                      'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h',
-                      'src/core/ext/upb-generated/google/rpc/status.upb.c',
-                      'src/core/ext/upb-generated/google/rpc/status.upb.h',
-                      'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c',
-                      'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c',
-                      'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/migrate.upb.c',
-                      'src/core/ext/upb-generated/udpa/annotations/migrate.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/security.upb.c',
-                      'src/core/ext/upb-generated/udpa/annotations/security.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
-                      'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
-                      'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
-                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
-                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
-                      'src/core/ext/upb-generated/validate/validate.upb.c',
-                      'src/core/ext/upb-generated/validate/validate.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c',
-                      'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/security.upb.c',
-                      'src/core/ext/upb-generated/xds/annotations/v3/security.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c',
-                      'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/status.upb.c',
-                      'src/core/ext/upb-generated/xds/annotations/v3/status.upb.h',
-                      'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c',
-                      'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/cidr.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/cidr.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/extension.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/extension.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                      'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-                      'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h',
-                      'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
-                      'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c',
-                      'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/cel.upb.c',
-                      'src/core/ext/upb-generated/xds/type/v3/cel.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/range.upb.c',
-                      'src/core/ext/upb-generated/xds/type/v3/range.upb.h',
-                      'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c',
-                      'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h',
+                      'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h',
+                      'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/annotations/resource.upb.h',
+                      'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h',
+                      'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
+                      '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/pick_first/v3/pick_first.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
+                      '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/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.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/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',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
+                      '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/common.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h',
+                      'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/percent.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/range.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h',
+                      'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/annotations.upb.h',
+                      'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/api/annotations.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/http.upb.h',
+                      'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/api/http.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/api/httpbody.upb.h',
+                      'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/any.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/descriptor.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/duration.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/empty.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/struct.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/timestamp.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/protobuf/wrappers.upb.h',
+                      'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
+                      'src/core/ext/upb-gen/google/rpc/status.upb.h',
+                      'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+                      'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
+                      'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c',
+                      '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.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c',
+                      'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/migrate.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c',
+                      'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/security.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c',
+                      'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c',
+                      'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/status.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c',
+                      'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/udpa/annotations/versioning.upb.h',
+                      'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c',
+                      'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h',
+                      'src/core/ext/upb-gen/validate/validate.upb.h',
+                      'src/core/ext/upb-gen/validate/validate.upb_minitable.c',
+                      'src/core/ext/upb-gen/validate/validate.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/security.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/status.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h',
+                      'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/authority.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/cidr.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/context_params.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/extension.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h',
+                      'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c',
+                      '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.c',
+                      'src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/cel.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/range.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h',
+                      'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h',
+                      'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c',
+                      'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
+                      '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.c',
+                      '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/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',
+                      '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.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/http.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/api/http.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/validate/validate.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/validate/validate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
+                      '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/ext/xds/certificate_provider_store.cc',
                       'src/core/ext/xds/certificate_provider_store.h',
                       'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
@@ -1200,7 +1363,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/forkable.h',
                       'src/core/lib/event_engine/grpc_polled_fd.h',
                       'src/core/lib/event_engine/handle_containers.h',
-                      'src/core/lib/event_engine/memory_allocator.cc',
                       'src/core/lib/event_engine/memory_allocator_factory.h',
                       'src/core/lib/event_engine/nameser.h',
                       'src/core/lib/event_engine/poller.h',
@@ -1217,6 +1379,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.h',
+                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
+                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine.cc',
@@ -1243,6 +1407,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc',
                       'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                      'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                       'src/core/lib/event_engine/resolved_address.cc',
                       'src/core/lib/event_engine/resolved_address_internal.h',
                       'src/core/lib/event_engine/shim.cc',
@@ -1267,6 +1432,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/trace.h',
                       'src/core/lib/event_engine/utils.cc',
                       'src/core/lib/event_engine/utils.h',
+                      'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
+                      'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                       'src/core/lib/event_engine/windows/iocp.cc',
                       'src/core/lib/event_engine/windows/iocp.h',
                       'src/core/lib/event_engine/windows/win_socket.cc',
@@ -1326,6 +1493,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/gprpp/crash.cc',
                       'src/core/lib/gprpp/crash.h',
                       'src/core/lib/gprpp/debug_location.h',
+                      'src/core/lib/gprpp/directory_reader.h',
                       'src/core/lib/gprpp/dual_ref_counted.h',
                       'src/core/lib/gprpp/env.h',
                       'src/core/lib/gprpp/examine_stack.cc',
@@ -1350,6 +1518,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/gprpp/packed_table.h',
                       'src/core/lib/gprpp/per_cpu.cc',
                       'src/core/lib/gprpp/per_cpu.h',
+                      'src/core/lib/gprpp/posix/directory_reader.cc',
                       'src/core/lib/gprpp/posix/env.cc',
                       'src/core/lib/gprpp/posix/stat.cc',
                       'src/core/lib/gprpp/posix/thd.cc',
@@ -1379,6 +1548,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/gprpp/unique_type_name.h',
                       'src/core/lib/gprpp/validation_errors.cc',
                       'src/core/lib/gprpp/validation_errors.h',
+                      'src/core/lib/gprpp/windows/directory_reader.cc',
                       'src/core/lib/gprpp/windows/env.cc',
                       'src/core/lib/gprpp/windows/stat.cc',
                       'src/core/lib/gprpp/windows/thd.cc',
@@ -1587,6 +1757,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/promise/seq.h',
                       'src/core/lib/promise/sleep.cc',
                       'src/core/lib/promise/sleep.h',
+                      'src/core/lib/promise/status_flag.h',
                       'src/core/lib/promise/trace.cc',
                       'src/core/lib/promise/trace.h',
                       'src/core/lib/promise/try_seq.h',
@@ -1931,29 +2102,14 @@ Pod::Spec.new do |s|
                       'third_party/re2/util/strutil.h',
                       'third_party/re2/util/utf.h',
                       'third_party/re2/util/util.h',
-                      'third_party/upb/upb/alloc.h',
-                      'third_party/upb/upb/arena.h',
-                      'third_party/upb/upb/array.h',
                       'third_party/upb/upb/base/descriptor_constants.h',
-                      'third_party/upb/upb/base/log2.h',
+                      'third_party/upb/upb/base/internal/log2.h',
                       'third_party/upb/upb/base/status.c',
                       'third_party/upb/upb/base/status.h',
+                      'third_party/upb/upb/base/status.hpp',
                       'third_party/upb/upb/base/string_view.h',
-                      'third_party/upb/upb/collections/array.c',
                       'third_party/upb/upb/collections/array.h',
-                      'third_party/upb/upb/collections/array_internal.h',
-                      'third_party/upb/upb/collections/map.c',
                       'third_party/upb/upb/collections/map.h',
-                      'third_party/upb/upb/collections/map_gencode_util.h',
-                      'third_party/upb/upb/collections/map_internal.h',
-                      'third_party/upb/upb/collections/map_sorter.c',
-                      'third_party/upb/upb/collections/map_sorter_internal.h',
-                      'third_party/upb/upb/collections/message_value.h',
-                      'third_party/upb/upb/decode.h',
-                      'third_party/upb/upb/def.h',
-                      'third_party/upb/upb/def.hpp',
-                      'third_party/upb/upb/encode.h',
-                      'third_party/upb/upb/extension_registry.h',
                       'third_party/upb/upb/generated_code_support.h',
                       'third_party/upb/upb/hash/common.c',
                       'third_party/upb/upb/hash/common.h',
@@ -1971,21 +2127,33 @@ Pod::Spec.new do |s|
                       'third_party/upb/upb/lex/strtod.h',
                       'third_party/upb/upb/lex/unicode.c',
                       'third_party/upb/upb/lex/unicode.h',
-                      'third_party/upb/upb/map.h',
                       'third_party/upb/upb/mem/alloc.c',
                       'third_party/upb/upb/mem/alloc.h',
                       'third_party/upb/upb/mem/arena.c',
                       'third_party/upb/upb/mem/arena.h',
-                      'third_party/upb/upb/mem/arena_internal.h',
+                      'third_party/upb/upb/mem/arena.hpp',
+                      'third_party/upb/upb/mem/internal/arena.h',
                       'third_party/upb/upb/message/accessors.c',
                       'third_party/upb/upb/message/accessors.h',
-                      'third_party/upb/upb/message/accessors_internal.h',
-                      'third_party/upb/upb/message/extension_internal.h',
-                      'third_party/upb/upb/message/internal.h',
+                      'third_party/upb/upb/message/array.c',
+                      'third_party/upb/upb/message/array.h',
+                      'third_party/upb/upb/message/internal/accessors.h',
+                      'third_party/upb/upb/message/internal/array.h',
+                      'third_party/upb/upb/message/internal/extension.h',
+                      'third_party/upb/upb/message/internal/map.h',
                       'third_party/upb/upb/message/internal/map_entry.h',
+                      'third_party/upb/upb/message/internal/map_sorter.h',
+                      'third_party/upb/upb/message/internal/message.h',
+                      'third_party/upb/upb/message/internal/types.h',
+                      'third_party/upb/upb/message/map.c',
+                      'third_party/upb/upb/message/map.h',
+                      'third_party/upb/upb/message/map_gencode_util.h',
+                      'third_party/upb/upb/message/map_sorter.c',
                       'third_party/upb/upb/message/message.c',
                       'third_party/upb/upb/message/message.h',
                       'third_party/upb/upb/message/tagged_ptr.h',
+                      'third_party/upb/upb/message/types.h',
+                      'third_party/upb/upb/message/value.h',
                       'third_party/upb/upb/mini_descriptor/build_enum.c',
                       'third_party/upb/upb/mini_descriptor/build_enum.h',
                       'third_party/upb/upb/mini_descriptor/decode.c',
@@ -2016,82 +2184,76 @@ Pod::Spec.new do |s|
                       'third_party/upb/upb/mini_table/message.c',
                       'third_party/upb/upb/mini_table/message.h',
                       'third_party/upb/upb/mini_table/sub.h',
-                      'third_party/upb/upb/msg.h',
                       'third_party/upb/upb/port/atomic.h',
                       'third_party/upb/upb/port/def.inc',
                       'third_party/upb/upb/port/undef.inc',
                       'third_party/upb/upb/port/vsnprintf_compat.h',
-                      'third_party/upb/upb/reflection.h',
-                      'third_party/upb/upb/reflection.hpp',
                       'third_party/upb/upb/reflection/common.h',
                       'third_party/upb/upb/reflection/def.h',
                       'third_party/upb/upb/reflection/def.hpp',
-                      'third_party/upb/upb/reflection/def_builder.c',
-                      'third_party/upb/upb/reflection/def_builder_internal.h',
                       'third_party/upb/upb/reflection/def_pool.c',
                       'third_party/upb/upb/reflection/def_pool.h',
-                      'third_party/upb/upb/reflection/def_pool_internal.h',
                       'third_party/upb/upb/reflection/def_type.c',
                       'third_party/upb/upb/reflection/def_type.h',
                       'third_party/upb/upb/reflection/desc_state.c',
-                      'third_party/upb/upb/reflection/desc_state_internal.h',
                       'third_party/upb/upb/reflection/enum_def.c',
                       'third_party/upb/upb/reflection/enum_def.h',
-                      'third_party/upb/upb/reflection/enum_def_internal.h',
                       'third_party/upb/upb/reflection/enum_reserved_range.c',
                       'third_party/upb/upb/reflection/enum_reserved_range.h',
-                      'third_party/upb/upb/reflection/enum_reserved_range_internal.h',
                       'third_party/upb/upb/reflection/enum_value_def.c',
                       'third_party/upb/upb/reflection/enum_value_def.h',
-                      'third_party/upb/upb/reflection/enum_value_def_internal.h',
                       'third_party/upb/upb/reflection/extension_range.c',
                       'third_party/upb/upb/reflection/extension_range.h',
-                      'third_party/upb/upb/reflection/extension_range_internal.h',
                       'third_party/upb/upb/reflection/field_def.c',
                       'third_party/upb/upb/reflection/field_def.h',
-                      'third_party/upb/upb/reflection/field_def_internal.h',
                       'third_party/upb/upb/reflection/file_def.c',
                       'third_party/upb/upb/reflection/file_def.h',
-                      'third_party/upb/upb/reflection/file_def_internal.h',
+                      'third_party/upb/upb/reflection/internal/def_builder.c',
+                      'third_party/upb/upb/reflection/internal/def_builder.h',
+                      'third_party/upb/upb/reflection/internal/def_pool.h',
+                      'third_party/upb/upb/reflection/internal/desc_state.h',
+                      'third_party/upb/upb/reflection/internal/enum_def.h',
+                      'third_party/upb/upb/reflection/internal/enum_reserved_range.h',
+                      'third_party/upb/upb/reflection/internal/enum_value_def.h',
+                      'third_party/upb/upb/reflection/internal/extension_range.h',
+                      'third_party/upb/upb/reflection/internal/field_def.h',
+                      'third_party/upb/upb/reflection/internal/file_def.h',
+                      'third_party/upb/upb/reflection/internal/message_def.h',
+                      'third_party/upb/upb/reflection/internal/message_reserved_range.h',
+                      'third_party/upb/upb/reflection/internal/method_def.h',
+                      'third_party/upb/upb/reflection/internal/oneof_def.h',
+                      'third_party/upb/upb/reflection/internal/service_def.h',
+                      'third_party/upb/upb/reflection/internal/strdup2.c',
+                      'third_party/upb/upb/reflection/internal/strdup2.h',
                       'third_party/upb/upb/reflection/message.c',
                       'third_party/upb/upb/reflection/message.h',
                       'third_party/upb/upb/reflection/message.hpp',
                       'third_party/upb/upb/reflection/message_def.c',
                       'third_party/upb/upb/reflection/message_def.h',
-                      'third_party/upb/upb/reflection/message_def_internal.h',
                       'third_party/upb/upb/reflection/message_reserved_range.c',
                       'third_party/upb/upb/reflection/message_reserved_range.h',
-                      'third_party/upb/upb/reflection/message_reserved_range_internal.h',
                       'third_party/upb/upb/reflection/method_def.c',
                       'third_party/upb/upb/reflection/method_def.h',
-                      'third_party/upb/upb/reflection/method_def_internal.h',
                       'third_party/upb/upb/reflection/oneof_def.c',
                       'third_party/upb/upb/reflection/oneof_def.h',
-                      'third_party/upb/upb/reflection/oneof_def_internal.h',
                       'third_party/upb/upb/reflection/service_def.c',
                       'third_party/upb/upb/reflection/service_def.h',
-                      'third_party/upb/upb/reflection/service_def_internal.h',
-                      'third_party/upb/upb/status.h',
-                      'third_party/upb/upb/string_view.h',
                       'third_party/upb/upb/text/encode.c',
                       'third_party/upb/upb/text/encode.h',
-                      'third_party/upb/upb/text_encode.h',
-                      'third_party/upb/upb/upb.h',
                       'third_party/upb/upb/upb.hpp',
-                      'third_party/upb/upb/wire/common.h',
-                      'third_party/upb/upb/wire/common_internal.h',
                       'third_party/upb/upb/wire/decode.c',
                       'third_party/upb/upb/wire/decode.h',
                       'third_party/upb/upb/wire/decode_fast.c',
                       'third_party/upb/upb/wire/decode_fast.h',
-                      'third_party/upb/upb/wire/decode_internal.h',
                       'third_party/upb/upb/wire/encode.c',
                       'third_party/upb/upb/wire/encode.h',
                       'third_party/upb/upb/wire/eps_copy_input_stream.c',
                       'third_party/upb/upb/wire/eps_copy_input_stream.h',
+                      'third_party/upb/upb/wire/internal/constants.h',
+                      'third_party/upb/upb/wire/internal/decode.h',
+                      'third_party/upb/upb/wire/internal/swap.h',
                       'third_party/upb/upb/wire/reader.c',
                       'third_party/upb/upb/wire/reader.h',
-                      'third_party/upb/upb/wire/swap_internal.h',
                       'third_party/upb/upb/wire/types.h',
                       'third_party/utf8_range/naive.c',
                       'third_party/utf8_range/range2-neon.c',
@@ -2224,319 +2386,482 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                               'src/core/ext/transport/inproc/inproc_transport.h',
                               'src/core/ext/transport/inproc/legacy_inproc_transport.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h',
-                              'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h',
-                              'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
-                              'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h',
-                              'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h',
-                              'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
-                              'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
-                              'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/http.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/percent.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/range.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h',
-                              'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h',
-                              'src/core/ext/upb-generated/google/api/annotations.upb.h',
-                              'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h',
-                              'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h',
-                              'src/core/ext/upb-generated/google/api/http.upb.h',
-                              'src/core/ext/upb-generated/google/api/httpbody.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/any.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/duration.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/empty.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/struct.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h',
-                              'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h',
-                              'src/core/ext/upb-generated/google/rpc/status.upb.h',
-                              'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h',
-                              'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/migrate.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/security.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
-                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
-                              'src/core/ext/upb-generated/validate/validate.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/security.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/status.upb.h',
-                              'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/cidr.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/extension.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
-                              'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                              'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h',
-                              'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h',
-                              'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/cel.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/range.upb.h',
-                              'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/http.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h',
+                              'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h',
+                              'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/annotations/resource.upb.h',
+                              'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h',
+                              'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h',
+                              'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h',
+                              '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/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',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h',
+                              'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/percent.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/range.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h',
+                              'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/annotations.upb.h',
+                              'src/core/ext/upb-gen/google/api/annotations.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h',
+                              'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/http.upb.h',
+                              'src/core/ext/upb-gen/google/api/http.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/api/httpbody.upb.h',
+                              'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/any.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/descriptor.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/duration.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/empty.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/struct.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/timestamp.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/protobuf/wrappers.upb.h',
+                              'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h',
+                              'src/core/ext/upb-gen/google/rpc/status.upb.h',
+                              'src/core/ext/upb-gen/google/rpc/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h',
+                              'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h',
+                              '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h',
+                              'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/migrate.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/security.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/status.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/udpa/annotations/versioning.upb.h',
+                              'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h',
+                              'src/core/ext/upb-gen/validate/validate.upb.h',
+                              'src/core/ext/upb-gen/validate/validate.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/security.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/status.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h',
+                              'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/authority.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/cidr.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/context_params.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/extension.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h',
+                              'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h',
+                              '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/ext/upb-gen/xds/type/matcher/v3/cel.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h',
+                              'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/cel.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/range.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h',
+                              'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h',
+                              'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
+                              '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/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',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/http.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/validate/validate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h',
+                              '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/ext/xds/certificate_provider_store.h',
                               'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
                               'src/core/ext/xds/upb_utils.h',
@@ -2622,6 +2947,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                               'src/core/lib/event_engine/posix_engine/lockfree_event.h',
+                              'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
                               'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -2636,6 +2962,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h',
+                              'src/core/lib/event_engine/ref_counted_dns_resolver_interface.h',
                               'src/core/lib/event_engine/resolved_address_internal.h',
                               'src/core/lib/event_engine/shim.h',
                               'src/core/lib/event_engine/tcp_socket_utils.h',
@@ -2647,6 +2974,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/time_util.h',
                               'src/core/lib/event_engine/trace.h',
                               'src/core/lib/event_engine/utils.h',
+                              'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                               'src/core/lib/event_engine/windows/iocp.h',
                               'src/core/lib/event_engine/windows/win_socket.h',
                               'src/core/lib/event_engine/windows/windows_endpoint.h',
@@ -2670,6 +2998,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/gprpp/cpp_impl_of.h',
                               'src/core/lib/gprpp/crash.h',
                               'src/core/lib/gprpp/debug_location.h',
+                              'src/core/lib/gprpp/directory_reader.h',
                               'src/core/lib/gprpp/dual_ref_counted.h',
                               'src/core/lib/gprpp/env.h',
                               'src/core/lib/gprpp/examine_stack.h',
@@ -2816,6 +3145,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/promise/race.h',
                               'src/core/lib/promise/seq.h',
                               'src/core/lib/promise/sleep.h',
+                              'src/core/lib/promise/status_flag.h',
                               'src/core/lib/promise/trace.h',
                               'src/core/lib/promise/try_seq.h',
                               'src/core/lib/resolver/endpoint_addresses.h',
@@ -2986,25 +3316,13 @@ Pod::Spec.new do |s|
                               'third_party/re2/util/strutil.h',
                               'third_party/re2/util/utf.h',
                               'third_party/re2/util/util.h',
-                              'third_party/upb/upb/alloc.h',
-                              'third_party/upb/upb/arena.h',
-                              'third_party/upb/upb/array.h',
                               'third_party/upb/upb/base/descriptor_constants.h',
-                              'third_party/upb/upb/base/log2.h',
+                              'third_party/upb/upb/base/internal/log2.h',
                               'third_party/upb/upb/base/status.h',
+                              'third_party/upb/upb/base/status.hpp',
                               'third_party/upb/upb/base/string_view.h',
                               'third_party/upb/upb/collections/array.h',
-                              'third_party/upb/upb/collections/array_internal.h',
                               'third_party/upb/upb/collections/map.h',
-                              'third_party/upb/upb/collections/map_gencode_util.h',
-                              'third_party/upb/upb/collections/map_internal.h',
-                              'third_party/upb/upb/collections/map_sorter_internal.h',
-                              'third_party/upb/upb/collections/message_value.h',
-                              'third_party/upb/upb/decode.h',
-                              'third_party/upb/upb/def.h',
-                              'third_party/upb/upb/def.hpp',
-                              'third_party/upb/upb/encode.h',
-                              'third_party/upb/upb/extension_registry.h',
                               'third_party/upb/upb/generated_code_support.h',
                               'third_party/upb/upb/hash/common.h',
                               'third_party/upb/upb/hash/int_table.h',
@@ -3015,17 +3333,26 @@ Pod::Spec.new do |s|
                               'third_party/upb/upb/lex/round_trip.h',
                               'third_party/upb/upb/lex/strtod.h',
                               'third_party/upb/upb/lex/unicode.h',
-                              'third_party/upb/upb/map.h',
                               'third_party/upb/upb/mem/alloc.h',
                               'third_party/upb/upb/mem/arena.h',
-                              'third_party/upb/upb/mem/arena_internal.h',
+                              'third_party/upb/upb/mem/arena.hpp',
+                              'third_party/upb/upb/mem/internal/arena.h',
                               'third_party/upb/upb/message/accessors.h',
-                              'third_party/upb/upb/message/accessors_internal.h',
-                              'third_party/upb/upb/message/extension_internal.h',
-                              'third_party/upb/upb/message/internal.h',
+                              'third_party/upb/upb/message/array.h',
+                              'third_party/upb/upb/message/internal/accessors.h',
+                              'third_party/upb/upb/message/internal/array.h',
+                              'third_party/upb/upb/message/internal/extension.h',
+                              'third_party/upb/upb/message/internal/map.h',
                               'third_party/upb/upb/message/internal/map_entry.h',
+                              'third_party/upb/upb/message/internal/map_sorter.h',
+                              'third_party/upb/upb/message/internal/message.h',
+                              'third_party/upb/upb/message/internal/types.h',
+                              'third_party/upb/upb/message/map.h',
+                              'third_party/upb/upb/message/map_gencode_util.h',
                               'third_party/upb/upb/message/message.h',
                               'third_party/upb/upb/message/tagged_ptr.h',
+                              'third_party/upb/upb/message/types.h',
+                              'third_party/upb/upb/message/value.h',
                               'third_party/upb/upb/mini_descriptor/build_enum.h',
                               'third_party/upb/upb/mini_descriptor/decode.h',
                               'third_party/upb/upb/mini_descriptor/internal/base92.h',
@@ -3048,60 +3375,53 @@ Pod::Spec.new do |s|
                               'third_party/upb/upb/mini_table/internal/sub.h',
                               'third_party/upb/upb/mini_table/message.h',
                               'third_party/upb/upb/mini_table/sub.h',
-                              'third_party/upb/upb/msg.h',
                               'third_party/upb/upb/port/atomic.h',
                               'third_party/upb/upb/port/def.inc',
                               'third_party/upb/upb/port/undef.inc',
                               'third_party/upb/upb/port/vsnprintf_compat.h',
-                              'third_party/upb/upb/reflection.h',
-                              'third_party/upb/upb/reflection.hpp',
                               'third_party/upb/upb/reflection/common.h',
                               'third_party/upb/upb/reflection/def.h',
                               'third_party/upb/upb/reflection/def.hpp',
-                              'third_party/upb/upb/reflection/def_builder_internal.h',
                               'third_party/upb/upb/reflection/def_pool.h',
-                              'third_party/upb/upb/reflection/def_pool_internal.h',
                               'third_party/upb/upb/reflection/def_type.h',
-                              'third_party/upb/upb/reflection/desc_state_internal.h',
                               'third_party/upb/upb/reflection/enum_def.h',
-                              'third_party/upb/upb/reflection/enum_def_internal.h',
                               'third_party/upb/upb/reflection/enum_reserved_range.h',
-                              'third_party/upb/upb/reflection/enum_reserved_range_internal.h',
                               'third_party/upb/upb/reflection/enum_value_def.h',
-                              'third_party/upb/upb/reflection/enum_value_def_internal.h',
                               'third_party/upb/upb/reflection/extension_range.h',
-                              'third_party/upb/upb/reflection/extension_range_internal.h',
                               'third_party/upb/upb/reflection/field_def.h',
-                              'third_party/upb/upb/reflection/field_def_internal.h',
                               'third_party/upb/upb/reflection/file_def.h',
-                              'third_party/upb/upb/reflection/file_def_internal.h',
+                              'third_party/upb/upb/reflection/internal/def_builder.h',
+                              'third_party/upb/upb/reflection/internal/def_pool.h',
+                              'third_party/upb/upb/reflection/internal/desc_state.h',
+                              'third_party/upb/upb/reflection/internal/enum_def.h',
+                              'third_party/upb/upb/reflection/internal/enum_reserved_range.h',
+                              'third_party/upb/upb/reflection/internal/enum_value_def.h',
+                              'third_party/upb/upb/reflection/internal/extension_range.h',
+                              'third_party/upb/upb/reflection/internal/field_def.h',
+                              'third_party/upb/upb/reflection/internal/file_def.h',
+                              'third_party/upb/upb/reflection/internal/message_def.h',
+                              'third_party/upb/upb/reflection/internal/message_reserved_range.h',
+                              'third_party/upb/upb/reflection/internal/method_def.h',
+                              'third_party/upb/upb/reflection/internal/oneof_def.h',
+                              'third_party/upb/upb/reflection/internal/service_def.h',
+                              'third_party/upb/upb/reflection/internal/strdup2.h',
                               'third_party/upb/upb/reflection/message.h',
                               'third_party/upb/upb/reflection/message.hpp',
                               'third_party/upb/upb/reflection/message_def.h',
-                              'third_party/upb/upb/reflection/message_def_internal.h',
                               'third_party/upb/upb/reflection/message_reserved_range.h',
-                              'third_party/upb/upb/reflection/message_reserved_range_internal.h',
                               'third_party/upb/upb/reflection/method_def.h',
-                              'third_party/upb/upb/reflection/method_def_internal.h',
                               'third_party/upb/upb/reflection/oneof_def.h',
-                              'third_party/upb/upb/reflection/oneof_def_internal.h',
                               'third_party/upb/upb/reflection/service_def.h',
-                              'third_party/upb/upb/reflection/service_def_internal.h',
-                              'third_party/upb/upb/status.h',
-                              'third_party/upb/upb/string_view.h',
                               'third_party/upb/upb/text/encode.h',
-                              'third_party/upb/upb/text_encode.h',
-                              'third_party/upb/upb/upb.h',
                               'third_party/upb/upb/upb.hpp',
-                              'third_party/upb/upb/wire/common.h',
-                              'third_party/upb/upb/wire/common_internal.h',
                               'third_party/upb/upb/wire/decode.h',
                               'third_party/upb/upb/wire/decode_fast.h',
-                              'third_party/upb/upb/wire/decode_internal.h',
                               'third_party/upb/upb/wire/encode.h',
                               'third_party/upb/upb/wire/eps_copy_input_stream.h',
+                              'third_party/upb/upb/wire/internal/constants.h',
+                              'third_party/upb/upb/wire/internal/decode.h',
+                              'third_party/upb/upb/wire/internal/swap.h',
                               'third_party/upb/upb/wire/reader.h',
-                              'third_party/upb/upb/wire/swap_internal.h',
                               'third_party/upb/upb/wire/types.h',
                               'third_party/utf8_range/utf8_range.h',
                               'third_party/xxhash/xxhash.h',
diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
index 93efa37861a23..13c652e779543 100644
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-ProtoRPC'
-  version = '1.60.0-dev'
+  version = '1.61.0-dev'
   s.version  = version
   s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
   s.homepage = 'https://grpc.io'
diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
index b1f3f328f4de2..cb28e76f54700 100644
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-RxLibrary'
-  version = '1.60.0-dev'
+  version = '1.61.0-dev'
   s.version  = version
   s.summary  = 'Reactive Extensions library for iOS/OSX.'
   s.homepage = 'https://grpc.io'
diff --git a/gRPC.podspec b/gRPC.podspec
index e917a3a4e36ba..120a23ffcbc9f 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -20,7 +20,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC'
-  version = '1.60.0-dev'
+  version = '1.61.0-dev'
   s.version  = version
   s.summary  = 'gRPC client library for iOS/OSX'
   s.homepage = 'https://grpc.io'
@@ -32,6 +32,8 @@ Pod::Spec.new do |s|
     :tag => "v#{version}",
   }
 
+  s.resource = 'src/objective-c/PrivacyInfo.xcprivacy'
+
   name = 'GRPCClient'
   s.module_name = name
   s.header_dir = name
diff --git a/grpc.gemspec b/grpc.gemspec
index e3f14b7b7e38d..4b796f508bdcf 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
   s.platform      = Gem::Platform::RUBY
 
-  s.add_dependency 'google-protobuf', '~> 3.24'
+  s.add_dependency 'google-protobuf', '~> 3.25'
   s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
 
   s.add_development_dependency 'bundler',            '>= 1.9'
@@ -338,632 +338,795 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/transport/inproc/inproc_transport.h )
   s.files += %w( src/core/ext/transport/inproc/legacy_inproc_transport.cc )
   s.files += %w( src/core/ext/transport/inproc/legacy_inproc_transport.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/annotations/resource.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/annotations/resource.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/http.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/http.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/percent.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/percent.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/range.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/range.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c )
-  s.files += %w( src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/api/annotations.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/api/annotations.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/api/http.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/api/http.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/api/httpbody.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/api/httpbody.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/any.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/any.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/descriptor.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/descriptor.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/duration.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/duration.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/empty.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/empty.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/struct.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/struct.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/timestamp.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/timestamp.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/wrappers.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/protobuf/wrappers.upb.h )
-  s.files += %w( src/core/ext/upb-generated/google/rpc/status.upb.c )
-  s.files += %w( src/core/ext/upb-generated/google/rpc/status.upb.h )
-  s.files += %w( src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c )
-  s.files += %w( src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/migrate.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/migrate.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/security.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/security.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/status.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/status.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.h )
-  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c )
-  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/security.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/security.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/status.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/status.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/cidr.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/cidr.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/context_params.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/context_params.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/extension.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/extension.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/cel.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/cel.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/range.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/range.upb.h )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c )
-  s.files += %w( src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/http.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/http.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/resource.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h )
+  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/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 )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/percent.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/range.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/annotations.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/annotations.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/api/annotations.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/http.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/http.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/api/http.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/httpbody.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/any.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/descriptor.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/duration.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/empty.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/struct.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/timestamp.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/wrappers.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/google/rpc/status.upb.h )
+  s.files += %w( src/core/ext/upb-gen/google/rpc/status.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/google/rpc/status.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/migrate.upb.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/security.upb.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/status.upb.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/versioning.upb.h )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/validate/validate.upb.h )
+  s.files += %w( src/core/ext/upb-gen/validate/validate.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/validate/validate.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/security.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/status.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/authority.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/cidr.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/context_params.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/extension.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/cel.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/range.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c )
+  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/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 )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/http.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/http.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/validate/validate.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/validate/validate.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c )
+  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/ext/xds/certificate_provider_store.cc )
   s.files += %w( src/core/ext/xds/certificate_provider_store.h )
   s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.cc )
@@ -1103,7 +1266,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/forkable.h )
   s.files += %w( src/core/lib/event_engine/grpc_polled_fd.h )
   s.files += %w( src/core/lib/event_engine/handle_containers.h )
-  s.files += %w( src/core/lib/event_engine/memory_allocator.cc )
   s.files += %w( src/core/lib/event_engine/memory_allocator_factory.h )
   s.files += %w( src/core/lib/event_engine/nameser.h )
   s.files += %w( src/core/lib/event_engine/poller.h )
@@ -1120,6 +1282,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/posix_engine/internal_errqueue.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/lockfree_event.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/lockfree_event.h )
+  s.files += %w( src/core/lib/event_engine/posix_engine/native_dns_resolver.cc )
+  s.files += %w( src/core/lib/event_engine/posix_engine/native_dns_resolver.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_endpoint.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_endpoint.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_engine.cc )
@@ -1146,6 +1310,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h )
+  s.files += %w( src/core/lib/event_engine/ref_counted_dns_resolver_interface.h )
   s.files += %w( src/core/lib/event_engine/resolved_address.cc )
   s.files += %w( src/core/lib/event_engine/resolved_address_internal.h )
   s.files += %w( src/core/lib/event_engine/shim.cc )
@@ -1170,6 +1335,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/trace.h )
   s.files += %w( src/core/lib/event_engine/utils.cc )
   s.files += %w( src/core/lib/event_engine/utils.h )
+  s.files += %w( src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc )
+  s.files += %w( src/core/lib/event_engine/windows/grpc_polled_fd_windows.h )
   s.files += %w( src/core/lib/event_engine/windows/iocp.cc )
   s.files += %w( src/core/lib/event_engine/windows/iocp.h )
   s.files += %w( src/core/lib/event_engine/windows/win_socket.cc )
@@ -1229,6 +1396,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/gprpp/crash.cc )
   s.files += %w( src/core/lib/gprpp/crash.h )
   s.files += %w( src/core/lib/gprpp/debug_location.h )
+  s.files += %w( src/core/lib/gprpp/directory_reader.h )
   s.files += %w( src/core/lib/gprpp/dual_ref_counted.h )
   s.files += %w( src/core/lib/gprpp/env.h )
   s.files += %w( src/core/lib/gprpp/examine_stack.cc )
@@ -1253,6 +1421,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/gprpp/packed_table.h )
   s.files += %w( src/core/lib/gprpp/per_cpu.cc )
   s.files += %w( src/core/lib/gprpp/per_cpu.h )
+  s.files += %w( src/core/lib/gprpp/posix/directory_reader.cc )
   s.files += %w( src/core/lib/gprpp/posix/env.cc )
   s.files += %w( src/core/lib/gprpp/posix/stat.cc )
   s.files += %w( src/core/lib/gprpp/posix/thd.cc )
@@ -1282,6 +1451,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/gprpp/unique_type_name.h )
   s.files += %w( src/core/lib/gprpp/validation_errors.cc )
   s.files += %w( src/core/lib/gprpp/validation_errors.h )
+  s.files += %w( src/core/lib/gprpp/windows/directory_reader.cc )
   s.files += %w( src/core/lib/gprpp/windows/env.cc )
   s.files += %w( src/core/lib/gprpp/windows/stat.cc )
   s.files += %w( src/core/lib/gprpp/windows/thd.cc )
@@ -1490,6 +1660,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/promise/seq.h )
   s.files += %w( src/core/lib/promise/sleep.cc )
   s.files += %w( src/core/lib/promise/sleep.h )
+  s.files += %w( src/core/lib/promise/status_flag.h )
   s.files += %w( src/core/lib/promise/trace.cc )
   s.files += %w( src/core/lib/promise/trace.h )
   s.files += %w( src/core/lib/promise/try_seq.h )
@@ -2810,29 +2981,14 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/re2/util/strutil.h )
   s.files += %w( third_party/re2/util/utf.h )
   s.files += %w( third_party/re2/util/util.h )
-  s.files += %w( third_party/upb/upb/alloc.h )
-  s.files += %w( third_party/upb/upb/arena.h )
-  s.files += %w( third_party/upb/upb/array.h )
   s.files += %w( third_party/upb/upb/base/descriptor_constants.h )
-  s.files += %w( third_party/upb/upb/base/log2.h )
+  s.files += %w( third_party/upb/upb/base/internal/log2.h )
   s.files += %w( third_party/upb/upb/base/status.c )
   s.files += %w( third_party/upb/upb/base/status.h )
+  s.files += %w( third_party/upb/upb/base/status.hpp )
   s.files += %w( third_party/upb/upb/base/string_view.h )
-  s.files += %w( third_party/upb/upb/collections/array.c )
   s.files += %w( third_party/upb/upb/collections/array.h )
-  s.files += %w( third_party/upb/upb/collections/array_internal.h )
-  s.files += %w( third_party/upb/upb/collections/map.c )
   s.files += %w( third_party/upb/upb/collections/map.h )
-  s.files += %w( third_party/upb/upb/collections/map_gencode_util.h )
-  s.files += %w( third_party/upb/upb/collections/map_internal.h )
-  s.files += %w( third_party/upb/upb/collections/map_sorter.c )
-  s.files += %w( third_party/upb/upb/collections/map_sorter_internal.h )
-  s.files += %w( third_party/upb/upb/collections/message_value.h )
-  s.files += %w( third_party/upb/upb/decode.h )
-  s.files += %w( third_party/upb/upb/def.h )
-  s.files += %w( third_party/upb/upb/def.hpp )
-  s.files += %w( third_party/upb/upb/encode.h )
-  s.files += %w( third_party/upb/upb/extension_registry.h )
   s.files += %w( third_party/upb/upb/generated_code_support.h )
   s.files += %w( third_party/upb/upb/hash/common.c )
   s.files += %w( third_party/upb/upb/hash/common.h )
@@ -2850,21 +3006,33 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/upb/upb/lex/strtod.h )
   s.files += %w( third_party/upb/upb/lex/unicode.c )
   s.files += %w( third_party/upb/upb/lex/unicode.h )
-  s.files += %w( third_party/upb/upb/map.h )
   s.files += %w( third_party/upb/upb/mem/alloc.c )
   s.files += %w( third_party/upb/upb/mem/alloc.h )
   s.files += %w( third_party/upb/upb/mem/arena.c )
   s.files += %w( third_party/upb/upb/mem/arena.h )
-  s.files += %w( third_party/upb/upb/mem/arena_internal.h )
+  s.files += %w( third_party/upb/upb/mem/arena.hpp )
+  s.files += %w( third_party/upb/upb/mem/internal/arena.h )
   s.files += %w( third_party/upb/upb/message/accessors.c )
   s.files += %w( third_party/upb/upb/message/accessors.h )
-  s.files += %w( third_party/upb/upb/message/accessors_internal.h )
-  s.files += %w( third_party/upb/upb/message/extension_internal.h )
-  s.files += %w( third_party/upb/upb/message/internal.h )
+  s.files += %w( third_party/upb/upb/message/array.c )
+  s.files += %w( third_party/upb/upb/message/array.h )
+  s.files += %w( third_party/upb/upb/message/internal/accessors.h )
+  s.files += %w( third_party/upb/upb/message/internal/array.h )
+  s.files += %w( third_party/upb/upb/message/internal/extension.h )
+  s.files += %w( third_party/upb/upb/message/internal/map.h )
   s.files += %w( third_party/upb/upb/message/internal/map_entry.h )
+  s.files += %w( third_party/upb/upb/message/internal/map_sorter.h )
+  s.files += %w( third_party/upb/upb/message/internal/message.h )
+  s.files += %w( third_party/upb/upb/message/internal/types.h )
+  s.files += %w( third_party/upb/upb/message/map.c )
+  s.files += %w( third_party/upb/upb/message/map.h )
+  s.files += %w( third_party/upb/upb/message/map_gencode_util.h )
+  s.files += %w( third_party/upb/upb/message/map_sorter.c )
   s.files += %w( third_party/upb/upb/message/message.c )
   s.files += %w( third_party/upb/upb/message/message.h )
   s.files += %w( third_party/upb/upb/message/tagged_ptr.h )
+  s.files += %w( third_party/upb/upb/message/types.h )
+  s.files += %w( third_party/upb/upb/message/value.h )
   s.files += %w( third_party/upb/upb/mini_descriptor/build_enum.c )
   s.files += %w( third_party/upb/upb/mini_descriptor/build_enum.h )
   s.files += %w( third_party/upb/upb/mini_descriptor/decode.c )
@@ -2895,82 +3063,76 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/upb/upb/mini_table/message.c )
   s.files += %w( third_party/upb/upb/mini_table/message.h )
   s.files += %w( third_party/upb/upb/mini_table/sub.h )
-  s.files += %w( third_party/upb/upb/msg.h )
   s.files += %w( third_party/upb/upb/port/atomic.h )
   s.files += %w( third_party/upb/upb/port/def.inc )
   s.files += %w( third_party/upb/upb/port/undef.inc )
   s.files += %w( third_party/upb/upb/port/vsnprintf_compat.h )
-  s.files += %w( third_party/upb/upb/reflection.h )
-  s.files += %w( third_party/upb/upb/reflection.hpp )
   s.files += %w( third_party/upb/upb/reflection/common.h )
   s.files += %w( third_party/upb/upb/reflection/def.h )
   s.files += %w( third_party/upb/upb/reflection/def.hpp )
-  s.files += %w( third_party/upb/upb/reflection/def_builder.c )
-  s.files += %w( third_party/upb/upb/reflection/def_builder_internal.h )
   s.files += %w( third_party/upb/upb/reflection/def_pool.c )
   s.files += %w( third_party/upb/upb/reflection/def_pool.h )
-  s.files += %w( third_party/upb/upb/reflection/def_pool_internal.h )
   s.files += %w( third_party/upb/upb/reflection/def_type.c )
   s.files += %w( third_party/upb/upb/reflection/def_type.h )
   s.files += %w( third_party/upb/upb/reflection/desc_state.c )
-  s.files += %w( third_party/upb/upb/reflection/desc_state_internal.h )
   s.files += %w( third_party/upb/upb/reflection/enum_def.c )
   s.files += %w( third_party/upb/upb/reflection/enum_def.h )
-  s.files += %w( third_party/upb/upb/reflection/enum_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/enum_reserved_range.c )
   s.files += %w( third_party/upb/upb/reflection/enum_reserved_range.h )
-  s.files += %w( third_party/upb/upb/reflection/enum_reserved_range_internal.h )
   s.files += %w( third_party/upb/upb/reflection/enum_value_def.c )
   s.files += %w( third_party/upb/upb/reflection/enum_value_def.h )
-  s.files += %w( third_party/upb/upb/reflection/enum_value_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/extension_range.c )
   s.files += %w( third_party/upb/upb/reflection/extension_range.h )
-  s.files += %w( third_party/upb/upb/reflection/extension_range_internal.h )
   s.files += %w( third_party/upb/upb/reflection/field_def.c )
   s.files += %w( third_party/upb/upb/reflection/field_def.h )
-  s.files += %w( third_party/upb/upb/reflection/field_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/file_def.c )
   s.files += %w( third_party/upb/upb/reflection/file_def.h )
-  s.files += %w( third_party/upb/upb/reflection/file_def_internal.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/def_builder.c )
+  s.files += %w( third_party/upb/upb/reflection/internal/def_builder.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/def_pool.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/desc_state.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/enum_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/enum_reserved_range.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/enum_value_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/extension_range.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/field_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/file_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/message_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/message_reserved_range.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/method_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/oneof_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/service_def.h )
+  s.files += %w( third_party/upb/upb/reflection/internal/strdup2.c )
+  s.files += %w( third_party/upb/upb/reflection/internal/strdup2.h )
   s.files += %w( third_party/upb/upb/reflection/message.c )
   s.files += %w( third_party/upb/upb/reflection/message.h )
   s.files += %w( third_party/upb/upb/reflection/message.hpp )
   s.files += %w( third_party/upb/upb/reflection/message_def.c )
   s.files += %w( third_party/upb/upb/reflection/message_def.h )
-  s.files += %w( third_party/upb/upb/reflection/message_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/message_reserved_range.c )
   s.files += %w( third_party/upb/upb/reflection/message_reserved_range.h )
-  s.files += %w( third_party/upb/upb/reflection/message_reserved_range_internal.h )
   s.files += %w( third_party/upb/upb/reflection/method_def.c )
   s.files += %w( third_party/upb/upb/reflection/method_def.h )
-  s.files += %w( third_party/upb/upb/reflection/method_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/oneof_def.c )
   s.files += %w( third_party/upb/upb/reflection/oneof_def.h )
-  s.files += %w( third_party/upb/upb/reflection/oneof_def_internal.h )
   s.files += %w( third_party/upb/upb/reflection/service_def.c )
   s.files += %w( third_party/upb/upb/reflection/service_def.h )
-  s.files += %w( third_party/upb/upb/reflection/service_def_internal.h )
-  s.files += %w( third_party/upb/upb/status.h )
-  s.files += %w( third_party/upb/upb/string_view.h )
   s.files += %w( third_party/upb/upb/text/encode.c )
   s.files += %w( third_party/upb/upb/text/encode.h )
-  s.files += %w( third_party/upb/upb/text_encode.h )
-  s.files += %w( third_party/upb/upb/upb.h )
   s.files += %w( third_party/upb/upb/upb.hpp )
-  s.files += %w( third_party/upb/upb/wire/common.h )
-  s.files += %w( third_party/upb/upb/wire/common_internal.h )
   s.files += %w( third_party/upb/upb/wire/decode.c )
   s.files += %w( third_party/upb/upb/wire/decode.h )
   s.files += %w( third_party/upb/upb/wire/decode_fast.c )
   s.files += %w( third_party/upb/upb/wire/decode_fast.h )
-  s.files += %w( third_party/upb/upb/wire/decode_internal.h )
   s.files += %w( third_party/upb/upb/wire/encode.c )
   s.files += %w( third_party/upb/upb/wire/encode.h )
   s.files += %w( third_party/upb/upb/wire/eps_copy_input_stream.c )
   s.files += %w( third_party/upb/upb/wire/eps_copy_input_stream.h )
+  s.files += %w( third_party/upb/upb/wire/internal/constants.h )
+  s.files += %w( third_party/upb/upb/wire/internal/decode.h )
+  s.files += %w( third_party/upb/upb/wire/internal/swap.h )
   s.files += %w( third_party/upb/upb/wire/reader.c )
   s.files += %w( third_party/upb/upb/wire/reader.h )
-  s.files += %w( third_party/upb/upb/wire/swap_internal.h )
   s.files += %w( third_party/upb/upb/wire/types.h )
   s.files += %w( third_party/utf8_range/naive.c )
   s.files += %w( third_party/utf8_range/range2-neon.c )
diff --git a/grpc.gyp b/grpc.gyp
index 9d76638ef4b43..4b043c457b2a4 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -58,8 +58,8 @@
       '-Ithird_party/abseil-cpp',
       '-Ithird_party/re2',
       '-Ithird_party/upb',
-      '-Isrc/core/ext/upb-generated',
-      '-Isrc/core/ext/upbdefs-generated',
+      '-Isrc/core/ext/upb-gen',
+      '-Isrc/core/ext/upbdefs-gen',
       '-Ithird_party/utf8_range',
       '-Ithird_party/xxhash',
     ],
@@ -139,8 +139,8 @@
             '-Ithird_party/abseil-cpp',
             '-Ithird_party/re2',
             '-Ithird_party/upb',
-            '-Isrc/core/ext/upb-generated',
-            '-Isrc/core/ext/upbdefs-generated',
+            '-Isrc/core/ext/upb-gen',
+            '-Isrc/core/ext/upbdefs-gen',
             '-Ithird_party/utf8_range',
             '-Ithird_party/xxhash',
           ],
@@ -152,8 +152,8 @@
             '-Ithird_party/abseil-cpp',
             '-Ithird_party/re2',
             '-Ithird_party/upb',
-            '-Isrc/core/ext/upb-generated',
-            '-Isrc/core/ext/upbdefs-generated',
+            '-Isrc/core/ext/upb-gen',
+            '-Isrc/core/ext/upbdefs-gen',
             '-Ithird_party/utf8_range',
             '-Ithird_party/xxhash',
             '-stdlib=libc++',
@@ -249,9 +249,11 @@
       'target_name': 'grpc',
       'type': 'static_library',
       'dependencies': [
-        're2',
+        'upb_collections_lib',
         'upb_json_lib',
         'upb_textformat_lib',
+        'upb',
+        're2',
         'z',
         'absl/algorithm:container',
         'absl/cleanup:cleanup',
@@ -387,319 +389,319 @@
         'src/core/ext/transport/inproc/inproc_plugin.cc',
         'src/core/ext/transport/inproc/inproc_transport.cc',
         'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
-        'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c',
-        'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
-        'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
-        'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
-        'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c',
-        'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
-        'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
-        'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
-        'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c',
-        'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c',
-        'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c',
-        'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c',
-        'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
-        'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
-        'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c',
-        'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
-        'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
-        'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/http.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
-        'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/api/httpbody.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/migrate.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/security.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/security.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/status.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/cidr.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/extension.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-        'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/cel.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/range.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
-        'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c',
+        '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/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',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c',
+        '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c',
+        'src/core/ext/upb-gen/validate/validate.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
+        '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/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',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/http.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c',
+        'src/core/ext/upbdefs-gen/validate/validate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c',
+        '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/ext/xds/certificate_provider_store.cc',
         'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
         'src/core/ext/xds/xds_api.cc',
@@ -762,12 +764,12 @@
         'src/core/lib/event_engine/default_event_engine_factory.cc',
         'src/core/lib/event_engine/event_engine.cc',
         'src/core/lib/event_engine/forkable.cc',
-        'src/core/lib/event_engine/memory_allocator.cc',
         'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc',
         'src/core/lib/event_engine/posix_engine/ev_poll_posix.cc',
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
+        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -792,6 +794,7 @@
         'src/core/lib/event_engine/time_util.cc',
         'src/core/lib/event_engine/trace.cc',
         'src/core/lib/event_engine/utils.cc',
+        'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
@@ -802,11 +805,13 @@
         'src/core/lib/experiments/experiments.cc',
         'src/core/lib/gprpp/load_file.cc',
         'src/core/lib/gprpp/per_cpu.cc',
+        'src/core/lib/gprpp/posix/directory_reader.cc',
         'src/core/lib/gprpp/ref_counted_string.cc',
         'src/core/lib/gprpp/status_helper.cc',
         'src/core/lib/gprpp/time.cc',
         'src/core/lib/gprpp/time_averaged_stats.cc',
         'src/core/lib/gprpp/validation_errors.cc',
+        'src/core/lib/gprpp/windows/directory_reader.cc',
         'src/core/lib/gprpp/work_serializer.cc',
         'src/core/lib/handshaker/proxy_mapper_registry.cc',
         'src/core/lib/http/format_request.cc',
@@ -1104,6 +1109,7 @@
       'dependencies': [
         'upb_collections_lib',
         'upb',
+        'utf8_range_lib',
         'z',
         'absl/algorithm:container',
         'absl/cleanup:cleanup',
@@ -1223,25 +1229,25 @@
         'src/core/ext/transport/inproc/inproc_plugin.cc',
         'src/core/ext/transport/inproc/inproc_transport.cc',
         'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
+        'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+        '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/lib/address_utils/parse_address.cc',
         'src/core/lib/address_utils/sockaddr_utils.cc',
         'src/core/lib/backoff/backoff.cc',
@@ -1278,12 +1284,12 @@
         'src/core/lib/event_engine/default_event_engine_factory.cc',
         'src/core/lib/event_engine/event_engine.cc',
         'src/core/lib/event_engine/forkable.cc',
-        'src/core/lib/event_engine/memory_allocator.cc',
         'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc',
         'src/core/lib/event_engine/posix_engine/ev_poll_posix.cc',
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
+        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -1308,6 +1314,7 @@
         'src/core/lib/event_engine/time_util.cc',
         'src/core/lib/event_engine/trace.cc',
         'src/core/lib/event_engine/utils.cc',
+        'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
@@ -1512,7 +1519,13 @@
         'third_party/upb/upb/mini_descriptor/build_enum.c',
         'third_party/upb/upb/mini_descriptor/decode.c',
         'third_party/upb/upb/mini_descriptor/internal/base92.c',
+        'third_party/upb/upb/mini_descriptor/internal/encode.c',
         'third_party/upb/upb/mini_descriptor/link.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
       ],
     },
     {
@@ -1584,29 +1597,11 @@
       'target_name': 'upb',
       'type': 'static_library',
       'dependencies': [
-        'utf8_range_lib',
       ],
       'sources': [
         'third_party/upb/upb/base/status.c',
-        'third_party/upb/upb/collections/array.c',
-        'third_party/upb/upb/collections/map.c',
-        'third_party/upb/upb/collections/map_sorter.c',
-        'third_party/upb/upb/hash/common.c',
-        'third_party/upb/upb/lex/atoi.c',
-        'third_party/upb/upb/lex/round_trip.c',
-        'third_party/upb/upb/lex/strtod.c',
-        'third_party/upb/upb/lex/unicode.c',
         'third_party/upb/upb/mem/alloc.c',
         'third_party/upb/upb/mem/arena.c',
-        'third_party/upb/upb/message/message.c',
-        'third_party/upb/upb/mini_table/extension_registry.c',
-        'third_party/upb/upb/mini_table/internal/message.c',
-        'third_party/upb/upb/mini_table/message.c',
-        'third_party/upb/upb/wire/decode.c',
-        'third_party/upb/upb/wire/decode_fast.c',
-        'third_party/upb/upb/wire/encode.c',
-        'third_party/upb/upb/wire/eps_copy_input_stream.c',
-        'third_party/upb/upb/wire/reader.c',
       ],
     },
     {
@@ -1616,12 +1611,12 @@
       ],
       'sources': [
         'third_party/upb/upb/base/status.c',
-        'third_party/upb/upb/collections/array.c',
-        'third_party/upb/upb/collections/map.c',
-        'third_party/upb/upb/collections/map_sorter.c',
         'third_party/upb/upb/hash/common.c',
         'third_party/upb/upb/mem/alloc.c',
         'third_party/upb/upb/mem/arena.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
         'third_party/upb/upb/message/message.c',
         'third_party/upb/upb/mini_table/extension_registry.c',
         'third_party/upb/upb/mini_table/internal/message.c',
@@ -1632,20 +1627,33 @@
       'target_name': 'upb_json_lib',
       'type': 'static_library',
       'dependencies': [
-        'upb_collections_lib',
-        'upb',
+        'utf8_range_lib',
       ],
       'sources': [
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'third_party/upb/upb/base/status.c',
+        'third_party/upb/upb/hash/common.c',
         'third_party/upb/upb/json/decode.c',
         'third_party/upb/upb/json/encode.c',
+        'third_party/upb/upb/lex/atoi.c',
+        'third_party/upb/upb/lex/round_trip.c',
+        'third_party/upb/upb/lex/strtod.c',
+        'third_party/upb/upb/lex/unicode.c',
+        'third_party/upb/upb/mem/alloc.c',
+        'third_party/upb/upb/mem/arena.c',
         'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
         'third_party/upb/upb/mini_descriptor/build_enum.c',
         'third_party/upb/upb/mini_descriptor/decode.c',
         'third_party/upb/upb/mini_descriptor/internal/base92.c',
         'third_party/upb/upb/mini_descriptor/internal/encode.c',
         'third_party/upb/upb/mini_descriptor/link.c',
-        'third_party/upb/upb/reflection/def_builder.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
         'third_party/upb/upb/reflection/def_pool.c',
         'third_party/upb/upb/reflection/def_type.c',
         'third_party/upb/upb/reflection/desc_state.c',
@@ -1655,30 +1663,50 @@
         'third_party/upb/upb/reflection/extension_range.c',
         'third_party/upb/upb/reflection/field_def.c',
         'third_party/upb/upb/reflection/file_def.c',
+        'third_party/upb/upb/reflection/internal/def_builder.c',
+        'third_party/upb/upb/reflection/internal/strdup2.c',
         'third_party/upb/upb/reflection/message.c',
         'third_party/upb/upb/reflection/message_def.c',
         'third_party/upb/upb/reflection/message_reserved_range.c',
         'third_party/upb/upb/reflection/method_def.c',
         'third_party/upb/upb/reflection/oneof_def.c',
         'third_party/upb/upb/reflection/service_def.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
       ],
     },
     {
       'target_name': 'upb_textformat_lib',
       'type': 'static_library',
       'dependencies': [
-        'upb_collections_lib',
-        'upb',
+        'utf8_range_lib',
       ],
       'sources': [
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'third_party/upb/upb/base/status.c',
+        'third_party/upb/upb/hash/common.c',
+        'third_party/upb/upb/lex/atoi.c',
+        'third_party/upb/upb/lex/round_trip.c',
+        'third_party/upb/upb/lex/strtod.c',
+        'third_party/upb/upb/lex/unicode.c',
+        'third_party/upb/upb/mem/alloc.c',
+        'third_party/upb/upb/mem/arena.c',
         'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
         'third_party/upb/upb/mini_descriptor/build_enum.c',
         'third_party/upb/upb/mini_descriptor/decode.c',
         'third_party/upb/upb/mini_descriptor/internal/base92.c',
         'third_party/upb/upb/mini_descriptor/internal/encode.c',
         'third_party/upb/upb/mini_descriptor/link.c',
-        'third_party/upb/upb/reflection/def_builder.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
         'third_party/upb/upb/reflection/def_pool.c',
         'third_party/upb/upb/reflection/def_type.c',
         'third_party/upb/upb/reflection/desc_state.c',
@@ -1688,6 +1716,8 @@
         'third_party/upb/upb/reflection/extension_range.c',
         'third_party/upb/upb/reflection/field_def.c',
         'third_party/upb/upb/reflection/file_def.c',
+        'third_party/upb/upb/reflection/internal/def_builder.c',
+        'third_party/upb/upb/reflection/internal/strdup2.c',
         'third_party/upb/upb/reflection/message.c',
         'third_party/upb/upb/reflection/message_def.c',
         'third_party/upb/upb/reflection/message_reserved_range.c',
@@ -1695,6 +1725,11 @@
         'third_party/upb/upb/reflection/oneof_def.c',
         'third_party/upb/upb/reflection/service_def.c',
         'third_party/upb/upb/text/encode.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
       ],
     },
     {
@@ -1966,8 +2001,9 @@
       'target_name': 'grpc_authorization_provider',
       'type': 'static_library',
       'dependencies': [
-        're2',
         'upb',
+        're2',
+        'utf8_range_lib',
         'z',
         'absl/cleanup:cleanup',
         'absl/container:flat_hash_map',
@@ -1985,12 +2021,12 @@
         'gpr',
       ],
       'sources': [
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        '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/lib/address_utils/parse_address.cc',
         'src/core/lib/address_utils/sockaddr_utils.cc',
         'src/core/lib/backoff/backoff.cc',
@@ -2027,12 +2063,12 @@
         'src/core/lib/event_engine/default_event_engine_factory.cc',
         'src/core/lib/event_engine/event_engine.cc',
         'src/core/lib/event_engine/forkable.cc',
-        'src/core/lib/event_engine/memory_allocator.cc',
         'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc',
         'src/core/lib/event_engine/posix_engine/ev_poll_posix.cc',
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
+        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -2057,6 +2093,7 @@
         'src/core/lib/event_engine/time_util.cc',
         'src/core/lib/event_engine/trace.cc',
         'src/core/lib/event_engine/utils.cc',
+        'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
@@ -2246,11 +2283,25 @@
         'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
         'src/core/tsi/transport_security.cc',
         'src/core/tsi/transport_security_grpc.cc',
+        'third_party/upb/upb/hash/common.c',
         'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
         'third_party/upb/upb/mini_descriptor/build_enum.c',
         'third_party/upb/upb/mini_descriptor/decode.c',
         'third_party/upb/upb/mini_descriptor/internal/base92.c',
+        'third_party/upb/upb/mini_descriptor/internal/encode.c',
         'third_party/upb/upb/mini_descriptor/link.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
       ],
     },
     {
diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h
index 2130f7feb1a82..20cbc64f52fde 100644
--- a/include/grpc/event_engine/event_engine.h
+++ b/include/grpc/event_engine/event_engine.h
@@ -79,7 +79,7 @@ namespace experimental {
 ///
 ///
 /// Blocking EventEngine Callbacks
-/// -----------------------------
+/// ------------------------------
 ///
 /// Doing blocking work in EventEngine callbacks is generally not advisable.
 /// While gRPC's default EventEngine implementations have some capacity to scale
@@ -90,6 +90,15 @@ namespace experimental {
 /// *Best Practice* : Occasional blocking work may be fine, but we do not
 /// recommend running a mostly blocking workload in EventEngine threads.
 ///
+///
+/// Thread-safety guarantees
+/// ------------------------
+///
+/// All EventEngine methods are guaranteed to be thread-safe, no external
+/// synchronization is required to call any EventEngine method. Please note that
+/// this does not apply to application callbacks, which may be run concurrently;
+/// application state synchronization must be managed by the application.
+///
 ////////////////////////////////////////////////////////////////////////////////
 class EventEngine : public std::enable_shared_from_this<EventEngine> {
  public:
@@ -246,6 +255,45 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
     /// values are expected to remain valid for the life of the Endpoint.
     virtual const ResolvedAddress& GetPeerAddress() const = 0;
     virtual const ResolvedAddress& GetLocalAddress() const = 0;
+
+    /// A method which allows users to query whether an Endpoint implementation
+    /// supports a specified extension. The name of the extension is provided
+    /// as an input.
+    ///
+    /// An extension could be any type with a unique string id. Each extension
+    /// may support additional capabilities and if the Endpoint implementation
+    /// supports the queried extension, it should return a valid pointer to the
+    /// extension type.
+    ///
+    /// E.g., use case of an EventEngine::Endpoint supporting a custom
+    /// extension.
+    ///
+    /// class CustomEndpointExtension {
+    ///  public:
+    ///    static constexpr std::string name = "my.namespace.extension_name";
+    ///    void Process() { ... }
+    /// }
+    ///
+    ///
+    /// class CustomEndpoint :
+    ///        public EventEngine::Endpoint, CustomEndpointExtension {
+    ///   public:
+    ///     void* QueryExtension(absl::string_view id) override {
+    ///       if (id == CustomEndpointExtension::name) {
+    ///         return static_cast<CustomEndpointExtension*>(this);
+    ///       }
+    ///       return nullptr;
+    ///     }
+    ///     ...
+    /// }
+    ///
+    /// auto ext_ =
+    /// static_cast<CustomEndpointExtension*>(
+    ///   endpoint->QueryExtension(CustomrEndpointExtension::name));
+    /// if (ext_ != nullptr) { ext_->Process(); }
+    ///
+    ///
+    virtual void* QueryExtension(absl::string_view /*id*/) { return nullptr; }
   };
 
   /// Called when a new connection is established.
@@ -405,8 +453,8 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
 
   /// Asynchronously executes a task as soon as possible.
   ///
-  /// \a Closures scheduled with \a Run cannot be cancelled. The \a closure will
-  /// not be deleted after it has been run, ownership remains with the caller.
+  /// \a Closures passed to \a Run cannot be cancelled. The \a closure will not
+  /// be deleted after it has been run, ownership remains with the caller.
   ///
   /// Implementations must not execute the closure in the calling thread before
   /// \a Run returns. For example, if the caller must release a lock before the
@@ -415,9 +463,9 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
   virtual void Run(Closure* closure) = 0;
   /// Asynchronously executes a task as soon as possible.
   ///
-  /// \a Closures scheduled with \a Run cannot be cancelled. Unlike the
-  /// overloaded \a Closure alternative, the absl::AnyInvocable version's \a
-  /// closure will be deleted by the EventEngine after the closure has been run.
+  /// \a Closures passed to \a Run cannot be cancelled. Unlike the overloaded \a
+  /// Closure alternative, the absl::AnyInvocable version's \a closure will be
+  /// deleted by the EventEngine after the closure has been run.
   ///
   /// This version of \a Run may be less performant than the \a Closure version
   /// in some scenarios. This overload is useful in situations where performance
@@ -453,13 +501,12 @@ class EventEngine : public std::enable_shared_from_this<EventEngine> {
                               absl::AnyInvocable<void()> closure) = 0;
   /// Request cancellation of a task.
   ///
-  /// If the associated closure has already been scheduled to run, it will not
-  /// be cancelled, and this function will return false.
+  /// If the associated closure cannot be cancelled for any reason, this
+  /// function will return false.
   ///
-  /// If the associated closure has not been scheduled to run, it will be
-  /// cancelled, and this method will return true. The associated
-  /// absl::AnyInvocable or \a Closure* will not be called. If the closure type
-  /// was an absl::AnyInvocable, it will be destroyed before the method returns.
+  /// If the associated closure can be cancelled, the associated callback will
+  /// never be run, and this method will return true. If the callback type was
+  /// an absl::AnyInvocable, it will be destroyed before the method returns.
   virtual bool Cancel(TaskHandle handle) = 0;
 };
 
diff --git a/include/grpc/event_engine/internal/memory_allocator_impl.h b/include/grpc/event_engine/internal/memory_allocator_impl.h
index 8397b3d970643..e34ffc7f9c2a4 100644
--- a/include/grpc/event_engine/internal/memory_allocator_impl.h
+++ b/include/grpc/event_engine/internal/memory_allocator_impl.h
@@ -50,6 +50,12 @@ class MemoryAllocatorImpl
   /// request.max() inclusively.
   virtual size_t Reserve(MemoryRequest request) = 0;
 
+  /// Allocate a slice, using MemoryRequest to size the number of returned
+  /// bytes. For a variable length request, check the returned slice length to
+  /// verify how much memory was allocated. Takes care of reserving memory for
+  /// any relevant control structures also.
+  virtual grpc_slice MakeSlice(MemoryRequest request) = 0;
+
   /// Release some bytes that were previously reserved.
   /// If more bytes are released than were reserved, we will have undefined
   /// behavior.
diff --git a/include/grpc/event_engine/memory_allocator.h b/include/grpc/event_engine/memory_allocator.h
index b3143d8dd6a79..cd14e3a93371f 100644
--- a/include/grpc/event_engine/memory_allocator.h
+++ b/include/grpc/event_engine/memory_allocator.h
@@ -134,7 +134,9 @@ class MemoryAllocator {
   /// bytes. For a variable length request, check the returned slice length to
   /// verify how much memory was allocated. Takes care of reserving memory for
   /// any relevant control structures also.
-  grpc_slice MakeSlice(MemoryRequest request);
+  grpc_slice MakeSlice(MemoryRequest request) {
+    return allocator_->MakeSlice(request);
+  }
 
   /// A C++ allocator for containers of T.
   template <typename T>
diff --git a/include/grpc/grpc_crl_provider.h b/include/grpc/grpc_crl_provider.h
index a66e15e62ab12..43f0310b2aa7d 100644
--- a/include/grpc/grpc_crl_provider.h
+++ b/include/grpc/grpc_crl_provider.h
@@ -28,7 +28,6 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc_security.h>
-#include <grpc/support/sync.h>
 
 namespace grpc_core {
 namespace experimental {
@@ -68,6 +67,17 @@ class CrlProvider {
 absl::StatusOr<std::shared_ptr<CrlProvider>> CreateStaticCrlProvider(
     absl::Span<const std::string> crls);
 
+// Creates a CRL Provider that periodically and asynchronously reloads a
+// directory. The refresh_duration minimum is 60 seconds. The
+// reload_error_callback provides a way for the user to specifically log or
+// otherwise notify of errors during reloading. Since reloading is asynchronous
+// and not on the main codepath, the grpc process will continue to run through
+// reloading errors, so this mechanism is an important way to provide signals to
+// your monitoring and alerting setup.
+absl::StatusOr<std::shared_ptr<CrlProvider>> CreateDirectoryReloaderCrlProvider(
+    absl::string_view directory, std::chrono::seconds refresh_duration,
+    std::function<void(absl::Status)> reload_error_callback);
+
 }  // namespace experimental
 }  // namespace grpc_core
 
@@ -81,5 +91,4 @@ absl::StatusOr<std::shared_ptr<CrlProvider>> CreateStaticCrlProvider(
 void grpc_tls_credentials_options_set_crl_provider(
     grpc_tls_credentials_options* options,
     std::shared_ptr<grpc_core::experimental::CrlProvider> provider);
-
 #endif /* GRPC_GRPC_CRL_PROVIDER_H */
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
index 3eae29f582574..c81b81a207b90 100644
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@@ -912,7 +912,10 @@ GRPCAPI void grpc_tls_credentials_options_set_identity_cert_name(
 GRPCAPI void grpc_tls_credentials_options_set_cert_request_type(
     grpc_tls_credentials_options* options,
     grpc_ssl_client_certificate_request_type type);
-/**
+
+/** Deprecated in favor of grpc_tls_credentials_options_set_crl_provider. The
+ * crl provider interface provides a significantly more flexible approach to
+ * using CRLs. See gRFC A69 for details.
  * EXPERIMENTAL API - Subject to change
  *
  * If set, gRPC will read all hashed x.509 CRL files in the directory and
diff --git a/include/grpc/impl/channel_arg_names.h b/include/grpc/impl/channel_arg_names.h
index def07be248d42..534300f22c24d 100644
--- a/include/grpc/impl/channel_arg_names.h
+++ b/include/grpc/impl/channel_arg_names.h
@@ -15,7 +15,7 @@
 #ifndef GRPC_IMPL_CHANNEL_ARG_NAMES_H
 #define GRPC_IMPL_CHANNEL_ARG_NAMES_H
 
-// IWYU pragma: private, include "third_party/grpc/include/grpc/grpc.h"
+// IWYU pragma: private, include <grpc/grpc.h>
 // IWYU pragma: friend "src/.*"
 // IWYU pragma: friend "test/.*"
 
@@ -384,6 +384,11 @@
  *  Defaults to 250ms. */
 #define GRPC_ARG_HAPPY_EYEBALLS_CONNECTION_ATTEMPT_DELAY_MS \
   "grpc.happy_eyeballs_connection_attempt_delay_ms"
+/** It accepts a MemoryAllocatorFactory as input and If specified, it forces
+ * the default event engine to use memory allocators created using the provided
+ * factory. */
+#define GRPC_ARG_EVENT_ENGINE_USE_MEMORY_ALLOCATOR_FACTORY \
+  "grpc.event_engine_use_memory_allocator_factory"
 /** \} */
 
 #endif /* GRPC_IMPL_CHANNEL_ARG_NAMES_H */
diff --git a/include/grpc/impl/slice_type.h b/include/grpc/impl/slice_type.h
index 5d618740553cc..7d9dfb78123b0 100644
--- a/include/grpc/impl/slice_type.h
+++ b/include/grpc/impl/slice_type.h
@@ -74,7 +74,7 @@ struct grpc_slice {
   } data;
 };
 
-#define GRPC_SLICE_BUFFER_INLINE_ELEMENTS 8
+#define GRPC_SLICE_BUFFER_INLINE_ELEMENTS 7
 
 /** Represents an expandable array of slices, to be interpreted as a
    single item. */
diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h
index 2209b7c6fb28c..7f5cb8208fafe 100644
--- a/include/grpcpp/security/tls_credentials_options.h
+++ b/include/grpcpp/security/tls_credentials_options.h
@@ -99,8 +99,9 @@ class TlsCredentialsOptions {
   // verifiers other than the host name verifier is used.
   void set_check_call_host(bool check_call_host);
 
-  // TODO(zhenlian): This is an experimental API is likely to change in the
-  // future. Before de-experiementalizing, verify the API is up to date.
+  // Deprecated in favor of set_crl_provider. The
+  // crl provider interface provides a significantly more flexible approach to
+  // using CRLs. See gRFC A69 for details.
   // If set, gRPC will read all hashed x.509 CRL files in the directory and
   // enforce the CRL files on all TLS handshakes. Only supported for OpenSSL
   // version > 1.1.
diff --git a/include/grpcpp/version_info.h b/include/grpcpp/version_info.h
index a1ee36a0fe359..85fb6219a706a 100644
--- a/include/grpcpp/version_info.h
+++ b/include/grpcpp/version_info.h
@@ -19,9 +19,9 @@
 #define GRPCPP_VERSION_INFO_H
 
 #define GRPC_CPP_VERSION_MAJOR 1
-#define GRPC_CPP_VERSION_MINOR 60
+#define GRPC_CPP_VERSION_MINOR 61
 #define GRPC_CPP_VERSION_PATCH 0
 #define GRPC_CPP_VERSION_TAG "dev"
-#define GRPC_CPP_VERSION_STRING "1.60.0-dev"
+#define GRPC_CPP_VERSION_STRING "1.61.0-dev"
 
 #endif  // GRPCPP_VERSION_INFO_H
diff --git a/package.xml b/package.xml
index 2f2810960ed9f..e0e276e52c71c 100644
--- a/package.xml
+++ b/package.xml
@@ -13,8 +13,8 @@
  <date>2019-09-24</date>
  <time>16:06:07</time>
  <version>
-  <release>1.60.0dev</release>
-  <api>1.60.0dev</api>
+  <release>1.61.0dev</release>
+  <api>1.61.0dev</api>
  </version>
  <stability>
   <release>beta</release>
@@ -22,7 +22,7 @@
  </stability>
  <license>Apache 2.0</license>
  <notes>
-- gRPC Core 1.60.0 update
+- gRPC Core 1.61.0 update
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -320,632 +320,795 @@
     <file baseinstalldir="/" name="src/core/ext/transport/inproc/inproc_transport.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/inproc/legacy_inproc_transport.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/inproc/legacy_inproc_transport.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/annotations/resource.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/annotations/resource.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/http.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/http.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/percent.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/percent.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/range.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/range.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/annotations.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/annotations.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/http.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/http.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/httpbody.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/api/httpbody.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/any.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/any.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/descriptor.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/descriptor.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/duration.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/duration.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/empty.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/empty.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/struct.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/struct.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/timestamp.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/timestamp.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/wrappers.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/protobuf/wrappers.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/rpc/status.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/google/rpc/status.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/migrate.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/migrate.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/security.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/security.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/status.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/status.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/versioning.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/versioning.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/security.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/security.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/status.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/status.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/authority.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/authority.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/cidr.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/cidr.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/context_params.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/context_params.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/extension.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/extension.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/cel.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/cel.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/range.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/range.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/http.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/http.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/resource.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h" role="src" />
+    <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/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" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/percent.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/range.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/annotations.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/annotations.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/annotations.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/http.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/http.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/http.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/httpbody.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/any.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/descriptor.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/duration.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/empty.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/struct.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/timestamp.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/wrappers.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/rpc/status.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/rpc/status.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/google/rpc/status.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/migrate.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/security.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/status.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/versioning.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/validate/validate.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/validate/validate.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/validate/validate.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/security.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/status.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/authority.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/cidr.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/context_params.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/extension.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/cel.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/range.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c" role="src" />
+    <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/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" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/http.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/http.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/validate/validate.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/validate/validate.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c" role="src" />
+    <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/ext/xds/certificate_provider_store.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_store.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/xds/file_watcher_certificate_provider_factory.cc" role="src" />
@@ -1085,7 +1248,6 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/forkable.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/grpc_polled_fd.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/handle_containers.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/event_engine/memory_allocator.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/memory_allocator_factory.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/nameser.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/poller.h" role="src" />
@@ -1102,6 +1264,8 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/internal_errqueue.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/lockfree_event.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/lockfree_event.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_dns_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_dns_resolver.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_endpoint.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_endpoint.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_engine.cc" role="src" />
@@ -1128,6 +1292,7 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/resolved_address.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/resolved_address_internal.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/shim.cc" role="src" />
@@ -1152,6 +1317,8 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/trace.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/utils.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/utils.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/iocp.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/iocp.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/win_socket.cc" role="src" />
@@ -1211,6 +1378,7 @@
     <file baseinstalldir="/" name="src/core/lib/gprpp/crash.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/crash.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/debug_location.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/gprpp/directory_reader.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/dual_ref_counted.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/env.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/examine_stack.cc" role="src" />
@@ -1235,6 +1403,7 @@
     <file baseinstalldir="/" name="src/core/lib/gprpp/packed_table.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/per_cpu.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/per_cpu.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/gprpp/posix/directory_reader.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/posix/env.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/posix/stat.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/posix/thd.cc" role="src" />
@@ -1264,6 +1433,7 @@
     <file baseinstalldir="/" name="src/core/lib/gprpp/unique_type_name.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/validation_errors.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/validation_errors.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/gprpp/windows/directory_reader.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/windows/env.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/windows/stat.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/gprpp/windows/thd.cc" role="src" />
@@ -1472,6 +1642,7 @@
     <file baseinstalldir="/" name="src/core/lib/promise/seq.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/sleep.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/sleep.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/promise/status_flag.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/trace.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/trace.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/promise/try_seq.h" role="src" />
@@ -2724,29 +2895,14 @@
     <file baseinstalldir="/" name="third_party/re2/util/strutil.h" role="src" />
     <file baseinstalldir="/" name="third_party/re2/util/utf.h" role="src" />
     <file baseinstalldir="/" name="third_party/re2/util/util.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/alloc.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/arena.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/array.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/base/descriptor_constants.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/base/log2.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/base/internal/log2.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/base/status.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/base/status.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/base/status.hpp" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/base/string_view.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/array.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/collections/array.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/array_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/map.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/collections/map.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/map_gencode_util.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/map_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/map_sorter.c" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/map_sorter_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/collections/message_value.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/decode.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/def.hpp" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/encode.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/extension_registry.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/generated_code_support.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/hash/common.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/hash/common.h" role="src" />
@@ -2764,21 +2920,33 @@
     <file baseinstalldir="/" name="third_party/upb/upb/lex/strtod.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/lex/unicode.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/lex/unicode.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/map.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mem/alloc.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mem/alloc.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mem/arena.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mem/arena.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/mem/arena_internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/mem/arena.hpp" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/mem/internal/arena.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/accessors.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/accessors.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/message/accessors_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/message/extension_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/message/internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/array.c" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/array.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/accessors.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/array.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/extension.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/map.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/internal/map_entry.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/map_sorter.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/message.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/internal/types.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/map.c" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/map.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/map_gencode_util.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/map_sorter.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/message.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/message.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/message/tagged_ptr.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/types.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/message/value.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mini_descriptor/build_enum.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mini_descriptor/build_enum.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mini_descriptor/decode.c" role="src" />
@@ -2809,82 +2977,76 @@
     <file baseinstalldir="/" name="third_party/upb/upb/mini_table/message.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mini_table/message.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/mini_table/sub.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/msg.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/port/atomic.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/port/def.inc" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/port/undef.inc" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/port/vsnprintf_compat.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection.hpp" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/common.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def.hpp" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_builder.c" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_builder_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_pool.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_pool.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_pool_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_type.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/def_type.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/desc_state.c" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/desc_state_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_reserved_range.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_reserved_range.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_reserved_range_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_value_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_value_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/enum_value_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/extension_range.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/extension_range.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/extension_range_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/field_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/field_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/field_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/file_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/file_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/file_def_internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/def_builder.c" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/def_builder.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/def_pool.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/desc_state.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/enum_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/enum_reserved_range.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/enum_value_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/extension_range.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/field_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/file_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/message_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/message_reserved_range.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/method_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/oneof_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/service_def.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/strdup2.c" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/reflection/internal/strdup2.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message.hpp" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_reserved_range.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_reserved_range.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/message_reserved_range_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/method_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/method_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/method_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/oneof_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/oneof_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/oneof_def_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/service_def.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/reflection/service_def.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/reflection/service_def_internal.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/status.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/string_view.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/text/encode.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/text/encode.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/text_encode.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/upb.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/upb.hpp" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/wire/common.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/wire/common_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/decode.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/decode.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/decode_fast.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/decode_fast.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/wire/decode_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/encode.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/encode.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/eps_copy_input_stream.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/eps_copy_input_stream.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/wire/internal/constants.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/wire/internal/decode.h" role="src" />
+    <file baseinstalldir="/" name="third_party/upb/upb/wire/internal/swap.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/reader.c" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/reader.h" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/upb/wire/swap_internal.h" role="src" />
     <file baseinstalldir="/" name="third_party/upb/upb/wire/types.h" role="src" />
     <file baseinstalldir="/" name="third_party/utf8_range/naive.c" role="src" />
     <file baseinstalldir="/" name="third_party/utf8_range/range2-neon.c" role="src" />
diff --git a/requirements.bazel.txt b/requirements.bazel.txt
index 851dbd15a38da..532562389fd8e 100644
--- a/requirements.bazel.txt
+++ b/requirements.bazel.txt
@@ -16,3 +16,4 @@ xds-protos==0.0.11
 opencensus==0.10.0
 opencensus-ext-stackdriver==0.8.0
 absl-py==1.4.0
+googleapis-common-protos==1.61.0
diff --git a/setup.cfg b/setup.cfg
index 3ac6b513ae3a9..be9e83e43b0ea 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@
 plugins = Cython.Coverage
 
 [build]
-build_base=python_build
+build_base=pyb
 
 [build_ext]
 inplace=1
diff --git a/setup.py b/setup.py
index 613959550d4c9..97c1dcec54dd6 100644
--- a/setup.py
+++ b/setup.py
@@ -72,11 +72,9 @@
     os.path.join("third_party", "boringssl-with-bazel", "src", "include"),
 )
 UPB_INCLUDE = (os.path.join("third_party", "upb"),)
-UPB_GRPC_GENERATED_INCLUDE = (
-    os.path.join("src", "core", "ext", "upb-generated"),
-)
+UPB_GRPC_GENERATED_INCLUDE = (os.path.join("src", "core", "ext", "upb-gen"),)
 UPBDEFS_GRPC_GENERATED_INCLUDE = (
-    os.path.join("src", "core", "ext", "upbdefs-generated"),
+    os.path.join("src", "core", "ext", "upbdefs-gen"),
 )
 UTF8_RANGE_INCLUDE = (os.path.join("third_party", "utf8_range"),)
 XXHASH_INCLUDE = (os.path.join("third_party", "xxhash"),)
diff --git a/src/core/BUILD b/src/core/BUILD
index c1dd1e080ba8c..449649facdcfd 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -117,10 +117,12 @@ grpc_cc_library(
         "lib/experiments/config.h",
         "lib/experiments/experiments.h",
     ],
-    defines = select({
-        "//:grpc_experiments_are_final": ["GRPC_EXPERIMENTS_ARE_FINAL"],
-        "//conditions:default": [],
-    }),
+    defines = select(
+        {
+            "//:grpc_experiments_are_final": ["GRPC_EXPERIMENTS_ARE_FINAL"],
+            "//conditions:default": [],
+        },
+    ),
     external_deps = [
         "absl/functional:any_invocable",
         "absl/strings",
@@ -239,6 +241,27 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "directory_reader",
+    srcs = [
+        "lib/gprpp/posix/directory_reader.cc",
+        "lib/gprpp/windows/directory_reader.cc",
+    ],
+    hdrs = [
+        "lib/gprpp/directory_reader.h",
+    ],
+    external_deps = [
+        "absl/functional:function_ref",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/strings",
+    ],
+    deps = [
+        "//:gpr",
+        "//:gpr_platform",
+    ],
+)
+
 grpc_cc_library(
     name = "chunked_vector",
     hdrs = ["lib/gprpp/chunked_vector.h"],
@@ -270,7 +293,9 @@ grpc_cc_library(
         "absl/strings:cord",
         "absl/time",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
+        "upb_mem_lib",
     ],
     language = "c++",
     deps = [
@@ -397,6 +422,23 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "status_flag",
+    external_deps = [
+        "absl/status",
+        "absl/status:statusor",
+        "absl/types:optional",
+    ],
+    language = "c++",
+    public_hdrs = [
+        "lib/promise/status_flag.h",
+    ],
+    deps = [
+        "promise_status",
+        "//:gpr_platform",
+    ],
+)
+
 grpc_cc_library(
     name = "map_pipe",
     external_deps = ["absl/status"],
@@ -436,6 +478,7 @@ grpc_cc_library(
         "arena",
         "construct_destruct",
         "context",
+        "poll",
         "promise_factory",
         "promise_trace",
         "ref_counted",
@@ -832,6 +875,25 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "inter_activity_latch",
+    external_deps = [
+        "absl/base:core_headers",
+        "absl/strings",
+    ],
+    language = "c++",
+    public_hdrs = [
+        "lib/promise/inter_activity_latch.h",
+    ],
+    deps = [
+        "activity",
+        "poll",
+        "promise_trace",
+        "wait_set",
+        "//:gpr",
+    ],
+)
+
 grpc_cc_library(
     name = "interceptor_list",
     hdrs = [
@@ -881,6 +943,19 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "promise_mutex",
+    hdrs = [
+        "lib/promise/promise_mutex.h",
+    ],
+    language = "c++",
+    deps = [
+        "activity",
+        "poll",
+        "//:gpr",
+    ],
+)
+
 grpc_cc_library(
     name = "inter_activity_pipe",
     hdrs = [
@@ -1088,9 +1163,6 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "event_engine_memory_allocator",
-    srcs = [
-        "lib/event_engine/memory_allocator.cc",
-    ],
     hdrs = [
         "//:include/grpc/event_engine/internal/memory_allocator_impl.h",
         "//:include/grpc/event_engine/memory_allocator.h",
@@ -1100,7 +1172,6 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "slice",
-        "slice_refcount",
         "//:gpr_platform",
     ],
 )
@@ -1146,6 +1217,7 @@ grpc_cc_library(
         "race",
         "resource_quota_trace",
         "seq",
+        "slice_refcount",
         "time",
         "useful",
         "//:gpr",
@@ -1435,9 +1507,7 @@ grpc_cc_library(
     hdrs = [
         "lib/event_engine/forkable.h",
     ],
-    external_deps = ["absl/base:core_headers"],
     deps = [
-        "no_destruct",
         "//:config_vars",
         "//:gpr",
         "//:gpr_platform",
@@ -1467,6 +1537,18 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "event_engine_query_extensions",
+    hdrs = [
+        "lib/event_engine/query_extensions.h",
+    ],
+    external_deps = ["absl/strings"],
+    deps = [
+        "//:event_engine_base_hdrs",
+        "//:gpr_platform",
+    ],
+)
+
 grpc_cc_library(
     name = "event_engine_work_queue",
     hdrs = [
@@ -1580,9 +1662,9 @@ grpc_cc_library(
         "event_engine_trace",
         "event_engine_work_queue",
         "forkable",
+        "no_destruct",
         "notification",
         "time",
-        "useful",
         "//:backoff",
         "//:event_engine_base_hdrs",
         "//:gpr",
@@ -1643,6 +1725,7 @@ grpc_cc_library(
     ],
     deps = [
         "event_engine_poller",
+        "forkable",
         "posix_event_engine_closure",
         "//:event_engine_base_hdrs",
         "//:gpr_platform",
@@ -1775,7 +1858,6 @@ grpc_cc_library(
     deps = [
         "event_engine_poller",
         "event_engine_time_util",
-        "forkable",
         "iomgr_port",
         "posix_event_engine_closure",
         "posix_event_engine_event_poller",
@@ -1813,7 +1895,6 @@ grpc_cc_library(
         "common_event_engine_closures",
         "event_engine_poller",
         "event_engine_time_util",
-        "forkable",
         "iomgr_port",
         "posix_event_engine_closure",
         "posix_event_engine_event_poller",
@@ -1838,7 +1919,9 @@ grpc_cc_library(
     ],
     external_deps = ["absl/strings"],
     deps = [
+        "forkable",
         "iomgr_port",
+        "no_destruct",
         "posix_event_engine_event_poller",
         "posix_event_engine_poller_posix_epoll1",
         "posix_event_engine_poller_posix_poll",
@@ -2052,8 +2135,11 @@ grpc_cc_library(
         "event_engine_thread_pool",
         "event_engine_trace",
         "event_engine_utils",
+        "forkable",
         "init_internally",
         "iomgr_port",
+        "native_dns_resolver",
+        "no_destruct",
         "posix_event_engine_base_hdrs",
         "posix_event_engine_closure",
         "posix_event_engine_endpoint",
@@ -2063,7 +2149,9 @@ grpc_cc_library(
         "posix_event_engine_tcp_socket_utils",
         "posix_event_engine_timer",
         "posix_event_engine_timer_manager",
+        "ref_counted_dns_resolver_interface",
         "useful",
+        "//:config_vars",
         "//:event_engine_base_hdrs",
         "//:gpr",
         "//:grpc_trace",
@@ -2081,6 +2169,7 @@ grpc_cc_library(
         "absl/strings",
     ],
     deps = [
+        "ares_resolver",
         "channel_args_endpoint_config",
         "common_event_engine_closures",
         "error",
@@ -2090,6 +2179,7 @@ grpc_cc_library(
         "event_engine_trace",
         "event_engine_utils",
         "init_internally",
+        "iomgr_port",
         "posix_event_engine_timer_manager",
         "time",
         "windows_endpoint",
@@ -2290,27 +2380,29 @@ grpc_cc_library(
     srcs = ["lib/event_engine/default_event_engine_factory.cc"],
     hdrs = ["lib/event_engine/default_event_engine_factory.h"],
     external_deps = ["absl/memory"],
-    select_deps = [{
-        "//:windows": ["windows_event_engine"],
-        "//:windows_msvc": ["windows_event_engine"],
-        "//:windows_other": ["windows_event_engine"],
-        "//:mac": [
-            "posix_event_engine",
-            "cf_event_engine",
-        ],
-        "//:mac_x86_64": [
-            "posix_event_engine",
-            "cf_event_engine",
-        ],
-        "//:mac_arm64": [
-            "posix_event_engine",
-            "cf_event_engine",
-        ],
-        "//:ios": ["cf_event_engine"],
-        "//:tvos": ["cf_event_engine"],
-        "//:watchos": ["cf_event_engine"],
-        "//conditions:default": ["posix_event_engine"],
-    }],
+    select_deps = [
+        {
+            "//:windows": ["windows_event_engine"],
+            "//:windows_msvc": ["windows_event_engine"],
+            "//:windows_other": ["windows_event_engine"],
+            "//:mac": [
+                "posix_event_engine",
+                "cf_event_engine",
+            ],
+            "//:mac_x86_64": [
+                "posix_event_engine",
+                "cf_event_engine",
+            ],
+            "//:mac_arm64": [
+                "posix_event_engine",
+                "cf_event_engine",
+            ],
+            "//:ios": ["cf_event_engine"],
+            "//:tvos": ["cf_event_engine"],
+            "//:watchos": ["cf_event_engine"],
+            "//conditions:default": ["posix_event_engine"],
+        },
+    ],
     deps = [
         "//:event_engine_base_hdrs",
         "//:gpr_platform",
@@ -2380,16 +2472,53 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "ref_counted_dns_resolver_interface",
+    hdrs = ["lib/event_engine/ref_counted_dns_resolver_interface.h"],
+    external_deps = ["absl/strings"],
+    deps = [
+        "//:event_engine_base_hdrs",
+        "//:gpr_platform",
+        "//:orphanable",
+    ],
+)
+
+grpc_cc_library(
+    name = "native_dns_resolver",
+    srcs = [
+        "lib/event_engine/posix_engine/native_dns_resolver.cc",
+    ],
+    hdrs = [
+        "lib/event_engine/posix_engine/native_dns_resolver.h",
+    ],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/strings",
+        "absl/strings:str_format",
+    ],
+    deps = [
+        "iomgr_port",
+        "ref_counted_dns_resolver_interface",
+        "useful",
+        "//:event_engine_base_hdrs",
+        "//:gpr",
+    ],
+)
+
 grpc_cc_library(
     name = "ares_resolver",
     srcs = [
         "lib/event_engine/ares_resolver.cc",
+        "lib/event_engine/windows/grpc_polled_fd_windows.cc",
     ],
     hdrs = [
         "lib/event_engine/ares_resolver.h",
         "lib/event_engine/grpc_polled_fd.h",
         "lib/event_engine/nameser.h",
         "lib/event_engine/posix_engine/grpc_polled_fd_posix.h",
+        "lib/event_engine/windows/grpc_polled_fd_windows.h",
     ],
     external_deps = [
         "absl/base:core_headers",
@@ -2405,6 +2534,7 @@ grpc_cc_library(
         "cares",
     ],
     deps = [
+        "common_event_engine_closures",
         "error",
         "event_engine_time_util",
         "grpc_sockaddr",
@@ -2412,7 +2542,10 @@ grpc_cc_library(
         "posix_event_engine_closure",
         "posix_event_engine_event_poller",
         "posix_event_engine_tcp_socket_utils",
+        "ref_counted_dns_resolver_interface",
         "resolved_address",
+        "slice",
+        "windows_iocp",
         "//:debug_location",
         "//:event_engine_base_hdrs",
         "//:gpr",
@@ -3082,15 +3215,23 @@ grpc_cc_library(
         "lib/security/credentials/tls/grpc_tls_crl_provider.h",
     ],
     external_deps = [
+        "absl/base:core_headers",
         "absl/container:flat_hash_map",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
+        "absl/types:optional",
         "absl/types:span",
         "libcrypto",
         "libssl",
     ],
     deps = [
+        "default_event_engine",
+        "directory_reader",
+        "load_file",
+        "slice",
+        "time",
+        "//:exec_ctx",
         "//:gpr",
         "//:grpc_base",
     ],
@@ -4047,13 +4188,16 @@ grpc_cc_library(
     external_deps = [
         "absl/base:core_headers",
         "absl/container:inlined_vector",
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
         "absl/strings:str_format",
         "absl/types:optional",
         "absl/types:variant",
+        "upb_base_lib",
         "upb_lib",
+        "upb_mem_lib",
     ],
     language = "c++",
     deps = [
@@ -4158,6 +4302,7 @@ grpc_cc_library(
         "absl/strings",
         "absl/strings:str_format",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
     ],
     language = "c++",
@@ -4209,7 +4354,7 @@ grpc_cc_library(
     ],
     external_deps = [
         "absl/strings",
-        "upb_lib",
+        "upb_base_lib",
     ],
     language = "c++",
     deps = ["//:gpr_platform"],
@@ -4284,7 +4429,9 @@ grpc_cc_library(
         "absl/types:optional",
         "absl/types:span",
         "absl/types:variant",
+        "upb_base_lib",
         "upb_lib",
+        "upb_mem_lib",
         "upb_textformat_lib",
         "upb_json_lib",
         "re2",
@@ -4569,6 +4716,7 @@ grpc_cc_library(
         "ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc",
     ],
     external_deps = [
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
@@ -4591,6 +4739,7 @@ grpc_cc_library(
         "no_destruct",
         "pollset_set",
         "ref_counted_string",
+        "resolved_address",
         "validation_errors",
         "//:channel_arg_names",
         "//:config",
@@ -4739,6 +4888,7 @@ grpc_cc_library(
         "ext/filters/client_channel/lb_policy/address_filtering.h",
     ],
     external_deps = [
+        "absl/functional:function_ref",
         "absl/status:statusor",
         "absl/strings",
     ],
@@ -4747,6 +4897,7 @@ grpc_cc_library(
         "channel_args",
         "ref_counted",
         "ref_counted_string",
+        "resolved_address",
         "//:endpoint_addresses",
         "//:gpr_platform",
         "//:ref_counted_ptr",
@@ -4768,6 +4919,7 @@ grpc_cc_library(
         "absl/status:statusor",
         "absl/strings",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
     ],
     language = "c++",
@@ -4815,6 +4967,7 @@ grpc_cc_library(
         "lb_policy",
         "subchannel_interface",
         "//:debug_location",
+        "//:endpoint_addresses",
         "//:gpr",
         "//:grpc_base",
         "//:ref_counted_ptr",
@@ -4832,7 +4985,7 @@ grpc_cc_library(
         "ext/filters/client_channel/lb_policy/endpoint_list.h",
     ],
     external_deps = [
-        "absl/functional:any_invocable",
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/types:optional",
@@ -5226,6 +5379,7 @@ grpc_cc_library(
     ],
     external_deps = [
         "absl/base:core_headers",
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
@@ -5327,6 +5481,7 @@ grpc_cc_library(
         "absl/status:statusor",
         "absl/strings",
         "absl/types:optional",
+        "upb_base_lib",
         "upb_lib",
     ],
     language = "c++",
@@ -5388,8 +5543,12 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "service_config_helper",
-    srcs = ["ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc"],
-    hdrs = ["ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h"],
+    srcs = [
+        "ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.cc",
+    ],
+    hdrs = [
+        "ext/filters/client_channel/resolver/dns/event_engine/service_config_helper.h",
+    ],
     external_deps = [
         "absl/status:statusor",
         "absl/strings",
@@ -5409,8 +5568,12 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "grpc_resolver_dns_event_engine",
-    srcs = ["ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc"],
-    hdrs = ["ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h"],
+    srcs = [
+        "ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc",
+    ],
+    hdrs = [
+        "ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.h",
+    ],
     external_deps = [
         "absl/base:core_headers",
         "absl/cleanup",
@@ -5675,7 +5838,6 @@ grpc_cc_library(
     hdrs = [
         "ext/transport/chttp2/transport/hpack_encoder_table.h",
     ],
-    external_deps = ["absl/container:inlined_vector"],
     language = "c++",
     deps = [
         "hpack_constants",
@@ -6021,6 +6183,7 @@ grpc_cc_library(
         "arena",
         "bitset",
         "chaotic_good_frame_header",
+        "context",
         "no_destruct",
         "slice",
         "slice_buffer",
@@ -6183,29 +6346,43 @@ grpc_cc_library(
     ],
     external_deps = [
         "absl/base:core_headers",
+        "absl/random",
+        "absl/random:bit_gen_ref",
         "absl/status",
+        "absl/status:statusor",
+        "absl/types:optional",
         "absl/types:variant",
     ],
     language = "c++",
     deps = [
         "activity",
+        "arena",
         "chaotic_good_frame",
         "chaotic_good_frame_header",
+        "context",
         "event_engine_wakeup_scheduler",
         "for_each",
         "grpc_promise_endpoint",
-        "join",
+        "if",
+        "inter_activity_pipe",
         "loop",
         "match",
+        "memory_quota",
         "mpsc",
         "pipe",
-        "seq",
+        "poll",
+        "resource_quota",
         "slice",
         "slice_buffer",
+        "try_join",
+        "try_seq",
+        "//:exec_ctx",
         "//:gpr",
         "//:gpr_platform",
         "//:grpc_base",
         "//:hpack_encoder",
+        "//:hpack_parser",
+        "//:ref_counted_ptr",
     ],
 )
 
@@ -6338,7 +6515,9 @@ grpc_upb_proto_library(
 
 grpc_upb_proto_library(
     name = "envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_upb",
-    deps = ["@envoy_api//envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3:pkg"],
+    deps = [
+        "@envoy_api//envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3:pkg",
+    ],
 )
 
 grpc_upb_proto_library(
@@ -6358,12 +6537,16 @@ grpc_upb_proto_library(
 
 grpc_upb_proto_library(
     name = "envoy_extensions_filters_network_http_connection_manager_upb",
-    deps = ["@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg"],
+    deps = [
+        "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
+    ],
 )
 
 grpc_upb_proto_reflection_library(
     name = "envoy_extensions_filters_network_http_connection_manager_upbdefs",
-    deps = ["@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg"],
+    deps = [
+        "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
+    ],
 )
 
 grpc_upb_proto_library(
@@ -6490,14 +6673,20 @@ WELL_KNOWN_PROTO_TARGETS = [
     "wrappers",
 ]
 
-[grpc_upb_proto_library(
-    name = "protobuf_" + target + "_upb",
-    deps = ["@com_google_protobuf//:" + target + "_proto"],
-) for target in WELL_KNOWN_PROTO_TARGETS]
+[
+    grpc_upb_proto_library(
+        name = "protobuf_" + target + "_upb",
+        deps = ["@com_google_protobuf//:" + target + "_proto"],
+    )
+    for target in WELL_KNOWN_PROTO_TARGETS
+]
 
-[grpc_upb_proto_reflection_library(
-    name = "protobuf_" + target + "_upbdefs",
-    deps = ["@com_google_protobuf//:" + target + "_proto"],
-) for target in WELL_KNOWN_PROTO_TARGETS]
+[
+    grpc_upb_proto_reflection_library(
+        name = "protobuf_" + target + "_upbdefs",
+        deps = ["@com_google_protobuf//:" + target + "_proto"],
+    )
+    for target in WELL_KNOWN_PROTO_TARGETS
+]
 
 grpc_generate_one_off_internal_targets()
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 991cbee4fc872..91b4712c61ac9 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -315,6 +315,14 @@ class ClientChannel::PromiseBasedCallData : public ClientChannel::CallData {
  public:
   explicit PromiseBasedCallData(ClientChannel* chand) : chand_(chand) {}
 
+  ~PromiseBasedCallData() override {
+    if (was_queued_ && client_initial_metadata_ != nullptr) {
+      MutexLock lock(&chand_->resolution_mu_);
+      RemoveCallFromResolverQueuedCallsLocked();
+      chand_->resolver_queued_calls_.erase(this);
+    }
+  }
+
   ArenaPromise<absl::StatusOr<CallArgs>> MakeNameResolutionPromise(
       CallArgs call_args) {
     pollent_ = NowOrNever(call_args.polling_entity->WaitAndCopy()).value();
@@ -399,6 +407,7 @@ class ClientChannel::PromiseBasedCallData : public ClientChannel::CallData {
 const grpc_channel_filter ClientChannel::kFilterVtableWithPromises = {
     ClientChannel::FilterBasedCallData::StartTransportStreamOpBatch,
     ClientChannel::MakeCallPromise,
+    /* init_call: */ nullptr,
     ClientChannel::StartTransportOp,
     sizeof(ClientChannel::FilterBasedCallData),
     ClientChannel::FilterBasedCallData::Init,
@@ -415,6 +424,7 @@ const grpc_channel_filter ClientChannel::kFilterVtableWithPromises = {
 const grpc_channel_filter ClientChannel::kFilterVtableWithoutPromises = {
     ClientChannel::FilterBasedCallData::StartTransportStreamOpBatch,
     nullptr,
+    /* init_call: */ nullptr,
     ClientChannel::StartTransportOp,
     sizeof(ClientChannel::FilterBasedCallData),
     ClientChannel::FilterBasedCallData::Init,
@@ -562,6 +572,7 @@ class DynamicTerminationFilter::CallData {
 const grpc_channel_filter DynamicTerminationFilter::kFilterVtable = {
     DynamicTerminationFilter::CallData::StartTransportStreamOpBatch,
     DynamicTerminationFilter::MakeCallPromise,
+    /* init_call: */ nullptr,
     DynamicTerminationFilter::StartTransportOp,
     sizeof(DynamicTerminationFilter::CallData),
     DynamicTerminationFilter::CallData::Init,
@@ -1599,7 +1610,12 @@ absl::Status ClientChannel::CreateOrUpdateLbPolicyLocked(
     Resolver::Result result) {
   // Construct update.
   LoadBalancingPolicy::UpdateArgs update_args;
-  update_args.addresses = std::move(result.addresses);
+  if (!result.addresses.ok()) {
+    update_args.addresses = result.addresses.status();
+  } else {
+    update_args.addresses = std::make_shared<EndpointAddressesListIterator>(
+        std::move(*result.addresses));
+  }
   update_args.config = std::move(lb_policy_config);
   update_args.resolution_note = std::move(result.resolution_note);
   // Remove the config selector from channel args so that we're not holding
diff --git a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc b/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc
index b6e8396b95e23..bac15550d2d6d 100644
--- a/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc
@@ -20,11 +20,13 @@
 
 #include <stddef.h>
 
-#include <algorithm>
 #include <utility>
 
+#include "absl/functional/function_ref.h"
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {
 
@@ -43,32 +45,63 @@ int HierarchicalPathArg::ChannelArgsCompare(const HierarchicalPathArg* a,
   return 0;
 }
 
+namespace {
+
+class HierarchicalAddressIterator : public EndpointAddressesIterator {
+ public:
+  HierarchicalAddressIterator(
+      std::shared_ptr<EndpointAddressesIterator> parent_it,
+      RefCountedStringValue child_name)
+      : parent_it_(std::move(parent_it)), child_name_(std::move(child_name)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    RefCountedPtr<HierarchicalPathArg> remaining_path_attr;
+    parent_it_->ForEach([&](const EndpointAddresses& endpoint) {
+      const auto* path_arg = endpoint.args().GetObject<HierarchicalPathArg>();
+      if (path_arg == nullptr) return;
+      const std::vector<RefCountedStringValue>& path = path_arg->path();
+      auto it = path.begin();
+      if (it == path.end()) return;
+      if (*it != child_name_) return;
+      ChannelArgs args = endpoint.args();
+      ++it;
+      if (it != path.end()) {
+        std::vector<RefCountedStringValue> remaining_path(it, path.end());
+        if (remaining_path_attr == nullptr ||
+            remaining_path_attr->path() != remaining_path) {
+          remaining_path_attr =
+              MakeRefCounted<HierarchicalPathArg>(std::move(remaining_path));
+        }
+        args = args.SetObject(remaining_path_attr);
+      }
+      callback(EndpointAddresses(endpoint.addresses(), args));
+    });
+  }
+
+ private:
+  std::shared_ptr<EndpointAddressesIterator> parent_it_;
+  RefCountedStringValue child_name_;
+};
+
+}  // namespace
+
 absl::StatusOr<HierarchicalAddressMap> MakeHierarchicalAddressMap(
-    const absl::StatusOr<EndpointAddressesList>& addresses) {
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses) {
   if (!addresses.ok()) return addresses.status();
   HierarchicalAddressMap result;
-  RefCountedPtr<HierarchicalPathArg> remaining_path_attr;
-  for (const EndpointAddresses& endpoint_addresses : *addresses) {
-    const auto* path_arg =
-        endpoint_addresses.args().GetObject<HierarchicalPathArg>();
-    if (path_arg == nullptr) continue;
+  (*addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+    const auto* path_arg = endpoint.args().GetObject<HierarchicalPathArg>();
+    if (path_arg == nullptr) return;
     const std::vector<RefCountedStringValue>& path = path_arg->path();
     auto it = path.begin();
-    if (it == path.end()) continue;
-    EndpointAddressesList& target_list = result[*it];
-    ChannelArgs args = endpoint_addresses.args();
-    ++it;
-    if (it != path.end()) {
-      std::vector<RefCountedStringValue> remaining_path(it, path.end());
-      if (remaining_path_attr == nullptr ||
-          remaining_path_attr->path() != remaining_path) {
-        remaining_path_attr =
-            MakeRefCounted<HierarchicalPathArg>(std::move(remaining_path));
-      }
-      args = args.SetObject(remaining_path_attr);
+    if (it == path.end()) return;
+    auto& target_list = result[*it];
+    if (target_list == nullptr) {
+      target_list =
+          std::make_shared<HierarchicalAddressIterator>(*addresses, *it);
     }
-    target_list.emplace_back(endpoint_addresses.addresses(), args);
-  }
+  });
   return result;
 }
 
diff --git a/src/core/ext/filters/client_channel/lb_policy/address_filtering.h b/src/core/ext/filters/client_channel/lb_policy/address_filtering.h
index d0e2faae29451..924261669bd87 100644
--- a/src/core/ext/filters/client_channel/lb_policy/address_filtering.h
+++ b/src/core/ext/filters/client_channel/lb_policy/address_filtering.h
@@ -20,6 +20,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <map>
+#include <memory>
 #include <utility>
 #include <vector>
 
@@ -105,12 +106,12 @@ class HierarchicalPathArg : public RefCounted<HierarchicalPathArg> {
 // A map from the next path element to the endpoint addresses that fall
 // under that path element.
 using HierarchicalAddressMap =
-    std::map<RefCountedStringValue, EndpointAddressesList,
+    std::map<RefCountedStringValue, std::shared_ptr<EndpointAddressesIterator>,
              RefCountedStringValueLessThan>;
 
 // Splits up the addresses into a separate list for each child.
 absl::StatusOr<HierarchicalAddressMap> MakeHierarchicalAddressMap(
-    const absl::StatusOr<EndpointAddressesList>& addresses);
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses);
 
 }  // namespace grpc_core
 
diff --git a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc b/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc
index f82ac6f53d16b..598df7ec1b0fc 100644
--- a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc
@@ -98,7 +98,7 @@ class ChildPolicyHandler::Helper
             : parent()->child_policy_.get();
     if (child_ != latest_child_policy) return;
     if (GRPC_TRACE_FLAG_ENABLED(*(parent()->tracer_))) {
-      gpr_log(GPR_INFO, "[child_policy_handler %p] started name re-resolving",
+      gpr_log(GPR_INFO, "[child_policy_handler %p] requesting re-resolution",
               parent());
     }
     parent()->channel_control_helper()->RequestReresolution();
diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
index 2c878bb2db098..7f2ecdd69f024 100644
--- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
@@ -118,7 +118,7 @@ void EndpointList::Endpoint::Init(
   GPR_ASSERT(config.ok());
   // Update child policy.
   LoadBalancingPolicy::UpdateArgs update_args;
-  update_args.addresses.emplace().emplace_back(addresses);
+  update_args.addresses = std::make_shared<SingleEndpointIterator>(addresses);
   update_args.args = child_args;
   update_args.config = std::move(*config);
   // TODO(roth): If the child reports a non-OK status with the update,
@@ -163,15 +163,16 @@ RefCountedPtr<SubchannelInterface> EndpointList::Endpoint::CreateSubchannel(
 //
 
 void EndpointList::Init(
-    const EndpointAddressesList& endpoints, const ChannelArgs& args,
-    absl::AnyInvocable<OrphanablePtr<Endpoint>(RefCountedPtr<EndpointList>,
-                                               const EndpointAddresses&,
-                                               const ChannelArgs&)>
+    EndpointAddressesIterator* endpoints, const ChannelArgs& args,
+    absl::FunctionRef<OrphanablePtr<Endpoint>(RefCountedPtr<EndpointList>,
+                                              const EndpointAddresses&,
+                                              const ChannelArgs&)>
         create_endpoint) {
-  for (const EndpointAddresses& addresses : endpoints) {
+  if (endpoints == nullptr) return;
+  endpoints->ForEach([&](const EndpointAddresses& endpoint) {
     endpoints_.push_back(
-        create_endpoint(Ref(DEBUG_LOCATION, "Endpoint"), addresses, args));
-  }
+        create_endpoint(Ref(DEBUG_LOCATION, "Endpoint"), endpoint, args));
+  });
 }
 
 void EndpointList::ResetBackoffLocked() {
diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
index df31bc39c0e83..c814d9f50eb99 100644
--- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
+++ b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include "absl/functional/any_invocable.h"
+#include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 
@@ -53,7 +53,7 @@ namespace grpc_core {
 class MyEndpointList : public EndpointList {
  public:
   MyEndpointList(RefCountedPtr<MyLbPolicy> lb_policy,
-                 const EndpointAddressesList& endpoints,
+                 EndpointAddressesIterator* endpoints,
                  const ChannelArgs& args)
       : EndpointList(std::move(lb_policy),
                      GRPC_TRACE_FLAG_ENABLED(grpc_my_tracer)
@@ -184,8 +184,8 @@ class EndpointList : public InternallyRefCounted<EndpointList> {
   EndpointList(RefCountedPtr<LoadBalancingPolicy> policy, const char* tracer)
       : policy_(std::move(policy)), tracer_(tracer) {}
 
-  void Init(const EndpointAddressesList& endpoints, const ChannelArgs& args,
-            absl::AnyInvocable<OrphanablePtr<Endpoint>(
+  void Init(EndpointAddressesIterator* endpoints, const ChannelArgs& args,
+            absl::FunctionRef<OrphanablePtr<Endpoint>(
                 RefCountedPtr<EndpointList>, const EndpointAddresses&,
                 const ChannelArgs&)>
                 create_endpoint);
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
index 85f04a3b4a4e6..0f4c7675f8983 100644
--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
@@ -72,6 +72,7 @@
 #include <vector>
 
 #include "absl/container/inlined_vector.h"
+#include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -384,9 +385,9 @@ class GrpcLb : public LoadBalancingPolicy {
     // Returns a text representation suitable for logging.
     std::string AsText() const;
 
-    // Extracts all non-drop entries into an EndpointAddressesList.
-    EndpointAddressesList GetServerAddressList(
-        GrpcLbClientStats* client_stats) const;
+    // Extracts all non-drop entries into an EndpointAddressesIterator.
+    std::shared_ptr<EndpointAddressesIterator> GetServerAddressList(
+        GrpcLbClientStats* client_stats);
 
     // Returns true if the serverlist contains at least one drop entry and
     // no backend address entries.
@@ -400,6 +401,8 @@ class GrpcLb : public LoadBalancingPolicy {
     const char* ShouldDrop();
 
    private:
+    class AddressIterator;
+
     std::vector<GrpcLbServer> serverlist_;
 
     // Accessed from the picker, so needs synchronization.
@@ -504,6 +507,8 @@ class GrpcLb : public LoadBalancingPolicy {
     RefCountedPtr<GrpcLb> parent_;
   };
 
+  class NullLbTokenEndpointIterator;
+
   void ShutdownLocked() override;
 
   // Helper functions used in UpdateLocked().
@@ -569,7 +574,8 @@ class GrpcLb : public LoadBalancingPolicy {
   // Whether we're in fallback mode.
   bool fallback_mode_ = false;
   // The backend addresses from the resolver.
-  absl::StatusOr<EndpointAddressesList> fallback_backend_addresses_;
+  absl::StatusOr<std::shared_ptr<NullLbTokenEndpointIterator>>
+      fallback_backend_addresses_;
   // The last resolution note from our parent.
   // To be passed to child policy when fallback_backend_addresses_ is empty.
   std::string resolution_note_;
@@ -594,11 +600,30 @@ class GrpcLb : public LoadBalancingPolicy {
 };
 
 //
-// GrpcLb::Serverlist
+// GrpcLb::Serverlist::AddressIterator
 //
 
-bool GrpcLb::Serverlist::operator==(const Serverlist& other) const {
-  return serverlist_ == other.serverlist_;
+bool IsServerValid(const GrpcLbServer& server, size_t idx, bool log) {
+  if (server.drop) return false;
+  if (GPR_UNLIKELY(server.port >> 16 != 0)) {
+    if (log) {
+      gpr_log(GPR_ERROR,
+              "Invalid port '%d' at index %" PRIuPTR
+              " of serverlist. Ignoring.",
+              server.port, idx);
+    }
+    return false;
+  }
+  if (GPR_UNLIKELY(server.ip_size != 4 && server.ip_size != 16)) {
+    if (log) {
+      gpr_log(GPR_ERROR,
+              "Expected IP to be 4 or 16 bytes, got %d at index %" PRIuPTR
+              " of serverlist. Ignoring",
+              server.ip_size, idx);
+    }
+    return false;
+  }
+  return true;
 }
 
 void ParseServer(const GrpcLbServer& server, grpc_resolved_address* addr) {
@@ -623,6 +648,53 @@ void ParseServer(const GrpcLbServer& server, grpc_resolved_address* addr) {
   }
 }
 
+class GrpcLb::Serverlist::AddressIterator : public EndpointAddressesIterator {
+ public:
+  AddressIterator(RefCountedPtr<Serverlist> serverlist,
+                  RefCountedPtr<GrpcLbClientStats> client_stats)
+      : serverlist_(std::move(serverlist)),
+        client_stats_(std::move(client_stats)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    for (size_t i = 0; i < serverlist_->serverlist_.size(); ++i) {
+      const GrpcLbServer& server = serverlist_->serverlist_[i];
+      if (!IsServerValid(server, i, false)) continue;
+      // Address processing.
+      grpc_resolved_address addr;
+      ParseServer(server, &addr);
+      // LB token processing.
+      const size_t lb_token_length = strnlen(
+          server.load_balance_token, GPR_ARRAY_SIZE(server.load_balance_token));
+      std::string lb_token(server.load_balance_token, lb_token_length);
+      if (lb_token.empty()) {
+        auto addr_uri = grpc_sockaddr_to_uri(&addr);
+        gpr_log(GPR_INFO,
+                "Missing LB token for backend address '%s'. The empty token "
+                "will be used instead",
+                addr_uri.ok() ? addr_uri->c_str()
+                              : addr_uri.status().ToString().c_str());
+      }
+      // Return address with a channel arg containing LB token and stats object.
+      callback(EndpointAddresses(
+          addr, ChannelArgs().SetObject(MakeRefCounted<TokenAndClientStatsArg>(
+                    std::move(lb_token), client_stats_))));
+    }
+  }
+
+ private:
+  RefCountedPtr<Serverlist> serverlist_;
+  RefCountedPtr<GrpcLbClientStats> client_stats_;
+};
+
+//
+// GrpcLb::Serverlist
+//
+
+bool GrpcLb::Serverlist::operator==(const Serverlist& other) const {
+  return serverlist_ == other.serverlist_;
+}
+
 std::string GrpcLb::Serverlist::AsText() const {
   std::vector<std::string> entries;
   for (size_t i = 0; i < serverlist_.size(); ++i) {
@@ -642,59 +714,12 @@ std::string GrpcLb::Serverlist::AsText() const {
   return absl::StrJoin(entries, "");
 }
 
-bool IsServerValid(const GrpcLbServer& server, size_t idx, bool log) {
-  if (server.drop) return false;
-  if (GPR_UNLIKELY(server.port >> 16 != 0)) {
-    if (log) {
-      gpr_log(GPR_ERROR,
-              "Invalid port '%d' at index %" PRIuPTR
-              " of serverlist. Ignoring.",
-              server.port, idx);
-    }
-    return false;
-  }
-  if (GPR_UNLIKELY(server.ip_size != 4 && server.ip_size != 16)) {
-    if (log) {
-      gpr_log(GPR_ERROR,
-              "Expected IP to be 4 or 16 bytes, got %d at index %" PRIuPTR
-              " of serverlist. Ignoring",
-              server.ip_size, idx);
-    }
-    return false;
-  }
-  return true;
-}
-
 // Returns addresses extracted from the serverlist.
-EndpointAddressesList GrpcLb::Serverlist::GetServerAddressList(
-    GrpcLbClientStats* client_stats) const {
+std::shared_ptr<EndpointAddressesIterator>
+GrpcLb::Serverlist::GetServerAddressList(GrpcLbClientStats* client_stats) {
   RefCountedPtr<GrpcLbClientStats> stats;
   if (client_stats != nullptr) stats = client_stats->Ref();
-  EndpointAddressesList endpoints;
-  for (size_t i = 0; i < serverlist_.size(); ++i) {
-    const GrpcLbServer& server = serverlist_[i];
-    if (!IsServerValid(server, i, false)) continue;
-    // Address processing.
-    grpc_resolved_address addr;
-    ParseServer(server, &addr);
-    // LB token processing.
-    const size_t lb_token_length = strnlen(
-        server.load_balance_token, GPR_ARRAY_SIZE(server.load_balance_token));
-    std::string lb_token(server.load_balance_token, lb_token_length);
-    if (lb_token.empty()) {
-      auto addr_uri = grpc_sockaddr_to_uri(&addr);
-      gpr_log(GPR_INFO,
-              "Missing LB token for backend address '%s'. The empty token will "
-              "be used instead",
-              addr_uri.ok() ? addr_uri->c_str()
-                            : addr_uri.status().ToString().c_str());
-    }
-    // Add address with a channel arg containing LB token and stats object.
-    endpoints.emplace_back(
-        addr, ChannelArgs().SetObject(MakeRefCounted<TokenAndClientStatsArg>(
-                  std::move(lb_token), stats)));
-  }
-  return endpoints;
+  return std::make_shared<AddressIterator>(Ref(), std::move(stats));
 }
 
 bool GrpcLb::Serverlist::ContainsAllDropEntries() const {
@@ -841,14 +866,10 @@ void GrpcLb::Helper::UpdateState(grpc_connectivity_state state,
 
 void GrpcLb::Helper::RequestReresolution() {
   if (parent()->shutting_down_) return;
-  // If we are talking to a balancer, we expect to get updated addresses
-  // from the balancer, so we can ignore the re-resolution request from
-  // the child policy. Otherwise, pass the re-resolution request up to the
-  // channel.
-  if (parent()->lb_calld_ == nullptr ||
-      !parent()->lb_calld_->seen_initial_response()) {
-    parent()->channel_control_helper()->RequestReresolution();
-  }
+  // Ignore if we're not in fallback mode, because if we got the backend
+  // addresses from the balancer, re-resolving is not going to fix it.
+  if (!parent()->fallback_mode_) return;
+  parent()->channel_control_helper()->RequestReresolution();
 }
 
 //
@@ -1507,21 +1528,45 @@ void GrpcLb::ResetBackoffLocked() {
   }
 }
 
+// Endpoint iterator wrapper to add null LB token attribute.
+class GrpcLb::NullLbTokenEndpointIterator : public EndpointAddressesIterator {
+ public:
+  explicit NullLbTokenEndpointIterator(
+      std::shared_ptr<EndpointAddressesIterator> parent_it)
+      : parent_it_(std::move(parent_it)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    parent_it_->ForEach([&](const EndpointAddresses& endpoint) {
+      if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) {
+        gpr_log(GPR_INFO, "[grpclb %p] fallback address: %s", this,
+                endpoint.ToString().c_str());
+      }
+      callback(EndpointAddresses(endpoint.addresses(),
+                                 endpoint.args().SetObject(empty_token_)));
+    });
+  }
+
+ private:
+  std::shared_ptr<EndpointAddressesIterator> parent_it_;
+  RefCountedPtr<TokenAndClientStatsArg> empty_token_ =
+      MakeRefCounted<TokenAndClientStatsArg>("", nullptr);
+};
+
 absl::Status GrpcLb::UpdateLocked(UpdateArgs args) {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) {
+    gpr_log(GPR_INFO, "[grpclb %p] received update", this);
+  }
   const bool is_initial_update = lb_channel_ == nullptr;
   config_ = args.config;
   GPR_ASSERT(config_ != nullptr);
   args_ = std::move(args.args);
   // Update fallback address list.
-  fallback_backend_addresses_ = std::move(args.addresses);
-  if (fallback_backend_addresses_.ok()) {
-    // Add null LB token attributes.
-    for (EndpointAddresses& addresses : *fallback_backend_addresses_) {
-      addresses = EndpointAddresses(
-          addresses.addresses(),
-          addresses.args().SetObject(
-              MakeRefCounted<TokenAndClientStatsArg>("", nullptr)));
-    }
+  if (!args.addresses.ok()) {
+    fallback_backend_addresses_ = args.addresses.status();
+  } else {
+    fallback_backend_addresses_ = std::make_shared<NullLbTokenEndpointIterator>(
+        std::move(*args.addresses));
   }
   resolution_note_ = std::move(args.resolution_note);
   // Update balancer channel.
@@ -1569,6 +1614,12 @@ absl::Status GrpcLb::UpdateLocked(UpdateArgs args) {
 absl::Status GrpcLb::UpdateBalancerChannelLocked() {
   // Get balancer addresses.
   EndpointAddressesList balancer_addresses = ExtractBalancerAddresses(args_);
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) {
+    for (const auto& endpoint : balancer_addresses) {
+      gpr_log(GPR_INFO, "[grpclb %p] balancer address: %s", this,
+              endpoint.ToString().c_str());
+    }
+  }
   absl::Status status;
   if (balancer_addresses.empty()) {
     status = absl::UnavailableError("balancer address list must be non-empty");
@@ -1747,6 +1798,12 @@ OrphanablePtr<LoadBalancingPolicy> GrpcLb::CreateChildPolicyLocked(
   return lb_policy;
 }
 
+bool EndpointIteratorIsEmpty(const EndpointAddressesIterator& endpoints) {
+  bool empty = true;
+  endpoints.ForEach([&](const EndpointAddresses&) { empty = false; });
+  return empty;
+}
+
 void GrpcLb::CreateOrUpdateChildPolicyLocked() {
   if (shutting_down_) return;
   // Construct update args.
@@ -1760,16 +1817,17 @@ void GrpcLb::CreateOrUpdateChildPolicyLocked() {
     // picks.
     update_args.addresses = fallback_backend_addresses_;
     if (fallback_backend_addresses_.ok() &&
-        fallback_backend_addresses_->empty()) {
+        EndpointIteratorIsEmpty(**fallback_backend_addresses_)) {
       update_args.resolution_note = absl::StrCat(
-          "grpclb in fallback mode without any balancer addresses: ",
+          "grpclb in fallback mode without any fallback addresses: ",
           resolution_note_);
     }
   } else {
     update_args.addresses = serverlist_->GetServerAddressList(
         lb_calld_ == nullptr ? nullptr : lb_calld_->client_stats());
     is_backend_from_grpclb_load_balancer = true;
-    if (update_args.addresses.ok() && update_args.addresses->empty()) {
+    if (update_args.addresses.ok() &&
+        EndpointIteratorIsEmpty(**update_args.addresses)) {
       update_args.resolution_note = "empty serverlist from grpclb balancer";
     }
   }
diff --git a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc b/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc
index 8569f24019d65..656332b21286c 100644
--- a/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc
@@ -661,7 +661,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
   if (args.addresses.ok()) {
     std::set<EndpointAddressSet> current_endpoints;
     std::set<grpc_resolved_address, ResolvedAddressLessThan> current_addresses;
-    for (const EndpointAddresses& endpoint : *args.addresses) {
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
       EndpointAddressSet key(endpoint.addresses());
       current_endpoints.emplace(key);
       for (const grpc_resolved_address& address : endpoint.addresses()) {
@@ -708,7 +708,7 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
         }
         it->second->DisableEjection();
       }
-    }
+    });
     // Remove any entries we no longer need in the subchannel map.
     for (auto it = subchannel_state_map_.begin();
          it != subchannel_state_map_.end();) {
@@ -753,7 +753,6 @@ absl::Status OutlierDetectionLb::UpdateLocked(UpdateArgs args) {
   update_args.addresses = std::move(args.addresses);
   update_args.resolution_note = std::move(args.resolution_note);
   update_args.config = config_->child_policy();
-  // Update the policy.
   update_args.args = std::move(args.args);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_outlier_detection_lb_trace)) {
     gpr_log(GPR_INFO,
diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
index fe007eeb4305f..e51248faa9caf 100644
--- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
@@ -21,7 +21,6 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <string>
@@ -114,7 +113,7 @@ class PickFirst : public LoadBalancingPolicy {
    public:
     class SubchannelData {
      public:
-      SubchannelData(SubchannelList* subchannel_list,
+      SubchannelData(SubchannelList* subchannel_list, size_t index,
                      RefCountedPtr<SubchannelInterface> subchannel);
 
       SubchannelInterface* subchannel() const { return subchannel_.get(); }
@@ -125,12 +124,6 @@ class PickFirst : public LoadBalancingPolicy {
         return connectivity_status_;
       }
 
-      // Returns the index into the subchannel list of this object.
-      size_t Index() const {
-        return static_cast<size_t>(this -
-                                   &subchannel_list_->subchannels_.front());
-      }
-
       // Resets the connection backoff.
       void ResetBackoffLocked() {
         if (subchannel_ != nullptr) subchannel_->ResetBackoff();
@@ -153,10 +146,8 @@ class PickFirst : public LoadBalancingPolicy {
       class Watcher
           : public SubchannelInterface::ConnectivityStateWatcherInterface {
        public:
-        Watcher(SubchannelData* subchannel_data,
-                RefCountedPtr<SubchannelList> subchannel_list)
-            : subchannel_data_(subchannel_data),
-              subchannel_list_(std::move(subchannel_list)) {}
+        Watcher(RefCountedPtr<SubchannelList> subchannel_list, size_t index)
+            : subchannel_list_(std::move(subchannel_list)), index_(index) {}
 
         ~Watcher() override {
           subchannel_list_.reset(DEBUG_LOCATION, "Watcher dtor");
@@ -164,8 +155,8 @@ class PickFirst : public LoadBalancingPolicy {
 
         void OnConnectivityStateChange(grpc_connectivity_state new_state,
                                        absl::Status status) override {
-          subchannel_data_->OnConnectivityStateChange(new_state,
-                                                      std::move(status));
+          subchannel_list_->subchannels_[index_].OnConnectivityStateChange(
+              new_state, std::move(status));
         }
 
         grpc_pollset_set* interested_parties() override {
@@ -173,8 +164,8 @@ class PickFirst : public LoadBalancingPolicy {
         }
 
        private:
-        SubchannelData* subchannel_data_;
         RefCountedPtr<SubchannelList> subchannel_list_;
+        const size_t index_;
       };
 
       // This method will be invoked once soon after instantiation to report
@@ -193,6 +184,7 @@ class PickFirst : public LoadBalancingPolicy {
 
       // Backpointer to owning subchannel list.  Not owned.
       SubchannelList* subchannel_list_;
+      const size_t index_;
       // The subchannel.
       RefCountedPtr<SubchannelInterface> subchannel_;
       // Will be non-null when the subchannel's state is being watched.
@@ -205,7 +197,8 @@ class PickFirst : public LoadBalancingPolicy {
     };
 
     SubchannelList(RefCountedPtr<PickFirst> policy,
-                   EndpointAddressesList addresses, const ChannelArgs& args);
+                   EndpointAddressesIterator* addresses,
+                   const ChannelArgs& args);
 
     ~SubchannelList() override;
 
@@ -321,6 +314,14 @@ class PickFirst : public LoadBalancingPolicy {
 
   void UnsetSelectedSubchannel();
 
+  // When ExitIdleLocked() is called, we create a subchannel_list_ and start
+  // trying to connect, but we don't actually change state_ until the first
+  // subchannel reports CONNECTING.  So in order to know if we're really
+  // idle, we need to check both state_ and subchannel_list_.
+  bool IsIdle() const {
+    return state_ == GRPC_CHANNEL_IDLE && subchannel_list_ == nullptr;
+  }
+
   // Whether we should enable health watching.
   const bool enable_health_watch_;
   // Whether we should omit our status message prefix.
@@ -388,10 +389,7 @@ void PickFirst::ShutdownLocked() {
 
 void PickFirst::ExitIdleLocked() {
   if (shutdown_) return;
-  // Need to check subchannel_list_ being null here, in case the
-  // application calls channel->GetState(true) again before we
-  // transition to state CONNECTING.
-  if (state_ == GRPC_CHANNEL_IDLE && subchannel_list_ == nullptr) {
+  if (IsIdle()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
       gpr_log(GPR_INFO, "Pick First %p exiting idle", this);
     }
@@ -408,9 +406,9 @@ void PickFirst::ResetBackoffLocked() {
 
 void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() {
   // Create a subchannel list from latest_update_args_.
-  EndpointAddressesList addresses;
+  EndpointAddressesIterator* addresses = nullptr;
   if (latest_update_args_.addresses.ok()) {
-    addresses = *latest_update_args_.addresses;
+    addresses = latest_update_args_.addresses->get();
   }
   // Replace latest_pending_subchannel_list_.
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace) &&
@@ -420,7 +418,7 @@ void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() {
             latest_pending_subchannel_list_.get());
   }
   latest_pending_subchannel_list_ = MakeOrphanable<SubchannelList>(
-      Ref(), std::move(addresses), latest_update_args_.args);
+      Ref(), addresses, latest_update_args_.args);
   // Empty update or no valid subchannels.  Put the channel in
   // TRANSIENT_FAILURE and request re-resolution.
   if (latest_pending_subchannel_list_->size() == 0) {
@@ -478,9 +476,7 @@ class AddressFamilyIterator {
 absl::Status PickFirst::UpdateLocked(UpdateArgs args) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
     if (args.addresses.ok()) {
-      gpr_log(GPR_INFO,
-              "Pick First %p received update with %" PRIuPTR " addresses", this,
-              args.addresses->size());
+      gpr_log(GPR_INFO, "Pick First %p received update", this);
     } else {
       gpr_log(GPR_INFO, "Pick First %p received update with address error: %s",
               this, args.addresses.status().ToString().c_str());
@@ -490,51 +486,59 @@ absl::Status PickFirst::UpdateLocked(UpdateArgs args) {
   absl::Status status;
   if (!args.addresses.ok()) {
     status = args.addresses.status();
-  } else if (args.addresses->empty()) {
-    status = absl::UnavailableError("address list must not be empty");
   } else {
-    // Shuffle the list if needed.
-    auto config = static_cast<PickFirstConfig*>(args.config.get());
-    if (config->shuffle_addresses()) {
-      absl::c_shuffle(*args.addresses, bit_gen_);
-    }
-    // Flatten the list so that we have one address per endpoint.
-    // While we're iterating, also determine the desired address family
-    // order and the index of the first element of each family, for use in
-    // the interleaving below.
-    std::set<absl::string_view> address_families;
-    std::vector<AddressFamilyIterator> address_family_order;
     EndpointAddressesList endpoints;
-    for (const auto& endpoint : *args.addresses) {
-      for (const auto& address : endpoint.addresses()) {
-        endpoints.emplace_back(address, endpoint.args());
-        if (IsPickFirstHappyEyeballsEnabled()) {
-          absl::string_view scheme = GetAddressFamily(address);
-          bool inserted = address_families.insert(scheme).second;
-          if (inserted) {
-            address_family_order.emplace_back(scheme, endpoints.size() - 1);
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      endpoints.push_back(endpoint);
+    });
+    if (endpoints.empty()) {
+      status = absl::UnavailableError("address list must not be empty");
+    } else {
+      // Shuffle the list if needed.
+      auto config = static_cast<PickFirstConfig*>(args.config.get());
+      if (config->shuffle_addresses()) {
+        absl::c_shuffle(endpoints, bit_gen_);
+      }
+      // Flatten the list so that we have one address per endpoint.
+      // While we're iterating, also determine the desired address family
+      // order and the index of the first element of each family, for use in
+      // the interleaving below.
+      std::set<absl::string_view> address_families;
+      std::vector<AddressFamilyIterator> address_family_order;
+      EndpointAddressesList flattened_endpoints;
+      for (const auto& endpoint : endpoints) {
+        for (const auto& address : endpoint.addresses()) {
+          flattened_endpoints.emplace_back(address, endpoint.args());
+          if (IsPickFirstHappyEyeballsEnabled()) {
+            absl::string_view scheme = GetAddressFamily(address);
+            bool inserted = address_families.insert(scheme).second;
+            if (inserted) {
+              address_family_order.emplace_back(scheme,
+                                                flattened_endpoints.size() - 1);
+            }
           }
         }
       }
-    }
-    // Interleave addresses as per RFC-8305 section 4.
-    if (IsPickFirstHappyEyeballsEnabled()) {
-      EndpointAddressesList interleaved_endpoints;
-      interleaved_endpoints.reserve(endpoints.size());
-      std::vector<bool> endpoints_moved(endpoints.size());
-      size_t scheme_index = 0;
-      for (size_t i = 0; i < endpoints.size(); ++i) {
-        EndpointAddresses* endpoint;
-        do {
-          auto& iterator = address_family_order[scheme_index++ %
-                                                address_family_order.size()];
-          endpoint = iterator.Next(endpoints, &endpoints_moved);
-        } while (endpoint == nullptr);
-        interleaved_endpoints.emplace_back(std::move(*endpoint));
+      endpoints = std::move(flattened_endpoints);
+      // Interleave addresses as per RFC-8305 section 4.
+      if (IsPickFirstHappyEyeballsEnabled()) {
+        EndpointAddressesList interleaved_endpoints;
+        interleaved_endpoints.reserve(endpoints.size());
+        std::vector<bool> endpoints_moved(endpoints.size());
+        size_t scheme_index = 0;
+        for (size_t i = 0; i < endpoints.size(); ++i) {
+          EndpointAddresses* endpoint;
+          do {
+            auto& iterator = address_family_order[scheme_index++ %
+                                                  address_family_order.size()];
+            endpoint = iterator.Next(endpoints, &endpoints_moved);
+          } while (endpoint == nullptr);
+          interleaved_endpoints.emplace_back(std::move(*endpoint));
+        }
+        endpoints = std::move(interleaved_endpoints);
       }
-      args.addresses = std::move(interleaved_endpoints);
-    } else {
-      args.addresses = std::move(endpoints);
+      args.addresses =
+          std::make_shared<EndpointAddressesListIterator>(std::move(endpoints));
     }
   }
   // If the update contains a resolver error and we have a previous update
@@ -546,7 +550,7 @@ absl::Status PickFirst::UpdateLocked(UpdateArgs args) {
   latest_update_args_ = std::move(args);
   // If we are not in idle, start connection attempt immediately.
   // Otherwise, we defer the attempt into ExitIdleLocked().
-  if (state_ != GRPC_CHANNEL_IDLE) {
+  if (!IsIdle()) {
     AttemptToConnectUsingLatestUpdateArgsLocked();
   }
   return status;
@@ -612,18 +616,20 @@ void PickFirst::HealthWatcher::OnConnectivityStateChange(
 //
 
 PickFirst::SubchannelList::SubchannelData::SubchannelData(
-    SubchannelList* subchannel_list,
+    SubchannelList* subchannel_list, size_t index,
     RefCountedPtr<SubchannelInterface> subchannel)
-    : subchannel_list_(subchannel_list), subchannel_(std::move(subchannel)) {
+    : subchannel_list_(subchannel_list),
+      index_(index),
+      subchannel_(std::move(subchannel)) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
     gpr_log(GPR_INFO,
             "[PF %p] subchannel list %p index %" PRIuPTR
             " (subchannel %p): starting watch",
-            subchannel_list_->policy_.get(), subchannel_list_,
-            subchannel_list_->size(), subchannel_.get());
+            subchannel_list_->policy_.get(), subchannel_list_, index_,
+            subchannel_.get());
   }
   auto watcher = std::make_unique<Watcher>(
-      this, subchannel_list_->Ref(DEBUG_LOCATION, "Watcher"));
+      subchannel_list_->Ref(DEBUG_LOCATION, "Watcher"), index_);
   pending_watcher_ = watcher.get();
   subchannel_->WatchConnectivityState(std::move(watcher));
 }
@@ -634,7 +640,7 @@ void PickFirst::SubchannelList::SubchannelData::ShutdownLocked() {
       gpr_log(GPR_INFO,
               "[PF %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR
               " (subchannel %p): cancelling watch and unreffing subchannel",
-              subchannel_list_->policy_.get(), subchannel_list_, Index(),
+              subchannel_list_->policy_.get(), subchannel_list_, index_,
               subchannel_list_->size(), subchannel_.get());
     }
     subchannel_->CancelConnectivityStateWatch(pending_watcher_);
@@ -654,7 +660,7 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
         "status=%s, shutting_down=%d, pending_watcher=%p, "
         "seen_transient_failure=%d, p->selected_=%p, "
         "p->subchannel_list_=%p, p->latest_pending_subchannel_list_=%p",
-        p, subchannel_list_, Index(), subchannel_list_->size(),
+        p, subchannel_list_, index_, subchannel_list_->size(),
         subchannel_.get(),
         (connectivity_state_.has_value()
              ? ConnectivityStateName(*connectivity_state_)
@@ -766,7 +772,7 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
   if (!IsPickFirstHappyEyeballsEnabled()) {
     // Ignore any other updates for subchannels we're not currently trying to
     // connect to.
-    if (Index() != subchannel_list_->attempting_index_) return;
+    if (index_ != subchannel_list_->attempting_index_) return;
     // React to the connectivity state.
     ReactToConnectivityStateLocked();
     return;
@@ -779,7 +785,7 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
       if (!prev_seen_transient_failure && seen_transient_failure_) {
         // If a connection attempt fails before the timer fires, then
         // cancel the timer and start connecting on the next subchannel.
-        if (Index() == subchannel_list_->attempting_index_) {
+        if (index_ == subchannel_list_->attempting_index_) {
           if (subchannel_list_->timer_handle_.has_value()) {
             p->channel_control_helper()->GetEventEngine()->Cancel(
                 *subchannel_list_->timer_handle_);
@@ -853,7 +859,7 @@ void PickFirst::SubchannelList::SubchannelData::
       // We skip subchannels in state TRANSIENT_FAILURE to avoid a
       // large recursion that could overflow the stack.
       SubchannelData* found_subchannel = nullptr;
-      for (size_t next_index = Index() + 1;
+      for (size_t next_index = index_ + 1;
            next_index < subchannel_list_->size(); ++next_index) {
         SubchannelData* sc = &subchannel_list_->subchannels_[next_index];
         GPR_ASSERT(sc->connectivity_state_.has_value());
@@ -941,14 +947,14 @@ void PickFirst::SubchannelList::SubchannelData::RequestConnectionWithTimer() {
     GPR_ASSERT(connectivity_state_ == GRPC_CHANNEL_CONNECTING);
   }
   // If this is not the last subchannel in the list, start the timer.
-  if (Index() != subchannel_list_->size() - 1) {
+  if (index_ != subchannel_list_->size() - 1) {
     PickFirst* p = subchannel_list_->policy_.get();
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
       gpr_log(GPR_INFO,
               "Pick First %p subchannel list %p: starting Connection "
               "Attempt Delay timer for %" PRId64 "ms for index %" PRIuPTR,
               p, subchannel_list_, p->connection_attempt_delay_.millis(),
-              Index());
+              index_);
     }
     subchannel_list_->timer_handle_ =
         p->channel_control_helper()->GetEventEngine()->RunAfter(
@@ -1036,7 +1042,7 @@ void PickFirst::SubchannelList::SubchannelData::ProcessUnselectedReadyLocked() {
   }
   // Unref all other subchannels in the list.
   for (size_t i = 0; i < subchannel_list_->size(); ++i) {
-    if (i != Index()) {
+    if (i != index_) {
       subchannel_list_->subchannels_[i].ShutdownLocked();
     }
   }
@@ -1047,7 +1053,7 @@ void PickFirst::SubchannelList::SubchannelData::ProcessUnselectedReadyLocked() {
 //
 
 PickFirst::SubchannelList::SubchannelList(RefCountedPtr<PickFirst> policy,
-                                          EndpointAddressesList addresses,
+                                          EndpointAddressesIterator* addresses,
                                           const ChannelArgs& args)
     : InternallyRefCounted<SubchannelList>(
           GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace) ? "SubchannelList"
@@ -1057,14 +1063,12 @@ PickFirst::SubchannelList::SubchannelList(RefCountedPtr<PickFirst> policy,
                 .Remove(
                     GRPC_ARG_INTERNAL_PICK_FIRST_OMIT_STATUS_MESSAGE_PREFIX)) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
-    gpr_log(GPR_INFO,
-            "[PF %p] Creating subchannel list %p for %" PRIuPTR
-            " subchannels - channel args: %s",
-            policy_.get(), this, addresses.size(), args_.ToString().c_str());
+    gpr_log(GPR_INFO, "[PF %p] Creating subchannel list %p - channel args: %s",
+            policy_.get(), this, args_.ToString().c_str());
   }
-  subchannels_.reserve(addresses.size());
+  if (addresses == nullptr) return;
   // Create a subchannel for each address.
-  for (const EndpointAddresses& address : addresses) {
+  addresses->ForEach([&](const EndpointAddresses& address) {
     GPR_ASSERT(address.addresses().size() == 1);
     RefCountedPtr<SubchannelInterface> subchannel =
         policy_->channel_control_helper()->CreateSubchannel(
@@ -1076,7 +1080,7 @@ PickFirst::SubchannelList::SubchannelList(RefCountedPtr<PickFirst> policy,
                 "[PF %p] could not create subchannel for address %s, ignoring",
                 policy_.get(), address.ToString().c_str());
       }
-      continue;
+      return;
     }
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_pick_first_trace)) {
       gpr_log(GPR_INFO,
@@ -1085,8 +1089,8 @@ PickFirst::SubchannelList::SubchannelList(RefCountedPtr<PickFirst> policy,
               policy_.get(), this, subchannels_.size(), subchannel.get(),
               address.ToString().c_str());
     }
-    subchannels_.emplace_back(this, std::move(subchannel));
-  }
+    subchannels_.emplace_back(this, subchannels_.size(), std::move(subchannel));
+  });
 }
 
 PickFirst::SubchannelList::~SubchannelList() {
diff --git a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
index e1e21072bc066..cdfe6adceafd2 100644
--- a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
@@ -684,7 +684,8 @@ absl::Status PriorityLb::ChildPriority::UpdateLocked(
   if (priority_policy_->addresses_.ok()) {
     auto it = priority_policy_->addresses_->find(name_);
     if (it == priority_policy_->addresses_->end()) {
-      update_args.addresses.emplace();
+      update_args.addresses = std::make_shared<EndpointAddressesListIterator>(
+          EndpointAddressesList());
     } else {
       update_args.addresses = it->second;
     }
diff --git a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc
index 5881f168c8630..c1c52c7de5f4a 100644
--- a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc
@@ -554,7 +554,8 @@ void RingHash::RingHashEndpoint::UpdateChildPolicyLocked() {
   GPR_ASSERT(config.ok());
   // Update child policy.
   LoadBalancingPolicy::UpdateArgs update_args;
-  update_args.addresses.emplace().emplace_back(ring_hash_->endpoints_[index_]);
+  update_args.addresses =
+      std::make_shared<SingleEndpointIterator>(ring_hash_->endpoints_[index_]);
   update_args.args = ring_hash_->args_;
   update_args.config = std::move(*config);
   // TODO(roth): If the child reports a non-OK status with the update,
@@ -622,18 +623,14 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
   // Check address list.
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
-      gpr_log(GPR_INFO, "[RH %p] received update with %" PRIuPTR " addresses",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[RH %p] received update", this);
     }
     // De-dup endpoints, taking weight into account.
     endpoints_.clear();
-    endpoints_.reserve(args.addresses->size());
     std::map<EndpointAddressSet, size_t> endpoint_indices;
-    size_t num_skipped = 0;
-    for (size_t i = 0; i < args.addresses->size(); ++i) {
-      EndpointAddresses& endpoint = (*args.addresses)[i];
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
       const EndpointAddressSet key(endpoint.addresses());
-      auto p = endpoint_indices.emplace(key, i - num_skipped);
+      auto p = endpoint_indices.emplace(key, endpoints_.size());
       if (!p.second) {
         // Duplicate endpoint.  Combine weights and skip the dup.
         EndpointAddresses& prev_endpoint = endpoints_[p.first->second];
@@ -651,11 +648,10 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
             prev_endpoint.addresses(),
             prev_endpoint.args().Set(GRPC_ARG_ADDRESS_WEIGHT,
                                      weight_arg + prev_weight_arg));
-        ++num_skipped;
       } else {
-        endpoints_.push_back(std::move(endpoint));
+        endpoints_.push_back(endpoint);
       }
-    }
+    });
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_ring_hash_trace)) {
       gpr_log(GPR_INFO, "[RH %p] received update with addresses error: %s",
diff --git a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
index f51ef89a0bedb..1521fafcfc4f4 100644
--- a/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc
@@ -707,7 +707,7 @@ class RlsLb : public LoadBalancingPolicy {
   OrphanablePtr<RlsChannel> rls_channel_ ABSL_GUARDED_BY(mu_);
 
   // Accessed only from within WorkSerializer.
-  absl::StatusOr<EndpointAddressesList> addresses_;
+  absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses_;
   ChannelArgs channel_args_;
   RefCountedPtr<RlsLbConfig> config_;
   RefCountedPtr<ChildPolicyWrapper> default_child_policy_;
@@ -1858,6 +1858,27 @@ RlsLb::RlsLb(Args args) : LoadBalancingPolicy(std::move(args)), cache_(this) {
   }
 }
 
+bool EndpointsEqual(
+    const absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> endpoints1,
+    const absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>>
+        endpoints2) {
+  if (endpoints1.status() != endpoints2.status()) return false;
+  if (endpoints1.ok()) {
+    std::vector<EndpointAddresses> e1_list;
+    (*endpoints1)->ForEach([&](const EndpointAddresses& endpoint) {
+      e1_list.push_back(endpoint);
+    });
+    size_t i = 0;
+    bool different = false;
+    (*endpoints2)->ForEach([&](const EndpointAddresses& endpoint) {
+      if (endpoint != e1_list[i++]) different = true;
+    });
+    if (different) return false;
+    if (i != e1_list.size()) return false;
+  }
+  return true;
+}
+
 absl::Status RlsLb::UpdateLocked(UpdateArgs args) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_rls_trace)) {
     gpr_log(GPR_INFO, "[rlslb %p] policy updated", this);
@@ -1875,7 +1896,7 @@ absl::Status RlsLb::UpdateLocked(UpdateArgs args) {
   // Swap out addresses.
   // If the new address list is an error and we have an existing address list,
   // stick with the existing addresses.
-  absl::StatusOr<EndpointAddressesList> old_addresses;
+  absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> old_addresses;
   if (args.addresses.ok()) {
     old_addresses = std::move(addresses_);
     addresses_ = std::move(args.addresses);
@@ -1888,7 +1909,7 @@ absl::Status RlsLb::UpdateLocked(UpdateArgs args) {
   bool update_child_policies =
       old_config == nullptr ||
       old_config->child_policy_config() != config_->child_policy_config() ||
-      old_addresses != addresses_ || args.args != channel_args_;
+      !EndpointsEqual(old_addresses, addresses_) || args.args != channel_args_;
   // If default target changes, swap out child policy.
   bool created_default_child = false;
   if (old_config == nullptr ||
diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
index 51e89c8e5b377..1c893fb1dcbda 100644
--- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
@@ -125,14 +125,14 @@ class OldRoundRobin : public LoadBalancingPolicy {
       : public SubchannelList<RoundRobinSubchannelList,
                               RoundRobinSubchannelData> {
    public:
-    RoundRobinSubchannelList(OldRoundRobin* policy, ServerAddressList addresses,
+    RoundRobinSubchannelList(OldRoundRobin* policy,
+                             EndpointAddressesIterator* addresses,
                              const ChannelArgs& args)
         : SubchannelList(policy,
                          (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)
                               ? "RoundRobinSubchannelList"
                               : nullptr),
-                         std::move(addresses), policy->channel_control_helper(),
-                         args) {
+                         addresses, policy->channel_control_helper(), args) {
       // Need to maintain a ref to the LB policy as long as we maintain
       // any references to subchannels, since the subchannels'
       // pollset_sets will include the LB policy's pollset_set.
@@ -277,13 +277,12 @@ void OldRoundRobin::ResetBackoffLocked() {
 }
 
 absl::Status OldRoundRobin::UpdateLocked(UpdateArgs args) {
-  ServerAddressList addresses;
+  EndpointAddressesIterator* addresses = nullptr;
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) {
-      gpr_log(GPR_INFO, "[RR %p] received update with %" PRIuPTR " addresses",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[RR %p] received update", this);
     }
-    addresses = std::move(*args.addresses);
+    addresses = args.addresses->get();
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) {
       gpr_log(GPR_INFO, "[RR %p] received update with address error: %s", this,
@@ -299,8 +298,8 @@ absl::Status OldRoundRobin::UpdateLocked(UpdateArgs args) {
     gpr_log(GPR_INFO, "[RR %p] replacing previous pending subchannel list %p",
             this, latest_pending_subchannel_list_.get());
   }
-  latest_pending_subchannel_list_ = MakeRefCounted<RoundRobinSubchannelList>(
-      this, std::move(addresses), args.args);
+  latest_pending_subchannel_list_ =
+      MakeRefCounted<RoundRobinSubchannelList>(this, addresses, args.args);
   latest_pending_subchannel_list_->StartWatchingLocked(args.args);
   // If the new list is empty, immediately promote it to
   // subchannel_list_ and report TRANSIENT_FAILURE.
@@ -524,7 +523,7 @@ class RoundRobin : public LoadBalancingPolicy {
   class RoundRobinEndpointList : public EndpointList {
    public:
     RoundRobinEndpointList(RefCountedPtr<RoundRobin> round_robin,
-                           const EndpointAddressesList& endpoints,
+                           EndpointAddressesIterator* endpoints,
                            const ChannelArgs& args)
         : EndpointList(std::move(round_robin),
                        GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)
@@ -687,13 +686,12 @@ void RoundRobin::ResetBackoffLocked() {
 }
 
 absl::Status RoundRobin::UpdateLocked(UpdateArgs args) {
-  EndpointAddressesList addresses;
+  EndpointAddressesIterator* addresses = nullptr;
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) {
-      gpr_log(GPR_INFO, "[RR %p] received update with %" PRIuPTR " endpoints",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[RR %p] received update", this);
     }
-    addresses = std::move(*args.addresses);
+    addresses = args.addresses->get();
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_round_robin_trace)) {
       gpr_log(GPR_INFO, "[RR %p] received update with address error: %s", this,
@@ -710,8 +708,7 @@ absl::Status RoundRobin::UpdateLocked(UpdateArgs args) {
             latest_pending_endpoint_list_.get());
   }
   latest_pending_endpoint_list_ = MakeOrphanable<RoundRobinEndpointList>(
-      Ref(DEBUG_LOCATION, "RoundRobinEndpointList"), std::move(addresses),
-      args.args);
+      Ref(DEBUG_LOCATION, "RoundRobinEndpointList"), addresses, args.args);
   // If the new list is empty, immediately promote it to
   // endpoint_list_ and report TRANSIENT_FAILURE.
   if (latest_pending_endpoint_list_->size() == 0) {
diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
index cb52ad92daaa4..b5076a9f492bd 100644
--- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
+++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
@@ -42,6 +42,7 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/load_balancing/subchannel_interface.h"
+#include "src/core/lib/resolver/endpoint_addresses.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/transport/connectivity_state.h"
 
@@ -208,7 +209,7 @@ class SubchannelList : public DualRefCounted<SubchannelListType> {
 
  protected:
   SubchannelList(LoadBalancingPolicy* policy, const char* tracer,
-                 ServerAddressList addresses,
+                 EndpointAddressesIterator* addresses,
                  LoadBalancingPolicy::ChannelControlHelper* helper,
                  const ChannelArgs& args);
 
@@ -365,19 +366,18 @@ void SubchannelData<SubchannelListType, SubchannelDataType>::ShutdownLocked() {
 template <typename SubchannelListType, typename SubchannelDataType>
 SubchannelList<SubchannelListType, SubchannelDataType>::SubchannelList(
     LoadBalancingPolicy* policy, const char* tracer,
-    ServerAddressList addresses,
+    EndpointAddressesIterator* addresses,
     LoadBalancingPolicy::ChannelControlHelper* helper, const ChannelArgs& args)
     : DualRefCounted<SubchannelListType>(tracer),
       policy_(policy),
       tracer_(tracer) {
   if (GPR_UNLIKELY(tracer_ != nullptr)) {
-    gpr_log(GPR_INFO,
-            "[%s %p] Creating subchannel list %p for %" PRIuPTR " subchannels",
-            tracer_, policy, this, addresses.size());
+    gpr_log(GPR_INFO, "[%s %p] Creating subchannel list %p", tracer_, policy,
+            this);
   }
-  subchannels_.reserve(addresses.size());
+  if (addresses == nullptr) return;
   // Create a subchannel for each address.
-  for (ServerAddress address : addresses) {
+  addresses->ForEach([&](const EndpointAddresses& address) {
     RefCountedPtr<SubchannelInterface> subchannel =
         helper->CreateSubchannel(address.address(), address.args(), args);
     if (subchannel == nullptr) {
@@ -387,7 +387,7 @@ SubchannelList<SubchannelListType, SubchannelDataType>::SubchannelList(
                 "[%s %p] could not create subchannel for address %s, ignoring",
                 tracer_, policy_, address.ToString().c_str());
       }
-      continue;
+      return;
     }
     if (GPR_UNLIKELY(tracer_ != nullptr)) {
       gpr_log(GPR_INFO,
@@ -397,8 +397,8 @@ SubchannelList<SubchannelListType, SubchannelDataType>::SubchannelList(
               address.ToString().c_str());
     }
     subchannels_.emplace_back();
-    subchannels_.back().Init(this, std::move(address), std::move(subchannel));
-  }
+    subchannels_.back().Init(this, address, std::move(subchannel));
+  });
 }
 
 template <typename SubchannelListType, typename SubchannelDataType>
diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc
index 102cd6aa7cf37..aa2c6f5bb66b5 100644
--- a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc
@@ -247,14 +247,13 @@ class OldWeightedRoundRobin : public LoadBalancingPolicy {
                               WeightedRoundRobinSubchannelData> {
    public:
     WeightedRoundRobinSubchannelList(OldWeightedRoundRobin* policy,
-                                     ServerAddressList addresses,
+                                     EndpointAddressesIterator* addresses,
                                      const ChannelArgs& args)
         : SubchannelList(policy,
                          (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)
                               ? "WeightedRoundRobinSubchannelList"
                               : nullptr),
-                         std::move(addresses), policy->channel_control_helper(),
-                         args) {
+                         addresses, policy->channel_control_helper(), args) {
       // Need to maintain a ref to the LB policy as long as we maintain
       // any references to subchannels, since the subchannels'
       // pollset_sets will include the LB policy's pollset_set.
@@ -675,11 +674,10 @@ void OldWeightedRoundRobin::ResetBackoffLocked() {
 absl::Status OldWeightedRoundRobin::UpdateLocked(UpdateArgs args) {
   global_stats().IncrementWrrUpdates();
   config_ = std::move(args.config);
-  ServerAddressList addresses;
+  std::shared_ptr<EndpointAddressesIterator> addresses;
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
-      gpr_log(GPR_INFO, "[WRR %p] received update with %" PRIuPTR " addresses",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[WRR %p] received update", this);
     }
     // Weed out duplicate addresses.  Also sort the addresses so that if
     // the set of the addresses don't change, their indexes in the
@@ -698,10 +696,12 @@ absl::Status OldWeightedRoundRobin::UpdateLocked(UpdateArgs args) {
         return memcmp(addr1.addr, addr2.addr, addr1.len) < 0;
       }
     };
-    std::set<ServerAddress, AddressLessThan> ordered_addresses(
-        args.addresses->begin(), args.addresses->end());
-    addresses =
-        ServerAddressList(ordered_addresses.begin(), ordered_addresses.end());
+    std::set<ServerAddress, AddressLessThan> ordered_addresses;
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      ordered_addresses.insert(endpoint);
+    });
+    addresses = std::make_shared<EndpointAddressesListIterator>(
+        ServerAddressList(ordered_addresses.begin(), ordered_addresses.end()));
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
       gpr_log(GPR_INFO, "[WRR %p] received update with address error: %s", this,
@@ -718,8 +718,8 @@ absl::Status OldWeightedRoundRobin::UpdateLocked(UpdateArgs args) {
             this, latest_pending_subchannel_list_.get());
   }
   latest_pending_subchannel_list_ =
-      MakeRefCounted<WeightedRoundRobinSubchannelList>(
-          this, std::move(addresses), args.args);
+      MakeRefCounted<WeightedRoundRobinSubchannelList>(this, addresses.get(),
+                                                       args.args);
   latest_pending_subchannel_list_->StartWatchingLocked(args.args);
   // If the new list is empty, immediately promote it to
   // subchannel_list_ and report TRANSIENT_FAILURE.
@@ -1079,7 +1079,7 @@ class WeightedRoundRobin : public LoadBalancingPolicy {
     };
 
     WrrEndpointList(RefCountedPtr<WeightedRoundRobin> wrr,
-                    const EndpointAddressesList& endpoints,
+                    EndpointAddressesIterator* endpoints,
                     const ChannelArgs& args)
         : EndpointList(std::move(wrr),
                        GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)
@@ -1516,11 +1516,10 @@ void WeightedRoundRobin::ResetBackoffLocked() {
 absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
   global_stats().IncrementWrrUpdates();
   config_ = std::move(args.config);
-  EndpointAddressesList addresses;
+  std::shared_ptr<EndpointAddressesIterator> addresses;
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
-      gpr_log(GPR_INFO, "[WRR %p] received update with %" PRIuPTR " addresses",
-              this, args.addresses->size());
+      gpr_log(GPR_INFO, "[WRR %p] received update", this);
     }
     // Weed out duplicate endpoints.  Also sort the endpoints so that if
     // the set of endpoints doesn't change, their indexes in the endpoint
@@ -1539,10 +1538,13 @@ absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
         return e1 < e2;
       }
     };
-    std::set<EndpointAddresses, EndpointAddressesLessThan> ordered_addresses(
-        args.addresses->begin(), args.addresses->end());
-    addresses = EndpointAddressesList(ordered_addresses.begin(),
-                                      ordered_addresses.end());
+    std::set<EndpointAddresses, EndpointAddressesLessThan> ordered_addresses;
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      ordered_addresses.insert(endpoint);
+    });
+    addresses =
+        std::make_shared<EndpointAddressesListIterator>(EndpointAddressesList(
+            ordered_addresses.begin(), ordered_addresses.end()));
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_wrr_trace)) {
       gpr_log(GPR_INFO, "[WRR %p] received update with address error: %s", this,
@@ -1559,7 +1561,7 @@ absl::Status WeightedRoundRobin::UpdateLocked(UpdateArgs args) {
             this, latest_pending_endpoint_list_.get());
   }
   latest_pending_endpoint_list_ =
-      MakeOrphanable<WrrEndpointList>(Ref(), std::move(addresses), args.args);
+      MakeOrphanable<WrrEndpointList>(Ref(), addresses.get(), args.args);
   // If the new list is empty, immediately promote it to
   // endpoint_list_ and report TRANSIENT_FAILURE.
   if (latest_pending_endpoint_list_->size() == 0) {
diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
index eecd112445ab0..0639ce9b0946a 100644
--- a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
@@ -157,10 +157,10 @@ class WeightedTargetLb : public LoadBalancingPolicy {
 
     void Orphan() override;
 
-    absl::Status UpdateLocked(const WeightedTargetLbConfig::ChildConfig& config,
-                              absl::StatusOr<EndpointAddressesList> addresses,
-                              const std::string& resolution_note,
-                              const ChannelArgs& args);
+    absl::Status UpdateLocked(
+        const WeightedTargetLbConfig::ChildConfig& config,
+        absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
+        const std::string& resolution_note, const ChannelArgs& args);
     void ResetBackoffLocked();
     void DeactivateLocked();
 
@@ -338,11 +338,12 @@ absl::Status WeightedTargetLb::UpdateLocked(UpdateArgs args) {
       target = MakeOrphanable<WeightedChild>(
           Ref(DEBUG_LOCATION, "WeightedChild"), name);
     }
-    absl::StatusOr<EndpointAddressesList> addresses;
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses;
     if (address_map.ok()) {
       auto it = address_map->find(name);
       if (it == address_map->end()) {
-        addresses.emplace();
+        addresses = std::make_shared<EndpointAddressesListIterator>(
+            EndpointAddressesList());
       } else {
         addresses = std::move(it->second);
       }
@@ -589,7 +590,7 @@ WeightedTargetLb::WeightedChild::CreateChildPolicyLocked(
 
 absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
     const WeightedTargetLbConfig::ChildConfig& config,
-    absl::StatusOr<EndpointAddressesList> addresses,
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
     const std::string& resolution_note, const ChannelArgs& args) {
   if (weighted_target_policy_->shutting_down_) return absl::OkStatus();
   // Update child weight.
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
index f1278b98ae420..ea42f22e7c078 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
@@ -199,8 +199,21 @@ class CdsLb : public LoadBalancingPolicy {
   // The root of the tree is config_->cluster().
   std::map<std::string, WatcherState> watchers_;
 
+  // TODO(roth, yashkt): These are here because XdsCertificateProvider
+  // does not store the actual underlying cert providers, it stores only
+  // their distributors, so we need to hold a ref to the cert providers
+  // here.  However, in the aggregate cluster case, there may be multiple
+  // clusters in the same cert provider, and we're only tracking the cert
+  // providers for the most recent underlying cluster here.  This is
+  // clearly a bug, and I think it will cause us to stop getting updates
+  // for all but one of the cert providers in the aggregate cluster
+  // case.  Need to figure out the right way to fix this -- I don't
+  // think we want to store another map here, so ideally, we should just
+  // have XdsCertificateProvider actually hold the refs to the cert
+  // providers instead of just the distributors.
   RefCountedPtr<grpc_tls_certificate_provider> root_certificate_provider_;
   RefCountedPtr<grpc_tls_certificate_provider> identity_certificate_provider_;
+
   RefCountedPtr<XdsCertificateProvider> xds_certificate_provider_;
 
   // Child LB policy.
@@ -594,20 +607,7 @@ absl::Status CdsLb::UpdateXdsCertificateProvider(
                        root_provider_instance_name, "\" not recognized."));
     }
   }
-  if (root_certificate_provider_ != new_root_provider) {
-    if (root_certificate_provider_ != nullptr &&
-        root_certificate_provider_->interested_parties() != nullptr) {
-      grpc_pollset_set_del_pollset_set(
-          interested_parties(),
-          root_certificate_provider_->interested_parties());
-    }
-    if (new_root_provider != nullptr &&
-        new_root_provider->interested_parties() != nullptr) {
-      grpc_pollset_set_add_pollset_set(interested_parties(),
-                                       new_root_provider->interested_parties());
-    }
-    root_certificate_provider_ = std::move(new_root_provider);
-  }
+  root_certificate_provider_ = std::move(new_root_provider);
   xds_certificate_provider_->UpdateRootCertNameAndDistributor(
       cluster_name, root_provider_cert_name,
       root_certificate_provider_ == nullptr
@@ -631,20 +631,7 @@ absl::Status CdsLb::UpdateXdsCertificateProvider(
                        identity_provider_instance_name, "\" not recognized."));
     }
   }
-  if (identity_certificate_provider_ != new_identity_provider) {
-    if (identity_certificate_provider_ != nullptr &&
-        identity_certificate_provider_->interested_parties() != nullptr) {
-      grpc_pollset_set_del_pollset_set(
-          interested_parties(),
-          identity_certificate_provider_->interested_parties());
-    }
-    if (new_identity_provider != nullptr &&
-        new_identity_provider->interested_parties() != nullptr) {
-      grpc_pollset_set_add_pollset_set(
-          interested_parties(), new_identity_provider->interested_parties());
-    }
-    identity_certificate_provider_ = std::move(new_identity_provider);
-  }
+  identity_certificate_provider_ = std::move(new_identity_provider);
   xds_certificate_provider_->UpdateIdentityCertNameAndDistributor(
       cluster_name, identity_provider_cert_name,
       identity_certificate_provider_ == nullptr
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc
index 50740151c9d93..8548de565d643 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc
@@ -250,7 +250,7 @@ class XdsClusterImplLb : public LoadBalancingPolicy {
   OrphanablePtr<LoadBalancingPolicy> CreateChildPolicyLocked(
       const ChannelArgs& args);
   absl::Status UpdateChildPolicyLocked(
-      absl::StatusOr<EndpointAddressesList> addresses,
+      absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
       std::string resolution_note, const ChannelArgs& args);
 
   void MaybeUpdatePickerLocked();
@@ -569,7 +569,7 @@ OrphanablePtr<LoadBalancingPolicy> XdsClusterImplLb::CreateChildPolicyLocked(
 }
 
 absl::Status XdsClusterImplLb::UpdateChildPolicyLocked(
-    absl::StatusOr<EndpointAddressesList> addresses,
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
     std::string resolution_note, const ChannelArgs& args) {
   // Create policy if needed.
   if (child_policy_ == nullptr) {
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc
index 4f6e8611b5a08..e613b3eb0d221 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc
@@ -149,7 +149,8 @@ class XdsClusterManagerLb : public LoadBalancingPolicy {
 
     absl::Status UpdateLocked(
         RefCountedPtr<LoadBalancingPolicy::Config> config,
-        const absl::StatusOr<EndpointAddressesList>& addresses,
+        const absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>>&
+            addresses,
         const ChannelArgs& args);
     void ExitIdleLocked();
     void ResetBackoffLocked();
@@ -482,7 +483,7 @@ XdsClusterManagerLb::ClusterChild::CreateChildPolicyLocked(
 
 absl::Status XdsClusterManagerLb::ClusterChild::UpdateLocked(
     RefCountedPtr<LoadBalancingPolicy::Config> config,
-    const absl::StatusOr<EndpointAddressesList>& addresses,
+    const absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>>& addresses,
     const ChannelArgs& args) {
   if (xds_cluster_manager_policy_->shutting_down_) return absl::OkStatus();
   // Update child weight.
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc
index 42f8673e724a2..6a58213347a1d 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc
@@ -28,6 +28,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -61,6 +62,7 @@
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/pollset_set.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
@@ -390,7 +392,7 @@ class XdsClusterResolverLb : public LoadBalancingPolicy {
   absl::Status UpdateChildPolicyLocked();
   OrphanablePtr<LoadBalancingPolicy> CreateChildPolicyLocked(
       const ChannelArgs& args);
-  EndpointAddressesList CreateChildPolicyAddressesLocked();
+  std::shared_ptr<EndpointAddressesIterator> CreateChildPolicyAddressesLocked();
   std::string CreateChildPolicyResolutionNoteLocked();
   RefCountedPtr<Config> CreateChildPolicyConfigLocked();
   ChannelArgs CreateChildPolicyArgsLocked(const ChannelArgs& args_in);
@@ -529,10 +531,16 @@ XdsClusterResolverLb::DiscoveryMechanismEntry::config() const {
       ->config_->discovery_mechanisms()[discovery_mechanism->index()];
 }
 
+std::string MakeChildPolicyName(absl::string_view cluster_name,
+                                size_t child_number) {
+  return absl::StrCat("{cluster=", cluster_name,
+                      ", child_number=", child_number, "}");
+}
+
 std::string XdsClusterResolverLb::DiscoveryMechanismEntry::GetChildPolicyName(
     size_t priority) const {
-  return absl::StrCat("{cluster=", config().cluster_name,
-                      ", child_number=", priority_child_numbers[priority], "}");
+  return MakeChildPolicyName(config().cluster_name,
+                             priority_child_numbers[priority]);
 }
 
 //
@@ -768,39 +776,76 @@ void XdsClusterResolverLb::OnResourceDoesNotExist(size_t index,
 // child policy-related methods
 //
 
-EndpointAddressesList XdsClusterResolverLb::CreateChildPolicyAddressesLocked() {
-  EndpointAddressesList addresses;
-  for (const auto& discovery_entry : discovery_mechanisms_) {
-    const auto& priority_list =
-        GetUpdatePriorityList(*discovery_entry.latest_update);
-    for (size_t priority = 0; priority < priority_list.size(); ++priority) {
-      const auto& priority_entry = priority_list[priority];
-      std::string priority_child_name =
-          discovery_entry.GetChildPolicyName(priority);
-      for (const auto& p : priority_entry.localities) {
-        const auto& locality_name = p.first;
-        const auto& locality = p.second;
-        std::vector<RefCountedStringValue> hierarchical_path = {
-            RefCountedStringValue(priority_child_name),
-            RefCountedStringValue(locality_name->AsHumanReadableString())};
-        auto hierarchical_path_attr =
-            MakeRefCounted<HierarchicalPathArg>(std::move(hierarchical_path));
-        for (const auto& endpoint : locality.endpoints) {
-          uint32_t endpoint_weight =
-              locality.lb_weight *
-              endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
-          addresses.emplace_back(
-              endpoint.addresses(),
-              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));
+class PriorityEndpointIterator : public EndpointAddressesIterator {
+ public:
+  struct DiscoveryMechanismResult {
+    std::shared_ptr<const XdsEndpointResource> update;
+    std::string cluster_name;
+    std::vector<size_t /*child_number*/> priority_child_numbers;
+
+    DiscoveryMechanismResult(
+        std::shared_ptr<const XdsEndpointResource> resource,
+        std::string cluster, std::vector<size_t> child_numbers)
+        : update(std::move(resource)),
+          cluster_name(std::move(cluster)),
+          priority_child_numbers(std::move(child_numbers)) {}
+
+    std::string GetChildPolicyName(size_t priority) const {
+      return MakeChildPolicyName(cluster_name,
+                                 priority_child_numbers[priority]);
+    }
+  };
+
+  explicit PriorityEndpointIterator(
+      std::vector<DiscoveryMechanismResult> results)
+      : results_(std::move(results)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    for (const auto& entry : results_) {
+      const auto& priority_list = GetUpdatePriorityList(*entry.update);
+      for (size_t priority = 0; priority < priority_list.size(); ++priority) {
+        const auto& priority_entry = priority_list[priority];
+        std::string priority_child_name = entry.GetChildPolicyName(priority);
+        for (const auto& p : priority_entry.localities) {
+          const auto& locality_name = p.first;
+          const auto& locality = p.second;
+          std::vector<RefCountedStringValue> hierarchical_path = {
+              RefCountedStringValue(priority_child_name),
+              RefCountedStringValue(locality_name->AsHumanReadableString())};
+          auto hierarchical_path_attr =
+              MakeRefCounted<HierarchicalPathArg>(std::move(hierarchical_path));
+          for (const auto& endpoint : locality.endpoints) {
+            uint32_t endpoint_weight =
+                locality.lb_weight *
+                endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
+            callback(EndpointAddresses(
+                endpoint.addresses(),
+                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)));
+          }
         }
       }
     }
   }
-  return addresses;
+
+ private:
+  std::vector<DiscoveryMechanismResult> results_;
+};
+
+std::shared_ptr<EndpointAddressesIterator>
+XdsClusterResolverLb::CreateChildPolicyAddressesLocked() {
+  std::vector<PriorityEndpointIterator::DiscoveryMechanismResult> entries;
+  entries.reserve(discovery_mechanisms_.size());
+  for (const auto& discovery_entry : discovery_mechanisms_) {
+    entries.emplace_back(discovery_entry.latest_update,
+                         discovery_entry.config().cluster_name,
+                         discovery_entry.priority_child_numbers);
+  }
+  return std::make_shared<PriorityEndpointIterator>(std::move(entries));
 }
 
 std::string XdsClusterResolverLb::CreateChildPolicyResolutionNoteLocked() {
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc
index 7a1c6792a6c9f..c42219b4c42a8 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc
@@ -18,7 +18,6 @@
 
 #include "src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h"
 
-#include <inttypes.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -34,6 +33,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -300,8 +300,7 @@ class XdsOverrideHostLb : public LoadBalancingPolicy {
 
   void MaybeUpdatePickerLocked();
 
-  absl::StatusOr<EndpointAddressesList> UpdateAddressMap(
-      absl::StatusOr<EndpointAddressesList> endpoints);
+  void UpdateAddressMap(const EndpointAddressesIterator& endpoints);
 
   RefCountedPtr<SubchannelWrapper> AdoptSubchannel(
       const grpc_resolved_address& address,
@@ -508,12 +507,36 @@ void XdsOverrideHostLb::ResetBackoffLocked() {
   if (child_policy_ != nullptr) child_policy_->ResetBackoffLocked();
 }
 
+// Wraps the endpoint iterator and filters out endpoints in state DRAINING.
+class ChildEndpointIterator : public EndpointAddressesIterator {
+ public:
+  explicit ChildEndpointIterator(
+      std::shared_ptr<EndpointAddressesIterator> parent_it)
+      : parent_it_(std::move(parent_it)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    parent_it_->ForEach([&](const EndpointAddresses& endpoint) {
+      XdsHealthStatus status = GetEndpointHealthStatus(endpoint);
+      if (status.status() != XdsHealthStatus::kDraining) {
+        if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+          gpr_log(GPR_INFO,
+                  "[xds_override_host_lb %p] endpoint %s: not draining, "
+                  "passing to child",
+                  this, endpoint.ToString().c_str());
+        }
+        callback(endpoint);
+      }
+    });
+  }
+
+ private:
+  std::shared_ptr<EndpointAddressesIterator> parent_it_;
+};
+
 absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-    gpr_log(GPR_INFO,
-            "[xds_override_host_lb %p] Received update with %" PRIuPTR
-            " addresses",
-            this, args.addresses.ok() ? args.addresses->size() : 0);
+    gpr_log(GPR_INFO, "[xds_override_host_lb %p] Received update", this);
   }
   auto old_config = std::move(config_);
   // Update config.
@@ -521,13 +544,24 @@ absl::Status XdsOverrideHostLb::UpdateLocked(UpdateArgs args) {
   if (config_ == nullptr) {
     return absl::InvalidArgumentError("Missing policy config");
   }
+  // Update address map and wrap endpoint iterator for child policy.
+  if (args.addresses.ok()) {
+    UpdateAddressMap(**args.addresses);
+    args.addresses =
+        std::make_shared<ChildEndpointIterator>(std::move(*args.addresses));
+  } else {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
+      gpr_log(GPR_INFO, "[xds_override_host_lb %p] address error: %s", this,
+              args.addresses.status().ToString().c_str());
+    }
+  }
   // Create child policy if needed.
   if (child_policy_ == nullptr) {
     child_policy_ = CreateChildPolicyLocked(args.args);
   }
   // Update child policy.
   UpdateArgs update_args;
-  update_args.addresses = UpdateAddressMap(std::move(args.addresses));
+  update_args.addresses = std::move(args.addresses);
   update_args.resolution_note = std::move(args.resolution_note);
   update_args.config = config_->child_config();
   update_args.args = std::move(args.args);
@@ -578,18 +612,9 @@ OrphanablePtr<LoadBalancingPolicy> XdsOverrideHostLb::CreateChildPolicyLocked(
   return lb_policy;
 }
 
-absl::StatusOr<EndpointAddressesList> XdsOverrideHostLb::UpdateAddressMap(
-    absl::StatusOr<EndpointAddressesList> endpoints) {
-  if (!endpoints.ok()) {
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-      gpr_log(GPR_INFO, "[xds_override_host_lb %p] address error: %s", this,
-              endpoints.status().ToString().c_str());
-    }
-    return endpoints;
-  }
-  // Construct the list of addresses to pass to the child policy and a
-  // map of address info from which to update subchannel_map_.
-  EndpointAddressesList child_addresses;
+void XdsOverrideHostLb::UpdateAddressMap(
+    const EndpointAddressesIterator& endpoints) {
+  // Construct a map of address info from which to update subchannel_map_.
   struct AddressInfo {
     XdsHealthStatus eds_health_status;
     RefCountedStringValue address_list;
@@ -597,25 +622,18 @@ absl::StatusOr<EndpointAddressesList> XdsOverrideHostLb::UpdateAddressMap(
         : eds_health_status(status), address_list(std::move(addresses)) {}
   };
   std::map<const std::string, AddressInfo> addresses_for_map;
-  for (const auto& endpoint : *endpoints) {
+  endpoints.ForEach([&](const EndpointAddresses& endpoint) {
     XdsHealthStatus status = GetEndpointHealthStatus(endpoint);
-    if (status.status() != XdsHealthStatus::kDraining) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
-        gpr_log(GPR_INFO,
-                "[xds_override_host_lb %p] endpoint %s: not draining, "
-                "passing to child",
-                this, endpoint.ToString().c_str());
-      }
-      child_addresses.push_back(endpoint);
-    } else if (!config_->override_host_status_set().Contains(status)) {
-      // Skip draining hosts if not in the override status set.
+    // Skip draining hosts if not in the override status set.
+    if (status.status() == XdsHealthStatus::kDraining &&
+        !config_->override_host_status_set().Contains(status)) {
       if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_override_host_trace)) {
         gpr_log(GPR_INFO,
                 "[xds_override_host_lb %p] endpoint %s: draining but not in "
                 "override_host_status set -- ignoring",
                 this, endpoint.ToString().c_str());
       }
-      continue;
+      return;
     }
     std::vector<std::string> addresses;
     addresses.reserve(endpoint.addresses().size());
@@ -641,7 +659,7 @@ absl::StatusOr<EndpointAddressesList> XdsOverrideHostLb::UpdateAddressMap(
           std::piecewise_construct, std::forward_as_tuple(addresses[i]),
           std::forward_as_tuple(status, std::move(address_list)));
     }
-  }
+  });
   // Now grab the lock and update subchannel_map_ from addresses_for_map.
   {
     MutexLock lock(&subchannel_map_mu_);
@@ -688,7 +706,6 @@ absl::StatusOr<EndpointAddressesList> XdsOverrideHostLb::UpdateAddressMap(
       it->second.set_address_list(std::move(address_info.address_list));
     }
   }
-  return child_addresses;
 }
 
 RefCountedPtr<XdsOverrideHostLb::SubchannelWrapper>
diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc
index 26f0ec9084a28..2d346217e47bb 100644
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc
@@ -21,7 +21,6 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -170,10 +169,10 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
   // Scan the addresses to find the weight for each locality.
   std::map<std::string, uint32_t> locality_weights;
   if (args.addresses.ok()) {
-    for (const auto& address : *args.addresses) {
-      auto* locality_name = address.args().GetObject<XdsLocalityName>();
+    (*args.addresses)->ForEach([&](const EndpointAddresses& endpoint) {
+      auto* locality_name = endpoint.args().GetObject<XdsLocalityName>();
       uint32_t weight =
-          address.args().GetInt(GRPC_ARG_XDS_LOCALITY_WEIGHT).value_or(0);
+          endpoint.args().GetInt(GRPC_ARG_XDS_LOCALITY_WEIGHT).value_or(0);
       if (locality_name != nullptr && weight > 0) {
         auto p = locality_weights.emplace(
             locality_name->AsHumanReadableString(), weight);
@@ -184,7 +183,7 @@ absl::Status XdsWrrLocalityLb::UpdateLocked(UpdateArgs args) {
                   p.first->first.c_str(), p.first->second, weight);
         }
       }
-    }
+    });
   }
   // Construct the config for the weighted_target policy.
   Json::Object weighted_targets;
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
index 193e3c2b42258..91b0d9e72159d 100644
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
@@ -22,10 +22,9 @@
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 
 #include <memory>
+#include <type_traits>
 #include <utility>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/support/log.h>
@@ -36,9 +35,7 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/work_serializer.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/service_config/service_config.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 namespace grpc_core {
@@ -55,47 +52,38 @@ class FakeResolver : public Resolver {
 
  private:
   friend class FakeResolverResponseGenerator;
-  friend class FakeResolverResponseSetter;
 
   void ShutdownLocked() override;
 
   void MaybeSendResultLocked();
 
-  void ReturnReresolutionResult();
-
   // passed-in parameters
-  ChannelArgs channel_args_;
   std::shared_ptr<WorkSerializer> work_serializer_;
   std::unique_ptr<ResultHandler> result_handler_;
+  ChannelArgs channel_args_;
   RefCountedPtr<FakeResolverResponseGenerator> response_generator_;
-  // If has_next_result_ is true, next_result_ is the next resolution result
-  // to be returned.
-  bool has_next_result_ = false;
-  Result next_result_;
-  // Result to use for the pretended re-resolution in
-  // RequestReresolutionLocked().
-  bool has_reresolution_result_ = false;
-  Result reresolution_result_;
+  // The next resolution result to be returned, if any.  Present when we
+  // get a result before the resolver is started.
+  absl::optional<Result> next_result_;
   // True after the call to StartLocked().
   bool started_ = false;
   // True after the call to ShutdownLocked().
   bool shutdown_ = false;
-  // if true, return failure
-  bool return_failure_ = false;
-  // pending re-resolution
-  bool reresolution_closure_pending_ = false;
 };
 
 FakeResolver::FakeResolver(ResolverArgs args)
     : work_serializer_(std::move(args.work_serializer)),
       result_handler_(std::move(args.result_handler)),
+      channel_args_(
+          // Channels sharing the same subchannels may have different resolver
+          // response generators. If we don't remove this arg, subchannel pool
+          // will create new subchannels for the same address instead of
+          // reusing existing ones because of different values of this channel
+          // arg. Can't just use GRPC_ARG_NO_SUBCHANNEL_PREFIX, since
+          // that can't be passed into the channel from test code.
+          args.args.Remove(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR)),
       response_generator_(
           args.args.GetObjectRef<FakeResolverResponseGenerator>()) {
-  // Channels sharing the same subchannels may have different resolver response
-  // generators. If we don't remove this arg, subchannel pool will create new
-  // subchannels for the same address instead of reusing existing ones because
-  // of different values of this channel arg.
-  channel_args_ = args.args.Remove(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR);
   if (response_generator_ != nullptr) {
     response_generator_->SetFakeResolver(Ref());
   }
@@ -107,19 +95,9 @@ void FakeResolver::StartLocked() {
 }
 
 void FakeResolver::RequestReresolutionLocked() {
-  if (has_reresolution_result_ || return_failure_) {
-    next_result_ = reresolution_result_;
-    has_next_result_ = true;
-    // Return the result in a different closure, so that we don't call
-    // back into the LB policy while it's still processing the previous
-    // update.
-    if (!reresolution_closure_pending_) {
-      reresolution_closure_pending_ = true;
-      Ref().release();  // ref held by closure
-      work_serializer_->Run([this]() { ReturnReresolutionResult(); },
-                            DEBUG_LOCATION);
-    }
-  }
+  // Re-resolution can't happen until after we return an initial result.
+  GPR_ASSERT(response_generator_ != nullptr);
+  response_generator_->ReresolutionRequested();
 }
 
 void FakeResolver::ShutdownLocked() {
@@ -132,80 +110,15 @@ void FakeResolver::ShutdownLocked() {
 
 void FakeResolver::MaybeSendResultLocked() {
   if (!started_ || shutdown_) return;
-  if (return_failure_) {
-    // TODO(roth): Change resolver result generator to be able to inject
-    // the error to be returned and to be able to independently set errors
-    // for addresses and service config.
-    Result result;
-    result.addresses = absl::UnavailableError("Resolver transient failure");
-    result.service_config = result.addresses.status();
-    result.args = channel_args_;
-    result_handler_->ReportResult(std::move(result));
-    return_failure_ = false;
-  } else if (has_next_result_) {
+  if (next_result_.has_value()) {
     // When both next_results_ and channel_args_ contain an arg with the same
-    // name, only the one in next_results_.
-    next_result_.args = next_result_.args.UnionWith(channel_args_);
-    result_handler_->ReportResult(std::move(next_result_));
-    has_next_result_ = false;
+    // name, use the one in next_results_.
+    next_result_->args = next_result_->args.UnionWith(channel_args_);
+    result_handler_->ReportResult(std::move(*next_result_));
+    next_result_.reset();
   }
 }
 
-void FakeResolver::ReturnReresolutionResult() {
-  reresolution_closure_pending_ = false;
-  MaybeSendResultLocked();
-  Unref();
-}
-
-class FakeResolverResponseSetter {
- public:
-  explicit FakeResolverResponseSetter(RefCountedPtr<FakeResolver> resolver,
-                                      Resolver::Result result,
-                                      bool has_result = false,
-                                      bool immediate = true)
-      : resolver_(std::move(resolver)),
-        result_(std::move(result)),
-        has_result_(has_result),
-        immediate_(immediate) {}
-  void SetResponseLocked();
-  void SetReresolutionResponseLocked();
-  void SetFailureLocked();
-
- private:
-  RefCountedPtr<FakeResolver> resolver_;
-  Resolver::Result result_;
-  bool has_result_;
-  bool immediate_;
-};
-
-// Deletes object when done
-void FakeResolverResponseSetter::SetReresolutionResponseLocked() {
-  if (!resolver_->shutdown_) {
-    resolver_->reresolution_result_ = std::move(result_);
-    resolver_->has_reresolution_result_ = has_result_;
-  }
-  delete this;
-}
-
-// Deletes object when done
-void FakeResolverResponseSetter::SetResponseLocked() {
-  if (!resolver_->shutdown_) {
-    resolver_->next_result_ = std::move(result_);
-    resolver_->has_next_result_ = true;
-    resolver_->MaybeSendResultLocked();
-  }
-  delete this;
-}
-
-// Deletes object when done
-void FakeResolverResponseSetter::SetFailureLocked() {
-  if (!resolver_->shutdown_) {
-    resolver_->return_failure_ = true;
-    if (immediate_) resolver_->MaybeSendResultLocked();
-  }
-  delete this;
-}
-
 //
 // FakeResolverResponseGenerator
 //
@@ -220,101 +133,73 @@ void FakeResolverResponseGenerator::SetResponseAndNotify(
   {
     MutexLock lock(&mu_);
     if (resolver_ == nullptr) {
-      has_result_ = true;
       result_ = std::move(result);
       if (notify_when_set != nullptr) notify_when_set->Notify();
       return;
     }
     resolver = resolver_->Ref();
   }
-  FakeResolverResponseSetter* arg =
-      new FakeResolverResponseSetter(resolver, std::move(result));
-  resolver->work_serializer_->Run(
-      [arg, notify_when_set]() {
-        arg->SetResponseLocked();
-        if (notify_when_set != nullptr) notify_when_set->Notify();
-      },
-      DEBUG_LOCATION);
+  SendResultToResolver(std::move(resolver), std::move(result), notify_when_set);
 }
 
-void FakeResolverResponseGenerator::SetReresolutionResponseAndNotify(
-    Resolver::Result result, Notification* notify_when_set) {
-  RefCountedPtr<FakeResolver> resolver;
+void FakeResolverResponseGenerator::SetFakeResolver(
+    RefCountedPtr<FakeResolver> resolver) {
+  Resolver::Result result;
   {
     MutexLock lock(&mu_);
-    GPR_ASSERT(resolver_ != nullptr);
-    resolver = resolver_->Ref();
+    resolver_ = resolver;
+    if (resolver_set_cv_ != nullptr) resolver_set_cv_->SignalAll();
+    if (resolver == nullptr) return;
+    if (!result_.has_value()) return;
+    result = std::move(*result_);
+    result_.reset();
   }
-  FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(
-      resolver, std::move(result), true /* has_result */);
-  resolver->work_serializer_->Run(
-      [arg, notify_when_set]() {
-        arg->SetReresolutionResponseLocked();
+  SendResultToResolver(std::move(resolver), std::move(result), nullptr);
+}
+
+void FakeResolverResponseGenerator::SendResultToResolver(
+    RefCountedPtr<FakeResolver> resolver, Resolver::Result result,
+    Notification* notify_when_set) {
+  auto* resolver_ptr = resolver.get();
+  resolver_ptr->work_serializer_->Run(
+      [resolver = std::move(resolver), result = std::move(result),
+       notify_when_set]() mutable {
+        if (!resolver->shutdown_) {
+          resolver->next_result_ = std::move(result);
+          resolver->MaybeSendResultLocked();
+        }
         if (notify_when_set != nullptr) notify_when_set->Notify();
       },
       DEBUG_LOCATION);
 }
 
-void FakeResolverResponseGenerator::UnsetReresolutionResponse() {
-  RefCountedPtr<FakeResolver> resolver;
-  {
-    MutexLock lock(&mu_);
-    GPR_ASSERT(resolver_ != nullptr);
-    resolver = resolver_->Ref();
-  }
-  FakeResolverResponseSetter* arg =
-      new FakeResolverResponseSetter(resolver, Resolver::Result());
-  resolver->work_serializer_->Run(
-      [arg]() { arg->SetReresolutionResponseLocked(); }, DEBUG_LOCATION);
-}
-
-void FakeResolverResponseGenerator::SetFailure() {
-  RefCountedPtr<FakeResolver> resolver;
-  {
-    MutexLock lock(&mu_);
-    GPR_ASSERT(resolver_ != nullptr);
-    resolver = resolver_->Ref();
-  }
-  FakeResolverResponseSetter* arg =
-      new FakeResolverResponseSetter(resolver, Resolver::Result());
-  resolver->work_serializer_->Run([arg]() { arg->SetFailureLocked(); },
-                                  DEBUG_LOCATION);
-}
-
-void FakeResolverResponseGenerator::SetFailureOnReresolution() {
-  RefCountedPtr<FakeResolver> resolver;
-  {
-    MutexLock lock(&mu_);
-    GPR_ASSERT(resolver_ != nullptr);
-    resolver = resolver_->Ref();
+bool FakeResolverResponseGenerator::WaitForResolverSet(absl::Duration timeout) {
+  MutexLock lock(&mu_);
+  if (resolver_ == nullptr) {
+    CondVar condition;
+    resolver_set_cv_ = &condition;
+    condition.WaitWithTimeout(&mu_, timeout);
+    resolver_set_cv_ = nullptr;
   }
-  FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(
-      resolver, Resolver::Result(), false /* has_result */,
-      false /* immediate */);
-  resolver->work_serializer_->Run([arg]() { arg->SetFailureLocked(); },
-                                  DEBUG_LOCATION);
+  return resolver_ != nullptr;
 }
 
-void FakeResolverResponseGenerator::SetFakeResolver(
-    RefCountedPtr<FakeResolver> resolver) {
-  MutexLock lock(&mu_);
-  resolver_ = std::move(resolver);
-  cv_.SignalAll();
-  if (resolver_ == nullptr) return;
-  if (has_result_) {
-    FakeResolverResponseSetter* arg =
-        new FakeResolverResponseSetter(resolver_, std::move(result_));
-    resolver_->work_serializer_->Run([arg]() { arg->SetResponseLocked(); },
-                                     DEBUG_LOCATION);
-    has_result_ = false;
+bool FakeResolverResponseGenerator::WaitForReresolutionRequest(
+    absl::Duration timeout) {
+  MutexLock lock(&reresolution_mu_);
+  if (!reresolution_requested_) {
+    CondVar condition;
+    reresolution_cv_ = &condition;
+    condition.WaitWithTimeout(&reresolution_mu_, timeout);
+    reresolution_cv_ = nullptr;
   }
+  return std::exchange(reresolution_requested_, false);
 }
 
-void FakeResolverResponseGenerator::WaitForResolverSet() {
-  MutexLock lock(&mu_);
-  while (resolver_ == nullptr) {
-    cv_.Wait(&mu_);
-  }
+void FakeResolverResponseGenerator::ReresolutionRequested() {
+  MutexLock lock(&reresolution_mu_);
+  reresolution_requested_ = true;
+  if (reresolution_cv_ != nullptr) reresolution_cv_->SignalAll();
 }
 
 namespace {
@@ -341,22 +226,6 @@ const grpc_arg_pointer_vtable
         ResponseGeneratorChannelArgCopy, ResponseGeneratorChannelArgDestroy,
         ResponseGeneratorChannelArgCmp};
 
-grpc_arg FakeResolverResponseGenerator::MakeChannelArg(
-    FakeResolverResponseGenerator* generator) {
-  return grpc_channel_arg_pointer_create(
-      const_cast<char*>(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR), generator,
-      &kChannelArgPointerVtable);
-}
-
-RefCountedPtr<FakeResolverResponseGenerator>
-FakeResolverResponseGenerator::GetFromArgs(const grpc_channel_args* args) {
-  auto* response_generator =
-      grpc_channel_args_find_pointer<FakeResolverResponseGenerator>(
-          args, GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR);
-  if (response_generator == nullptr) return nullptr;
-  return response_generator->Ref();
-}
-
 //
 // Factory
 //
diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
index b0463eee9d610..0a39dd423541e 100644
--- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
@@ -23,6 +23,8 @@
 
 #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>
 
@@ -42,8 +44,7 @@ class FakeResolver;
 
 /// A mechanism for generating responses for the fake resolver.
 /// An instance of this class is passed to the fake resolver via a channel
-/// argument (see \a MakeChannelArg()) and used to inject and trigger custom
-/// resolutions.
+/// argument and used to inject and trigger custom resolutions.
 // TODO(roth): I would ideally like this to be InternallyRefCounted
 // instead of RefCounted, but external refs are currently needed to
 // encode this in channel args.  Once channel_args are converted to C++,
@@ -77,50 +78,20 @@ class FakeResolverResponseGenerator
     n.WaitForNotification();
   }
 
-  // Sets the re-resolution response, which is returned by the fake resolver
-  // when re-resolution is requested (via \a RequestReresolutionLocked()).
-  // The new re-resolution response replaces any previous re-resolution
-  // response that may have been set by a previous call.
-  // notify_when_set is an optional notification to signal when the response has
-  // been set.
-  void SetReresolutionResponseAndNotify(Resolver::Result result,
-                                        Notification* notify_when_set);
-  void SetReresolutionResponseAsync(Resolver::Result result) {
-    SetReresolutionResponseAndNotify(std::move(result), nullptr);
-  }
-  void SetReresolutionResponseSynchronously(Resolver::Result result) {
-    Notification n;
-    SetReresolutionResponseAndNotify(std::move(result), &n);
-    n.WaitForNotification();
-  }
-
-  // Unsets the re-resolution response.  After this, the fake resolver will
-  // not return anything when \a RequestReresolutionLocked() is called.
-  void UnsetReresolutionResponse();
-
-  // Tells the resolver to return a transient failure.
-  void SetFailure();
-
-  // Same as SetFailure(), but instead of returning the error
-  // immediately, waits for the next call to RequestReresolutionLocked().
-  void SetFailureOnReresolution();
-
-  // Returns a channel arg containing \a generator.
-  // TODO(roth): When we have time, make this a non-static method.
-  static grpc_arg MakeChannelArg(FakeResolverResponseGenerator* generator);
+  // Waits up to timeout for a re-resolution request.  Returns true if a
+  // re-resolution request is seen, or false if timeout occurs.  Returns
+  // true immediately if there was a re-resolution request since the
+  // last time this method was called.
+  bool WaitForReresolutionRequest(absl::Duration timeout);
 
-  // Returns the response generator in \a args, or null if not found.
-  static RefCountedPtr<FakeResolverResponseGenerator> GetFromArgs(
-      const grpc_channel_args* args);
+  // Wait for a resolver to be set (setting may be happening asynchronously, so
+  // this may block - consider it test only).
+  bool WaitForResolverSet(absl::Duration timeout);
 
   static absl::string_view ChannelArgName() {
     return GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR;
   }
 
-  // Wait for a resolver to be set (setting may be happening asynchronously, so
-  // this may block - consider it test only).
-  void WaitForResolverSet();
-
   static int ChannelArgsCompare(const FakeResolverResponseGenerator* a,
                                 const FakeResolverResponseGenerator* b) {
     return QsortCompare(a, b);
@@ -128,15 +99,29 @@ class FakeResolverResponseGenerator
 
  private:
   friend class FakeResolver;
+
   // Set the corresponding FakeResolver to this generator.
   void SetFakeResolver(RefCountedPtr<FakeResolver> resolver);
 
+  // Called by FakeResolver when re-resolution is requested.
+  void ReresolutionRequested();
+
+  // Helper function to send a result to the resolver.
+  static void SendResultToResolver(RefCountedPtr<FakeResolver> resolver,
+                                   Resolver::Result result,
+                                   Notification* notify_when_set);
+
   // Mutex protecting the members below.
   Mutex mu_;
-  CondVar cv_;
+  CondVar* resolver_set_cv_ ABSL_GUARDED_BY(mu_) = nullptr;
   RefCountedPtr<FakeResolver> resolver_ ABSL_GUARDED_BY(mu_);
-  Resolver::Result result_ ABSL_GUARDED_BY(mu_);
-  bool has_result_ ABSL_GUARDED_BY(mu_) = false;
+  // Temporarily stores the result when it gets set before the response
+  // generator is seen by the FakeResolver.
+  absl::optional<Resolver::Result> result_ ABSL_GUARDED_BY(mu_);
+
+  Mutex reresolution_mu_;
+  CondVar* reresolution_cv_ ABSL_GUARDED_BY(reresolution_mu_) = nullptr;
+  bool reresolution_requested_ ABSL_GUARDED_BY(reresolution_mu_) = false;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/client_channel/retry_filter.cc b/src/core/ext/filters/client_channel/retry_filter.cc
index cb29fbee2a48f..f2d393f9484cb 100644
--- a/src/core/ext/filters/client_channel/retry_filter.cc
+++ b/src/core/ext/filters/client_channel/retry_filter.cc
@@ -143,6 +143,7 @@ const RetryMethodConfig* RetryFilter::GetRetryPolicy(
 const grpc_channel_filter RetryFilter::kVtable = {
     RetryFilter::LegacyCallData::StartTransportStreamOpBatch,
     nullptr,
+    /* init_call: */ nullptr,
     RetryFilter::StartTransportOp,
     sizeof(RetryFilter::LegacyCallData),
     RetryFilter::LegacyCallData::Init,
diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc
index 94a4f65225e4e..588827b95842e 100644
--- a/src/core/ext/filters/deadline/deadline_filter.cc
+++ b/src/core/ext/filters/deadline/deadline_filter.cc
@@ -343,6 +343,7 @@ const grpc_channel_filter grpc_client_deadline_filter = {
        grpc_core::NextPromiseFactory next_promise_factory) {
       return next_promise_factory(std::move(call_args));
     },
+    /* init_call: */ nullptr,
     grpc_channel_next_op,
     sizeof(grpc_deadline_state),
     deadline_init_call_elem,
@@ -368,6 +369,17 @@ const grpc_channel_filter grpc_server_deadline_filter = {
       }
       return next_promise_factory(std::move(call_args));
     },
+    [](grpc_channel_element*, grpc_core::CallSpineInterface* spine) {
+      spine->client_initial_metadata().receiver.InterceptAndMap(
+          [](grpc_core::ClientMetadataHandle md) {
+            auto deadline = md->get(grpc_core::GrpcTimeoutMetadata());
+            if (deadline.has_value()) {
+              grpc_core::GetContext<grpc_core::CallContext>()->UpdateDeadline(
+                  *deadline);
+            }
+            return md;
+          });
+    },
     grpc_channel_next_op,
     sizeof(server_call_data),
     deadline_init_call_elem,
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 8b547bac6ee2b..ac8004cdd3e41 100644
--- a/src/core/ext/filters/http/client/http_client_filter.cc
+++ b/src/core/ext/filters/http/client/http_client_filter.cc
@@ -51,6 +51,10 @@
 
 namespace grpc_core {
 
+const NoInterceptor HttpClientFilter::Call::OnServerToClientMessage;
+const NoInterceptor HttpClientFilter::Call::OnClientToServerMessage;
+const NoInterceptor HttpClientFilter::Call::OnFinalize;
+
 const grpc_channel_filter HttpClientFilter::kFilter =
     MakePromiseBasedFilter<HttpClientFilter, FilterEndpoint::kClient,
                            kFilterExaminesServerInitialMetadata>("http-client");
@@ -105,40 +109,27 @@ Slice UserAgentFromArgs(const ChannelArgs& args,
 }
 }  // namespace
 
-ArenaPromise<ServerMetadataHandle> HttpClientFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  auto& md = call_args.client_initial_metadata;
-  if (test_only_use_put_requests_) {
-    md->Set(HttpMethodMetadata(), HttpMethodMetadata::kPut);
+void HttpClientFilter::Call::OnClientInitialMetadata(ClientMetadata& md,
+                                                     HttpClientFilter* filter) {
+  if (filter->test_only_use_put_requests_) {
+    md.Set(HttpMethodMetadata(), HttpMethodMetadata::kPut);
   } else {
-    md->Set(HttpMethodMetadata(), HttpMethodMetadata::kPost);
+    md.Set(HttpMethodMetadata(), HttpMethodMetadata::kPost);
   }
-  md->Set(HttpSchemeMetadata(), scheme_);
-  md->Set(TeMetadata(), TeMetadata::kTrailers);
-  md->Set(ContentTypeMetadata(), ContentTypeMetadata::kApplicationGrpc);
-  md->Set(UserAgentMetadata(), user_agent_.Ref());
-
-  auto* initial_metadata_err =
-      GetContext<Arena>()->New<Latch<ServerMetadataHandle>>();
-
-  call_args.server_initial_metadata->InterceptAndMap(
-      [initial_metadata_err](
-          ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
-        auto r = CheckServerMetadata(md.get());
-        if (!r.ok()) {
-          initial_metadata_err->Set(ServerMetadataFromStatus(r));
-          return absl::nullopt;
-        }
-        return std::move(md);
-      });
-
-  return Race(initial_metadata_err->Wait(),
-              Map(next_promise_factory(std::move(call_args)),
-                  [](ServerMetadataHandle md) -> ServerMetadataHandle {
-                    auto r = CheckServerMetadata(md.get());
-                    if (!r.ok()) return ServerMetadataFromStatus(r);
-                    return md;
-                  }));
+  md.Set(HttpSchemeMetadata(), filter->scheme_);
+  md.Set(TeMetadata(), TeMetadata::kTrailers);
+  md.Set(ContentTypeMetadata(), ContentTypeMetadata::kApplicationGrpc);
+  md.Set(UserAgentMetadata(), filter->user_agent_.Ref());
+}
+
+absl::Status HttpClientFilter::Call::OnServerInitialMetadata(
+    ServerMetadata& md) {
+  return CheckServerMetadata(&md);
+}
+
+absl::Status HttpClientFilter::Call::OnServerTrailingMetadata(
+    ServerMetadata& md) {
+  return CheckServerMetadata(&md);
 }
 
 HttpClientFilter::HttpClientFilter(HttpSchemeMetadata::ValueType scheme,
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 298daf03c6700..dbfa9f7f2d0e2 100644
--- a/src/core/ext/filters/http/client/http_client_filter.h
+++ b/src/core/ext/filters/http/client/http_client_filter.h
@@ -25,23 +25,28 @@
 #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"
-#include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 
 namespace grpc_core {
 
-class HttpClientFilter : public ChannelFilter {
+class HttpClientFilter : public ImplementChannelFilter<HttpClientFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<HttpClientFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& md, HttpClientFilter* filter);
+    absl::Status OnServerInitialMetadata(ServerMetadata& md);
+    absl::Status OnServerTrailingMetadata(ServerMetadata& md);
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   HttpClientFilter(HttpSchemeMetadata::ValueType scheme, Slice user_agent,
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 2d4953dd26b25..38c2dda0e167e 100644
--- a/src/core/ext/filters/http/server/http_server_filter.cc
+++ b/src/core/ext/filters/http/server/http_server_filter.cc
@@ -49,6 +49,10 @@
 
 namespace grpc_core {
 
+const NoInterceptor HttpServerFilter::Call::OnClientToServerMessage;
+const NoInterceptor HttpServerFilter::Call::OnServerToClientMessage;
+const NoInterceptor HttpServerFilter::Call::OnFinalize;
+
 const grpc_channel_filter HttpServerFilter::kFilter =
     MakePromiseBasedFilter<HttpServerFilter, FilterEndpoint::kServer,
                            kFilterExaminesServerInitialMetadata>("http-server");
@@ -71,85 +75,81 @@ ServerMetadataHandle MalformedRequest(absl::string_view explanation) {
 }
 }  // namespace
 
-ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  const auto& md = call_args.client_initial_metadata;
-
-  auto method = md->get(HttpMethodMetadata());
+ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, HttpServerFilter* filter) {
+  auto method = md.get(HttpMethodMetadata());
   if (method.has_value()) {
     switch (*method) {
       case HttpMethodMetadata::kPost:
         break;
       case HttpMethodMetadata::kPut:
-        if (allow_put_requests_) {
+        if (filter->allow_put_requests_) {
           break;
         }
         ABSL_FALLTHROUGH_INTENDED;
       case HttpMethodMetadata::kInvalid:
       case HttpMethodMetadata::kGet:
-        return Immediate(MalformedRequest("Bad method header"));
+        return MalformedRequest("Bad method header");
     }
   } else {
-    return Immediate(MalformedRequest("Missing :method header"));
+    return MalformedRequest("Missing :method header");
   }
 
-  auto te = md->Take(TeMetadata());
+  auto te = md.Take(TeMetadata());
   if (te == TeMetadata::kTrailers) {
     // Do nothing, ok.
   } else if (!te.has_value()) {
-    return Immediate(MalformedRequest("Missing :te header"));
+    return MalformedRequest("Missing :te header");
   } else {
-    return Immediate(MalformedRequest("Bad :te header"));
+    return MalformedRequest("Bad :te header");
   }
 
-  auto scheme = md->Take(HttpSchemeMetadata());
+  auto scheme = md.Take(HttpSchemeMetadata());
   if (scheme.has_value()) {
     if (*scheme == HttpSchemeMetadata::kInvalid) {
-      return Immediate(MalformedRequest("Bad :scheme header"));
+      return MalformedRequest("Bad :scheme header");
     }
   } else {
-    return Immediate(MalformedRequest("Missing :scheme header"));
+    return MalformedRequest("Missing :scheme header");
   }
 
-  md->Remove(ContentTypeMetadata());
+  md.Remove(ContentTypeMetadata());
 
-  Slice* path_slice = md->get_pointer(HttpPathMetadata());
+  Slice* path_slice = md.get_pointer(HttpPathMetadata());
   if (path_slice == nullptr) {
-    return Immediate(MalformedRequest("Missing :path header"));
+    return MalformedRequest("Missing :path header");
   }
 
-  if (md->get_pointer(HttpAuthorityMetadata()) == nullptr) {
-    absl::optional<Slice> host = md->Take(HostMetadata());
+  if (md.get_pointer(HttpAuthorityMetadata()) == nullptr) {
+    absl::optional<Slice> host = md.Take(HostMetadata());
     if (host.has_value()) {
-      md->Set(HttpAuthorityMetadata(), std::move(*host));
+      md.Set(HttpAuthorityMetadata(), std::move(*host));
     }
   }
 
-  if (md->get_pointer(HttpAuthorityMetadata()) == nullptr) {
-    return Immediate(MalformedRequest("Missing :authority header"));
+  if (md.get_pointer(HttpAuthorityMetadata()) == nullptr) {
+    return MalformedRequest("Missing :authority header");
   }
 
-  if (!surface_user_agent_) {
-    md->Remove(UserAgentMetadata());
+  if (!filter->surface_user_agent_) {
+    md.Remove(UserAgentMetadata());
   }
 
-  call_args.server_initial_metadata->InterceptAndMap(
-      [](ServerMetadataHandle md) {
-        if (grpc_call_trace.enabled()) {
-          gpr_log(GPR_INFO, "%s[http-server] Write metadata",
-                  Activity::current()->DebugTag().c_str());
-        }
-        FilterOutgoingMetadata(md.get());
-        md->Set(HttpStatusMetadata(), 200);
-        md->Set(ContentTypeMetadata(), ContentTypeMetadata::kApplicationGrpc);
-        return md;
-      });
-
-  return Map(next_promise_factory(std::move(call_args)),
-             [](ServerMetadataHandle md) -> ServerMetadataHandle {
-               FilterOutgoingMetadata(md.get());
-               return md;
-             });
+  return nullptr;
+}
+
+void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  if (grpc_call_trace.enabled()) {
+    gpr_log(GPR_INFO, "%s[http-server] Write metadata",
+            Activity::current()->DebugTag().c_str());
+  }
+  FilterOutgoingMetadata(&md);
+  md.Set(HttpStatusMetadata(), 200);
+  md.Set(ContentTypeMetadata(), ContentTypeMetadata::kApplicationGrpc);
+}
+
+void HttpServerFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  FilterOutgoingMetadata(&md);
 }
 
 absl::StatusOr<HttpServerFilter> HttpServerFilter::Create(
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 bc97bd53b8a76..a87c83518ee35 100644
--- a/src/core/ext/filters/http/server/http_server_filter.h
+++ b/src/core/ext/filters/http/server/http_server_filter.h
@@ -32,16 +32,23 @@
 namespace grpc_core {
 
 // Processes metadata on the server side for HTTP2 transports
-class HttpServerFilter : public ChannelFilter {
+class HttpServerFilter : public ImplementChannelFilter<HttpServerFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<HttpServerFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    ServerMetadataHandle OnClientInitialMetadata(ClientMetadata& md,
+                                                 HttpServerFilter* filter);
+    void OnServerInitialMetadata(ServerMetadata& md);
+    void OnServerTrailingMetadata(ServerMetadata& md);
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   HttpServerFilter(bool surface_user_agent, bool allow_put_requests)
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 dcfc162ab62c5..9cfc00474c49c 100644
--- a/src/core/ext/filters/message_size/message_size_filter.cc
+++ b/src/core/ext/filters/message_size/message_size_filter.cc
@@ -50,6 +50,15 @@
 
 namespace grpc_core {
 
+const NoInterceptor ClientMessageSizeFilter::Call::OnClientInitialMetadata;
+const NoInterceptor ClientMessageSizeFilter::Call::OnServerInitialMetadata;
+const NoInterceptor ClientMessageSizeFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ClientMessageSizeFilter::Call::OnFinalize;
+const NoInterceptor ServerMessageSizeFilter::Call::OnClientInitialMetadata;
+const NoInterceptor ServerMessageSizeFilter::Call::OnServerInitialMetadata;
+const NoInterceptor ServerMessageSizeFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ServerMessageSizeFilter::Call::OnFinalize;
+
 //
 // MessageSizeParsedConfig
 //
@@ -138,60 +147,6 @@ const grpc_channel_filter ServerMessageSizeFilter::kFilter =
                            kFilterExaminesOutboundMessages |
                                kFilterExaminesInboundMessages>("message_size");
 
-class MessageSizeFilter::CallBuilder {
- private:
-  auto Interceptor(uint32_t max_length, bool is_send) {
-    return [max_length, is_send,
-            err = err_](MessageHandle msg) -> absl::optional<MessageHandle> {
-      if (grpc_call_trace.enabled()) {
-        gpr_log(GPR_INFO, "%s[message_size] %s len:%" PRIdPTR " max:%d",
-                Activity::current()->DebugTag().c_str(),
-                is_send ? "send" : "recv", msg->payload()->Length(),
-                max_length);
-      }
-      if (msg->payload()->Length() > max_length) {
-        if (err->is_set()) return std::move(msg);
-        auto r = GetContext<Arena>()->MakePooled<ServerMetadata>(
-            GetContext<Arena>());
-        r->Set(GrpcStatusMetadata(), GRPC_STATUS_RESOURCE_EXHAUSTED);
-        r->Set(GrpcMessageMetadata(),
-               Slice::FromCopiedString(
-                   absl::StrFormat("%s message larger than max (%u vs. %d)",
-                                   is_send ? "Sent" : "Received",
-                                   msg->payload()->Length(), max_length)));
-        err->Set(std::move(r));
-        return absl::nullopt;
-      }
-      return std::move(msg);
-    };
-  }
-
- public:
-  explicit CallBuilder(const MessageSizeParsedConfig& limits)
-      : limits_(limits) {}
-
-  template <typename T>
-  void AddSend(T* pipe_end) {
-    if (!limits_.max_send_size().has_value()) return;
-    pipe_end->InterceptAndMap(Interceptor(*limits_.max_send_size(), true));
-  }
-  template <typename T>
-  void AddRecv(T* pipe_end) {
-    if (!limits_.max_recv_size().has_value()) return;
-    pipe_end->InterceptAndMap(Interceptor(*limits_.max_recv_size(), false));
-  }
-
-  ArenaPromise<ServerMetadataHandle> Run(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) {
-    return Race(err_->Wait(), next_promise_factory(std::move(call_args)));
-  }
-
- private:
-  Latch<ServerMetadataHandle>* const err_ =
-      GetContext<Arena>()->ManagedNew<Latch<ServerMetadataHandle>>();
-  MessageSizeParsedConfig limits_;
-};
-
 absl::StatusOr<ClientMessageSizeFilter> ClientMessageSizeFilter::Create(
     const ChannelArgs& args, ChannelFilter::Args) {
   return ClientMessageSizeFilter(args);
@@ -202,20 +157,40 @@ absl::StatusOr<ServerMessageSizeFilter> ServerMessageSizeFilter::Create(
   return ServerMessageSizeFilter(args);
 }
 
-ArenaPromise<ServerMetadataHandle> ClientMessageSizeFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+namespace {
+ServerMetadataHandle CheckPayload(const Message& msg,
+                                  absl::optional<uint32_t> max_length,
+                                  bool is_send) {
+  if (!max_length.has_value()) return nullptr;
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_call_trace)) {
+    gpr_log(GPR_INFO, "%s[message_size] %s len:%" PRIdPTR " max:%d",
+            Activity::current()->DebugTag().c_str(), is_send ? "send" : "recv",
+            msg.payload()->Length(), *max_length);
+  }
+  if (msg.payload()->Length() <= *max_length) return nullptr;
+  auto r = GetContext<Arena>()->MakePooled<ServerMetadata>(GetContext<Arena>());
+  r->Set(GrpcStatusMetadata(), GRPC_STATUS_RESOURCE_EXHAUSTED);
+  r->Set(GrpcMessageMetadata(), Slice::FromCopiedString(absl::StrFormat(
+                                    "%s message larger than max (%u vs. %d)",
+                                    is_send ? "Sent" : "Received",
+                                    msg.payload()->Length(), *max_length)));
+  return r;
+}
+}  // namespace
+
+ClientMessageSizeFilter::Call::Call(ClientMessageSizeFilter* filter)
+    : limits_(filter->parsed_config_) {
   // Get max sizes from channel data, then merge in per-method config values.
   // Note: Per-method config is only available on the client, so we
   // apply the max request size to the send limit and the max response
   // size to the receive limit.
-  MessageSizeParsedConfig limits = this->limits();
   const MessageSizeParsedConfig* config_from_call_context =
       MessageSizeParsedConfig::GetFromCallContext(
           GetContext<grpc_call_context_element>(),
-          service_config_parser_index_);
+          filter->service_config_parser_index_);
   if (config_from_call_context != nullptr) {
-    absl::optional<uint32_t> max_send_size = limits.max_send_size();
-    absl::optional<uint32_t> max_recv_size = limits.max_recv_size();
+    absl::optional<uint32_t> max_send_size = limits_.max_send_size();
+    absl::optional<uint32_t> max_recv_size = limits_.max_recv_size();
     if (config_from_call_context->max_send_size().has_value() &&
         (!max_send_size.has_value() ||
          *config_from_call_context->max_send_size() < *max_send_size)) {
@@ -226,21 +201,28 @@ ArenaPromise<ServerMetadataHandle> ClientMessageSizeFilter::MakeCallPromise(
          *config_from_call_context->max_recv_size() < *max_recv_size)) {
       max_recv_size = *config_from_call_context->max_recv_size();
     }
-    limits = MessageSizeParsedConfig(max_send_size, max_recv_size);
+    limits_ = MessageSizeParsedConfig(max_send_size, max_recv_size);
   }
+}
+
+ServerMetadataHandle ServerMessageSizeFilter::Call::OnClientToServerMessage(
+    const Message& message, ServerMessageSizeFilter* filter) {
+  return CheckPayload(message, filter->parsed_config_.max_recv_size(), false);
+}
+
+ServerMetadataHandle ServerMessageSizeFilter::Call::OnServerToClientMessage(
+    const Message& message, ServerMessageSizeFilter* filter) {
+  return CheckPayload(message, filter->parsed_config_.max_send_size(), true);
+}
 
-  CallBuilder b(limits);
-  b.AddSend(call_args.client_to_server_messages);
-  b.AddRecv(call_args.server_to_client_messages);
-  return b.Run(std::move(call_args), std::move(next_promise_factory));
+ServerMetadataHandle ClientMessageSizeFilter::Call::OnClientToServerMessage(
+    const Message& message) {
+  return CheckPayload(message, limits_.max_send_size(), true);
 }
 
-ArenaPromise<ServerMetadataHandle> ServerMessageSizeFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  CallBuilder b(limits());
-  b.AddSend(call_args.server_to_client_messages);
-  b.AddRecv(call_args.client_to_server_messages);
-  return b.Run(std::move(call_args), std::move(next_promise_factory));
+ServerMetadataHandle ClientMessageSizeFilter::Call::OnServerToClientMessage(
+    const Message& message) {
+  return CheckPayload(message, limits_.max_recv_size(), false);
 }
 
 namespace {
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 75135a1b75e04..647aeeed94f5c 100644
--- a/src/core/ext/filters/message_size/message_size_filter.h
+++ b/src/core/ext/filters/message_size/message_size_filter.h
@@ -86,48 +86,60 @@ class MessageSizeParser : public ServiceConfigParser::Parser {
 absl::optional<uint32_t> GetMaxRecvSizeFromChannelArgs(const ChannelArgs& args);
 absl::optional<uint32_t> GetMaxSendSizeFromChannelArgs(const ChannelArgs& args);
 
-class MessageSizeFilter : public ChannelFilter {
- protected:
-  explicit MessageSizeFilter(const ChannelArgs& args)
-      : limits_(MessageSizeParsedConfig::GetFromChannelArgs(args)) {}
-
-  class CallBuilder;
-
-  const MessageSizeParsedConfig& limits() const { return limits_; }
-
- private:
-  MessageSizeParsedConfig limits_;
-};
-
-class ServerMessageSizeFilter final : public MessageSizeFilter {
+class ServerMessageSizeFilter final
+    : public ImplementChannelFilter<ServerMessageSizeFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<ServerMessageSizeFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    static const NoInterceptor OnClientInitialMetadata;
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnFinalize;
+    ServerMetadataHandle OnClientToServerMessage(
+        const Message& message, ServerMessageSizeFilter* filter);
+    ServerMetadataHandle OnServerToClientMessage(
+        const Message& message, ServerMessageSizeFilter* filter);
+  };
 
  private:
-  using MessageSizeFilter::MessageSizeFilter;
+  explicit ServerMessageSizeFilter(const ChannelArgs& args)
+      : parsed_config_(MessageSizeParsedConfig::GetFromChannelArgs(args)) {}
+  const MessageSizeParsedConfig parsed_config_;
 };
 
-class ClientMessageSizeFilter final : public MessageSizeFilter {
+class ClientMessageSizeFilter final
+    : public ImplementChannelFilter<ClientMessageSizeFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<ClientMessageSizeFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    explicit Call(ClientMessageSizeFilter* filter);
+
+    static const NoInterceptor OnClientInitialMetadata;
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnFinalize;
+    ServerMetadataHandle OnClientToServerMessage(const Message& message);
+    ServerMetadataHandle OnServerToClientMessage(const Message& message);
+
+   private:
+    MessageSizeParsedConfig limits_;
+  };
 
  private:
+  explicit ClientMessageSizeFilter(const ChannelArgs& args)
+      : parsed_config_(MessageSizeParsedConfig::GetFromChannelArgs(args)) {}
   const size_t service_config_parser_index_{MessageSizeParser::ParserIndex()};
-  using MessageSizeFilter::MessageSizeFilter;
+  const MessageSizeParsedConfig parsed_config_;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 6eb6e4b86ba73..686a024827bf0 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -20,17 +20,26 @@
 #include <string>
 #include <tuple>
 
+#include "absl/random/bit_gen_ref.h"
+#include "absl/random/random.h"
+#include "absl/status/statusor.h"
+
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
 #include <grpc/support/log.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"
 #include "src/core/lib/gprpp/match.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
-#include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/try_join.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"
@@ -49,9 +58,15 @@ ClientTransport::ClientTransport(
       control_endpoint_write_buffer_(SliceBuffer()),
       data_endpoint_write_buffer_(SliceBuffer()),
       hpack_compressor_(std::make_unique<HPackCompressor>()),
+      hpack_parser_(std::make_unique<HPackParser>()),
+      memory_allocator_(
+          ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator(
+              "client_transport")),
+      arena_(MakeScopedArena(1024, &memory_allocator_)),
+      context_(arena_.get()),
       event_engine_(event_engine) {
   auto write_loop = Loop([this] {
-    return Seq(
+    return TrySeq(
         // Get next outgoing frame.
         this->outgoing_frames_.Next(),
         // Construct data buffers that will be sent to the endpoints.
@@ -81,30 +96,93 @@ ClientTransport::ClientTransport(
         },
         // Write buffers to corresponding endpoints concurrently.
         [this]() {
-          return Join(this->control_endpoint_->Write(
-                          std::move(control_endpoint_write_buffer_)),
-                      this->data_endpoint_->Write(
-                          std::move(data_endpoint_write_buffer_)));
+          return TryJoin(
+              control_endpoint_->Write(
+                  std::move(control_endpoint_write_buffer_)),
+              data_endpoint_->Write(std::move(data_endpoint_write_buffer_)));
         },
-        // Finish writes and return status.
-        [](std::tuple<absl::Status, absl::Status> ret)
-            -> LoopCtl<absl::Status> {
-          // If writes failed, return failure status.
-          if (!(std::get<0>(ret).ok() || std::get<1>(ret).ok())) {
-            // TODO(ladynana): handle the promise endpoint write failures with
-            // closing the transport.
-            return absl::InternalError("Promise endpoint writes failed.");
-          }
+        // Finish writes to difference endpoints and continue the loop.
+        []() -> LoopCtl<absl::Status> {
+          // The write failures will be caught in TrySeq and exit loop.
+          // Therefore, only need to return Continue() in the last lambda
+          // function.
           return Continue();
         });
   });
   writer_ = MakeActivity(
       // Continuously write next outgoing frames to promise endpoints.
       std::move(write_loop), EventEngineWakeupScheduler(event_engine_),
-      [](absl::Status status) {
-        GPR_ASSERT(status.code() == absl::StatusCode::kCancelled ||
-                   status.code() == absl::StatusCode::kInternal);
-      });
+      [this](absl::Status status) {
+        if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
+          this->AbortWithError();
+        }
+      },
+      // Hold Arena in activity for GetContext<Arena> usage.
+      arena_.get());
+  auto read_loop = Loop([this] {
+    return TrySeq(
+        // Read frame header from control endpoint.
+        // TODO(ladynana): remove memcpy in ReadSlice.
+        this->control_endpoint_->ReadSlice(FrameHeader::frame_header_size_),
+        // Read different parts of the server frame from control/data endpoints
+        // based on frame header.
+        [this](Slice read_buffer) mutable {
+          frame_header_ = std::make_shared<FrameHeader>(
+              FrameHeader::Parse(
+                  reinterpret_cast<const uint8_t*>(
+                      GRPC_SLICE_START_PTR(read_buffer.c_slice())))
+                  .value());
+          // Read header and trailers from control endpoint.
+          // Read message padding and message from data endpoint.
+          return TryJoin(
+              control_endpoint_->Read(frame_header_->GetFrameLength()),
+              data_endpoint_->Read(frame_header_->message_padding +
+                                   frame_header_->message_length));
+        },
+        // Construct and send the server frame to corresponding stream.
+        [this](std::tuple<SliceBuffer, SliceBuffer> ret) mutable {
+          control_endpoint_read_buffer_ = std::move(std::get<0>(ret));
+          // Discard message padding and only keep message in data read buffer.
+          std::get<1>(ret).MoveLastNBytesIntoSliceBuffer(
+              frame_header_->message_length, data_endpoint_read_buffer_);
+          ServerFragmentFrame frame;
+          // Initialized to get this_cpu() info in global_stat().
+          ExecCtx exec_ctx;
+          // Deserialize frame from read buffer.
+          absl::BitGen bitgen;
+          auto status = frame.Deserialize(hpack_parser_.get(), *frame_header_,
+                                          absl::BitGenRef(bitgen),
+                                          control_endpoint_read_buffer_);
+          GPR_ASSERT(status.ok());
+          // Move message into frame.
+          frame.message = arena_->MakePooled<Message>(
+              std::move(data_endpoint_read_buffer_), 0);
+          auto stream_id = frame.frame_header.stream_id;
+          {
+            MutexLock lock(&mu_);
+            return stream_map_[stream_id]->Push(ServerFrame(std::move(frame)));
+          }
+        },
+        // Check if send frame to corresponding stream successfully.
+        [](bool ret) -> LoopCtl<absl::Status> {
+          if (ret) {
+            // Send incoming frames successfully.
+            return Continue();
+          } else {
+            return absl::InternalError("Send incoming frames failed.");
+          }
+        });
+  });
+  reader_ = MakeActivity(
+      // Continuously read next incoming frames from promise endpoints.
+      std::move(read_loop), EventEngineWakeupScheduler(event_engine_),
+      [this](absl::Status status) {
+        if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
+          this->AbortWithError();
+        }
+      },
+      // Hold Arena in activity for GetContext<Arena> usage.
+      arena_.get());
 }
 
 }  // namespace chaotic_good
diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h
index 9b2129c083fc2..4972630cf9cc6 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.h
+++ b/src/core/ext/transport/chaotic_good/client_transport.h
@@ -17,29 +17,42 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #include <initializer_list>  // IWYU pragma: keep
+#include <map>
 #include <memory>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #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 "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/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/for_each.h"
+#include "src/core/lib/promise/if.h"
+#include "src/core/lib/promise/inter_activity_pipe.h"
+#include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/mpsc.h"
 #include "src/core/lib/promise/pipe.h"
-#include "src/core/lib/promise/seq.h"
+#include "src/core/lib/promise/poll.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/memory_quota.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/metadata_batch.h"  // IWYU pragma: keep
 #include "src/core/lib/transport/promise_endpoint.h"
@@ -58,18 +71,44 @@ class ClientTransport {
     if (writer_ != nullptr) {
       writer_.reset();
     }
+    if (reader_ != nullptr) {
+      reader_.reset();
+    }
+  }
+  void AbortWithError() {
+    // Mark transport as unavailable when the endpoint write/read failed.
+    // Close all the available pipes.
+    if (!outgoing_frames_.IsClosed()) {
+      outgoing_frames_.MarkClosed();
+    }
+    MutexLock lock(&mu_);
+    for (const auto& pair : stream_map_) {
+      if (!pair.second->IsClose()) {
+        pair.second->MarkClose();
+      }
+    }
   }
   auto AddStream(CallArgs call_args) {
     // At this point, the connection is set up.
     // Start sending data frames.
     uint32_t stream_id;
+    InterActivityPipe<ServerFrame, server_frame_queue_size_> pipe_server_frames;
     {
       MutexLock lock(&mu_);
       stream_id = next_stream_id_++;
+      stream_map_.insert(
+          std::pair<uint32_t,
+                    std::shared_ptr<InterActivityPipe<
+                        ServerFrame, server_frame_queue_size_>::Sender>>(
+              stream_id, std::make_shared<InterActivityPipe<
+                             ServerFrame, server_frame_queue_size_>::Sender>(
+                             std::move(pipe_server_frames.sender))));
     }
-    return Seq(
-        // Continuously send data frame with client to server messages.
-        ForEach(std::move(*call_args.client_to_server_messages),
+    return TrySeq(
+        TryJoin(
+            // Continuously send client frame with client to server messages.
+            ForEach(
+                std::move(*call_args.client_to_server_messages),
                 [stream_id, initial_frame = true,
                  client_initial_metadata =
                      std::move(call_args.client_initial_metadata),
@@ -89,33 +128,112 @@ class ClientTransport {
                     frame.headers = std::move(client_initial_metadata);
                     initial_frame = false;
                   }
-                  return Seq(
+                  return TrySeq(
                       outgoing_frames.Send(ClientFrame(std::move(frame))),
                       [](bool success) -> absl::Status {
                         if (!success) {
-                          return absl::InternalError(
-                              "Send frame to outgoing_frames failed.");
+                          // TODO(ladynana): propagate the actual error message
+                          // from EventEngine.
+                          return absl::UnavailableError(
+                              "Transport closed due to endpoint write/read "
+                              "failed.");
                         }
                         return absl::OkStatus();
                       });
-                }));
+                }),
+            // Continuously receive server frames from endpoints and save
+            // results to call_args.
+            Loop([server_initial_metadata = call_args.server_initial_metadata,
+                  server_to_client_messages =
+                      call_args.server_to_client_messages,
+                  receiver = std::move(pipe_server_frames.receiver)]() mutable {
+              return TrySeq(
+                  // Receive incoming server frame.
+                  receiver.Next(),
+                  // Save incomming frame results to call_args.
+                  [server_initial_metadata, server_to_client_messages](
+                      absl::optional<ServerFrame> server_frame) mutable {
+                    bool transport_closed = false;
+                    ServerFragmentFrame frame;
+                    if (!server_frame.has_value()) {
+                      // Incoming server frame pipe is closed, which only
+                      // happens when transport is aborted.
+                      transport_closed = true;
+                    } else {
+                      frame = std::move(
+                          absl::get<ServerFragmentFrame>(*server_frame));
+                    };
+                    bool has_headers = (frame.headers != nullptr);
+                    bool has_message = (frame.message != nullptr);
+                    bool has_trailers = (frame.trailers != nullptr);
+                    return TrySeq(
+                        If((!transport_closed) && has_headers,
+                           [server_initial_metadata,
+                            headers = std::move(frame.headers)]() mutable {
+                             return server_initial_metadata->Push(
+                                 std::move(headers));
+                           },
+                           [] { return false; }),
+                        If((!transport_closed) && has_message,
+                           [server_to_client_messages,
+                            message = std::move(frame.message)]() mutable {
+                             return server_to_client_messages->Push(
+                                 std::move(message));
+                           },
+                           [] { return false; }),
+                        If((!transport_closed) && has_trailers,
+                           [trailers = std::move(frame.trailers)]() mutable
+                           -> LoopCtl<ServerMetadataHandle> {
+                             return std::move(trailers);
+                           },
+                           [transport_closed]()
+                               -> LoopCtl<ServerMetadataHandle> {
+                             if (transport_closed) {
+                               // TODO(ladynana): propagate the actual error
+                               // message from EventEngine.
+                               return ServerMetadataFromStatus(
+                                   absl::UnavailableError(
+                                       "Transport closed due to endpoint "
+                                       "write/read failed."));
+                             }
+                             return Continue();
+                           }));
+                  });
+            })),
+        [](std::tuple<Empty, ServerMetadataHandle> ret) {
+          return std::move(std::get<1>(ret));
+        });
   }
 
  private:
   // Max buffer is set to 4, so that for stream writes each time it will queue
   // at most 2 frames.
   MpscReceiver<ClientFrame> outgoing_frames_;
-  Mutex mu_;
-  uint32_t next_stream_id_ ABSL_GUARDED_BY(mu_) = 1;
+  // 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 server_frame_queue_size_ = 2;
   // Assigned aligned bytes from setting frame.
   size_t aligned_bytes = 64;
+  Mutex mu_;
+  uint32_t next_stream_id_ ABSL_GUARDED_BY(mu_) = 1;
+  // Map of stream incoming server frames, key is stream_id.
+  std::map<uint32_t, std::shared_ptr<InterActivityPipe<
+                         ServerFrame, server_frame_queue_size_>::Sender>>
+      stream_map_ ABSL_GUARDED_BY(mu_);
   ActivityPtr writer_;
   ActivityPtr reader_;
   std::unique_ptr<PromiseEndpoint> control_endpoint_;
   std::unique_ptr<PromiseEndpoint> data_endpoint_;
   SliceBuffer control_endpoint_write_buffer_;
   SliceBuffer data_endpoint_write_buffer_;
+  SliceBuffer control_endpoint_read_buffer_;
+  SliceBuffer data_endpoint_read_buffer_;
   std::unique_ptr<HPackCompressor> hpack_compressor_;
+  std::unique_ptr<HPackParser> hpack_parser_;
+  std::shared_ptr<FrameHeader> frame_header_;
+  MemoryAllocator memory_allocator_;
+  ScopedArenaPtr arena_;
+  promise_detail::Context<Arena> context_;
   // Use to synchronize writer_ and reader_ activity with outside activities;
   std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine_;
 };
diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc
index a463c2e02b6c1..2f7f938e7c3a8 100644
--- a/src/core/ext/transport/chaotic_good/frame.cc
+++ b/src/core/ext/transport/chaotic_good/frame.cc
@@ -32,6 +32,8 @@
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/status_helper.h"
+#include "src/core/lib/promise/context.h"
+#include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
 
@@ -134,7 +136,9 @@ absl::StatusOr<Arena::PoolPtr<Metadata>> ReadMetadata(
     absl::BitGenRef bitsrc) {
   if (!maybe_slices.ok()) return maybe_slices.status();
   auto& slices = *maybe_slices;
-  Arena::PoolPtr<Metadata> metadata;
+  auto arena = GetContext<Arena>();
+  GPR_ASSERT(arena != nullptr);
+  Arena::PoolPtr<Metadata> metadata = arena->MakePooled<Metadata>(arena);
   parser->BeginFrame(
       metadata.get(), std::numeric_limits<uint32_t>::max(),
       std::numeric_limits<uint32_t>::max(),
diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h
index eca8200a1a808..8e5031802e5d1 100644
--- a/src/core/ext/transport/chaotic_good/frame.h
+++ b/src/core/ext/transport/chaotic_good/frame.h
@@ -97,6 +97,7 @@ struct ServerFragmentFrame final : public FrameInterface {
 
   FrameHeader frame_header;
   ServerMetadataHandle headers;
+  MessageHandle message;
   ServerMetadataHandle trailers;
 
   bool operator==(const ServerFragmentFrame& other) const {
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 86753e7724cbc..b75d792e5721e 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -229,30 +229,36 @@ static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error,
 #define GRPC_ARG_SETTINGS_TIMEOUT "grpc.http2.settings_timeout"
 
 namespace {
-grpc_core::CallTracerInterface* CallTracerIfEnabled(grpc_chttp2_stream* s) {
+
+using TaskHandle = ::grpc_event_engine::experimental::EventEngine::TaskHandle;
+
+grpc_core::CallTracerInterface* CallTracerIfSampled(grpc_chttp2_stream* s) {
   if (s->context == nullptr || !grpc_core::IsTraceRecordCallopsEnabled()) {
     return nullptr;
   }
-  return static_cast<grpc_core::CallTracerInterface*>(
+  auto* call_tracer = static_cast<grpc_core::CallTracerInterface*>(
       static_cast<grpc_call_context_element*>(
           s->context)[GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE]
           .value);
+  if (call_tracer == nullptr || !call_tracer->IsSampled()) {
+    return nullptr;
+  }
+  return call_tracer;
 }
 
-std::shared_ptr<grpc_core::TcpTracerInterface> TcpTracerIfEnabled(
+std::shared_ptr<grpc_core::TcpTracerInterface> TcpTracerIfSampled(
     grpc_chttp2_stream* s) {
-  if (s->context == nullptr || !s->traced ||
-      !grpc_core::IsTraceRecordCallopsEnabled()) {
+  if (s->context == nullptr || !grpc_core::IsTraceRecordCallopsEnabled()) {
     return nullptr;
   }
-  auto* call_tracer = static_cast<grpc_core::CallTracerInterface*>(
+  auto* call_attempt_tracer = static_cast<grpc_core::CallTracerInterface*>(
       static_cast<grpc_call_context_element*>(
           s->context)[GRPC_CONTEXT_CALL_TRACER]
           .value);
-  if (!call_tracer) {
+  if (call_attempt_tracer == nullptr || !call_attempt_tracer->IsSampled()) {
     return nullptr;
   }
-  return call_tracer->StartNewTcpTrace();
+  return call_attempt_tracer->StartNewTcpTrace();
 }
 
 grpc_core::WriteTimestampsCallback g_write_timestamps_callback = nullptr;
@@ -497,10 +503,8 @@ static void read_channel_args(grpc_chttp2_transport* t,
   if (max_requests_per_read.has_value()) {
     t->max_requests_per_read =
         grpc_core::Clamp(*max_requests_per_read, 1, 10000);
-  } else if (grpc_core::IsChttp2BatchRequestsEnabled()) {
-    t->max_requests_per_read = 32;
   } else {
-    t->max_requests_per_read = std::numeric_limits<size_t>::max();
+    t->max_requests_per_read = 32;
   }
 
   if (channel_args.GetBool(GRPC_ARG_ENABLE_CHANNELZ)
@@ -517,8 +521,8 @@ static void read_channel_args(grpc_chttp2_transport* t,
 
   t->ack_pings = channel_args.GetBool("grpc.http2.ack_pings").value_or(true);
 
-  t->allow_tarpit = channel_args.GetBool(GRPC_ARG_HTTP_ALLOW_TARPIT)
-                        .value_or(grpc_core::IsTarpitEnabled());
+  t->allow_tarpit =
+      channel_args.GetBool(GRPC_ARG_HTTP_ALLOW_TARPIT).value_or(true);
   t->min_tarpit_duration_ms =
       channel_args
           .GetDurationFromIntMillis(GRPC_ARG_HTTP_TARPIT_MIN_DURATION_MS)
@@ -800,41 +804,33 @@ static void close_transport_locked(grpc_chttp2_transport* t,
     t->closed_with_error = error;
     connectivity_state_set(t, GRPC_CHANNEL_SHUTDOWN, absl::Status(),
                            "close_transport");
-    if (t->keepalive_ping_timeout_handle !=
-        grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid) {
-      t->event_engine->Cancel(std::exchange(
-          t->keepalive_ping_timeout_handle,
-          grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid));
-    }
-    if (t->settings_ack_watchdog !=
-        grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid) {
-      t->event_engine->Cancel(std::exchange(
-          t->settings_ack_watchdog,
-          grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid));
-    }
-    if (t->delayed_ping_timer_handle.has_value()) {
-      if (t->event_engine->Cancel(*t->delayed_ping_timer_handle)) {
-        t->delayed_ping_timer_handle.reset();
-      }
+    if (t->keepalive_ping_timeout_handle != TaskHandle::kInvalid) {
+      t->event_engine->Cancel(std::exchange(t->keepalive_ping_timeout_handle,
+                                            TaskHandle::kInvalid));
     }
-    if (t->next_bdp_ping_timer_handle.has_value()) {
-      if (t->event_engine->Cancel(*t->next_bdp_ping_timer_handle)) {
-        t->next_bdp_ping_timer_handle.reset();
-      }
+    if (t->settings_ack_watchdog != TaskHandle::kInvalid) {
+      t->event_engine->Cancel(
+          std::exchange(t->settings_ack_watchdog, TaskHandle::kInvalid));
+    }
+    if (t->delayed_ping_timer_handle != TaskHandle::kInvalid &&
+        t->event_engine->Cancel(t->delayed_ping_timer_handle)) {
+      t->delayed_ping_timer_handle = TaskHandle::kInvalid;
+    }
+    if (t->next_bdp_ping_timer_handle != TaskHandle::kInvalid &&
+        t->event_engine->Cancel(t->next_bdp_ping_timer_handle)) {
+      t->next_bdp_ping_timer_handle = TaskHandle::kInvalid;
     }
     switch (t->keepalive_state) {
       case GRPC_CHTTP2_KEEPALIVE_STATE_WAITING:
-        if (t->keepalive_ping_timer_handle.has_value()) {
-          if (t->event_engine->Cancel(*t->keepalive_ping_timer_handle)) {
-            t->keepalive_ping_timer_handle.reset();
-          }
+        if (t->keepalive_ping_timer_handle != TaskHandle::kInvalid &&
+            t->event_engine->Cancel(t->keepalive_ping_timer_handle)) {
+          t->keepalive_ping_timer_handle = TaskHandle::kInvalid;
         }
         break;
       case GRPC_CHTTP2_KEEPALIVE_STATE_PINGING:
-        if (t->keepalive_ping_timer_handle.has_value()) {
-          if (t->event_engine->Cancel(*t->keepalive_ping_timer_handle)) {
-            t->keepalive_ping_timer_handle.reset();
-          }
+        if (t->keepalive_ping_timer_handle != TaskHandle::kInvalid &&
+            t->event_engine->Cancel(t->keepalive_ping_timer_handle)) {
+          t->keepalive_ping_timer_handle = TaskHandle::kInvalid;
         }
         break;
       case GRPC_CHTTP2_KEEPALIVE_STATE_DYING:
@@ -1471,8 +1467,8 @@ static void perform_stream_op_locked(void* stream_op,
 
   s->context = op->payload->context;
   s->traced = op->is_traced;
-  s->call_tracer = CallTracerIfEnabled(s);
-  s->tcp_tracer = TcpTracerIfEnabled(s);
+  s->call_tracer = CallTracerIfSampled(s);
+  s->tcp_tracer = TcpTracerIfSampled(s);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace)) {
     gpr_log(GPR_INFO,
             "perform_stream_op_locked[s=%p; op=%p]: %s; on_complete = %p", s,
@@ -1834,8 +1830,8 @@ static void retry_initiate_ping_locked(
     grpc_core::RefCountedPtr<grpc_chttp2_transport> t,
     GRPC_UNUSED grpc_error_handle error) {
   GPR_DEBUG_ASSERT(error.ok());
-  GPR_ASSERT(t->delayed_ping_timer_handle.has_value());
-  t->delayed_ping_timer_handle.reset();
+  GPR_ASSERT(t->delayed_ping_timer_handle != TaskHandle::kInvalid);
+  t->delayed_ping_timer_handle = TaskHandle::kInvalid;
   grpc_chttp2_initiate_write(t.get(),
                              GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING);
 }
@@ -2828,7 +2824,6 @@ static void read_action_parse_loop_locked(
     }
 
     close_transport_locked(t.get(), error);
-    t->endpoint_reading = 0;
   } else if (t->closed_with_error.ok()) {
     keep_reading = true;
     // Since we have read a byte, reset the keepalive timer
@@ -2857,17 +2852,15 @@ static void read_action_locked(
     grpc_error_handle error) {
   // got an incoming read, cancel any pending keepalive timers
   t->keepalive_incoming_data_wanted = false;
-  if (t->keepalive_ping_timeout_handle !=
-      grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid) {
+  if (t->keepalive_ping_timeout_handle != TaskHandle::kInvalid) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_ping_trace) ||
         GRPC_TRACE_FLAG_ENABLED(grpc_keepalive_trace)) {
       gpr_log(GPR_INFO,
               "%s[%p]: Clear keepalive timer because data was received",
               t->is_client ? "CLIENT" : "SERVER", t.get());
     }
-    t->event_engine->Cancel(std::exchange(
-        t->keepalive_ping_timeout_handle,
-        grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid));
+    t->event_engine->Cancel(
+        std::exchange(t->keepalive_ping_timeout_handle, TaskHandle::kInvalid));
   }
   grpc_error_handle err = error;
   if (!err.ok()) {
@@ -2960,7 +2953,7 @@ static void finish_bdp_ping_locked(
       t->flow_control.bdp_estimator()->CompletePing();
   grpc_chttp2_act_on_flowctl_action(t->flow_control.PeriodicUpdate(), t.get(),
                                     nullptr);
-  GPR_ASSERT(!t->next_bdp_ping_timer_handle.has_value());
+  GPR_ASSERT(t->next_bdp_ping_timer_handle == TaskHandle::kInvalid);
   t->next_bdp_ping_timer_handle =
       t->event_engine->RunAfter(next_ping - grpc_core::Timestamp::Now(), [t] {
         grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
@@ -2980,8 +2973,8 @@ static void next_bdp_ping_timer_expired_locked(
     grpc_core::RefCountedPtr<grpc_chttp2_transport> t,
     GRPC_UNUSED grpc_error_handle error) {
   GPR_DEBUG_ASSERT(error.ok());
-  GPR_ASSERT(t->next_bdp_ping_timer_handle.has_value());
-  t->next_bdp_ping_timer_handle.reset();
+  GPR_ASSERT(t->next_bdp_ping_timer_handle != TaskHandle::kInvalid);
+  t->next_bdp_ping_timer_handle = TaskHandle::kInvalid;
   if (t->flow_control.bdp_estimator()->accumulator() == 0) {
     // Block the bdp ping till we receive more data.
     t->bdp_ping_blocked = true;
@@ -3050,8 +3043,8 @@ static void init_keepalive_ping_locked(
     GRPC_UNUSED grpc_error_handle error) {
   GPR_DEBUG_ASSERT(error.ok());
   GPR_ASSERT(t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING);
-  GPR_ASSERT(t->keepalive_ping_timer_handle.has_value());
-  t->keepalive_ping_timer_handle.reset();
+  GPR_ASSERT(t->keepalive_ping_timer_handle != TaskHandle::kInvalid);
+  t->keepalive_ping_timer_handle = TaskHandle::kInvalid;
   if (t->destroying || !t->closed_with_error.ok()) {
     t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_DYING;
   } else {
@@ -3092,7 +3085,7 @@ static void finish_keepalive_ping_locked(
                 std::string(t->peer_string.as_string_view()).c_str());
       }
       t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING;
-      GPR_ASSERT(!t->keepalive_ping_timer_handle.has_value());
+      GPR_ASSERT(t->keepalive_ping_timer_handle == TaskHandle::kInvalid);
       t->keepalive_ping_timer_handle =
           t->event_engine->RunAfter(t->keepalive_time, [t] {
             grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
@@ -3104,22 +3097,21 @@ static void finish_keepalive_ping_locked(
 }
 
 static void maybe_reset_keepalive_ping_timer_locked(grpc_chttp2_transport* t) {
-  if (t->keepalive_ping_timer_handle.has_value()) {
-    if (t->event_engine->Cancel(*t->keepalive_ping_timer_handle)) {
-      // Cancel succeeds, resets the keepalive ping timer. Note that we don't
-      // need to Ref or Unref here since we still hold the Ref.
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace) ||
-          GRPC_TRACE_FLAG_ENABLED(grpc_keepalive_trace)) {
-        gpr_log(GPR_INFO, "%s: Keepalive ping cancelled. Resetting timer.",
-                std::string(t->peer_string.as_string_view()).c_str());
-      }
-      t->keepalive_ping_timer_handle = t->event_engine->RunAfter(
-          t->keepalive_time, [t = t->Ref()]() mutable {
-            grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
-            grpc_core::ExecCtx exec_ctx;
-            init_keepalive_ping(std::move(t));
-          });
+  if (t->keepalive_ping_timer_handle != TaskHandle::kInvalid &&
+      t->event_engine->Cancel(t->keepalive_ping_timer_handle)) {
+    // Cancel succeeds, resets the keepalive ping timer. Note that we don't
+    // need to Ref or Unref here since we still hold the Ref.
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace) ||
+        GRPC_TRACE_FLAG_ENABLED(grpc_keepalive_trace)) {
+      gpr_log(GPR_INFO, "%s: Keepalive ping cancelled. Resetting timer.",
+              std::string(t->peer_string.as_string_view()).c_str());
     }
+    t->keepalive_ping_timer_handle =
+        t->event_engine->RunAfter(t->keepalive_time, [t = t->Ref()]() mutable {
+          grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
+          grpc_core::ExecCtx exec_ctx;
+          init_keepalive_ping(std::move(t));
+        });
   }
 }
 
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
index 1bfea72c12828..b008e57135afe 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
@@ -119,6 +119,15 @@ class HttpAnnotation : public CallTracerAnnotationInterface::Annotation {
 
   std::string ToString() const override;
 
+  Type http_type() const { return type_; }
+  Timestamp time() const { return time_; }
+  absl::optional<chttp2::TransportFlowControl::Stats> transport_stats() const {
+    return transport_stats_;
+  }
+  absl::optional<chttp2::StreamFlowControl::Stats> stream_stats() const {
+    return stream_stats_;
+  }
+
  private:
   const Type type_;
   const Timestamp time_;
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
index c7d1eff946f02..986c62bc427e5 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.cc
+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -422,23 +422,9 @@ FlowControlAction StreamFlowControl::UpdateAction(FlowControlAction action) {
     }
     // min_progress_size_ > 0 means we have a reader ready to read.
     if (min_progress_size_ > 0) {
-      if (IsLazierStreamUpdatesEnabled()) {
-        if (announced_window_delta_ <=
-            -static_cast<int64_t>(tfc_->sent_init_window()) / 2) {
-          urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
-        }
-      } else {
-        // If we're into initial window to receive that data we should wake up
-        // and send an update.
-        if (announced_window_delta_ < 0) {
-          urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
-        } else if (announced_window_delta_ == 0 &&
-                   tfc_->queued_init_window() == 0) {
-          // Special case when initial window size is zero, meaning that
-          // announced_window_delta cannot become negative (it may already be so
-          // however).
-          urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
-        }
+      if (announced_window_delta_ <=
+          -static_cast<int64_t>(tfc_->sent_init_window()) / 2) {
+        urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
       }
     }
     action.set_send_stream_update(urgency);
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 6c3a56ef74fe5..71e5cd7098f89 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
@@ -126,7 +126,7 @@ grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser,
           grpc_core::StatusIntProperty::kHttp2Error,
           static_cast<intptr_t>(reason));
     }
-    if (grpc_core::IsPingOnRstStreamEnabled() && !t->is_client &&
+    if (!t->is_client &&
         absl::Bernoulli(t->bitgen, t->ping_on_rst_stream_percent / 100.0)) {
       ++t->num_pending_induced_frames;
       t->ping_callbacks.RequestPing();
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
index 69f2c92dbc69c..ed615d5acd651 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
@@ -475,31 +475,25 @@ void Encoder::EncodeRepeatingSliceValue(const absl::string_view& key,
 
 void TimeoutCompressorImpl::EncodeWith(absl::string_view key,
                                        Timestamp deadline, Encoder* encoder) {
-  Timeout timeout = Timeout::FromDuration(deadline - Timestamp::Now());
+  const Timeout timeout = Timeout::FromDuration(deadline - Timestamp::Now());
   auto& table = encoder->hpack_table();
-  for (auto it = previous_timeouts_.begin(); it != previous_timeouts_.end();
-       ++it) {
-    double ratio = timeout.RatioVersus(it->timeout);
+  for (size_t i = 0; i < kNumPreviousValues; i++) {
+    const auto& previous = previous_timeouts_[i];
+    if (!table.ConvertableToDynamicIndex(previous.index)) continue;
+    const double ratio = timeout.RatioVersus(previous.timeout);
     // If the timeout we're sending is shorter than a previous timeout, but
     // within 3% of it, we'll consider sending it.
-    if (ratio > -3 && ratio <= 0 &&
-        table.ConvertableToDynamicIndex(it->index)) {
-      encoder->EmitIndexed(table.DynamicIndex(it->index));
-      // Put this timeout to the front of the queue - forces common timeouts to
-      // be considered earlier.
-      std::swap(*it, *previous_timeouts_.begin());
+    if (ratio > -3 && ratio <= 0) {
+      encoder->EmitIndexed(table.DynamicIndex(previous.index));
       return;
     }
   }
-  // Clean out some expired timeouts.
-  while (!previous_timeouts_.empty() &&
-         !table.ConvertableToDynamicIndex(previous_timeouts_.back().index)) {
-    previous_timeouts_.pop_back();
-  }
   Slice encoded = timeout.Encode();
   uint32_t index = encoder->EmitLitHdrWithNonBinaryStringKeyIncIdx(
       Slice::FromStaticString(key), std::move(encoded));
-  previous_timeouts_.push_back(PreviousTimeout{timeout, index});
+  uint32_t i = next_previous_value_;
+  ++next_previous_value_;
+  previous_timeouts_[i % kNumPreviousValues] = PreviousTimeout{timeout, index};
 }
 
 Encoder::Encoder(HPackCompressor* compressor, bool use_true_binary_metadata,
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
index 12e2df3eb6c07..500126932e115 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
@@ -276,8 +276,10 @@ class Compressor<MetadataTrait, SmallSetOfValuesCompressor> {
 };
 
 struct PreviousTimeout {
-  Timeout timeout;
-  uint32_t index;
+  Timeout timeout = Timeout::FromDuration(Duration::Zero());
+  // Dynamic table index of a previously sent timeout
+  // 0 is guaranteed not in the dynamic table so is a safe initializer
+  uint32_t index = 0;
 };
 
 class TimeoutCompressorImpl {
@@ -285,7 +287,9 @@ class TimeoutCompressorImpl {
   void EncodeWith(absl::string_view key, Timestamp deadline, Encoder* encoder);
 
  private:
-  std::vector<PreviousTimeout> previous_timeouts_;
+  static constexpr const size_t kNumPreviousValues = 5;
+  PreviousTimeout previous_timeouts_[kNumPreviousValues];
+  uint32_t next_previous_value_ = 0;
 };
 
 template <typename MetadataTrait>
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 623e50bf62078..9716333773d18 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
@@ -21,8 +21,7 @@
 #include <stdint.h>
 
 #include <limits>
-
-#include "absl/container/inlined_vector.h"
+#include <vector>
 
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 
@@ -59,6 +58,7 @@ class HPackEncoderTable {
            table_elems_ - index;
   }
   // Check if an element index is convertable to a dynamic index
+  // Note that 0 is always not convertable
   bool ConvertableToDynamicIndex(uint32_t index) const {
     return index > tail_remote_index_;
   }
@@ -73,8 +73,7 @@ class HPackEncoderTable {
   uint32_t table_elems_ = 0;
   uint32_t table_size_ = 0;
   // The size of each element in the HPACK table.
-  absl::InlinedVector<EntrySize, hpack_constants::kInitialTableEntries>
-      elem_size_;
+  std::vector<EntrySize> elem_size_;
 };
 
 }  // 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 9c38776b36831..4e87d291d8c4a 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
@@ -59,13 +59,21 @@ absl::Status MakeStreamError(absl::Status error) {
 }  // namespace
 
 absl::Status HpackParseResult::Materialize() const {
-  if (materialized_status_.has_value()) return *materialized_status_;
-  materialized_status_ = BuildMaterialized();
-  return *materialized_status_;
+  if (state_ != nullptr && state_->materialized_status.has_value()) {
+    return *state_->materialized_status;
+  }
+  absl::Status materialized_status = BuildMaterialized();
+  if (!materialized_status.ok()) {
+    // We can safely assume state_ is not null here, since BuildMaterialized
+    // returns ok if it is.
+    state_->materialized_status = materialized_status;
+  }
+  return materialized_status;
 }
 
 absl::Status HpackParseResult::BuildMaterialized() const {
-  switch (status_.get()) {
+  if (state_ == nullptr) return absl::OkStatus();
+  switch (state_->status.get()) {
     case HpackParseStatus::kOk:
       return absl::OkStatus();
     case HpackParseStatus::kEof:
@@ -75,17 +83,17 @@ absl::Status HpackParseResult::BuildMaterialized() const {
       Crash("Materialize() called on moved-from object");
       break;
     case HpackParseStatus::kInvalidMetadata:
-      if (key_.empty()) {
+      if (state_->key.empty()) {
         return MakeStreamError(absl::InternalError(
-            ValidateMetadataResultToString(validate_metadata_result_)));
+            ValidateMetadataResultToString(state_->validate_metadata_result)));
       } else {
         return MakeStreamError(absl::InternalError(absl::StrCat(
-            ValidateMetadataResultToString(validate_metadata_result_), ": ",
-            key_)));
+            ValidateMetadataResultToString(state_->validate_metadata_result),
+            ": ", state_->key)));
       }
     case HpackParseStatus::kSoftMetadataLimitExceeded:
     case HpackParseStatus::kHardMetadataLimitExceeded: {
-      const auto& e = metadata_limit_exceeded_;
+      const auto& e = state_->metadata_limit_exceeded;
       // Collect a summary of sizes so far for debugging
       // Do not collect contents, for fear of exposing PII.
       std::string summary;
@@ -95,35 +103,36 @@ absl::Status HpackParseResult::BuildMaterialized() const {
       }
       return MakeStreamError(absl::ResourceExhaustedError(absl::StrCat(
           "received metadata size exceeds ",
-          status_.get() == HpackParseStatus::kSoftMetadataLimitExceeded
+          state_->status.get() == HpackParseStatus::kSoftMetadataLimitExceeded
               ? "soft"
               : "hard",
           " limit (", e.frame_length, " vs. ", e.limit, ")",
           summary.empty() ? "" : "; ", summary)));
     }
     case HpackParseStatus::kHardMetadataLimitExceededByKey: {
-      const auto& e = metadata_limit_exceeded_by_atom_;
+      const auto& e = state_->metadata_limit_exceeded_by_atom;
       return MakeStreamError(absl::ResourceExhaustedError(
           absl::StrCat("received metadata size exceeds hard limit (key length ",
                        e.atom_length, " vs. ", e.limit, ")")));
     }
     case HpackParseStatus::kHardMetadataLimitExceededByValue: {
-      const auto& e = metadata_limit_exceeded_by_atom_;
+      const auto& e = state_->metadata_limit_exceeded_by_atom;
       return MakeStreamError(absl::ResourceExhaustedError(absl::StrCat(
           "received metadata size exceeds hard limit (value length ",
           e.atom_length, " vs. ", e.limit, ")")));
     }
     case HpackParseStatus::kMetadataParseError:
-      if (!key_.empty()) {
+      if (!state_->key.empty()) {
         return MakeStreamError(absl::InternalError(
-            absl::StrCat("Error parsing '", key_, "' metadata")));
+            absl::StrCat("Error parsing '", state_->key, "' metadata")));
       } else {
         return MakeStreamError(absl::InternalError("Error parsing metadata"));
       }
     case HpackParseStatus::kUnbase64Failed:
-      if (!key_.empty()) {
-        return MakeStreamError(absl::InternalError(absl::StrCat(
-            "Error parsing '", key_, "' metadata: illegal base64 encoding")));
+      if (!state_->key.empty()) {
+        return MakeStreamError(absl::InternalError(
+            absl::StrCat("Error parsing '", state_->key,
+                         "' metadata: illegal base64 encoding")));
       } else {
         return MakeStreamError(absl::InternalError(
             absl::StrCat("Failed base64 decoding metadata")));
@@ -135,22 +144,23 @@ absl::Status HpackParseResult::BuildMaterialized() const {
       return absl::InternalError(absl::StrFormat(
           "integer overflow in hpack integer decoding: have 0x%08x, "
           "got byte 0x%02x",
-          varint_out_of_range_.value, varint_out_of_range_.last_byte));
+          state_->varint_out_of_range.value,
+          state_->varint_out_of_range.last_byte));
     case HpackParseStatus::kIllegalTableSizeChange:
       return absl::InternalError(absl::StrCat(
-          "Attempt to make hpack table ", illegal_table_size_change_.new_size,
-          " bytes when max is ", illegal_table_size_change_.max_size,
-          " bytes"));
+          "Attempt to make hpack table ",
+          state_->illegal_table_size_change.new_size, " bytes when max is ",
+          state_->illegal_table_size_change.max_size, " bytes"));
     case HpackParseStatus::kAddBeforeTableSizeUpdated:
       return absl::InternalError(
           absl::StrCat("HPACK max table size reduced to ",
-                       illegal_table_size_change_.new_size,
+                       state_->illegal_table_size_change.new_size,
                        " but not reflected by hpack stream (still at ",
-                       illegal_table_size_change_.max_size, ")"));
+                       state_->illegal_table_size_change.max_size, ")"));
     case HpackParseStatus::kParseHuffFailed:
-      if (!key_.empty()) {
-        return absl::InternalError(
-            absl::StrCat("Failed huffman decoding '", key_, "' metadata"));
+      if (!state_->key.empty()) {
+        return absl::InternalError(absl::StrCat("Failed huffman decoding '",
+                                                state_->key, "' metadata"));
       } else {
         return absl::InternalError(
             absl::StrCat("Failed huffman decoding metadata"));
@@ -164,7 +174,7 @@ absl::Status HpackParseResult::BuildMaterialized() const {
           "Malicious varint encoding detected in HPACK stream");
     case HpackParseStatus::kInvalidHpackIndex:
       return absl::InternalError(absl::StrFormat(
-          "Invalid HPACK index received (%d)", invalid_hpack_index_));
+          "Invalid HPACK index received (%d)", state_->invalid_hpack_index));
     case HpackParseStatus::kIllegalHpackOpCode:
       return absl::InternalError("Illegal hpack op code");
   }
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 188b1563b4716..4a551e94475d1 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
@@ -31,6 +31,8 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/lib/gprpp/ref_counted.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/surface/validate_metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
@@ -128,10 +130,18 @@ class HpackParseResult {
  public:
   HpackParseResult() : HpackParseResult{HpackParseStatus::kOk} {}
 
-  bool ok() const { return status_.get() == HpackParseStatus::kOk; }
-  bool stream_error() const { return IsStreamError(status_.get()); }
-  bool connection_error() const { return IsConnectionError(status_.get()); }
-  bool ephemeral() const { return IsEphemeralError(status_.get()); }
+  bool ok() const {
+    return state_ == nullptr || state_->status.get() == HpackParseStatus::kOk;
+  }
+  bool stream_error() const {
+    return state_ != nullptr && IsStreamError(state_->status.get());
+  }
+  bool connection_error() const {
+    return state_ != nullptr && IsConnectionError(state_->status.get());
+  }
+  bool ephemeral() const {
+    return state_ != nullptr && IsEphemeralError(state_->status.get());
+  }
 
   std::unique_ptr<HpackParseResult> PersistentStreamErrorOrNullptr() const {
     if (ok() || connection_error() || ephemeral()) return nullptr;
@@ -154,20 +164,22 @@ class HpackParseResult {
   static HpackParseResult FromStatusWithKey(HpackParseStatus status,
                                             absl::string_view key) {
     auto r = FromStatus(status);
-    r.key_ = std::string(key);
+    if (r.state_ != nullptr) {
+      r.state_->key = std::string(key);
+    }
     return r;
   }
 
   static HpackParseResult MetadataParseError(absl::string_view key) {
     HpackParseResult r{HpackParseStatus::kMetadataParseError};
-    r.key_ = std::string(key);
+    r.state_->key = std::string(key);
     return r;
   }
 
   static HpackParseResult AddBeforeTableSizeUpdated(uint32_t current_size,
                                                     uint32_t max_size) {
     HpackParseResult p{HpackParseStatus::kAddBeforeTableSizeUpdated};
-    p.illegal_table_size_change_ =
+    p.state_->illegal_table_size_change =
         IllegalTableSizeChange{current_size, max_size};
     return p;
   }
@@ -184,8 +196,8 @@ class HpackParseResult {
                                                absl::string_view key) {
     GPR_DEBUG_ASSERT(result != ValidateMetadataResult::kOk);
     HpackParseResult p{HpackParseStatus::kInvalidMetadata};
-    p.key_ = std::string(key);
-    p.validate_metadata_result_ = result;
+    p.state_->key = std::string(key);
+    p.state_->validate_metadata_result = result;
     return p;
   }
 
@@ -196,20 +208,21 @@ class HpackParseResult {
   static HpackParseResult VarintOutOfRangeError(uint32_t value,
                                                 uint8_t last_byte) {
     HpackParseResult p{HpackParseStatus::kVarintOutOfRange};
-    p.varint_out_of_range_ = VarintOutOfRange{last_byte, value};
+    p.state_->varint_out_of_range = VarintOutOfRange{last_byte, value};
     return p;
   }
 
   static HpackParseResult InvalidHpackIndexError(uint32_t index) {
     HpackParseResult p{HpackParseStatus::kInvalidHpackIndex};
-    p.invalid_hpack_index_ = index;
+    p.state_->invalid_hpack_index = index;
     return p;
   }
 
   static HpackParseResult IllegalTableSizeChangeError(uint32_t new_size,
                                                       uint32_t max_size) {
     HpackParseResult p{HpackParseStatus::kIllegalTableSizeChange};
-    p.illegal_table_size_change_ = IllegalTableSizeChange{new_size, max_size};
+    p.state_->illegal_table_size_change =
+        IllegalTableSizeChange{new_size, max_size};
     return p;
   }
 
@@ -220,7 +233,7 @@ class HpackParseResult {
   static HpackParseResult SoftMetadataLimitExceededError(
       grpc_metadata_batch* metadata, uint32_t frame_length, uint32_t limit) {
     HpackParseResult p{HpackParseStatus::kSoftMetadataLimitExceeded};
-    p.metadata_limit_exceeded_ =
+    p.state_->metadata_limit_exceeded =
         MetadataLimitExceeded{frame_length, limit, metadata};
     return p;
   }
@@ -228,7 +241,7 @@ class HpackParseResult {
   static HpackParseResult HardMetadataLimitExceededError(
       grpc_metadata_batch* metadata, uint32_t frame_length, uint32_t limit) {
     HpackParseResult p{HpackParseStatus::kHardMetadataLimitExceeded};
-    p.metadata_limit_exceeded_ =
+    p.state_->metadata_limit_exceeded =
         MetadataLimitExceeded{frame_length, limit, metadata};
     return p;
   }
@@ -236,7 +249,7 @@ class HpackParseResult {
   static HpackParseResult HardMetadataLimitExceededByKeyError(
       uint32_t key_length, uint32_t limit) {
     HpackParseResult p{HpackParseStatus::kHardMetadataLimitExceededByKey};
-    p.metadata_limit_exceeded_by_atom_ =
+    p.state_->metadata_limit_exceeded_by_atom =
         MetadataLimitExceededByAtom{key_length, limit};
     return p;
   }
@@ -244,9 +257,9 @@ class HpackParseResult {
   static HpackParseResult HardMetadataLimitExceededByValueError(
       absl::string_view key, uint32_t value_length, uint32_t limit) {
     HpackParseResult p{HpackParseStatus::kHardMetadataLimitExceededByValue};
-    p.metadata_limit_exceeded_by_atom_ =
+    p.state_->metadata_limit_exceeded_by_atom =
         MetadataLimitExceededByAtom{value_length, limit};
-    p.key_ = std::string(key);
+    p.state_->key = std::string(key);
     return p;
   }
 
@@ -255,7 +268,13 @@ class HpackParseResult {
   absl::Status Materialize() const;
 
  private:
-  explicit HpackParseResult(HpackParseStatus status) : status_(status) {}
+  explicit HpackParseResult(HpackParseStatus status) {
+    // Dynamically allocate state if status is not ok.
+    if (status != HpackParseStatus::kOk) {
+      state_ = MakeRefCounted<HpackParseResultState>(status);
+    }
+  }
+
   absl::Status BuildMaterialized() const;
 
   struct VarintOutOfRange {
@@ -300,25 +319,31 @@ class HpackParseResult {
     HpackParseStatus status_;
   };
 
-  StatusWrapper status_;
-  union {
-    // Set if status == kInvalidMetadata
-    ValidateMetadataResult validate_metadata_result_;
-    // Set if status == kVarintOutOfRange
-    VarintOutOfRange varint_out_of_range_;
-    // Set if status == kInvalidHpackIndex
-    uint32_t invalid_hpack_index_;
-    // Set if status == kHardMetadataLimitExceeded or
-    // kSoftMetadataLimitExceeded
-    MetadataLimitExceeded metadata_limit_exceeded_;
-    // Set if status == kHardMetadataLimitExceededByKey or
-    // kHardMetadataLimitExceededByValue
-    MetadataLimitExceededByAtom metadata_limit_exceeded_by_atom_;
-    // Set if status == kIllegalTableSizeChange
-    IllegalTableSizeChange illegal_table_size_change_;
+  struct HpackParseResultState : public RefCounted<HpackParseResultState> {
+    explicit HpackParseResultState(HpackParseStatus incoming_status)
+        : status(incoming_status) {}
+    StatusWrapper status;
+    union {
+      // Set if status == kInvalidMetadata
+      ValidateMetadataResult validate_metadata_result;
+      // Set if status == kVarintOutOfRange
+      VarintOutOfRange varint_out_of_range;
+      // Set if status == kInvalidHpackIndex
+      uint32_t invalid_hpack_index;
+      // Set if status == kHardMetadataLimitExceeded or
+      // kSoftMetadataLimitExceeded
+      MetadataLimitExceeded metadata_limit_exceeded;
+      // Set if status == kHardMetadataLimitExceededByKey or
+      // kHardMetadataLimitExceededByValue
+      MetadataLimitExceededByAtom metadata_limit_exceeded_by_atom;
+      // Set if status == kIllegalTableSizeChange
+      IllegalTableSizeChange illegal_table_size_change;
+    };
+    std::string key;
+    mutable absl::optional<absl::Status> materialized_status;
   };
-  std::string key_;
-  mutable absl::optional<absl::Status> materialized_status_;
+
+  RefCountedPtr<HpackParseResultState> state_ = nullptr;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h
index 6b28daad61d4b..37456683b6468 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h
@@ -240,10 +240,6 @@ class HPackParser {
     uint32_t frame_length = 0;
     // Length of the string being parsed
     uint32_t string_length;
-    // How many more dynamic table updates are allowed
-    uint8_t dynamic_table_updates_allowed;
-    // Current parse state
-    ParseState parse_state = ParseState::kTop;
     // RED for overly large metadata sets
     RandomEarlyDetection metadata_early_detection;
     // Should the current header be added to the hpack table?
@@ -252,6 +248,10 @@ class HPackParser {
     bool is_string_huff_compressed;
     // Is the value being parsed binary?
     bool is_binary_header;
+    // How many more dynamic table updates are allowed
+    uint8_t dynamic_table_updates_allowed;
+    // Current parse state
+    ParseState parse_state = ParseState::kTop;
     absl::variant<const HPackTable::Memento*, Slice> key;
   };
 
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index e879b707ce500..7e105e8f695bc 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -319,7 +319,6 @@ struct grpc_chttp2_transport final
   };
 
   grpc_closure write_action_begin_locked;
-  grpc_closure write_action;
   grpc_closure write_action_end_locked;
 
   grpc_closure read_action_locked;
@@ -385,8 +384,9 @@ struct grpc_chttp2_transport final
   grpc_core::Chttp2PingAbusePolicy ping_abuse_policy;
   grpc_core::Chttp2PingRatePolicy ping_rate_policy;
   grpc_core::Chttp2PingCallbacks ping_callbacks;
-  absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
-      delayed_ping_timer_handle;
+  grpc_event_engine::experimental::EventEngine::TaskHandle
+      delayed_ping_timer_handle =
+          grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid;
   grpc_closure retry_initiate_ping_locked;
 
   grpc_core::Chttp2MaxConcurrentStreamsPolicy max_concurrent_streams_policy;
@@ -458,21 +458,20 @@ struct grpc_chttp2_transport final
   grpc_closure destructive_reclaimer_locked;
 
   // next bdp ping timer handle
-  absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
-      next_bdp_ping_timer_handle;
+  grpc_event_engine::experimental::EventEngine::TaskHandle
+      next_bdp_ping_timer_handle =
+          grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid;
 
   // keep-alive ping support
   /// Closure to initialize a keepalive ping
   grpc_closure init_keepalive_ping_locked;
-  /// Closure to run when the keepalive ping is sent
-  grpc_closure start_keepalive_ping_locked;
   /// Closure to run when the keepalive ping ack is received
   grpc_closure finish_keepalive_ping_locked;
-  /// Closure to run when the keepalive ping timeouts
-  grpc_closure keepalive_watchdog_fired_locked;
   /// timer to initiate ping events
-  absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
-      keepalive_ping_timer_handle;
+  grpc_event_engine::experimental::EventEngine::TaskHandle
+      keepalive_ping_timer_handle =
+          grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid;
+  ;
   /// time duration in between pings
   grpc_core::Duration keepalive_time;
   /// grace period to wait for data after sending a ping before keepalives
@@ -506,6 +505,9 @@ struct grpc_chttp2_transport final
   /// how much data are we willing to buffer when the WRITE_BUFFER_HINT is set?
   uint32_t write_buffer_size = grpc_core::chttp2::kDefaultWindow;
 
+  /// write execution state of the transport
+  grpc_chttp2_write_state write_state = GRPC_CHTTP2_WRITE_STATE_IDLE;
+
   /// policy for how much data we're willing to put into one http2 write
   grpc_core::Chttp2WriteSizePolicy write_size_policy;
 
@@ -525,8 +527,6 @@ struct grpc_chttp2_transport final
 
   /// if keepalive pings are allowed when there's no outstanding streams
   bool keepalive_permit_without_calls = false;
-  /// If start_keepalive_ping_locked has been called
-  bool keepalive_ping_started = false;
 
   // bdp estimator
   bool bdp_ping_blocked =
@@ -535,9 +535,6 @@ struct grpc_chttp2_transport final
   /// is the transport destroying itself?
   uint8_t destroying = false;
 
-  /// is there a read request to the endpoint outstanding?
-  uint8_t endpoint_reading = 1;
-
   /// is this a client?
   bool is_client;
 
@@ -559,9 +556,6 @@ struct grpc_chttp2_transport final
   // What percentage of rst_stream frames on the server should cause a ping
   // frame to be generated.
   uint8_t ping_on_rst_stream_percent;
-
-  /// write execution state of the transport
-  grpc_chttp2_write_state write_state = GRPC_CHTTP2_WRITE_STATE_IDLE;
 };
 
 typedef enum {
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc
index ade5363264a72..efa216fcf6e60 100644
--- a/src/core/ext/transport/chttp2/transport/parsing.cc
+++ b/src/core/ext/transport/chttp2/transport/parsing.cc
@@ -395,8 +395,7 @@ absl::variant<size_t, absl::Status> grpc_chttp2_perform_read(
         }
         cur += t->incoming_frame_size;
         t->incoming_stream = nullptr;
-        if (t->incoming_frame_type == GRPC_CHTTP2_FRAME_RST_STREAM &&
-            grpc_core::IsChttp2OffloadOnRstStreamEnabled()) {
+        if (t->incoming_frame_type == GRPC_CHTTP2_FRAME_RST_STREAM) {
           requests_started = std::numeric_limits<size_t>::max();
         }
         goto dts_fh_0;  // loop
@@ -702,8 +701,7 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t,
           t, std::string(t->peer_string.as_string_view()).c_str(),
           t->incoming_stream_id, t->last_new_stream_id));
       return init_header_skip_frame_parser(t, priority_type, is_eoh);
-    } else if (grpc_core::IsBlockExcessiveRequestsBeforeSettingsAckEnabled() &&
-               t->num_incoming_streams_before_settings_ack == 0) {
+    } else if (t->num_incoming_streams_before_settings_ack == 0) {
       GRPC_CHTTP2_IF_TRACING(gpr_log(
           GPR_ERROR,
           "transport:%p SERVER peer:%s rejecting grpc_chttp2_stream id=%d, "
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index 4e4757ce239cd..c81f2cf28081d 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -172,7 +172,9 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) {
               too_soon.next_allowed_ping_interval.ToString().c_str(),
               too_soon.wait.ToString().c_str());
         }
-        if (!t->delayed_ping_timer_handle.has_value()) {
+        if (t->delayed_ping_timer_handle ==
+            grpc_event_engine::experimental::EventEngine::TaskHandle::
+                kInvalid) {
           t->delayed_ping_timer_handle = t->event_engine->RunAfter(
               too_soon.wait, [t = t->Ref()]() mutable {
                 grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
@@ -278,8 +280,7 @@ class WriteContext {
                                       t_->settings[GRPC_LOCAL_SETTINGS],
                                       t_->force_send_settings,
                                       GRPC_CHTTP2_NUM_SETTINGS));
-      if (grpc_core::IsSettingsTimeoutEnabled() &&
-          t_->keepalive_timeout != grpc_core::Duration::Infinity()) {
+      if (t_->keepalive_timeout != grpc_core::Duration::Infinity()) {
         GPR_ASSERT(
             t_->settings_ack_watchdog ==
             grpc_event_engine::experimental::EventEngine::TaskHandle::kInvalid);
@@ -732,9 +733,7 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) {
       t->keepalive_timeout != grpc_core::Duration::Infinity()) {
     // Set ping timeout after finishing write so we don't measure our own send
     // time.
-    const auto timeout = grpc_core::IsSeparatePingFromKeepaliveEnabled()
-                             ? t->ping_timeout
-                             : t->keepalive_timeout;
+    const auto timeout = t->ping_timeout;
     auto id = t->ping_callbacks.OnPingTimeout(
         timeout, t->event_engine.get(), [t = t->Ref()] {
           grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
@@ -748,8 +747,7 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) {
               id.value());
     }
 
-    if (grpc_core::IsSeparatePingFromKeepaliveEnabled() &&
-        t->keepalive_incoming_data_wanted &&
+    if (t->keepalive_incoming_data_wanted &&
         t->keepalive_timeout < t->ping_timeout &&
         t->keepalive_ping_timeout_handle !=
             grpc_event_engine::experimental::EventEngine::TaskHandle::
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
index ec25b9a38ff2b..fc3059279f0ea 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/certs.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/certs.upb_minitable.h"
+
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -22,25 +28,19 @@ typedef struct envoy_admin_v3_Certificate envoy_admin_v3_Certificate;
 typedef struct envoy_admin_v3_CertificateDetails envoy_admin_v3_CertificateDetails;
 typedef struct envoy_admin_v3_CertificateDetails_OcspDetails envoy_admin_v3_CertificateDetails_OcspDetails;
 typedef struct envoy_admin_v3_SubjectAlternateName envoy_admin_v3_SubjectAlternateName;
-extern const upb_MiniTable envoy_admin_v3_Certificates_msg_init;
-extern const upb_MiniTable envoy_admin_v3_Certificate_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CertificateDetails_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CertificateDetails_OcspDetails_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SubjectAlternateName_msg_init;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 
 
 /* envoy.admin.v3.Certificates */
 
 UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Certificates*)_upb_Message_New(&envoy_admin_v3_Certificates_msg_init, arena);
+  return (envoy_admin_v3_Certificates*)_upb_Message_New(&envoy__admin__v3__Certificates_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_Certificates* ret = envoy_admin_v3_Certificates_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificates_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificates_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +50,7 @@ UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse_ex(con
                            int options, upb_Arena* arena) {
   envoy_admin_v3_Certificates* ret = envoy_admin_v3_Certificates_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificates_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificates_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +58,13 @@ UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse_ex(con
 }
 UPB_INLINE char* envoy_admin_v3_Certificates_serialize(const envoy_admin_v3_Certificates* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificates_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificates_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Certificates_serialize_ex(const envoy_admin_v3_Certificates* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificates_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificates_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Certificates_clear_certificates(envoy_admin_v3_Certificates* msg) {
@@ -126,7 +126,7 @@ UPB_INLINE struct envoy_admin_v3_Certificate* envoy_admin_v3_Certificates_add_ce
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_Certificate* sub = (struct envoy_admin_v3_Certificate*)_upb_Message_New(&envoy_admin_v3_Certificate_msg_init, arena);
+  struct envoy_admin_v3_Certificate* sub = (struct envoy_admin_v3_Certificate*)_upb_Message_New(&envoy__admin__v3__Certificate_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -135,12 +135,12 @@ UPB_INLINE struct envoy_admin_v3_Certificate* envoy_admin_v3_Certificates_add_ce
 /* envoy.admin.v3.Certificate */
 
 UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Certificate*)_upb_Message_New(&envoy_admin_v3_Certificate_msg_init, arena);
+  return (envoy_admin_v3_Certificate*)_upb_Message_New(&envoy__admin__v3__Certificate_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_Certificate* ret = envoy_admin_v3_Certificate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -150,7 +150,7 @@ UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse_ex(const
                            int options, upb_Arena* arena) {
   envoy_admin_v3_Certificate* ret = envoy_admin_v3_Certificate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificate_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -158,13 +158,13 @@ UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse_ex(const
 }
 UPB_INLINE char* envoy_admin_v3_Certificate_serialize(const envoy_admin_v3_Certificate* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificate_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Certificate_serialize_ex(const envoy_admin_v3_Certificate* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificate_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Certificate_clear_ca_cert(envoy_admin_v3_Certificate* msg) {
@@ -263,7 +263,7 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -289,7 +289,7 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -298,12 +298,12 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
 /* envoy.admin.v3.CertificateDetails */
 
 UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  return (envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_CertificateDetails* ret = envoy_admin_v3_CertificateDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -313,7 +313,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_CertificateDetails* ret = envoy_admin_v3_CertificateDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -321,13 +321,13 @@ UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_serialize(const envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_serialize_ex(const envoy_admin_v3_CertificateDetails* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CertificateDetails_clear_path(envoy_admin_v3_CertificateDetails* msg) {
@@ -475,7 +475,7 @@ UPB_INLINE struct envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_Certificat
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_SubjectAlternateName* sub = (struct envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy_admin_v3_SubjectAlternateName_msg_init, arena);
+  struct envoy_admin_v3_SubjectAlternateName* sub = (struct envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy__admin__v3__SubjectAlternateName_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -491,7 +491,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_valid_from(envoy_admin_v3_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_valid_from(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_CertificateDetails_set_valid_from(msg, sub);
   }
   return sub;
@@ -503,7 +503,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_expiration_time(envoy_admi
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_expiration_time(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_expiration_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_CertificateDetails_set_expiration_time(msg, sub);
   }
   return sub;
@@ -515,7 +515,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_ocsp_details(envoy_admin_v
 UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_mutable_ocsp_details(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
   struct envoy_admin_v3_CertificateDetails_OcspDetails* sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)envoy_admin_v3_CertificateDetails_ocsp_details(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, arena);
+    sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, arena);
     if (sub) envoy_admin_v3_CertificateDetails_set_ocsp_details(msg, sub);
   }
   return sub;
@@ -524,12 +524,12 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_
 /* envoy.admin.v3.CertificateDetails.OcspDetails */
 
 UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_OcspDetails_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, arena);
+  return (envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_OcspDetails_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_CertificateDetails_OcspDetails* ret = envoy_admin_v3_CertificateDetails_OcspDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -539,7 +539,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_Certifi
                            int options, upb_Arena* arena) {
   envoy_admin_v3_CertificateDetails_OcspDetails* ret = envoy_admin_v3_CertificateDetails_OcspDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -547,13 +547,13 @@ UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_Certifi
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_OcspDetails_serialize(const envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_OcspDetails_serialize_ex(const envoy_admin_v3_CertificateDetails_OcspDetails* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_clear_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg) {
@@ -594,7 +594,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(env
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_valid_from(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(msg, sub);
   }
   return sub;
@@ -606,7 +606,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(env
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_expiration(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_expiration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(msg, sub);
   }
   return sub;
@@ -615,12 +615,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_O
 /* envoy.admin.v3.SubjectAlternateName */
 
 UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateName_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy_admin_v3_SubjectAlternateName_msg_init, arena);
+  return (envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy__admin__v3__SubjectAlternateName_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateName_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_SubjectAlternateName* ret = envoy_admin_v3_SubjectAlternateName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SubjectAlternateName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SubjectAlternateName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -630,7 +630,7 @@ UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateN
                            int options, upb_Arena* arena) {
   envoy_admin_v3_SubjectAlternateName* ret = envoy_admin_v3_SubjectAlternateName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SubjectAlternateName_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SubjectAlternateName_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -638,13 +638,13 @@ UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateN
 }
 UPB_INLINE char* envoy_admin_v3_SubjectAlternateName_serialize(const envoy_admin_v3_SubjectAlternateName* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SubjectAlternateName_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SubjectAlternateName_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SubjectAlternateName_serialize_ex(const envoy_admin_v3_SubjectAlternateName* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SubjectAlternateName_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SubjectAlternateName_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -716,8 +716,6 @@ UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
new file mode 100644
index 0000000000000..1692371aa0540
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
@@ -0,0 +1,149 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/certs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/certs.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_Certificates_submsgs[1] = {
+  {.submsg = &envoy__admin__v3__Certificate_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
+  &envoy_admin_v3_Certificates_submsgs[0],
+  &envoy_admin_v3_Certificates__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_Certificate_submsgs[2] = {
+  {.submsg = &envoy__admin__v3__CertificateDetails_msg_init},
+  {.submsg = &envoy__admin__v3__CertificateDetails_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
+  &envoy_admin_v3_Certificate_submsgs[0],
+  &envoy_admin_v3_Certificate__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+    {0x000800003f010012, &upb_prm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_submsgs[4] = {
+  {.submsg = &envoy__admin__v3__SubjectAlternateName_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 56), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 64), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 72), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
+  &envoy_admin_v3_CertificateDetails_submsgs[0],
+  &envoy_admin_v3_CertificateDetails__fields[0],
+  UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_prm_1bt_max64b},
+    {0x003000003f000020, &upb_psv8_1bt},
+    {0x003800000101002a, &upb_psm_1bt_maxmaxb},
+    {0x0040000002020032, &upb_psm_1bt_maxmaxb},
+    {0x004800000303003a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = {
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = {
+  &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0],
+  &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init = {
+  NULL,
+  &envoy_admin_v3_SubjectAlternateName__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x000800000300001a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__admin__v3__Certificates_msg_init,
+  &envoy__admin__v3__Certificate_msg_init,
+  &envoy__admin__v3__CertificateDetails_msg_init,
+  &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init,
+  &envoy__admin__v3__SubjectAlternateName_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
new file mode 100644
index 0000000000000..3ce9de63aeb18
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/certs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CERTS_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__admin__v3__Certificates_msg_init;
+extern const upb_MiniTable envoy__admin__v3__Certificate_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
similarity index 94%
rename from src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
index 65ec5272fad3d..1f2790a76890f 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/clusters.proto
  *
@@ -10,7 +9,19 @@
 #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/clusters.upb_minitable.h"
+
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -21,32 +32,23 @@ typedef struct envoy_admin_v3_Clusters envoy_admin_v3_Clusters;
 typedef struct envoy_admin_v3_ClusterStatus envoy_admin_v3_ClusterStatus;
 typedef struct envoy_admin_v3_HostStatus envoy_admin_v3_HostStatus;
 typedef struct envoy_admin_v3_HostHealthStatus envoy_admin_v3_HostHealthStatus;
-extern const upb_MiniTable envoy_admin_v3_Clusters_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ClusterStatus_msg_init;
-extern const upb_MiniTable envoy_admin_v3_HostStatus_msg_init;
-extern const upb_MiniTable envoy_admin_v3_HostHealthStatus_msg_init;
 struct envoy_admin_v3_SimpleMetric;
 struct envoy_config_cluster_v3_CircuitBreakers;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_Locality;
 struct envoy_type_v3_Percent;
-extern const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Locality_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
 
 
 
 /* envoy.admin.v3.Clusters */
 
 UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Clusters*)_upb_Message_New(&envoy_admin_v3_Clusters_msg_init, arena);
+  return (envoy_admin_v3_Clusters*)_upb_Message_New(&envoy__admin__v3__Clusters_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_Clusters* ret = envoy_admin_v3_Clusters_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Clusters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Clusters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -56,7 +58,7 @@ UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse_ex(const char*
                            int options, upb_Arena* arena) {
   envoy_admin_v3_Clusters* ret = envoy_admin_v3_Clusters_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Clusters_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Clusters_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -64,13 +66,13 @@ UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse_ex(const char*
 }
 UPB_INLINE char* envoy_admin_v3_Clusters_serialize(const envoy_admin_v3_Clusters* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Clusters_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Clusters_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Clusters_serialize_ex(const envoy_admin_v3_Clusters* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Clusters_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Clusters_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Clusters_clear_cluster_statuses(envoy_admin_v3_Clusters* msg) {
@@ -132,7 +134,7 @@ UPB_INLINE struct envoy_admin_v3_ClusterStatus* envoy_admin_v3_Clusters_add_clus
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ClusterStatus* sub = (struct envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy_admin_v3_ClusterStatus_msg_init, arena);
+  struct envoy_admin_v3_ClusterStatus* sub = (struct envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy__admin__v3__ClusterStatus_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -141,12 +143,12 @@ UPB_INLINE struct envoy_admin_v3_ClusterStatus* envoy_admin_v3_Clusters_add_clus
 /* envoy.admin.v3.ClusterStatus */
 
 UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy_admin_v3_ClusterStatus_msg_init, arena);
+  return (envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy__admin__v3__ClusterStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ClusterStatus* ret = envoy_admin_v3_ClusterStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClusterStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClusterStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -156,7 +158,7 @@ UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse_ex(c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ClusterStatus* ret = envoy_admin_v3_ClusterStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClusterStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClusterStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -164,13 +166,13 @@ UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse_ex(c
 }
 UPB_INLINE char* envoy_admin_v3_ClusterStatus_serialize(const envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClusterStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClusterStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ClusterStatus_serialize_ex(const envoy_admin_v3_ClusterStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClusterStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClusterStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ClusterStatus_clear_name(envoy_admin_v3_ClusterStatus* msg) {
@@ -315,7 +317,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_success_rate_ejection_threshold(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold(msg, sub);
   }
   return sub;
@@ -341,7 +343,7 @@ UPB_INLINE struct envoy_admin_v3_HostStatus* envoy_admin_v3_ClusterStatus_add_ho
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_HostStatus* sub = (struct envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy_admin_v3_HostStatus_msg_init, arena);
+  struct envoy_admin_v3_HostStatus* sub = (struct envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy__admin__v3__HostStatus_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -353,7 +355,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_eject
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_local_origin_success_rate_ejection_threshold(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_ejection_threshold(msg, sub);
   }
   return sub;
@@ -365,7 +367,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_circuit_breakers(envoy_admin_v3
 UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_ClusterStatus_mutable_circuit_breakers(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
   struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_admin_v3_ClusterStatus_circuit_breakers(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_msg_init, arena);
+    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers_msg_init, arena);
     if (sub) envoy_admin_v3_ClusterStatus_set_circuit_breakers(msg, sub);
   }
   return sub;
@@ -382,12 +384,12 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_eds_service_name(envoy_admin_v3
 /* envoy.admin.v3.HostStatus */
 
 UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy_admin_v3_HostStatus_msg_init, arena);
+  return (envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy__admin__v3__HostStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_HostStatus* ret = envoy_admin_v3_HostStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -397,7 +399,7 @@ UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_HostStatus* ret = envoy_admin_v3_HostStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -405,13 +407,13 @@ UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_HostStatus_serialize(const envoy_admin_v3_HostStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_HostStatus_serialize_ex(const envoy_admin_v3_HostStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_HostStatus_clear_address(envoy_admin_v3_HostStatus* msg) {
@@ -567,7 +569,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_address(envoy_admin_v3_HostStatus
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_mutable_address(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_HostStatus_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_admin_v3_HostStatus_set_address(msg, sub);
   }
   return sub;
@@ -593,7 +595,7 @@ UPB_INLINE struct envoy_admin_v3_SimpleMetric* envoy_admin_v3_HostStatus_add_sta
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_SimpleMetric* sub = (struct envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy_admin_v3_SimpleMetric_msg_init, arena);
+  struct envoy_admin_v3_SimpleMetric* sub = (struct envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy__admin__v3__SimpleMetric_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -605,7 +607,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_health_status(envoy_admin_v3_HostS
 UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mutable_health_status(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
   struct envoy_admin_v3_HostHealthStatus* sub = (struct envoy_admin_v3_HostHealthStatus*)envoy_admin_v3_HostStatus_health_status(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy_admin_v3_HostHealthStatus_msg_init, arena);
+    sub = (struct envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy__admin__v3__HostHealthStatus_msg_init, arena);
     if (sub) envoy_admin_v3_HostStatus_set_health_status(msg, sub);
   }
   return sub;
@@ -617,7 +619,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_success_rate(envoy_admin_v3_HostSt
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_success_rate(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_admin_v3_HostStatus_set_success_rate(msg, sub);
   }
   return sub;
@@ -641,7 +643,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_local_origin_success_rate(envoy_ad
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local_origin_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_local_origin_success_rate(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_admin_v3_HostStatus_set_local_origin_success_rate(msg, sub);
   }
   return sub;
@@ -653,7 +655,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_locality(envoy_admin_v3_HostStatus
 UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutable_locality(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_admin_v3_HostStatus_locality(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
     if (sub) envoy_admin_v3_HostStatus_set_locality(msg, sub);
   }
   return sub;
@@ -662,12 +664,12 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutab
 /* envoy.admin.v3.HostHealthStatus */
 
 UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy_admin_v3_HostHealthStatus_msg_init, arena);
+  return (envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy__admin__v3__HostHealthStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_HostHealthStatus* ret = envoy_admin_v3_HostHealthStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostHealthStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostHealthStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -677,7 +679,7 @@ UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_pars
                            int options, upb_Arena* arena) {
   envoy_admin_v3_HostHealthStatus* ret = envoy_admin_v3_HostHealthStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostHealthStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostHealthStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -685,13 +687,13 @@ UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_pars
 }
 UPB_INLINE char* envoy_admin_v3_HostHealthStatus_serialize(const envoy_admin_v3_HostHealthStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostHealthStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostHealthStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_HostHealthStatus_serialize_ex(const envoy_admin_v3_HostHealthStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostHealthStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostHealthStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_HostHealthStatus_clear_failed_active_health_check(envoy_admin_v3_HostHealthStatus* msg) {
@@ -816,8 +818,6 @@ UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admi
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
new file mode 100644
index 0000000000000..e8e970c3aa48c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
@@ -0,0 +1,180 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/clusters.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/clusters.upb_minitable.h"
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_Clusters_submsgs[1] = {
+  {.submsg = &envoy__admin__v3__ClusterStatus_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
+  &envoy_admin_v3_Clusters_submsgs[0],
+  &envoy_admin_v3_Clusters__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ClusterStatus_submsgs[4] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__admin__v3__HostStatus_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 48), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(36, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
+  &envoy_admin_v3_ClusterStatus_submsgs[0],
+  &envoy_admin_v3_ClusterStatus__fields[0],
+  UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x002000003f010022, &upb_prm_1bt_max128b},
+    {0x002800000202002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000003030032, &upb_psm_1bt_maxmaxb},
+    {0x003800003f00003a, &upb_pss_1bt},
+    {0x004800003f000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_HostStatus_submsgs[6] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__admin__v3__SimpleMetric_msg_init},
+  {.submsg = &envoy__admin__v3__HostHealthStatus_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 40), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = {
+  &envoy_admin_v3_HostStatus_submsgs[0],
+  &envoy_admin_v3_HostStatus__fields[0],
+  UPB_SIZE(48, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001800003f010012, &upb_prm_1bt_maxmaxb},
+    {0x002000000202001a, &upb_psm_1bt_max64b},
+    {0x0028000003030022, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x003000003f000032, &upb_pss_1bt},
+    {0x000800003f000038, &upb_psv4_1bt},
+    {0x0040000004040042, &upb_psm_1bt_maxmaxb},
+    {0x004800000505004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_admin_v3_HostHealthStatus__fields[8] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init = {
+  NULL,
+  &envoy_admin_v3_HostHealthStatus__fields[0],
+  16, 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x000900003f000028, &upb_psb1_1bt},
+    {0x000a00003f000030, &upb_psb1_1bt},
+    {0x000b00003f000038, &upb_psb1_1bt},
+    {0x000c00003f000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &envoy__admin__v3__Clusters_msg_init,
+  &envoy__admin__v3__ClusterStatus_msg_init,
+  &envoy__admin__v3__HostStatus_msg_init,
+  &envoy__admin__v3__HostHealthStatus_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
new file mode 100644
index 0000000000000..98704a715ddfd
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/clusters.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_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__admin__v3__Clusters_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init;
+extern const upb_MiniTable envoy__admin__v3__HostStatus_msg_init;
+extern const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
index 3f11d917b17a4..2be1a96fd9462 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/config_dump.upb_minitable.h"
+
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -22,31 +31,22 @@ typedef struct envoy_admin_v3_BootstrapConfigDump envoy_admin_v3_BootstrapConfig
 typedef struct envoy_admin_v3_SecretsConfigDump envoy_admin_v3_SecretsConfigDump;
 typedef struct envoy_admin_v3_SecretsConfigDump_DynamicSecret envoy_admin_v3_SecretsConfigDump_DynamicSecret;
 typedef struct envoy_admin_v3_SecretsConfigDump_StaticSecret envoy_admin_v3_SecretsConfigDump_StaticSecret;
-extern const upb_MiniTable envoy_admin_v3_ConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_BootstrapConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init;
 struct envoy_admin_v3_UpdateFailureState;
 struct envoy_config_bootstrap_v3_Bootstrap;
 struct google_protobuf_Any;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 
 
 /* envoy.admin.v3.ConfigDump */
 
 UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ConfigDump*)_upb_Message_New(&envoy_admin_v3_ConfigDump_msg_init, arena);
+  return (envoy_admin_v3_ConfigDump*)_upb_Message_New(&envoy__admin__v3__ConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ConfigDump* ret = envoy_admin_v3_ConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -56,7 +56,7 @@ UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ConfigDump* ret = envoy_admin_v3_ConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -64,13 +64,13 @@ UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_ConfigDump_serialize(const envoy_admin_v3_ConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ConfigDump_serialize_ex(const envoy_admin_v3_ConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ConfigDump_clear_configs(envoy_admin_v3_ConfigDump* msg) {
@@ -132,7 +132,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(env
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -141,12 +141,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(env
 /* envoy.admin.v3.BootstrapConfigDump */
 
 UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_BootstrapConfigDump*)_upb_Message_New(&envoy_admin_v3_BootstrapConfigDump_msg_init, arena);
+  return (envoy_admin_v3_BootstrapConfigDump*)_upb_Message_New(&envoy__admin__v3__BootstrapConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_BootstrapConfigDump* ret = envoy_admin_v3_BootstrapConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__BootstrapConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -156,7 +156,7 @@ UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDum
                            int options, upb_Arena* arena) {
   envoy_admin_v3_BootstrapConfigDump* ret = envoy_admin_v3_BootstrapConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__BootstrapConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -164,13 +164,13 @@ UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDum
 }
 UPB_INLINE char* envoy_admin_v3_BootstrapConfigDump_serialize(const envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_BootstrapConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__BootstrapConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_BootstrapConfigDump_serialize_ex(const envoy_admin_v3_BootstrapConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_BootstrapConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__BootstrapConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_clear_bootstrap(envoy_admin_v3_BootstrapConfigDump* msg) {
@@ -211,7 +211,7 @@ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_bootstrap(envoy_admin_v3_
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapConfigDump_mutable_bootstrap(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Bootstrap* sub = (struct envoy_config_bootstrap_v3_Bootstrap*)envoy_admin_v3_BootstrapConfigDump_bootstrap(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap_msg_init, arena);
     if (sub) envoy_admin_v3_BootstrapConfigDump_set_bootstrap(msg, sub);
   }
   return sub;
@@ -223,7 +223,7 @@ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_last_updated(envoy_admin_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_mutable_last_updated(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_BootstrapConfigDump_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_BootstrapConfigDump_set_last_updated(msg, sub);
   }
   return sub;
@@ -232,12 +232,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_
 /* envoy.admin.v3.SecretsConfigDump */
 
 UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump* ret = envoy_admin_v3_SecretsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -247,7 +247,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_pa
                            int options, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump* ret = envoy_admin_v3_SecretsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -255,13 +255,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_pa
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_serialize(const envoy_admin_v3_SecretsConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_serialize_ex(const envoy_admin_v3_SecretsConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_clear_static_secrets(envoy_admin_v3_SecretsConfigDump* msg) {
@@ -397,7 +397,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_SecretsConfigDump_StaticSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_StaticSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -423,7 +423,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -449,7 +449,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -458,12 +458,12 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
 /* envoy.admin.v3.SecretsConfigDump.DynamicSecret */
 
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump_DynamicSecret* ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -473,7 +473,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_Secret
                            int options, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump_DynamicSecret* ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -481,13 +481,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_Secret
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize(const envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize_ex(const envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_clear_name(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg) {
@@ -584,7 +584,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(msg, sub);
   }
   return sub;
@@ -596,7 +596,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(envoy_
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_secret(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(msg, sub);
   }
   return sub;
@@ -608,7 +608,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(e
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(msg, sub);
   }
   return sub;
@@ -621,12 +621,12 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_client_status
 /* envoy.admin.v3.SecretsConfigDump.StaticSecret */
 
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_StaticSecret_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_StaticSecret_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump_StaticSecret* ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -636,7 +636,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_Secrets
                            int options, upb_Arena* arena) {
   envoy_admin_v3_SecretsConfigDump_StaticSecret* ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -644,13 +644,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_Secrets
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize(const envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize_ex(const envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_clear_name(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg) {
@@ -706,7 +706,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(e
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_StaticSecret_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(msg, sub);
   }
   return sub;
@@ -718,14 +718,12 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(envoy_a
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_StaticSecret_secret(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
new file mode 100644
index 0000000000000..8869c1acec228
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
@@ -0,0 +1,157 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/config_dump.upb_minitable.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_ConfigDump_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
+  &envoy_admin_v3_ConfigDump_submsgs[0],
+  &envoy_admin_v3_ConfigDump__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
+  &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
+  &envoy_admin_v3_BootstrapConfigDump__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = {
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init},
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init},
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
+  &envoy_admin_v3_SecretsConfigDump_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+    {0x000800003f010012, &upb_prm_1bt_max128b},
+    {0x001000003f02001a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init = {
+  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0030000002010022, &upb_psm_1bt_maxmaxb},
+    {0x003800000302002a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = {
+  &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
+  &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__admin__v3__ConfigDump_msg_init,
+  &envoy__admin__v3__BootstrapConfigDump_msg_init,
+  &envoy__admin__v3__SecretsConfigDump_msg_init,
+  &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init,
+  &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
new file mode 100644
index 0000000000000..6aaafb8bf1daa
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_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__admin__v3__ConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
index 24cb59ffccdf1..7c8b123cf3da1 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump_shared.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -36,29 +43,8 @@ typedef struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig envoy_adm
 typedef struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig;
 typedef struct envoy_admin_v3_EcdsConfigDump envoy_admin_v3_EcdsConfigDump;
 typedef struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig;
-extern const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenersConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ClustersConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init;
-extern const upb_MiniTable envoy_admin_v3_RoutesConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init;
-extern const upb_MiniTable envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EcdsConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init;
 struct google_protobuf_Any;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 typedef enum {
   envoy_admin_v3_UNKNOWN = 0,
@@ -73,12 +59,12 @@ typedef enum {
 /* envoy.admin.v3.UpdateFailureState */
 
 UPB_INLINE envoy_admin_v3_UpdateFailureState* envoy_admin_v3_UpdateFailureState_new(upb_Arena* arena) {
-  return (envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+  return (envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_UpdateFailureState* envoy_admin_v3_UpdateFailureState_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_UpdateFailureState* ret = envoy_admin_v3_UpdateFailureState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UpdateFailureState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -88,7 +74,7 @@ UPB_INLINE envoy_admin_v3_UpdateFailureState* envoy_admin_v3_UpdateFailureState_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_UpdateFailureState* ret = envoy_admin_v3_UpdateFailureState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UpdateFailureState_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -96,13 +82,13 @@ UPB_INLINE envoy_admin_v3_UpdateFailureState* envoy_admin_v3_UpdateFailureState_
 }
 UPB_INLINE char* envoy_admin_v3_UpdateFailureState_serialize(const envoy_admin_v3_UpdateFailureState* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UpdateFailureState_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UpdateFailureState_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_UpdateFailureState_serialize_ex(const envoy_admin_v3_UpdateFailureState* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UpdateFailureState_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UpdateFailureState_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_UpdateFailureState_clear_failed_configuration(envoy_admin_v3_UpdateFailureState* msg) {
@@ -165,7 +151,7 @@ UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_failed_configuration(envoy
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_mutable_failed_configuration(envoy_admin_v3_UpdateFailureState* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_UpdateFailureState_failed_configuration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_UpdateFailureState_set_failed_configuration(msg, sub);
   }
   return sub;
@@ -177,7 +163,7 @@ UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_last_update_attempt(envoy_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_mutable_last_update_attempt(envoy_admin_v3_UpdateFailureState* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_UpdateFailureState_last_update_attempt(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_UpdateFailureState_set_last_update_attempt(msg, sub);
   }
   return sub;
@@ -194,12 +180,12 @@ UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_version_info(envoy_admin_v
 /* envoy.admin.v3.ListenersConfigDump */
 
 UPB_INLINE envoy_admin_v3_ListenersConfigDump* envoy_admin_v3_ListenersConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenersConfigDump*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_msg_init, arena);
+  return (envoy_admin_v3_ListenersConfigDump*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenersConfigDump* envoy_admin_v3_ListenersConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump* ret = envoy_admin_v3_ListenersConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -209,7 +195,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump* envoy_admin_v3_ListenersConfigDum
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump* ret = envoy_admin_v3_ListenersConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -217,13 +203,13 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump* envoy_admin_v3_ListenersConfigDum
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_serialize(const envoy_admin_v3_ListenersConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_serialize_ex(const envoy_admin_v3_ListenersConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenersConfigDump_clear_version_info(envoy_admin_v3_ListenersConfigDump* msg) {
@@ -337,7 +323,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ListenersConfigDump_StaticListener* sub = (struct envoy_admin_v3_ListenersConfigDump_StaticListener*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, arena);
+  struct envoy_admin_v3_ListenersConfigDump_StaticListener* sub = (struct envoy_admin_v3_ListenersConfigDump_StaticListener*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -363,7 +349,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ListenersConfigDump_DynamicListener* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListener*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, arena);
+  struct envoy_admin_v3_ListenersConfigDump_DynamicListener* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListener*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -372,12 +358,12 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admi
 /* envoy.admin.v3.ListenersConfigDump.StaticListener */
 
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_ListenersConfigDump_StaticListener_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenersConfigDump_StaticListener*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, arena);
+  return (envoy_admin_v3_ListenersConfigDump_StaticListener*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_ListenersConfigDump_StaticListener_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_StaticListener* ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -387,7 +373,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_Lis
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_StaticListener* ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -395,13 +381,13 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_Lis
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_StaticListener_serialize(const envoy_admin_v3_ListenersConfigDump_StaticListener* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_StaticListener_serialize_ex(const envoy_admin_v3_ListenersConfigDump_StaticListener* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_clear_listener(envoy_admin_v3_ListenersConfigDump_StaticListener* msg) {
@@ -442,7 +428,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(e
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_listener(envoy_admin_v3_ListenersConfigDump_StaticListener* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_StaticListener_listener(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(msg, sub);
   }
   return sub;
@@ -454,7 +440,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updat
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_StaticListener_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updated(msg, sub);
   }
   return sub;
@@ -463,12 +449,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_
 /* envoy.admin.v3.ListenersConfigDump.DynamicListenerState */
 
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, arena);
+  return (envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_DynamicListenerState* ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -478,7 +464,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_DynamicListenerState* ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -486,13 +472,13 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_serialize_ex(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_clear_version_info(envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg) {
@@ -548,7 +534,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_list
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_listener(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_listener(msg, sub);
   }
   return sub;
@@ -560,7 +546,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated(msg, sub);
   }
   return sub;
@@ -569,12 +555,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_
 /* envoy.admin.v3.ListenersConfigDump.DynamicListener */
 
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_ListenersConfigDump_DynamicListener_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenersConfigDump_DynamicListener*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, arena);
+  return (envoy_admin_v3_ListenersConfigDump_DynamicListener*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_ListenersConfigDump_DynamicListener_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_DynamicListener* ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -584,7 +570,7 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_Li
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ListenersConfigDump_DynamicListener* ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -592,13 +578,13 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_Li
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_DynamicListener_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenersConfigDump_DynamicListener_serialize_ex(const envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_clear_name(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg) {
@@ -695,7 +681,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_st
 UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_active_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, arena);
+    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_state(msg, sub);
   }
   return sub;
@@ -707,7 +693,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_s
 UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_warming_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, arena);
+    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_state(msg, sub);
   }
   return sub;
@@ -719,7 +705,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_
 UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_draining_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init, arena);
+    sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_state(msg, sub);
   }
   return sub;
@@ -731,7 +717,7 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_sta
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state(msg, sub);
   }
   return sub;
@@ -744,12 +730,12 @@ UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_client_st
 /* envoy.admin.v3.ClustersConfigDump */
 
 UPB_INLINE envoy_admin_v3_ClustersConfigDump* envoy_admin_v3_ClustersConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ClustersConfigDump*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_msg_init, arena);
+  return (envoy_admin_v3_ClustersConfigDump*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ClustersConfigDump* envoy_admin_v3_ClustersConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump* ret = envoy_admin_v3_ClustersConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -759,7 +745,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump* envoy_admin_v3_ClustersConfigDump_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump* ret = envoy_admin_v3_ClustersConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -767,13 +753,13 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump* envoy_admin_v3_ClustersConfigDump_
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_serialize(const envoy_admin_v3_ClustersConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_serialize_ex(const envoy_admin_v3_ClustersConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ClustersConfigDump_clear_version_info(envoy_admin_v3_ClustersConfigDump* msg) {
@@ -924,7 +910,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ClustersConfigDump_StaticCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_StaticCluster*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, arena);
+  struct envoy_admin_v3_ClustersConfigDump_StaticCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_StaticCluster*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -950,7 +936,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, arena);
+  struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -976,7 +962,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, arena);
+  struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -985,12 +971,12 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_
 /* envoy.admin.v3.ClustersConfigDump.StaticCluster */
 
 UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_ClustersConfigDump_StaticCluster_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ClustersConfigDump_StaticCluster*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, arena);
+  return (envoy_admin_v3_ClustersConfigDump_StaticCluster*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_ClustersConfigDump_StaticCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump_StaticCluster* ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1000,7 +986,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_Clust
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump_StaticCluster* ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1008,13 +994,13 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_Clust
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_StaticCluster_serialize(const envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_StaticCluster_serialize_ex(const envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_clear_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster* msg) {
@@ -1055,7 +1041,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(envo
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_StaticCluster_cluster(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(msg, sub);
   }
   return sub;
@@ -1067,7 +1053,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_StaticCluster_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated(msg, sub);
   }
   return sub;
@@ -1076,12 +1062,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_S
 /* envoy.admin.v3.ClustersConfigDump.DynamicCluster */
 
 UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, arena);
+  return (envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_DynamicCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump_DynamicCluster* ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1091,7 +1077,7 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_Clus
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ClustersConfigDump_DynamicCluster* ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1099,13 +1085,13 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_Clus
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_DynamicCluster_serialize(const envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ClustersConfigDump_DynamicCluster_serialize_ex(const envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_clear_version_info(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg) {
@@ -1187,7 +1173,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(env
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_cluster(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(msg, sub);
   }
   return sub;
@@ -1199,7 +1185,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_update
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated(msg, sub);
   }
   return sub;
@@ -1211,7 +1197,7 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state(msg, sub);
   }
   return sub;
@@ -1224,12 +1210,12 @@ UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_client_stat
 /* envoy.admin.v3.RoutesConfigDump */
 
 UPB_INLINE envoy_admin_v3_RoutesConfigDump* envoy_admin_v3_RoutesConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_RoutesConfigDump*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_msg_init, arena);
+  return (envoy_admin_v3_RoutesConfigDump*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_RoutesConfigDump* envoy_admin_v3_RoutesConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump* ret = envoy_admin_v3_RoutesConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1239,7 +1225,7 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump* envoy_admin_v3_RoutesConfigDump_pars
                            int options, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump* ret = envoy_admin_v3_RoutesConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1247,13 +1233,13 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump* envoy_admin_v3_RoutesConfigDump_pars
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_serialize(const envoy_admin_v3_RoutesConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_serialize_ex(const envoy_admin_v3_RoutesConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_RoutesConfigDump_clear_static_route_configs(envoy_admin_v3_RoutesConfigDump* msg) {
@@ -1352,7 +1338,7 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, arena);
+  struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1378,7 +1364,7 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, arena);
+  struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1387,12 +1373,12 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admi
 /* envoy.admin.v3.RoutesConfigDump.StaticRouteConfig */
 
 UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(upb_Arena* arena) {
-  return (envoy_admin_v3_RoutesConfigDump_StaticRouteConfig*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, arena);
+  return (envoy_admin_v3_RoutesConfigDump_StaticRouteConfig*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1402,7 +1388,7 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_Rou
                            int options, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1410,13 +1396,13 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_Rou
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_serialize_ex(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_clear_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg) {
@@ -1457,7 +1443,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_conf
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_route_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_config(msg, sub);
   }
   return sub;
@@ -1469,7 +1455,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updat
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -1478,12 +1464,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_Sta
 /* envoy.admin.v3.RoutesConfigDump.DynamicRouteConfig */
 
 UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(upb_Arena* arena) {
-  return (envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, arena);
+  return (envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1493,7 +1479,7 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_Ro
                            int options, upb_Arena* arena) {
   envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1501,13 +1487,13 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_Ro
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_serialize_ex(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_clear_version_info(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg) {
@@ -1589,7 +1575,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_con
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_route_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_config(msg, sub);
   }
   return sub;
@@ -1601,7 +1587,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_upda
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -1613,7 +1599,7 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_sta
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state(msg, sub);
   }
   return sub;
@@ -1626,12 +1612,12 @@ UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_client_st
 /* envoy.admin.v3.ScopedRoutesConfigDump */
 
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump* envoy_admin_v3_ScopedRoutesConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ScopedRoutesConfigDump*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_msg_init, arena);
+  return (envoy_admin_v3_ScopedRoutesConfigDump*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump* envoy_admin_v3_ScopedRoutesConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump* ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1641,7 +1627,7 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump* envoy_admin_v3_ScopedRoutesCon
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump* ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1649,13 +1635,13 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump* envoy_admin_v3_ScopedRoutesCon
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_serialize(const envoy_admin_v3_ScopedRoutesConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_serialize_ex(const envoy_admin_v3_ScopedRoutesConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_clear_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump* msg) {
@@ -1754,7 +1740,7 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, arena);
+  struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1780,7 +1766,7 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfig
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, arena);
+  struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1789,12 +1775,12 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfig
 /* envoy.admin.v3.ScopedRoutesConfigDump.InlineScopedRouteConfigs */
 
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, arena);
+  return (envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1804,7 +1790,7 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1812,13 +1798,13 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_serialize_ex(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_clear_name(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg) {
@@ -1910,7 +1896,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Inl
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1922,7 +1908,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_s
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_last_updated(msg, sub);
   }
   return sub;
@@ -1931,12 +1917,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDu
 /* envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs */
 
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, arena);
+  return (envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1946,7 +1932,7 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envo
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1954,13 +1940,13 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envo
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_serialize_ex(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_clear_name(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg) {
@@ -2093,7 +2079,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Dyn
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2105,7 +2091,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_last_updated(msg, sub);
   }
   return sub;
@@ -2117,7 +2103,7 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_error_state(msg, sub);
   }
   return sub;
@@ -2130,12 +2116,12 @@ UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_
 /* envoy.admin.v3.EndpointsConfigDump */
 
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump* envoy_admin_v3_EndpointsConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_EndpointsConfigDump*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_msg_init, arena);
+  return (envoy_admin_v3_EndpointsConfigDump*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump* envoy_admin_v3_EndpointsConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump* ret = envoy_admin_v3_EndpointsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2145,7 +2131,7 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump* envoy_admin_v3_EndpointsConfigDum
                            int options, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump* ret = envoy_admin_v3_EndpointsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2153,13 +2139,13 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump* envoy_admin_v3_EndpointsConfigDum
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_serialize(const envoy_admin_v3_EndpointsConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_serialize_ex(const envoy_admin_v3_EndpointsConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_clear_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump* msg) {
@@ -2258,7 +2244,7 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, arena);
+  struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2284,7 +2270,7 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, arena);
+  struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2293,12 +2279,12 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envo
 /* envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig */
 
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(upb_Arena* arena) {
-  return (envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, arena);
+  return (envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2308,7 +2294,7 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2316,13 +2302,13 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_serialize_ex(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_clear_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg) {
@@ -2363,7 +2349,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endp
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_endpoint_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endpoint_config(msg, sub);
   }
   return sub;
@@ -2375,7 +2361,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -2384,12 +2370,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_
 /* envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig */
 
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(upb_Arena* arena) {
-  return (envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, arena);
+  return (envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2399,7 +2385,7 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin
                            int options, upb_Arena* arena) {
   envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2407,13 +2393,13 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_serialize_ex(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_clear_version_info(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg) {
@@ -2495,7 +2481,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_end
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_endpoint_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_endpoint_config(msg, sub);
   }
   return sub;
@@ -2507,7 +2493,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_las
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -2519,7 +2505,7 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_err
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state(msg, sub);
   }
   return sub;
@@ -2532,12 +2518,12 @@ UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_cli
 /* envoy.admin.v3.EcdsConfigDump */
 
 UPB_INLINE envoy_admin_v3_EcdsConfigDump* envoy_admin_v3_EcdsConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_EcdsConfigDump*)_upb_Message_New(&envoy_admin_v3_EcdsConfigDump_msg_init, arena);
+  return (envoy_admin_v3_EcdsConfigDump*)_upb_Message_New(&envoy__admin__v3__EcdsConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_EcdsConfigDump* envoy_admin_v3_EcdsConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_EcdsConfigDump* ret = envoy_admin_v3_EcdsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EcdsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EcdsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2547,7 +2533,7 @@ UPB_INLINE envoy_admin_v3_EcdsConfigDump* envoy_admin_v3_EcdsConfigDump_parse_ex
                            int options, upb_Arena* arena) {
   envoy_admin_v3_EcdsConfigDump* ret = envoy_admin_v3_EcdsConfigDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EcdsConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EcdsConfigDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2555,13 +2541,13 @@ UPB_INLINE envoy_admin_v3_EcdsConfigDump* envoy_admin_v3_EcdsConfigDump_parse_ex
 }
 UPB_INLINE char* envoy_admin_v3_EcdsConfigDump_serialize(const envoy_admin_v3_EcdsConfigDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EcdsConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EcdsConfigDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_EcdsConfigDump_serialize_ex(const envoy_admin_v3_EcdsConfigDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EcdsConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EcdsConfigDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_EcdsConfigDump_clear_ecds_filters(envoy_admin_v3_EcdsConfigDump* msg) {
@@ -2623,7 +2609,7 @@ UPB_INLINE struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* sub = (struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig*)_upb_Message_New(&envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, arena);
+  struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* sub = (struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig*)_upb_Message_New(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2632,12 +2618,12 @@ UPB_INLINE struct envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3
 /* envoy.admin.v3.EcdsConfigDump.EcdsFilterConfig */
 
 UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_new(upb_Arena* arena) {
-  return (envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig*)_upb_Message_New(&envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, arena);
+  return (envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig*)_upb_Message_New(&envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* ret = envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2647,7 +2633,7 @@ UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3_EcdsCo
                            int options, upb_Arena* arena) {
   envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* ret = envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2655,13 +2641,13 @@ UPB_INLINE envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* envoy_admin_v3_EcdsCo
 }
 UPB_INLINE char* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_serialize(const envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_serialize_ex(const envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_clear_version_info(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg) {
@@ -2743,7 +2729,7 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_ecds_filter(e
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_ecds_filter(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_ecds_filter(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_ecds_filter(msg, sub);
   }
   return sub;
@@ -2755,7 +2741,7 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_last_updated(
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_last_updated(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -2767,7 +2753,7 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_error_state(e
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_error_state(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_error_state(msg, sub);
   }
   return sub;
@@ -2777,8 +2763,6 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
new file mode 100644
index 0000000000000..c16f92540b5e4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
@@ -0,0 +1,532 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump_shared.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_UpdateFailureState_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
+  &envoy_admin_v3_UpdateFailureState_submsgs[0],
+  &envoy_admin_v3_UpdateFailureState__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] = {
+  {1, UPB_SIZE(8, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
+  &envoy_admin_v3_ListenersConfigDump_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x001800003f01001a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init = {
+  &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init = {
+  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = {
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = {
+  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init = {
+  &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
+  &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
+  UPB_SIZE(32, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x003000000403002a, &upb_psm_1bt_max64b},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_submsgs[3] = {
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
+  {1, UPB_SIZE(12, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
+  &envoy_admin_v3_ClustersConfigDump_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x001800003f01001a, &upb_prm_1bt_max64b},
+    {0x002000003f020022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init = {
+  &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init = {
+  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
+  &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
+  {.submsg = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init},
+  {.submsg = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
+  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
+  &envoy_admin_v3_RoutesConfigDump_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_prm_1bt_max64b},
+    {0x000800003f01001a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init = {
+  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init = {
+  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
+  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
+  {.submsg = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init},
+  {.submsg = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
+  &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+    {0x000800003f010012, &upb_prm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init = {
+  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
+    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init = {
+  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
+  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_prm_1bt_maxmaxb},
+    {0x0030000001010022, &upb_psm_1bt_maxmaxb},
+    {0x003800000202002a, &upb_psm_1bt_max64b},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
+  {.submsg = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init},
+  {.submsg = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] = {
+  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
+  &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_prm_1bt_max64b},
+    {0x000800003f01001a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init = {
+  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init = {
+  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
+  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_submsgs[1] = {
+  {.submsg = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
+  &envoy_admin_v3_EcdsConfigDump_submsgs[0],
+  &envoy_admin_v3_EcdsConfigDump__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init = {
+  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0],
+  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[19] = {
+  &envoy__admin__v3__UpdateFailureState_msg_init,
+  &envoy__admin__v3__ListenersConfigDump_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init,
+  &envoy__admin__v3__ClustersConfigDump_msg_init,
+  &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init,
+  &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init,
+  &envoy__admin__v3__RoutesConfigDump_msg_init,
+  &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init,
+  &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init,
+  &envoy__admin__v3__EcdsConfigDump_msg_init,
+  &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  19,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
new file mode 100644
index 0000000000000..343ceaff9a037
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
@@ -0,0 +1,48 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump_shared.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_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__admin__v3__UpdateFailureState_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
index e43e5d5092405..0fe577f7d69de 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/init_dump.proto
  *
@@ -10,7 +9,12 @@
 #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/init_dump.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,20 +23,18 @@ extern "C" {
 
 typedef struct envoy_admin_v3_UnreadyTargetsDumps envoy_admin_v3_UnreadyTargetsDumps;
 typedef struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump;
-extern const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_msg_init;
-extern const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init;
 
 
 
 /* envoy.admin.v3.UnreadyTargetsDumps */
 
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDumps_new(upb_Arena* arena) {
-  return (envoy_admin_v3_UnreadyTargetsDumps*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_msg_init, arena);
+  return (envoy_admin_v3_UnreadyTargetsDumps*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDumps_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_UnreadyTargetsDumps* ret = envoy_admin_v3_UnreadyTargetsDumps_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +44,7 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDump
                            int options, upb_Arena* arena) {
   envoy_admin_v3_UnreadyTargetsDumps* ret = envoy_admin_v3_UnreadyTargetsDumps_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +52,13 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDump
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_serialize(const envoy_admin_v3_UnreadyTargetsDumps* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_serialize_ex(const envoy_admin_v3_UnreadyTargetsDumps* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_clear_unready_targets_dumps(envoy_admin_v3_UnreadyTargetsDumps* msg) {
@@ -118,7 +120,7 @@ UPB_INLINE struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_a
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* sub = (struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, arena);
+  struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* sub = (struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -127,12 +129,12 @@ UPB_INLINE struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_a
 /* envoy.admin.v3.UnreadyTargetsDumps.UnreadyTargetsDump */
 
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, arena);
+  return (envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* ret = envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -142,7 +144,7 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3
                            int options, upb_Arena* arena) {
   envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* ret = envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -150,13 +152,13 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_serialize(const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_serialize_ex(const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_clear_name(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg) {
@@ -237,8 +239,6 @@ UPB_INLINE bool envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_add_target
   return true;
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
new file mode 100644
index 0000000000000..d582f86e730db
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
@@ -0,0 +1,66 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/init_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/init_dump.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = {
+  {.submsg = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = {
+  &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0],
+  &envoy_admin_v3_UnreadyTargetsDumps__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init = {
+  NULL,
+  &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__admin__v3__UnreadyTargetsDumps_msg_init,
+  &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
new file mode 100644
index 0000000000000..1715119fd5162
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/init_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_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__admin__v3__UnreadyTargetsDumps_msg_init;
+extern const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
index c301866cc9f2b..7a2c09a6b00bd 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/listeners.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/listeners.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,22 +25,19 @@ extern "C" {
 
 typedef struct envoy_admin_v3_Listeners envoy_admin_v3_Listeners;
 typedef struct envoy_admin_v3_ListenerStatus envoy_admin_v3_ListenerStatus;
-extern const upb_MiniTable envoy_admin_v3_Listeners_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenerStatus_msg_init;
 struct envoy_config_core_v3_Address;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
 
 
 
 /* envoy.admin.v3.Listeners */
 
 UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Listeners*)_upb_Message_New(&envoy_admin_v3_Listeners_msg_init, arena);
+  return (envoy_admin_v3_Listeners*)_upb_Message_New(&envoy__admin__v3__Listeners_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_Listeners* ret = envoy_admin_v3_Listeners_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Listeners_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Listeners_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse_ex(const cha
                            int options, upb_Arena* arena) {
   envoy_admin_v3_Listeners* ret = envoy_admin_v3_Listeners_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Listeners_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Listeners_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse_ex(const cha
 }
 UPB_INLINE char* envoy_admin_v3_Listeners_serialize(const envoy_admin_v3_Listeners* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Listeners_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Listeners_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Listeners_serialize_ex(const envoy_admin_v3_Listeners* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Listeners_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Listeners_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Listeners_clear_listener_statuses(envoy_admin_v3_Listeners* msg) {
@@ -120,7 +123,7 @@ UPB_INLINE struct envoy_admin_v3_ListenerStatus* envoy_admin_v3_Listeners_add_li
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_admin_v3_ListenerStatus* sub = (struct envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy_admin_v3_ListenerStatus_msg_init, arena);
+  struct envoy_admin_v3_ListenerStatus* sub = (struct envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy__admin__v3__ListenerStatus_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -129,12 +132,12 @@ UPB_INLINE struct envoy_admin_v3_ListenerStatus* envoy_admin_v3_Listeners_add_li
 /* envoy.admin.v3.ListenerStatus */
 
 UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy_admin_v3_ListenerStatus_msg_init, arena);
+  return (envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy__admin__v3__ListenerStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ListenerStatus* ret = envoy_admin_v3_ListenerStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -144,7 +147,7 @@ UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse_ex
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ListenerStatus* ret = envoy_admin_v3_ListenerStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenerStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenerStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -152,13 +155,13 @@ UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse_ex
 }
 UPB_INLINE char* envoy_admin_v3_ListenerStatus_serialize(const envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenerStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenerStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenerStatus_serialize_ex(const envoy_admin_v3_ListenerStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenerStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenerStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenerStatus_clear_name(envoy_admin_v3_ListenerStatus* msg) {
@@ -236,7 +239,7 @@ UPB_INLINE void envoy_admin_v3_ListenerStatus_set_local_address(envoy_admin_v3_L
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_mutable_local_address(envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_ListenerStatus_local_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_admin_v3_ListenerStatus_set_local_address(msg, sub);
   }
   return sub;
@@ -262,14 +265,12 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_ad
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
new file mode 100644
index 0000000000000..5e66238d8acb3
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
@@ -0,0 +1,74 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/listeners.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/listeners.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_Listeners_submsgs[1] = {
+  {.submsg = &envoy__admin__v3__ListenerStatus_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__Listeners_msg_init = {
+  &envoy_admin_v3_Listeners_submsgs[0],
+  &envoy_admin_v3_Listeners__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_ListenerStatus_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = {
+  &envoy_admin_v3_ListenerStatus_submsgs[0],
+  &envoy_admin_v3_ListenerStatus__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f01001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__admin__v3__Listeners_msg_init,
+  &envoy__admin__v3__ListenerStatus_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
new file mode 100644
index 0000000000000..8b1ce1f95dca9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/listeners.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_LISTENERS_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__admin__v3__Listeners_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
index d73d536132ae2..7185e31f800b3 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/memory.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/memory.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +23,18 @@ extern "C" {
 #endif
 
 typedef struct envoy_admin_v3_Memory envoy_admin_v3_Memory;
-extern const upb_MiniTable envoy_admin_v3_Memory_msg_init;
 
 
 
 /* envoy.admin.v3.Memory */
 
 UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Memory*)_upb_Message_New(&envoy_admin_v3_Memory_msg_init, arena);
+  return (envoy_admin_v3_Memory*)_upb_Message_New(&envoy__admin__v3__Memory_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_Memory* ret = envoy_admin_v3_Memory_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Memory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Memory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +44,7 @@ UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   envoy_admin_v3_Memory* ret = envoy_admin_v3_Memory_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Memory_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Memory_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +52,13 @@ UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse_ex(const char* buf
 }
 UPB_INLINE char* envoy_admin_v3_Memory_serialize(const envoy_admin_v3_Memory* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Memory_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Memory_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Memory_serialize_ex(const envoy_admin_v3_Memory* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Memory_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Memory_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Memory_clear_allocated(envoy_admin_v3_Memory* msg) {
@@ -149,8 +153,6 @@ UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Me
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
new file mode 100644
index 0000000000000..41229cca8fc25
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
@@ -0,0 +1,56 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/memory.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/memory.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_admin_v3_Memory__fields[6] = {
+  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__Memory_msg_init = {
+  NULL,
+  &envoy_admin_v3_Memory__fields[0],
+  48, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x001000003f000018, &upb_psv8_1bt},
+    {0x001800003f000020, &upb_psv8_1bt},
+    {0x002000003f000028, &upb_psv8_1bt},
+    {0x002800003f000030, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__admin__v3__Memory_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_memory_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/admin/v3/memory.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
new file mode 100644
index 0000000000000..d159b6804c301
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/memory.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MEMORY_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__admin__v3__Memory_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
index db291fe70806a..cc3647fa9d427 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/metrics.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,7 +23,6 @@ extern "C" {
 #endif
 
 typedef struct envoy_admin_v3_SimpleMetric envoy_admin_v3_SimpleMetric;
-extern const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init;
 
 typedef enum {
   envoy_admin_v3_SimpleMetric_COUNTER = 0,
@@ -30,12 +34,12 @@ typedef enum {
 /* envoy.admin.v3.SimpleMetric */
 
 UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy_admin_v3_SimpleMetric_msg_init, arena);
+  return (envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy__admin__v3__SimpleMetric_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_SimpleMetric* ret = envoy_admin_v3_SimpleMetric_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SimpleMetric_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SimpleMetric_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -45,7 +49,7 @@ UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse_ex(con
                            int options, upb_Arena* arena) {
   envoy_admin_v3_SimpleMetric* ret = envoy_admin_v3_SimpleMetric_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SimpleMetric_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SimpleMetric_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -53,13 +57,13 @@ UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse_ex(con
 }
 UPB_INLINE char* envoy_admin_v3_SimpleMetric_serialize(const envoy_admin_v3_SimpleMetric* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SimpleMetric_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SimpleMetric_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SimpleMetric_serialize_ex(const envoy_admin_v3_SimpleMetric* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SimpleMetric_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SimpleMetric_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SimpleMetric_clear_type(envoy_admin_v3_SimpleMetric* msg) {
@@ -109,8 +113,6 @@ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
new file mode 100644
index 0000000000000..8d8a26126a2d6
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/metrics.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_admin_v3_SimpleMetric__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init = {
+  NULL,
+  &envoy_admin_v3_SimpleMetric__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x001000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__admin__v3__SimpleMetric_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_metrics_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/admin/v3/metrics.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
new file mode 100644
index 0000000000000..10fcf59a89b4d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/metrics.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_METRICS_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__admin__v3__SimpleMetric_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
index 478dceeb978a1..314e2cbb7761c 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/mutex_stats.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/mutex_stats.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +23,18 @@ extern "C" {
 #endif
 
 typedef struct envoy_admin_v3_MutexStats envoy_admin_v3_MutexStats;
-extern const upb_MiniTable envoy_admin_v3_MutexStats_msg_init;
 
 
 
 /* envoy.admin.v3.MutexStats */
 
 UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_new(upb_Arena* arena) {
-  return (envoy_admin_v3_MutexStats*)_upb_Message_New(&envoy_admin_v3_MutexStats_msg_init, arena);
+  return (envoy_admin_v3_MutexStats*)_upb_Message_New(&envoy__admin__v3__MutexStats_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_MutexStats* ret = envoy_admin_v3_MutexStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_MutexStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__MutexStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +44,7 @@ UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_MutexStats* ret = envoy_admin_v3_MutexStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_MutexStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__MutexStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +52,13 @@ UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_MutexStats_serialize(const envoy_admin_v3_MutexStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_MutexStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__MutexStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_MutexStats_serialize_ex(const envoy_admin_v3_MutexStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_MutexStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__MutexStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_MutexStats_clear_num_contentions(envoy_admin_v3_MutexStats* msg) {
@@ -104,8 +108,6 @@ UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
new file mode 100644
index 0000000000000..7c3d1f733f426
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/mutex_stats.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/mutex_stats.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_admin_v3_MutexStats__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__MutexStats_msg_init = {
+  NULL,
+  &envoy_admin_v3_MutexStats__fields[0],
+  24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x001000003f000018, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__admin__v3__MutexStats_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_mutex_stats_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/admin/v3/mutex_stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
new file mode 100644
index 0000000000000..ba8367f875d77
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/mutex_stats.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_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__admin__v3__MutexStats_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
similarity index 97%
rename from src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
index 4857d33b1d5a2..a71152ff503d7 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/server_info.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/server_info.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,12 +26,8 @@ extern "C" {
 
 typedef struct envoy_admin_v3_ServerInfo envoy_admin_v3_ServerInfo;
 typedef struct envoy_admin_v3_CommandLineOptions envoy_admin_v3_CommandLineOptions;
-extern const upb_MiniTable envoy_admin_v3_ServerInfo_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CommandLineOptions_msg_init;
 struct envoy_config_core_v3_Node;
 struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 typedef enum {
   envoy_admin_v3_CommandLineOptions_Gradual = 0,
@@ -54,12 +57,12 @@ typedef enum {
 /* envoy.admin.v3.ServerInfo */
 
 UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ServerInfo*)_upb_Message_New(&envoy_admin_v3_ServerInfo_msg_init, arena);
+  return (envoy_admin_v3_ServerInfo*)_upb_Message_New(&envoy__admin__v3__ServerInfo_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_ServerInfo* ret = envoy_admin_v3_ServerInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ServerInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ServerInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -69,7 +72,7 @@ UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_ServerInfo* ret = envoy_admin_v3_ServerInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ServerInfo_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ServerInfo_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -77,13 +80,13 @@ UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_ServerInfo_serialize(const envoy_admin_v3_ServerInfo* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ServerInfo_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ServerInfo_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ServerInfo_serialize_ex(const envoy_admin_v3_ServerInfo* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ServerInfo_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ServerInfo_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ServerInfo_clear_version(envoy_admin_v3_ServerInfo* msg) {
@@ -195,7 +198,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_current_epoch(envoy_admin_v
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_current_epoch(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_current_epoch(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_admin_v3_ServerInfo_set_uptime_current_epoch(msg, sub);
   }
   return sub;
@@ -207,7 +210,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_all_epochs(envoy_admin_v3_S
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_all_epochs(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_all_epochs(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_admin_v3_ServerInfo_set_uptime_all_epochs(msg, sub);
   }
   return sub;
@@ -223,7 +226,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_command_line_options(envoy_admin_v
 UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_mutable_command_line_options(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
   struct envoy_admin_v3_CommandLineOptions* sub = (struct envoy_admin_v3_CommandLineOptions*)envoy_admin_v3_ServerInfo_command_line_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy_admin_v3_CommandLineOptions_msg_init, arena);
+    sub = (struct envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy__admin__v3__CommandLineOptions_msg_init, arena);
     if (sub) envoy_admin_v3_ServerInfo_set_command_line_options(msg, sub);
   }
   return sub;
@@ -235,7 +238,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_node(envoy_admin_v3_ServerInfo *ms
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_node(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_admin_v3_ServerInfo_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_admin_v3_ServerInfo_set_node(msg, sub);
   }
   return sub;
@@ -244,12 +247,12 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_n
 /* envoy.admin.v3.CommandLineOptions */
 
 UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy_admin_v3_CommandLineOptions_msg_init, arena);
+  return (envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy__admin__v3__CommandLineOptions_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_CommandLineOptions* ret = envoy_admin_v3_CommandLineOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CommandLineOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CommandLineOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -259,7 +262,7 @@ UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_
                            int options, upb_Arena* arena) {
   envoy_admin_v3_CommandLineOptions* ret = envoy_admin_v3_CommandLineOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CommandLineOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CommandLineOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -267,13 +270,13 @@ UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_
 }
 UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize(const envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CommandLineOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CommandLineOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize_ex(const envoy_admin_v3_CommandLineOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CommandLineOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CommandLineOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id(envoy_admin_v3_CommandLineOptions* msg) {
@@ -778,7 +781,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_file_flush_interval(envoy_
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_file_flush_interval(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_file_flush_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_admin_v3_CommandLineOptions_set_file_flush_interval(msg, sub);
   }
   return sub;
@@ -790,7 +793,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_time(envoy_admin_v3_
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_drain_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_drain_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_admin_v3_CommandLineOptions_set_drain_time(msg, sub);
   }
   return sub;
@@ -802,7 +805,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(envoy
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_parent_shutdown_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_parent_shutdown_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(msg, sub);
   }
   return sub;
@@ -916,8 +919,6 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_stats_tag(envoy_admin_v3_C
   return true;
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
new file mode 100644
index 0000000000000..a09012ee4722d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
@@ -0,0 +1,150 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/server_info.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/server_info.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_ServerInfo_submsgs[4] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__admin__v3__CommandLineOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
+  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 64), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
+  &envoy_admin_v3_ServerInfo_submsgs[0],
+  &envoy_admin_v3_ServerInfo__fields[0],
+  UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
+    {0x002800003f00002a, &upb_pss_1bt},
+    {0x0038000003020032, &upb_psm_1bt_maxmaxb},
+    {0x004000000403003a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = {
+  {1, UPB_SIZE(72, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(80, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(88, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 96, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(104, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(112, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(120, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(128, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(136, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(144, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(152, 208), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(16, 224), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(20, 232), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(24, 240), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(28, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(32, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(33, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(36, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(40, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(41, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(42, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(44, 248), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(48, 31), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(49, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(160, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(52, 36), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(56, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {35, UPB_SIZE(168, 272), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(60, 44), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {38, UPB_SIZE(68, 288), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = {
+  &envoy_admin_v3_CommandLineOptions_submsgs[0],
+  &envoy_admin_v3_CommandLineOptions__fields[0],
+  UPB_SIZE(176, 296), 34, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f000008, &upb_psv8_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x004000003f00001a, &upb_pss_1bt},
+    {0x005000003f000022, &upb_pss_1bt},
+    {0x000800003f000028, &upb_psb1_1bt},
+    {0x006000003f000032, &upb_pss_1bt},
+    {0x000c00003f000038, &upb_psv4_1bt},
+    {0x007000003f000042, &upb_pss_1bt},
+    {0x008000003f00004a, &upb_pss_1bt},
+    {0x009000003f000052, &upb_pss_1bt},
+    {0x00a000003f00005a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00b000003f00006a, &upb_pss_1bt},
+    {0x00c000003f000072, &upb_pss_1bt},
+    {0x00d000003f00007a, &upb_pss_1bt},
+    {0x00e0000001000182, &upb_psm_2bt_maxmaxb},
+    {0x00e800000201018a, &upb_psm_2bt_maxmaxb},
+    {0x00f0000003020192, &upb_psm_2bt_maxmaxb},
+    {0x001000003f000198, &upb_psv4_2bt},
+    {0x002c00003f0002a0, &upb_psv4_2bt},
+    {0x003000003f0002a8, &upb_psb1_2bt},
+    {0x001400003f0001b0, &upb_psb1_2bt},
+    {0x001500003f0001b8, &upb_psb1_2bt},
+    {0x001800003f0001c0, &upb_psv4_2bt},
+    {0x001c00003f0001c8, &upb_psb1_2bt},
+    {0x001d00003f0001d0, &upb_psb1_2bt},
+    {0x001e00003f0001d8, &upb_psb1_2bt},
+    {0x00f800003f0001e2, &upb_prs_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001f00003f0001f0, &upb_psb1_2bt},
+    {0x002000003f0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__admin__v3__ServerInfo_msg_init,
+  &envoy__admin__v3__CommandLineOptions_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
new file mode 100644
index 0000000000000..56229607e308d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/server_info.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_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__admin__v3__ServerInfo_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h
rename to src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
index f4b479f4e6d2f..895aff5169624 100644
--- a/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/tap.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/tap.upb_minitable.h"
+
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_admin_v3_TapRequest envoy_admin_v3_TapRequest;
-extern const upb_MiniTable envoy_admin_v3_TapRequest_msg_init;
 struct envoy_config_tap_v3_TapConfig;
-extern const upb_MiniTable envoy_config_tap_v3_TapConfig_msg_init;
 
 
 
 /* envoy.admin.v3.TapRequest */
 
 UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_new(upb_Arena* arena) {
-  return (envoy_admin_v3_TapRequest*)_upb_Message_New(&envoy_admin_v3_TapRequest_msg_init, arena);
+  return (envoy_admin_v3_TapRequest*)_upb_Message_New(&envoy__admin__v3__TapRequest_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_admin_v3_TapRequest* ret = envoy_admin_v3_TapRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_TapRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__TapRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_admin_v3_TapRequest* ret = envoy_admin_v3_TapRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_TapRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__TapRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_TapRequest_serialize(const envoy_admin_v3_TapRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_TapRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__TapRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_TapRequest_serialize_ex(const envoy_admin_v3_TapRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_TapRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__TapRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_admin_v3_TapRequest_clear_config_id(envoy_admin_v3_TapRequest* msg) {
@@ -97,14 +102,12 @@ UPB_INLINE void envoy_admin_v3_TapRequest_set_tap_config(envoy_admin_v3_TapReque
 UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutable_tap_config(envoy_admin_v3_TapRequest* msg, upb_Arena* arena) {
   struct envoy_config_tap_v3_TapConfig* sub = (struct envoy_config_tap_v3_TapConfig*)envoy_admin_v3_TapRequest_tap_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy_config_tap_v3_TapConfig_msg_init, arena);
+    sub = (struct envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy__config__tap__v3__TapConfig_msg_init, arena);
     if (sub) envoy_admin_v3_TapRequest_set_tap_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
new file mode 100644
index 0000000000000..dfeb01e569f08
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/tap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/admin/v3/tap.upb_minitable.h"
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_admin_v3_TapRequest_submsgs[1] = {
+  {.submsg = &envoy__config__tap__v3__TapConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = {
+  &envoy_admin_v3_TapRequest_submsgs[0],
+  &envoy_admin_v3_TapRequest__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__admin__v3__TapRequest_msg_init,
+};
+
+const upb_MiniTableFile envoy_admin_v3_tap_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/admin/v3/tap.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
new file mode 100644
index 0000000000000..d80367838d4f8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/tap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_TAP_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__admin__v3__TapRequest_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
rename to src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
index 54d8fbc9eb1db..c5eb66d91b282 100644
--- a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/annotations/deprecation.proto
  *
@@ -10,21 +9,20 @@
 #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/annotations/deprecation.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext;
-extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext;
-extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext;
-extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext;
 struct google_protobuf_EnumValueOptions;
 struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
 
 
 UPB_INLINE bool envoy_annotations_has_disallowed_by_default(const struct google_protobuf_FieldOptions* msg) {
@@ -115,8 +113,6 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go
   bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
-extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
new file mode 100644
index 0000000000000..8ee1efeea00e1
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
@@ -0,0 +1,58 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/deprecation.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext = {
+  {189503207, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext = {
+  {157299826, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext = {
+  {70100853, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumValueOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext = {
+  {181198657, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumValueOptions_msg_init,
+  {.submsg = NULL},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[4] = {
+  &envoy_annotations_disallowed_by_default_ext,
+  &envoy_annotations_deprecated_at_minor_version_ext,
+  &envoy_annotations_disallowed_by_default_enum_ext,
+  &envoy_annotations_deprecated_at_minor_version_enum_ext,
+};
+
+const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  extensions_layout,
+  0,
+  0,
+  4,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
new file mode 100644
index 0000000000000..f74c3758583ec
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/deprecation.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_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_MiniTableExtension envoy_annotations_disallowed_by_default_ext;
+extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext;
+extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext;
+extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext;
+
+extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h
new file mode 100644
index 0000000000000..5909196cc2e11
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h
@@ -0,0 +1,109 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/annotations/resource.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_annotations_ResourceAnnotation envoy_annotations_ResourceAnnotation;
+struct google_protobuf_ServiceOptions;
+
+
+
+/* envoy.annotations.ResourceAnnotation */
+
+UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_new(upb_Arena* arena) {
+  return (envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy__annotations__ResourceAnnotation_msg_init, arena);
+}
+UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__annotations__ResourceAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__annotations__ResourceAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize(const envoy_annotations_ResourceAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__annotations__ResourceAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize_ex(const envoy_annotations_ResourceAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__annotations__ResourceAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_annotations_ResourceAnnotation_clear_type(envoy_annotations_ResourceAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_annotations_ResourceAnnotation_type(const envoy_annotations_ResourceAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_annotations_ResourceAnnotation_set_type(envoy_annotations_ResourceAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool envoy_annotations_has_resource(const struct google_protobuf_ServiceOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &envoy_annotations_resource_ext);
+}
+UPB_INLINE void envoy_annotations_clear_resource(struct google_protobuf_ServiceOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &envoy_annotations_resource_ext);
+}
+UPB_INLINE const envoy_annotations_ResourceAnnotation* envoy_annotations_resource(const struct google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const envoy_annotations_ResourceAnnotation* default_val = NULL;
+  const envoy_annotations_ResourceAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOptions* msg, const envoy_annotations_ResourceAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
new file mode 100644
index 0000000000000..1da333fb45a04
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/annotations/resource.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_annotations_ResourceAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = {
+  NULL,
+  &envoy_annotations_ResourceAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__annotations__ResourceAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension envoy_annotations_resource_ext = {
+  {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__ServiceOptions_msg_init,
+  {.submsg = &envoy__annotations__ResourceAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &envoy_annotations_resource_ext,
+};
+
+const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
new file mode 100644
index 0000000000000..03b2f147104ce
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_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__annotations__ResourceAnnotation_msg_init;
+extern const upb_MiniTableExtension envoy_annotations_resource_ext;
+
+extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
new file mode 100644
index 0000000000000..aef7a14aac068
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
@@ -0,0 +1,1753 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_config_accesslog_v3_AccessLog envoy_config_accesslog_v3_AccessLog;
+typedef struct envoy_config_accesslog_v3_AccessLogFilter envoy_config_accesslog_v3_AccessLogFilter;
+typedef struct envoy_config_accesslog_v3_ComparisonFilter envoy_config_accesslog_v3_ComparisonFilter;
+typedef struct envoy_config_accesslog_v3_StatusCodeFilter envoy_config_accesslog_v3_StatusCodeFilter;
+typedef struct envoy_config_accesslog_v3_DurationFilter envoy_config_accesslog_v3_DurationFilter;
+typedef struct envoy_config_accesslog_v3_NotHealthCheckFilter envoy_config_accesslog_v3_NotHealthCheckFilter;
+typedef struct envoy_config_accesslog_v3_TraceableFilter envoy_config_accesslog_v3_TraceableFilter;
+typedef struct envoy_config_accesslog_v3_RuntimeFilter envoy_config_accesslog_v3_RuntimeFilter;
+typedef struct envoy_config_accesslog_v3_AndFilter envoy_config_accesslog_v3_AndFilter;
+typedef struct envoy_config_accesslog_v3_OrFilter envoy_config_accesslog_v3_OrFilter;
+typedef struct envoy_config_accesslog_v3_HeaderFilter envoy_config_accesslog_v3_HeaderFilter;
+typedef struct envoy_config_accesslog_v3_ResponseFlagFilter envoy_config_accesslog_v3_ResponseFlagFilter;
+typedef struct envoy_config_accesslog_v3_GrpcStatusFilter envoy_config_accesslog_v3_GrpcStatusFilter;
+typedef struct envoy_config_accesslog_v3_MetadataFilter envoy_config_accesslog_v3_MetadataFilter;
+typedef struct envoy_config_accesslog_v3_LogTypeFilter envoy_config_accesslog_v3_LogTypeFilter;
+typedef struct envoy_config_accesslog_v3_ExtensionFilter envoy_config_accesslog_v3_ExtensionFilter;
+struct envoy_config_core_v3_RuntimeUInt32;
+struct envoy_config_route_v3_HeaderMatcher;
+struct envoy_type_matcher_v3_MetadataMatcher;
+struct envoy_type_v3_FractionalPercent;
+struct google_protobuf_Any;
+struct google_protobuf_BoolValue;
+
+typedef enum {
+  envoy_config_accesslog_v3_ComparisonFilter_EQ = 0,
+  envoy_config_accesslog_v3_ComparisonFilter_GE = 1,
+  envoy_config_accesslog_v3_ComparisonFilter_LE = 2
+} envoy_config_accesslog_v3_ComparisonFilter_Op;
+
+typedef enum {
+  envoy_config_accesslog_v3_GrpcStatusFilter_OK = 0,
+  envoy_config_accesslog_v3_GrpcStatusFilter_CANCELED = 1,
+  envoy_config_accesslog_v3_GrpcStatusFilter_UNKNOWN = 2,
+  envoy_config_accesslog_v3_GrpcStatusFilter_INVALID_ARGUMENT = 3,
+  envoy_config_accesslog_v3_GrpcStatusFilter_DEADLINE_EXCEEDED = 4,
+  envoy_config_accesslog_v3_GrpcStatusFilter_NOT_FOUND = 5,
+  envoy_config_accesslog_v3_GrpcStatusFilter_ALREADY_EXISTS = 6,
+  envoy_config_accesslog_v3_GrpcStatusFilter_PERMISSION_DENIED = 7,
+  envoy_config_accesslog_v3_GrpcStatusFilter_RESOURCE_EXHAUSTED = 8,
+  envoy_config_accesslog_v3_GrpcStatusFilter_FAILED_PRECONDITION = 9,
+  envoy_config_accesslog_v3_GrpcStatusFilter_ABORTED = 10,
+  envoy_config_accesslog_v3_GrpcStatusFilter_OUT_OF_RANGE = 11,
+  envoy_config_accesslog_v3_GrpcStatusFilter_UNIMPLEMENTED = 12,
+  envoy_config_accesslog_v3_GrpcStatusFilter_INTERNAL = 13,
+  envoy_config_accesslog_v3_GrpcStatusFilter_UNAVAILABLE = 14,
+  envoy_config_accesslog_v3_GrpcStatusFilter_DATA_LOSS = 15,
+  envoy_config_accesslog_v3_GrpcStatusFilter_UNAUTHENTICATED = 16
+} envoy_config_accesslog_v3_GrpcStatusFilter_Status;
+
+
+
+/* envoy.config.accesslog.v3.AccessLog */
+
+UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLog_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize(const envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLog_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize_ex(const envoy_config_accesslog_v3_AccessLog* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLog_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_accesslog_v3_AccessLog_config_type_typed_config = 4,
+  envoy_config_accesslog_v3_AccessLog_config_type_NOT_SET = 0
+} envoy_config_accesslog_v3_AccessLog_config_type_oneofcases;
+UPB_INLINE envoy_config_accesslog_v3_AccessLog_config_type_oneofcases envoy_config_accesslog_v3_AccessLog_config_type_case(const envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_accesslog_v3_AccessLog_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_name(envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_accesslog_v3_AccessLog_name(const envoy_config_accesslog_v3_AccessLog* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_filter(envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_filter(const envoy_config_accesslog_v3_AccessLog* msg) {
+  const envoy_config_accesslog_v3_AccessLogFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_AccessLogFilter* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_filter(const envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_typed_config(envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_typed_config(const envoy_config_accesslog_v3_AccessLog* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_typed_config(const envoy_config_accesslog_v3_AccessLog* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_name(envoy_config_accesslog_v3_AccessLog *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_filter(envoy_config_accesslog_v3_AccessLog *msg, envoy_config_accesslog_v3_AccessLogFilter* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_mutable_filter(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_config_accesslog_v3_AccessLog_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLog_set_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_typed_config(envoy_config_accesslog_v3_AccessLog *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutable_typed_config(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_AccessLog_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLog_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.AccessLogFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize(const envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize_ex(const envoy_config_accesslog_v3_AccessLogFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_status_code_filter = 1,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_duration_filter = 2,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_not_health_check_filter = 3,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_traceable_filter = 4,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_runtime_filter = 5,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_and_filter = 6,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_or_filter = 7,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_header_filter = 8,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_response_flag_filter = 9,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_grpc_status_filter = 10,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_extension_filter = 11,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_metadata_filter = 12,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_log_type_filter = 13,
+  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_NOT_SET = 0
+} envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases;
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_case(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_StatusCodeFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_StatusCodeFilter* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_status_code_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_duration_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_DurationFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_DurationFilter* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_duration_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_NotHealthCheckFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_NotHealthCheckFilter* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_not_health_check_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_TraceableFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_TraceableFilter* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_traceable_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_RuntimeFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_RuntimeFilter* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_runtime_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_and_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_AndFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_AndFilter* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_and_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_or_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_OrFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_OrFilter* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_or_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_header_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_HeaderFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_HeaderFilter* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_header_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_ResponseFlagFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_ResponseFlagFilter* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_response_flag_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_GrpcStatusFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_GrpcStatusFilter* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_grpc_status_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_extension_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_ExtensionFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_ExtensionFilter* ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_extension_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_MetadataFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_MetadataFilter* ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_metadata_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const envoy_config_accesslog_v3_LogTypeFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_LogTypeFilter* ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_log_type_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_StatusCodeFilter* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_StatusCodeFilter* sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_DurationFilter* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_DurationFilter* sub = (struct envoy_config_accesslog_v3_DurationFilter*)envoy_config_accesslog_v3_AccessLogFilter_duration_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy__config__accesslog__v3__DurationFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_NotHealthCheckFilter* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_NotHealthCheckFilter* sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_TraceableFilter* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_TraceableFilter* sub = (struct envoy_config_accesslog_v3_TraceableFilter*)envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy__config__accesslog__v3__TraceableFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_RuntimeFilter* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_RuntimeFilter* sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__RuntimeFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_AndFilter* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_AndFilter* sub = (struct envoy_config_accesslog_v3_AndFilter*)envoy_config_accesslog_v3_AccessLogFilter_and_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AndFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_OrFilter* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_OrFilter* sub = (struct envoy_config_accesslog_v3_OrFilter*)envoy_config_accesslog_v3_AccessLogFilter_or_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy__config__accesslog__v3__OrFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_HeaderFilter* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_HeaderFilter* sub = (struct envoy_config_accesslog_v3_HeaderFilter*)envoy_config_accesslog_v3_AccessLogFilter_header_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy__config__accesslog__v3__HeaderFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ResponseFlagFilter* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_ResponseFlagFilter* sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_GrpcStatusFilter* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_GrpcStatusFilter* sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ExtensionFilter* value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_ExtensionFilter* sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)envoy_config_accesslog_v3_AccessLogFilter_extension_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ExtensionFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_MetadataFilter* value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_MetadataFilter* sub = (struct envoy_config_accesslog_v3_MetadataFilter*)envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy__config__accesslog__v3__MetadataFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_LogTypeFilter* value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_LogTypeFilter* sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__LogTypeFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.ComparisonFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize(const envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize_ex(const envoy_config_accesslog_v3_ComparisonFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_clear_op(envoy_config_accesslog_v3_ComparisonFilter* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_accesslog_v3_ComparisonFilter_op(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_clear_value(envoy_config_accesslog_v3_ComparisonFilter* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_value(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
+  const struct envoy_config_core_v3_RuntimeUInt32* default_val = NULL;
+  const struct envoy_config_core_v3_RuntimeUInt32* ret;
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_ComparisonFilter_has_value(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_op(envoy_config_accesslog_v3_ComparisonFilter *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_value(envoy_config_accesslog_v3_ComparisonFilter *msg, struct envoy_config_core_v3_RuntimeUInt32* value) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_mutable_value(envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_RuntimeUInt32* sub = (struct envoy_config_core_v3_RuntimeUInt32*)envoy_config_accesslog_v3_ComparisonFilter_value(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy__config__core__v3__RuntimeUInt32_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_ComparisonFilter_set_value(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.StatusCodeFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize(const envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize_ex(const envoy_config_accesslog_v3_StatusCodeFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_clear_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_comparison(const envoy_config_accesslog_v3_StatusCodeFilter* msg) {
+  const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_ComparisonFilter* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_StatusCodeFilter_has_comparison(const envoy_config_accesslog_v3_StatusCodeFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(envoy_config_accesslog_v3_StatusCodeFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_mutable_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_StatusCodeFilter_comparison(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.DurationFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy__config__accesslog__v3__DurationFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__DurationFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__DurationFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize(const envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__DurationFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize_ex(const envoy_config_accesslog_v3_DurationFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__DurationFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_clear_comparison(envoy_config_accesslog_v3_DurationFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_comparison(const envoy_config_accesslog_v3_DurationFilter* msg) {
+  const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL;
+  const envoy_config_accesslog_v3_ComparisonFilter* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_DurationFilter_has_comparison(const envoy_config_accesslog_v3_DurationFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_set_comparison(envoy_config_accesslog_v3_DurationFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_mutable_comparison(envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena) {
+  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_DurationFilter_comparison(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_DurationFilter_set_comparison(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.NotHealthCheckFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize_ex(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.config.accesslog.v3.TraceableFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy__config__accesslog__v3__TraceableFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__TraceableFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__TraceableFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize(const envoy_config_accesslog_v3_TraceableFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__TraceableFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize_ex(const envoy_config_accesslog_v3_TraceableFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__TraceableFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.config.accesslog.v3.RuntimeFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__RuntimeFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize(const envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize_ex(const envoy_config_accesslog_v3_RuntimeFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_runtime_key(envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_accesslog_v3_RuntimeFilter_runtime_key(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
+  const struct envoy_type_v3_FractionalPercent* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_has_percent_sampled(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_use_independent_randomness(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_runtime_key(envoy_config_accesslog_v3_RuntimeFilter *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter *msg, struct envoy_type_v3_FractionalPercent* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_mutable_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena) {
+  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.accesslog.v3.AndFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AndFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AndFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AndFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize(const envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AndFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize_ex(const envoy_config_accesslog_v3_AndFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AndFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_AndFilter_clear_filters(envoy_config_accesslog_v3_AndFilter* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_AndFilter_filters(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_accesslog_v3_AccessLogFilter* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_upb_array(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_mutable_upb_array(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_AndFilter_has_filters(const envoy_config_accesslog_v3_AndFilter* msg) {
+  size_t size;
+  envoy_config_accesslog_v3_AndFilter_filters(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_AndFilter_mutable_filters(envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_accesslog_v3_AccessLogFilter**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_AndFilter_resize_filters(envoy_config_accesslog_v3_AndFilter* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_accesslog_v3_AccessLogFilter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AndFilter_add_filters(envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.OrFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy__config__accesslog__v3__OrFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__OrFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__OrFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize(const envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__OrFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize_ex(const envoy_config_accesslog_v3_OrFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__OrFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_OrFilter_clear_filters(envoy_config_accesslog_v3_OrFilter* msg) {
+  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_OrFilter_filters(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_accesslog_v3_AccessLogFilter* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_upb_array(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_mutable_upb_array(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_OrFilter_has_filters(const envoy_config_accesslog_v3_OrFilter* msg) {
+  size_t size;
+  envoy_config_accesslog_v3_OrFilter_filters(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_OrFilter_mutable_filters(envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
+  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_accesslog_v3_AccessLogFilter**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_OrFilter_resize_filters(envoy_config_accesslog_v3_OrFilter* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_accesslog_v3_AccessLogFilter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_OrFilter_add_filters(envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.HeaderFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy__config__accesslog__v3__HeaderFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__HeaderFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__HeaderFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize(const envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__HeaderFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize_ex(const envoy_config_accesslog_v3_HeaderFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__HeaderFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_clear_header(envoy_config_accesslog_v3_HeaderFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_header(const envoy_config_accesslog_v3_HeaderFilter* msg) {
+  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
+  const struct envoy_config_route_v3_HeaderMatcher* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_HeaderFilter_has_header(const envoy_config_accesslog_v3_HeaderFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_set_header(envoy_config_accesslog_v3_HeaderFilter *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_mutable_header(envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena) {
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_accesslog_v3_HeaderFilter_header(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_HeaderFilter_set_header(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.ResponseFlagFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize_ex(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_ResponseFlagFilter_clear_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_config_accesslog_v3_ResponseFlagFilter_flags(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_ResponseFlagFilter_flags_upb_array(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_accesslog_v3_ResponseFlagFilter_flags_mutable_upb_array(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_ResponseFlagFilter_has_flags(const envoy_config_accesslog_v3_ResponseFlagFilter* msg) {
+  size_t size;
+  envoy_config_accesslog_v3_ResponseFlagFilter_flags(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE upb_StringView* envoy_config_accesslog_v3_ResponseFlagFilter_mutable_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_config_accesslog_v3_ResponseFlagFilter_resize_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_ResponseFlagFilter_add_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* envoy.config.accesslog.v3.GrpcStatusFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize_ex(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_clear_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* envoy_config_accesslog_v3_GrpcStatusFilter_statuses(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_GrpcStatusFilter_statuses_upb_array(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_accesslog_v3_GrpcStatusFilter_statuses_mutable_upb_array(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_has_statuses(const envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
+  size_t size;
+  envoy_config_accesslog_v3_GrpcStatusFilter_statuses(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_clear_exclude(envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_exclude(const envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE int32_t* envoy_config_accesslog_v3_GrpcStatusFilter_mutable_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* envoy_config_accesslog_v3_GrpcStatusFilter_resize_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_add_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_set_exclude(envoy_config_accesslog_v3_GrpcStatusFilter *msg, bool value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.accesslog.v3.MetadataFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy__config__accesslog__v3__MetadataFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__MetadataFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__MetadataFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize(const envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__MetadataFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize_ex(const envoy_config_accesslog_v3_MetadataFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__MetadataFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_clear_matcher(envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_matcher(const envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_matcher(const envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_clear_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(const envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const struct google_protobuf_BoolValue* default_val = NULL;
+  const struct google_protobuf_BoolValue* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_match_if_key_not_found(const envoy_config_accesslog_v3_MetadataFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_matcher(envoy_config_accesslog_v3_MetadataFilter *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_mutable_matcher(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_accesslog_v3_MetadataFilter_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter *msg, struct google_protobuf_BoolValue* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_mutable_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
+  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.accesslog.v3.LogTypeFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__LogTypeFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize(const envoy_config_accesslog_v3_LogTypeFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize_ex(const envoy_config_accesslog_v3_LogTypeFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_clear_types(envoy_config_accesslog_v3_LogTypeFilter* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* envoy_config_accesslog_v3_LogTypeFilter_types(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_LogTypeFilter_types_upb_array(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_accesslog_v3_LogTypeFilter_types_mutable_upb_array(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_has_types(const envoy_config_accesslog_v3_LogTypeFilter* msg) {
+  size_t size;
+  envoy_config_accesslog_v3_LogTypeFilter_types(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_clear_exclude(envoy_config_accesslog_v3_LogTypeFilter* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_exclude(const envoy_config_accesslog_v3_LogTypeFilter* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE int32_t* envoy_config_accesslog_v3_LogTypeFilter_mutable_types(envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* envoy_config_accesslog_v3_LogTypeFilter_resize_types(envoy_config_accesslog_v3_LogTypeFilter* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_add_types(envoy_config_accesslog_v3_LogTypeFilter* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_set_exclude(envoy_config_accesslog_v3_LogTypeFilter *msg, bool value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.accesslog.v3.ExtensionFilter */
+
+UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_new(upb_Arena* arena) {
+  return (envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ExtensionFilter_msg_init, arena);
+}
+UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize(const envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize_ex(const envoy_config_accesslog_v3_ExtensionFilter* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_accesslog_v3_ExtensionFilter_config_type_typed_config = 3,
+  envoy_config_accesslog_v3_ExtensionFilter_config_type_NOT_SET = 0
+} envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases;
+UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases envoy_config_accesslog_v3_ExtensionFilter_config_type_case(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_clear_name(envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_accesslog_v3_ExtensionFilter_name(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_clear_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_typed_config(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_accesslog_v3_ExtensionFilter_has_typed_config(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_name(envoy_config_accesslog_v3_ExtensionFilter *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(envoy_config_accesslog_v3_ExtensionFilter *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_mutable_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_ExtensionFilter_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
new file mode 100644
index 0000000000000..95d71bcaac895
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
@@ -0,0 +1,375 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLog_submsgs[2] = {
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
+  &envoy_config_accesslog_v3_AccessLog_submsgs[0],
+  &envoy_config_accesslog_v3_AccessLog__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0020000404010022, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = {
+  {.submsg = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__DurationFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__TraceableFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__RuntimeFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AndFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__OrFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__HeaderFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ExtensionFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__MetadataFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__LogTypeFilter_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__fields[13] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
+  &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0],
+  &envoy_config_accesslog_v3_AccessLogFilter__fields[0],
+  UPB_SIZE(8, 16), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x000800000504002a, &upb_pom_1bt_max64b},
+    {0x0008000006050032, &upb_pom_1bt_max64b},
+    {0x000800000706003a, &upb_pom_1bt_max64b},
+    {0x0008000008070042, &upb_pom_1bt_max64b},
+    {0x000800000908004a, &upb_pom_1bt_max64b},
+    {0x000800000a090052, &upb_pom_1bt_max64b},
+    {0x000800000b0a005a, &upb_pom_1bt_max64b},
+    {0x000800000c0b0062, &upb_pom_1bt_max64b},
+    {0x000800000d0c006a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__RuntimeUInt32_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fields[2] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
+  &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0],
+  &envoy_config_accesslog_v3_ComparisonFilter__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = {
+  {.submsg = &envoy__config__accesslog__v3__ComparisonFilter_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
+  &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0],
+  &envoy_config_accesslog_v3_StatusCodeFilter__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = {
+  {.submsg = &envoy__config__accesslog__v3__ComparisonFilter_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = {
+  &envoy_config_accesslog_v3_DurationFilter_submsgs[0],
+  &envoy_config_accesslog_v3_DurationFilter__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = {
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
+  &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0],
+  &envoy_config_accesslog_v3_RuntimeFilter__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_AndFilter_submsgs[1] = {
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
+  &envoy_config_accesslog_v3_AndFilter_submsgs[0],
+  &envoy_config_accesslog_v3_AndFilter__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_OrFilter_submsgs[1] = {
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] = {
+  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
+  &envoy_config_accesslog_v3_OrFilter_submsgs[0],
+  &envoy_config_accesslog_v3_OrFilter__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = {
+  &envoy_config_accesslog_v3_HeaderFilter_submsgs[0],
+  &envoy_config_accesslog_v3_HeaderFilter__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init = {
+  NULL,
+  &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prs_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_GrpcStatusFilter__fields[2] = {
+  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = {
+  NULL,
+  &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_ppv4_1bt},
+    {0x000000003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = {
+  &envoy_config_accesslog_v3_MetadataFilter_submsgs[0],
+  &envoy_config_accesslog_v3_MetadataFilter__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[2] = {
+  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = {
+  NULL,
+  &envoy_config_accesslog_v3_LogTypeFilter__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_ppv4_1bt},
+    {0x000000003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = {
+  &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0],
+  &envoy_config_accesslog_v3_ExtensionFilter__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[16] = {
+  &envoy__config__accesslog__v3__AccessLog_msg_init,
+  &envoy__config__accesslog__v3__AccessLogFilter_msg_init,
+  &envoy__config__accesslog__v3__ComparisonFilter_msg_init,
+  &envoy__config__accesslog__v3__StatusCodeFilter_msg_init,
+  &envoy__config__accesslog__v3__DurationFilter_msg_init,
+  &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init,
+  &envoy__config__accesslog__v3__TraceableFilter_msg_init,
+  &envoy__config__accesslog__v3__RuntimeFilter_msg_init,
+  &envoy__config__accesslog__v3__AndFilter_msg_init,
+  &envoy__config__accesslog__v3__OrFilter_msg_init,
+  &envoy__config__accesslog__v3__HeaderFilter_msg_init,
+  &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init,
+  &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init,
+  &envoy__config__accesslog__v3__MetadataFilter_msg_init,
+  &envoy__config__accesslog__v3__LogTypeFilter_msg_init,
+  &envoy__config__accesslog__v3__ExtensionFilter_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  16,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
new file mode 100644
index 0000000000000..acb89b662f0a5
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_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__config__accesslog__v3__AccessLog_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init;
+
+extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h
rename to src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
index 25c895e5390ee..13adc7b96ac81 100644
--- a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/bootstrap/v3/bootstrap.proto
  *
@@ -10,7 +9,35 @@
 #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -37,26 +64,6 @@ typedef struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer envoy_config_bo
 typedef struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer;
 typedef struct envoy_config_bootstrap_v3_LayeredRuntime envoy_config_bootstrap_v3_LayeredRuntime;
 typedef struct envoy_config_bootstrap_v3_CustomInlineHeader envoy_config_bootstrap_v3_CustomInlineHeader;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Admin_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Watchdogs_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_FatalAction_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Runtime_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_LayeredRuntime_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_CustomInlineHeader_msg_init;
 struct envoy_config_accesslog_v3_AccessLog;
 struct envoy_config_cluster_v3_Cluster;
 struct envoy_config_core_v3_Address;
@@ -78,27 +85,6 @@ struct envoy_type_v3_Percent;
 struct google_protobuf_Duration;
 struct google_protobuf_Struct;
 struct google_protobuf_UInt64Value;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DnsResolutionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsConfig_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsSink_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_OverloadManager_msg_init;
-extern const upb_MiniTable envoy_config_trace_v3_Tracing_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_Secret_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
 
 typedef enum {
   envoy_config_bootstrap_v3_CustomInlineHeader_REQUEST_HEADER = 0,
@@ -120,12 +106,12 @@ typedef enum {
 /* envoy.config.bootstrap.v3.Bootstrap */
 
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap* envoy_config_bootstrap_v3_Bootstrap_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap* envoy_config_bootstrap_v3_Bootstrap_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap* ret = envoy_config_bootstrap_v3_Bootstrap_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -135,7 +121,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap* envoy_config_bootstrap_v3_Bootst
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap* ret = envoy_config_bootstrap_v3_Bootstrap_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -143,13 +129,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap* envoy_config_bootstrap_v3_Bootst
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_serialize(const envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_serialize_ex(const envoy_config_bootstrap_v3_Bootstrap* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -822,7 +808,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_node(envoy_config_bootst
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_mutable_node(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_config_bootstrap_v3_Bootstrap_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_node(msg, sub);
   }
   return sub;
@@ -834,7 +820,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_static_resources(envoy_c
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_mutable_static_resources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)envoy_config_bootstrap_v3_Bootstrap_static_resources(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_static_resources(msg, sub);
   }
   return sub;
@@ -846,7 +832,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dynamic_resources(envoy_
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_mutable_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_dynamic_resources(msg, sub);
   }
   return sub;
@@ -858,7 +844,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_cluster_manager(envoy_co
 UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_mutable_cluster_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_ClusterManager* sub = (struct envoy_config_bootstrap_v3_ClusterManager*)envoy_config_bootstrap_v3_Bootstrap_cluster_manager(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_ClusterManager*)_upb_Message_New(&envoy_config_bootstrap_v3_ClusterManager_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_ClusterManager*)_upb_Message_New(&envoy__config__bootstrap__v3__ClusterManager_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_cluster_manager(msg, sub);
   }
   return sub;
@@ -888,7 +874,7 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_B
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_metrics_v3_StatsSink* sub = (struct envoy_config_metrics_v3_StatsSink*)_upb_Message_New(&envoy_config_metrics_v3_StatsSink_msg_init, arena);
+  struct envoy_config_metrics_v3_StatsSink* sub = (struct envoy_config_metrics_v3_StatsSink*)_upb_Message_New(&envoy__config__metrics__v3__StatsSink_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -900,7 +886,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_interval(env
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_interval(msg, sub);
   }
   return sub;
@@ -912,7 +898,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdog(envoy_config_bo
 UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdog(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Bootstrap_watchdog(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_watchdog(msg, sub);
   }
   return sub;
@@ -924,7 +910,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_tracing(envoy_config_boo
 UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_mutable_tracing(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_trace_v3_Tracing* sub = (struct envoy_config_trace_v3_Tracing*)envoy_config_bootstrap_v3_Bootstrap_tracing(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_trace_v3_Tracing*)_upb_Message_New(&envoy_config_trace_v3_Tracing_msg_init, arena);
+    sub = (struct envoy_config_trace_v3_Tracing*)_upb_Message_New(&envoy__config__trace__v3__Tracing_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_tracing(msg, sub);
   }
   return sub;
@@ -936,7 +922,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_admin(envoy_config_boots
 UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_mutable_admin(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Admin* sub = (struct envoy_config_bootstrap_v3_Admin*)envoy_config_bootstrap_v3_Bootstrap_admin(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Admin*)_upb_Message_New(&envoy_config_bootstrap_v3_Admin_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Admin*)_upb_Message_New(&envoy__config__bootstrap__v3__Admin_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_admin(msg, sub);
   }
   return sub;
@@ -948,7 +934,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_config(envoy_confi
 UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_metrics_v3_StatsConfig* sub = (struct envoy_config_metrics_v3_StatsConfig*)envoy_config_bootstrap_v3_Bootstrap_stats_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_metrics_v3_StatsConfig*)_upb_Message_New(&envoy_config_metrics_v3_StatsConfig_msg_init, arena);
+    sub = (struct envoy_config_metrics_v3_StatsConfig*)_upb_Message_New(&envoy__config__metrics__v3__StatsConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_stats_config(msg, sub);
   }
   return sub;
@@ -960,7 +946,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_hds_config(envoy_config_
 UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_hds_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_hds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_hds_config(msg, sub);
   }
   return sub;
@@ -972,7 +958,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_overload_manager(envoy_c
 UPB_INLINE struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_mutable_overload_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_overload_v3_OverloadManager* sub = (struct envoy_config_overload_v3_OverloadManager*)envoy_config_bootstrap_v3_Bootstrap_overload_manager(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_overload_v3_OverloadManager*)_upb_Message_New(&envoy_config_overload_v3_OverloadManager_msg_init, arena);
+    sub = (struct envoy_config_overload_v3_OverloadManager*)_upb_Message_New(&envoy__config__overload__v3__OverloadManager_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_overload_manager(msg, sub);
   }
   return sub;
@@ -988,7 +974,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(envoy_co
 UPB_INLINE struct envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_mutable_layered_runtime(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_LayeredRuntime* sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)envoy_config_bootstrap_v3_Bootstrap_layered_runtime(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)_upb_Message_New(&envoy_config_bootstrap_v3_LayeredRuntime_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)_upb_Message_New(&envoy__config__bootstrap__v3__LayeredRuntime_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(msg, sub);
   }
   return sub;
@@ -1004,7 +990,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_server_version_ove
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_stats_server_version_override(msg, sub);
   }
   return sub;
@@ -1034,7 +1020,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1060,7 +1046,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1072,7 +1058,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_config_source(en
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_default_config_source(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_default_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_default_config_source(msg, sub);
   }
   return sub;
@@ -1136,7 +1122,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(envoy_config_b
 UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdogs(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Watchdogs* sub = (struct envoy_config_bootstrap_v3_Watchdogs*)envoy_config_bootstrap_v3_Bootstrap_watchdogs(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Watchdogs*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdogs_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Watchdogs*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdogs_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(msg, sub);
   }
   return sub;
@@ -1162,7 +1148,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_bootstrap_v3_FatalAction* sub = (struct envoy_config_bootstrap_v3_FatalAction*)_upb_Message_New(&envoy_config_bootstrap_v3_FatalAction_msg_init, arena);
+  struct envoy_config_bootstrap_v3_FatalAction* sub = (struct envoy_config_bootstrap_v3_FatalAction*)_upb_Message_New(&envoy__config__bootstrap__v3__FatalAction_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1178,7 +1164,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dns_resolution_config(en
 UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_bootstrap_v3_Bootstrap_dns_resolution_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy_config_core_v3_DnsResolutionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy__config__core__v3__DnsResolutionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_dns_resolution_config(msg, sub);
   }
   return sub;
@@ -1190,7 +1176,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_typed_dns_resolver_confi
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_typed_dns_resolver_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_typed_dns_resolver_config(msg, sub);
   }
   return sub;
@@ -1216,7 +1202,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_boo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_bootstrap_v3_CustomInlineHeader* sub = (struct envoy_config_bootstrap_v3_CustomInlineHeader*)_upb_Message_New(&envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, arena);
+  struct envoy_config_bootstrap_v3_CustomInlineHeader* sub = (struct envoy_config_bootstrap_v3_CustomInlineHeader*)_upb_Message_New(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1232,7 +1218,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_regex_engine(env
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_default_regex_engine(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_default_regex_engine(msg, sub);
   }
   return sub;
@@ -1244,7 +1230,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_delegate_extension(e
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_delegate_extension(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_xds_delegate_extension(msg, sub);
   }
   return sub;
@@ -1256,7 +1242,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_config_tracker_exten
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_config_tracker_extension(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_xds_config_tracker_extension(msg, sub);
   }
   return sub;
@@ -1268,7 +1254,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_listener_manager(envoy_c
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_listener_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_listener_manager(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_listener_manager(msg, sub);
   }
   return sub;
@@ -1280,7 +1266,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_application_log_config(e
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_application_log_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)envoy_config_bootstrap_v3_Bootstrap_application_log_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_set_application_log_config(msg, sub);
   }
   return sub;
@@ -1289,12 +1275,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envo
 /* envoy.config.bootstrap.v3.Bootstrap.StaticResources */
 
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Bootstrap_StaticResources*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Bootstrap_StaticResources*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_StaticResources_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_StaticResources* ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1304,7 +1290,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_boo
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_StaticResources* ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1312,13 +1298,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_boo
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_StaticResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_StaticResources_serialize_ex(const envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_StaticResources_clear_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources* msg) {
@@ -1454,7 +1440,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener* envoy_config_bootstrap_v3_B
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_Listener* sub = (struct envoy_config_listener_v3_Listener*)_upb_Message_New(&envoy_config_listener_v3_Listener_msg_init, arena);
+  struct envoy_config_listener_v3_Listener* sub = (struct envoy_config_listener_v3_Listener*)_upb_Message_New(&envoy__config__listener__v3__Listener_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1480,7 +1466,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster* envoy_config_bootstrap_v3_Boo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_cluster_v3_Cluster* sub = (struct envoy_config_cluster_v3_Cluster*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_msg_init, arena);
+  struct envoy_config_cluster_v3_Cluster* sub = (struct envoy_config_cluster_v3_Cluster*)_upb_Message_New(&envoy__config__cluster__v3__Cluster_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1506,7 +1492,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret* envoy_config
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_transport_sockets_tls_v3_Secret* sub = (struct envoy_extensions_transport_sockets_tls_v3_Secret*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, arena);
+  struct envoy_extensions_transport_sockets_tls_v3_Secret* sub = (struct envoy_extensions_transport_sockets_tls_v3_Secret*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1515,12 +1501,12 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret* envoy_config
 /* envoy.config.bootstrap.v3.Bootstrap.DynamicResources */
 
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_DynamicResources* ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1530,7 +1516,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bo
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_DynamicResources* ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1538,13 +1524,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bo
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_serialize_ex(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_clear_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg) {
@@ -1622,7 +1608,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_con
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_lds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_config(msg, sub);
   }
   return sub;
@@ -1634,7 +1620,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_con
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_cds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_cds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_config(msg, sub);
   }
   return sub;
@@ -1646,7 +1632,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_ads_con
 UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_ads_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_ads_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_ads_config(msg, sub);
   }
   return sub;
@@ -1663,12 +1649,12 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_res
 /* envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig */
 
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* ret = envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1678,7 +1664,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_confi
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* ret = envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1686,13 +1672,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_confi
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_serialize(const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_serialize_ex(const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_clear_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg) {
@@ -1718,7 +1704,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_set_log
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_mutable_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_log_format(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_set_log_format(msg, sub);
   }
   return sub;
@@ -1727,12 +1713,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFo
 /* envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat */
 
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* ret = envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1742,7 +1728,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* e
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* ret = envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1750,13 +1736,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* e
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_serialize(const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_serialize_ex(const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1806,7 +1792,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogForm
 UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_mutable_json_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_json_format(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_set_json_format(msg, sub);
   }
   return sub;
@@ -1840,12 +1826,12 @@ UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstances
 /* envoy.config.bootstrap.v3.Admin */
 
 UPB_INLINE envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Admin_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Admin*)_upb_Message_New(&envoy_config_bootstrap_v3_Admin_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Admin*)_upb_Message_New(&envoy__config__bootstrap__v3__Admin_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Admin_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Admin* ret = envoy_config_bootstrap_v3_Admin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Admin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1855,7 +1841,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Admin_pars
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Admin* ret = envoy_config_bootstrap_v3_Admin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Admin_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1863,13 +1849,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Admin_pars
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Admin_serialize(const envoy_config_bootstrap_v3_Admin* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Admin_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Admin_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Admin_serialize_ex(const envoy_config_bootstrap_v3_Admin* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Admin_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Admin_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Admin_clear_access_log_path(envoy_config_bootstrap_v3_Admin* msg) {
@@ -2010,7 +1996,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_address(envoy_config_bootstr
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_Admin_mutable_address(envoy_config_bootstrap_v3_Admin* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_bootstrap_v3_Admin_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Admin_set_address(msg, sub);
   }
   return sub;
@@ -2036,7 +2022,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_bootstrap_v3_A
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2062,7 +2048,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_bootstrap_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2075,12 +2061,12 @@ UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_ignore_global_conn_limit(env
 /* envoy.config.bootstrap.v3.ClusterManager */
 
 UPB_INLINE envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_ClusterManager_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_ClusterManager*)_upb_Message_New(&envoy_config_bootstrap_v3_ClusterManager_msg_init, arena);
+  return (envoy_config_bootstrap_v3_ClusterManager*)_upb_Message_New(&envoy__config__bootstrap__v3__ClusterManager_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_ClusterManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_ClusterManager* ret = envoy_config_bootstrap_v3_ClusterManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__ClusterManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2090,7 +2076,7 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_C
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_ClusterManager* ret = envoy_config_bootstrap_v3_ClusterManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__ClusterManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2098,13 +2084,13 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_C
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_ClusterManager_serialize(const envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_ClusterManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__ClusterManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_ClusterManager_serialize_ex(const envoy_config_bootstrap_v3_ClusterManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_ClusterManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__ClusterManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_clear_local_cluster_name(envoy_config_bootstrap_v3_ClusterManager* msg) {
@@ -2175,7 +2161,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_outlier_detection(e
 UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_mutable_outlier_detection(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)envoy_config_bootstrap_v3_ClusterManager_outlier_detection(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)_upb_Message_New(&envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)_upb_Message_New(&envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_ClusterManager_set_outlier_detection(msg, sub);
   }
   return sub;
@@ -2187,7 +2173,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_upstream_bind_confi
 UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_ClusterManager_mutable_upstream_bind_config(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_bootstrap_v3_ClusterManager_upstream_bind_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy_config_core_v3_BindConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy__config__core__v3__BindConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_ClusterManager_set_upstream_bind_config(msg, sub);
   }
   return sub;
@@ -2199,7 +2185,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_load_stats_config(e
 UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_ClusterManager_mutable_load_stats_config(envoy_config_bootstrap_v3_ClusterManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_ClusterManager_load_stats_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_ClusterManager_set_load_stats_config(msg, sub);
   }
   return sub;
@@ -2208,12 +2194,12 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v
 /* envoy.config.bootstrap.v3.ClusterManager.OutlierDetection */
 
 UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)_upb_Message_New(&envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, arena);
+  return (envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)_upb_Message_New(&envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2223,7 +2209,7 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_conf
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2231,13 +2217,13 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_conf
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_serialize(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_serialize_ex(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_clear_event_log_path(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* msg) {
@@ -2278,7 +2264,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_ev
 UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_mutable_event_service(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_event_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy_config_core_v3_EventServiceConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy__config__core__v3__EventServiceConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_service(msg, sub);
   }
   return sub;
@@ -2287,12 +2273,12 @@ UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_bootstra
 /* envoy.config.bootstrap.v3.Watchdogs */
 
 UPB_INLINE envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Watchdogs_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Watchdogs*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdogs_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Watchdogs*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdogs_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Watchdogs_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdogs* ret = envoy_config_bootstrap_v3_Watchdogs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdogs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2302,7 +2288,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Watchd
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdogs* ret = envoy_config_bootstrap_v3_Watchdogs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdogs_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2310,13 +2296,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Watchd
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdogs_serialize(const envoy_config_bootstrap_v3_Watchdogs* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdogs_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdogs_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdogs_serialize_ex(const envoy_config_bootstrap_v3_Watchdogs* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdogs_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdogs_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_clear_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs* msg) {
@@ -2357,7 +2343,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(env
 UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_main_thread_watchdog(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(msg, sub);
   }
   return sub;
@@ -2369,7 +2355,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(envoy_co
 UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_worker_watchdog(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(msg, sub);
   }
   return sub;
@@ -2378,12 +2364,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_
 /* envoy.config.bootstrap.v3.Watchdog */
 
 UPB_INLINE envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdog_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Watchdog*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdog_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdog* ret = envoy_config_bootstrap_v3_Watchdog_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2393,7 +2379,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdo
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdog* ret = envoy_config_bootstrap_v3_Watchdog_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdog_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2401,13 +2387,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdo
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdog_serialize(const envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdog_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdog_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdog_serialize_ex(const envoy_config_bootstrap_v3_Watchdog* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdog_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdog_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_clear_miss_timeout(envoy_config_bootstrap_v3_Watchdog* msg) {
@@ -2545,7 +2531,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(envoy_config
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_miss_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_miss_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(msg, sub);
   }
   return sub;
@@ -2557,7 +2543,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(envoy_co
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_megamiss_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(msg, sub);
   }
   return sub;
@@ -2569,7 +2555,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(envoy_config
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_kill_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_kill_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(msg, sub);
   }
   return sub;
@@ -2581,7 +2567,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(envoy_c
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_timeout(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_multikill_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(msg, sub);
   }
   return sub;
@@ -2593,7 +2579,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(envoy
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_threshold(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_bootstrap_v3_Watchdog_multikill_threshold(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(msg, sub);
   }
   return sub;
@@ -2605,7 +2591,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(e
 UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_max_kill_timeout_jitter(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(msg, sub);
   }
   return sub;
@@ -2631,7 +2617,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_confi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* sub = (struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, arena);
+  struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* sub = (struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2640,12 +2626,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_confi
 /* envoy.config.bootstrap.v3.Watchdog.WatchdogAction */
 
 UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Watchdog_WatchdogAction*)_upb_Message_New(&envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Watchdog_WatchdogAction*)_upb_Message_New(&envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdog_WatchdogAction* ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2655,7 +2641,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_boots
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Watchdog_WatchdogAction* ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2663,13 +2649,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_boots
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_serialize(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_serialize_ex(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_clear_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction* msg) {
@@ -2706,7 +2692,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_config(env
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_mutable_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Watchdog_WatchdogAction_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_config(msg, sub);
   }
   return sub;
@@ -2719,12 +2705,12 @@ UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_event(envo
 /* envoy.config.bootstrap.v3.FatalAction */
 
 UPB_INLINE envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_FatalAction_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_FatalAction*)_upb_Message_New(&envoy_config_bootstrap_v3_FatalAction_msg_init, arena);
+  return (envoy_config_bootstrap_v3_FatalAction*)_upb_Message_New(&envoy__config__bootstrap__v3__FatalAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_FatalAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_FatalAction* ret = envoy_config_bootstrap_v3_FatalAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__FatalAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2734,7 +2720,7 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_Fata
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_FatalAction* ret = envoy_config_bootstrap_v3_FatalAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__FatalAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2742,13 +2728,13 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_Fata
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_FatalAction_serialize(const envoy_config_bootstrap_v3_FatalAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_FatalAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__FatalAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_FatalAction_serialize_ex(const envoy_config_bootstrap_v3_FatalAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_FatalAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__FatalAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_FatalAction_clear_config(envoy_config_bootstrap_v3_FatalAction* msg) {
@@ -2774,7 +2760,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_FatalAction_set_config(envoy_config_bo
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_FatalAction_mutable_config(envoy_config_bootstrap_v3_FatalAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_FatalAction_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_FatalAction_set_config(msg, sub);
   }
   return sub;
@@ -2783,12 +2769,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst
 /* envoy.config.bootstrap.v3.Runtime */
 
 UPB_INLINE envoy_config_bootstrap_v3_Runtime* envoy_config_bootstrap_v3_Runtime_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_Runtime*)_upb_Message_New(&envoy_config_bootstrap_v3_Runtime_msg_init, arena);
+  return (envoy_config_bootstrap_v3_Runtime*)_upb_Message_New(&envoy__config__bootstrap__v3__Runtime_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_Runtime* envoy_config_bootstrap_v3_Runtime_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Runtime* ret = envoy_config_bootstrap_v3_Runtime_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Runtime_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2798,7 +2784,7 @@ UPB_INLINE envoy_config_bootstrap_v3_Runtime* envoy_config_bootstrap_v3_Runtime_
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_Runtime* ret = envoy_config_bootstrap_v3_Runtime_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__Runtime_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2806,13 +2792,13 @@ UPB_INLINE envoy_config_bootstrap_v3_Runtime* envoy_config_bootstrap_v3_Runtime_
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Runtime_serialize(const envoy_config_bootstrap_v3_Runtime* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Runtime_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Runtime_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_Runtime_serialize_ex(const envoy_config_bootstrap_v3_Runtime* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_Runtime_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__Runtime_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_Runtime_clear_symlink_root(envoy_config_bootstrap_v3_Runtime* msg) {
@@ -2883,7 +2869,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_base(envoy_config_bootstra
 UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtime_mutable_base(envoy_config_bootstrap_v3_Runtime* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Runtime_base(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_Runtime_set_base(msg, sub);
   }
   return sub;
@@ -2892,12 +2878,12 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtime_muta
 /* envoy.config.bootstrap.v3.RuntimeLayer */
 
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_RuntimeLayer_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_RuntimeLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_msg_init, arena);
+  return (envoy_config_bootstrap_v3_RuntimeLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_RuntimeLayer_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2907,7 +2893,7 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_Run
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2915,13 +2901,13 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_Run
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_serialize_ex(const envoy_config_bootstrap_v3_RuntimeLayer* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3018,7 +3004,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(envoy_co
 UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer_mutable_static_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_RuntimeLayer_static_layer(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(msg, sub);
   }
   return sub;
@@ -3030,7 +3016,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(envoy_conf
 UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)envoy_config_bootstrap_v3_RuntimeLayer_disk_layer(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(msg, sub);
   }
   return sub;
@@ -3042,7 +3028,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(envoy_con
 UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)envoy_config_bootstrap_v3_RuntimeLayer_admin_layer(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(msg, sub);
   }
   return sub;
@@ -3054,7 +3040,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(envoy_conf
 UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer* msg, upb_Arena* arena) {
   struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)envoy_config_bootstrap_v3_RuntimeLayer_rtds_layer(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(msg, sub);
   }
   return sub;
@@ -3063,12 +3049,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config
 /* envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer */
 
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, arena);
+  return (envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3078,7 +3064,7 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootst
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3086,13 +3072,13 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootst
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_serialize_ex(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_clear_symlink_root(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* msg) {
@@ -3145,12 +3131,12 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_subdirector
 /* envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer */
 
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, arena);
+  return (envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3160,7 +3146,7 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_boots
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3168,13 +3154,13 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_boots
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_serialize_ex(const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -3182,12 +3168,12 @@ UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_serialize_ex(
 /* envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer */
 
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, arena);
+  return (envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3197,7 +3183,7 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootst
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3205,13 +3191,13 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootst
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_serialize_ex(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_clear_name(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* msg) {
@@ -3252,7 +3238,7 @@ UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_rtds_config
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_mutable_rtds_config(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_rtds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_rtds_config(msg, sub);
   }
   return sub;
@@ -3261,12 +3247,12 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_R
 /* envoy.config.bootstrap.v3.LayeredRuntime */
 
 UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_LayeredRuntime_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_LayeredRuntime*)_upb_Message_New(&envoy_config_bootstrap_v3_LayeredRuntime_msg_init, arena);
+  return (envoy_config_bootstrap_v3_LayeredRuntime*)_upb_Message_New(&envoy__config__bootstrap__v3__LayeredRuntime_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_LayeredRuntime_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_LayeredRuntime* ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3276,7 +3262,7 @@ UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_L
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_LayeredRuntime* ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3284,13 +3270,13 @@ UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_L
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_LayeredRuntime_serialize(const envoy_config_bootstrap_v3_LayeredRuntime* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_LayeredRuntime_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_LayeredRuntime_serialize_ex(const envoy_config_bootstrap_v3_LayeredRuntime* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_LayeredRuntime_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_LayeredRuntime_clear_layers(envoy_config_bootstrap_v3_LayeredRuntime* msg) {
@@ -3352,7 +3338,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_bootstrap_v3_RuntimeLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer*)_upb_Message_New(&envoy_config_bootstrap_v3_RuntimeLayer_msg_init, arena);
+  struct envoy_config_bootstrap_v3_RuntimeLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer*)_upb_Message_New(&envoy__config__bootstrap__v3__RuntimeLayer_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3361,12 +3347,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap
 /* envoy.config.bootstrap.v3.CustomInlineHeader */
 
 UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_v3_CustomInlineHeader_new(upb_Arena* arena) {
-  return (envoy_config_bootstrap_v3_CustomInlineHeader*)_upb_Message_New(&envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, arena);
+  return (envoy_config_bootstrap_v3_CustomInlineHeader*)_upb_Message_New(&envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, arena);
 }
 UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_v3_CustomInlineHeader_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_bootstrap_v3_CustomInlineHeader* ret = envoy_config_bootstrap_v3_CustomInlineHeader_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3376,7 +3362,7 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_
                            int options, upb_Arena* arena) {
   envoy_config_bootstrap_v3_CustomInlineHeader* ret = envoy_config_bootstrap_v3_CustomInlineHeader_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3384,13 +3370,13 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_CustomInlineHeader_serialize(const envoy_config_bootstrap_v3_CustomInlineHeader* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_bootstrap_v3_CustomInlineHeader_serialize_ex(const envoy_config_bootstrap_v3_CustomInlineHeader* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_clear_inline_header_name(envoy_config_bootstrap_v3_CustomInlineHeader* msg) {
@@ -3425,8 +3411,6 @@ UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_set_inline_header_t
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
new file mode 100644
index 0000000000000..ee709e3596c95
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
@@ -0,0 +1,612 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/bootstrap/v3/bootstrap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[28] = {
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__ClusterManager_msg_init},
+  {.submsg = &envoy__config__metrics__v3__StatsSink_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
+  {.submsg = &envoy__config__trace__v3__Tracing_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Admin_msg_init},
+  {.submsg = &envoy__config__metrics__v3__StatsConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__overload__v3__OverloadManager_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__LayeredRuntime_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdogs_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__FatalAction_msg_init},
+  {.submsg = &envoy__config__core__v3__DnsResolutionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[36] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(132, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 88), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(36, 96), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(40, 104), 9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(44, 112), 10, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(48, 120), 11, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(52, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(56, 128), 12, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(140, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(60, 152), 13, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(64, 5), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(68, 160), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(72, 168), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(76, 176), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(148, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(80, 200), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(84, 208), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(88, 216), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(92, 224), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {29, 3, UPB_SIZE(-97, -9), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(100, 232), 16, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(104, 240), 17, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(108, 248), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(156, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(112, 272), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {35, UPB_SIZE(116, 280), 19, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(120, 288), 20, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(124, 296), 21, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {38, UPB_SIZE(128, 304), 22, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap__fields[0],
+  UPB_SIZE(168, 312), 36, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0018000002010012, &upb_psm_1bt_max64b},
+    {0x002000000302001a, &upb_psm_1bt_max128b},
+    {0x0028000004030022, &upb_psm_1bt_max64b},
+    {0x003000003f00002a, &upb_pss_1bt},
+    {0x004000003f040032, &upb_prm_1bt_maxmaxb},
+    {0x004800000505003a, &upb_psm_1bt_maxmaxb},
+    {0x0050000006060042, &upb_psm_1bt_max128b},
+    {0x005800000707004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0060000008080062, &upb_psm_1bt_max128b},
+    {0x006800000909006a, &upb_psm_1bt_maxmaxb},
+    {0x007000000a0a0072, &upb_psm_1bt_maxmaxb},
+    {0x007800000b0b007a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000180, &upb_psb1_2bt},
+    {0x008000000c0c018a, &upb_psm_2bt_max64b},
+    {0x008800003f000192, &upb_pss_2bt},
+    {0x009800000d0d019a, &upb_psm_2bt_maxmaxb},
+    {0x000500003f0001a0, &upb_psb1_2bt},
+    {0x00a000003f0e01aa, &upb_prm_2bt_maxmaxb},
+    {0x00a800003f0f01b2, &upb_prm_2bt_maxmaxb},
+    {0x00b000000e1001ba, &upb_psm_2bt_maxmaxb},
+    {0x00b800003f0001c2, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00d000003f0001d2, &upb_prs_2bt},
+    {0x00d800000f1201da, &upb_psm_2bt_max64b},
+    {0x00e000003f1301e2, &upb_prm_2bt_max64b},
+    {0x000300081d0001e8, &upb_pob1_2bt},
+    {0x00e80000101401f2, &upb_psm_2bt_maxmaxb},
+    {0x00f00000111501fa, &upb_psm_2bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = {
+  {.submsg = &envoy__config__listener__v3__Listener_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x000800003f010012, &upb_prm_1bt_maxmaxb},
+    {0x001000003f02001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0],
+  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f00002a, &upb_pss_1bt},
+    {0x003000003f000032, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = {
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init = {
+  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0],
+  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Admin_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLog_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = {
+  &envoy_config_bootstrap_v3_Admin_submsgs[0],
+  &envoy_config_bootstrap_v3_Admin__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x003000003f010022, &upb_prm_1bt_maxmaxb},
+    {0x003800003f02002a, &upb_prm_1bt_maxmaxb},
+    {0x000100003f000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = {
+  {.submsg = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init},
+  {.submsg = &envoy__config__core__v3__BindConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields[4] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = {
+  &envoy_config_bootstrap_v3_ClusterManager_submsgs[0],
+  &envoy_config_bootstrap_v3_ClusterManager__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__EventServiceConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init = {
+  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0],
+  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = {
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = {
+  &envoy_config_bootstrap_v3_Watchdogs_submsgs[0],
+  &envoy_config_bootstrap_v3_Watchdogs__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x0010000002010012, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = {
+  &envoy_config_bootstrap_v3_Watchdog_submsgs[0],
+  &envoy_config_bootstrap_v3_Watchdog__fields[0],
+  UPB_SIZE(32, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
+    {0x003800003f06003a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init = {
+  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0],
+  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_FatalAction_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = {
+  &envoy_config_bootstrap_v3_FatalAction_submsgs[0],
+  &envoy_config_bootstrap_v3_FatalAction__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = {
+  &envoy_config_bootstrap_v3_Runtime_submsgs[0],
+  &envoy_config_bootstrap_v3_Runtime__fields[0],
+  UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_pss_1bt},
+    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = {
+  &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0],
+  &envoy_config_bootstrap_v3_RuntimeLayer__fields[0],
+  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
+    {0x001800000301001a, &upb_pom_1bt_max64b},
+    {0x0018000004020022, &upb_pom_1bt_max64b},
+    {0x001800000503002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[3] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init = {
+  NULL,
+  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psb1_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+  })
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init = {
+  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0],
+  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = {
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = {
+  &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0],
+  &envoy_config_bootstrap_v3_LayeredRuntime__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_config_bootstrap_v3_CustomInlineHeader__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = {
+  NULL,
+  &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[20] = {
+  &envoy__config__bootstrap__v3__Bootstrap_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init,
+  &envoy__config__bootstrap__v3__Admin_msg_init,
+  &envoy__config__bootstrap__v3__ClusterManager_msg_init,
+  &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init,
+  &envoy__config__bootstrap__v3__Watchdogs_msg_init,
+  &envoy__config__bootstrap__v3__Watchdog_msg_init,
+  &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init,
+  &envoy__config__bootstrap__v3__FatalAction_msg_init,
+  &envoy__config__bootstrap__v3__Runtime_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init,
+  &envoy__config__bootstrap__v3__LayeredRuntime_msg_init,
+  &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  20,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
new file mode 100644
index 0000000000000..94c88eeea5623
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/bootstrap/v3/bootstrap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_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__config__bootstrap__v3__Bootstrap_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init;
+
+extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
rename to src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
index 1b459b39085c1..0ee4c173445ad 100644
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/circuit_breaker.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,25 +29,20 @@ extern "C" {
 typedef struct envoy_config_cluster_v3_CircuitBreakers envoy_config_cluster_v3_CircuitBreakers;
 typedef struct envoy_config_cluster_v3_CircuitBreakers_Thresholds envoy_config_cluster_v3_CircuitBreakers_Thresholds;
 typedef struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init;
 struct envoy_type_v3_Percent;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.cluster.v3.CircuitBreakers */
 
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_CircuitBreakers_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_CircuitBreakers_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers* ret = envoy_config_cluster_v3_CircuitBreakers_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +52,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Circ
                            int options, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers* ret = envoy_config_cluster_v3_CircuitBreakers_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +60,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Circ
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_serialize(const envoy_config_cluster_v3_CircuitBreakers* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_clear_thresholds(envoy_config_cluster_v3_CircuitBreakers* msg) {
@@ -161,7 +165,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -187,7 +191,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -196,12 +200,12 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
 /* envoy.config.cluster.v3.CircuitBreakers.Thresholds */
 
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_Thresholds_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers_Thresholds* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -211,7 +215,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_clus
                            int options, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers_Thresholds* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -219,13 +223,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_clus
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_clear_priority(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg) {
@@ -352,7 +356,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_conne
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connections(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connections(msg, sub);
   }
   return sub;
@@ -364,7 +368,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pendi
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_pending_requests(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pending_requests(msg, sub);
   }
   return sub;
@@ -376,7 +380,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_reque
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_requests(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_requests(msg, sub);
   }
   return sub;
@@ -388,7 +392,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retri
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_retries(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retries(msg, sub);
   }
   return sub;
@@ -404,7 +408,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_conne
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connection_pools(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connection_pools(msg, sub);
   }
   return sub;
@@ -416,7 +420,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_bud
 UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
   struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_retry_budget(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, arena);
+    sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_budget(msg, sub);
   }
   return sub;
@@ -425,12 +429,12 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget
 /* envoy.config.cluster.v3.CircuitBreakers.Thresholds.RetryBudget */
 
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -440,7 +444,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy
                            int options, upb_Arena* arena) {
   envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -448,13 +452,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_clear_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg) {
@@ -495,7 +499,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_s
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_budget_percent(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_budget_percent(msg, sub);
   }
   return sub;
@@ -507,14 +511,12 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_s
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_min_retry_concurrency(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_min_retry_concurrency(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
new file mode 100644
index 0000000000000..ffbb007a72663
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
@@ -0,0 +1,125 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/circuit_breaker.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = {
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[2] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = {
+  &envoy_config_cluster_v3_CircuitBreakers_submsgs[0],
+  &envoy_config_cluster_v3_CircuitBreakers__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+    {0x000800003f010012, &upb_prm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[8] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 56), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init = {
+  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0],
+  &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0],
+  UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x001800000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000003020022, &upb_psm_1bt_maxmaxb},
+    {0x002800000403002a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000030, &upb_psb1_1bt},
+    {0x003000000504003a, &upb_psm_1bt_maxmaxb},
+    {0x0038000006050042, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init = {
+  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0],
+  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__config__cluster__v3__CircuitBreakers_msg_init,
+  &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init,
+  &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
new file mode 100644
index 0000000000000..a83799879b153
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/circuit_breaker.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_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__config__cluster__v3__CircuitBreakers_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
new file mode 100644
index 0000000000000..1da236c41ab72
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
@@ -0,0 +1,3890 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_config_cluster_v3_ClusterCollection envoy_config_cluster_v3_ClusterCollection;
+typedef struct envoy_config_cluster_v3_Cluster envoy_config_cluster_v3_Cluster;
+typedef struct envoy_config_cluster_v3_Cluster_TransportSocketMatch envoy_config_cluster_v3_Cluster_TransportSocketMatch;
+typedef struct envoy_config_cluster_v3_Cluster_CustomClusterType envoy_config_cluster_v3_Cluster_CustomClusterType;
+typedef struct envoy_config_cluster_v3_Cluster_EdsClusterConfig envoy_config_cluster_v3_Cluster_EdsClusterConfig;
+typedef struct envoy_config_cluster_v3_Cluster_LbSubsetConfig envoy_config_cluster_v3_Cluster_LbSubsetConfig;
+typedef struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector;
+typedef struct envoy_config_cluster_v3_Cluster_SlowStartConfig envoy_config_cluster_v3_Cluster_SlowStartConfig;
+typedef struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig envoy_config_cluster_v3_Cluster_RoundRobinLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig envoy_config_cluster_v3_Cluster_LeastRequestLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_RingHashLbConfig envoy_config_cluster_v3_Cluster_RingHashLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_MaglevLbConfig envoy_config_cluster_v3_Cluster_MaglevLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig envoy_config_cluster_v3_Cluster_OriginalDstLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig;
+typedef struct envoy_config_cluster_v3_Cluster_RefreshRate envoy_config_cluster_v3_Cluster_RefreshRate;
+typedef struct envoy_config_cluster_v3_Cluster_PreconnectPolicy envoy_config_cluster_v3_Cluster_PreconnectPolicy;
+typedef struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry;
+typedef struct envoy_config_cluster_v3_LoadBalancingPolicy envoy_config_cluster_v3_LoadBalancingPolicy;
+typedef struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy envoy_config_cluster_v3_LoadBalancingPolicy_Policy;
+typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions envoy_config_cluster_v3_UpstreamConnectionOptions;
+typedef struct envoy_config_cluster_v3_TrackClusterStats envoy_config_cluster_v3_TrackClusterStats;
+struct envoy_config_cluster_v3_CircuitBreakers;
+struct envoy_config_cluster_v3_Filter;
+struct envoy_config_cluster_v3_OutlierDetection;
+struct envoy_config_core_v3_Address;
+struct envoy_config_core_v3_BindConfig;
+struct envoy_config_core_v3_ConfigSource;
+struct envoy_config_core_v3_DnsResolutionConfig;
+struct envoy_config_core_v3_HealthCheck;
+struct envoy_config_core_v3_HealthStatusSet;
+struct envoy_config_core_v3_Http1ProtocolOptions;
+struct envoy_config_core_v3_Http2ProtocolOptions;
+struct envoy_config_core_v3_HttpProtocolOptions;
+struct envoy_config_core_v3_Metadata;
+struct envoy_config_core_v3_RuntimeDouble;
+struct envoy_config_core_v3_TcpKeepalive;
+struct envoy_config_core_v3_TransportSocket;
+struct envoy_config_core_v3_TypedExtensionConfig;
+struct envoy_config_core_v3_UpstreamHttpProtocolOptions;
+struct envoy_config_endpoint_v3_ClusterLoadAssignment;
+struct envoy_type_v3_Percent;
+struct google_protobuf_Any;
+struct google_protobuf_BoolValue;
+struct google_protobuf_DoubleValue;
+struct google_protobuf_Duration;
+struct google_protobuf_Struct;
+struct google_protobuf_UInt32Value;
+struct google_protobuf_UInt64Value;
+struct xds_core_v3_CollectionEntry;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_USE_CONFIGURED_PROTOCOL = 0,
+  envoy_config_cluster_v3_Cluster_USE_DOWNSTREAM_PROTOCOL = 1
+} envoy_config_cluster_v3_Cluster_ClusterProtocolSelection;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_STATIC = 0,
+  envoy_config_cluster_v3_Cluster_STRICT_DNS = 1,
+  envoy_config_cluster_v3_Cluster_LOGICAL_DNS = 2,
+  envoy_config_cluster_v3_Cluster_EDS = 3,
+  envoy_config_cluster_v3_Cluster_ORIGINAL_DST = 4
+} envoy_config_cluster_v3_Cluster_DiscoveryType;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_AUTO = 0,
+  envoy_config_cluster_v3_Cluster_V4_ONLY = 1,
+  envoy_config_cluster_v3_Cluster_V6_ONLY = 2,
+  envoy_config_cluster_v3_Cluster_V4_PREFERRED = 3,
+  envoy_config_cluster_v3_Cluster_ALL = 4
+} envoy_config_cluster_v3_Cluster_DnsLookupFamily;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_ROUND_ROBIN = 0,
+  envoy_config_cluster_v3_Cluster_LEAST_REQUEST = 1,
+  envoy_config_cluster_v3_Cluster_RING_HASH = 2,
+  envoy_config_cluster_v3_Cluster_RANDOM = 3,
+  envoy_config_cluster_v3_Cluster_MAGLEV = 5,
+  envoy_config_cluster_v3_Cluster_CLUSTER_PROVIDED = 6,
+  envoy_config_cluster_v3_Cluster_LOAD_BALANCING_POLICY_CONFIG = 7
+} envoy_config_cluster_v3_Cluster_LbPolicy;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_NO_FALLBACK = 0,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_ANY_ENDPOINT = 1,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_DEFAULT_SUBSET = 2
+} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_METADATA_NO_FALLBACK = 0,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_FALLBACK_LIST = 1
+} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_NOT_DEFINED = 0,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_NO_FALLBACK = 1,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ANY_ENDPOINT = 2,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_DEFAULT_SUBSET = 3,
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_KEYS_SUBSET = 4
+} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy;
+
+typedef enum {
+  envoy_config_cluster_v3_Cluster_RingHashLbConfig_XX_HASH = 0,
+  envoy_config_cluster_v3_Cluster_RingHashLbConfig_MURMUR_HASH_2 = 1
+} envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction;
+
+
+
+/* envoy.config.cluster.v3.ClusterCollection */
+
+UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_ClusterCollection*)_upb_Message_New(&envoy__config__cluster__v3__ClusterCollection_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_ClusterCollection* ret = envoy_config_cluster_v3_ClusterCollection_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__ClusterCollection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_ClusterCollection* ret = envoy_config_cluster_v3_ClusterCollection_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__ClusterCollection_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_ClusterCollection_serialize(const envoy_config_cluster_v3_ClusterCollection* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__ClusterCollection_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_ClusterCollection_serialize_ex(const envoy_config_cluster_v3_ClusterCollection* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__ClusterCollection_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_clear_entries(envoy_config_cluster_v3_ClusterCollection* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_entries(const envoy_config_cluster_v3_ClusterCollection* msg) {
+  const struct xds_core_v3_CollectionEntry* default_val = NULL;
+  const struct xds_core_v3_CollectionEntry* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_ClusterCollection_has_entries(const envoy_config_cluster_v3_ClusterCollection* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct xds_core_v3_CollectionEntry* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_mutable_entries(envoy_config_cluster_v3_ClusterCollection* msg, upb_Arena* arena) {
+  struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)envoy_config_cluster_v3_ClusterCollection_entries(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_CollectionEntry*)_upb_Message_New(&xds__core__v3__CollectionEntry_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_ClusterCollection_set_entries(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster*)_upb_Message_New(&envoy__config__cluster__v3__Cluster_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster* ret = envoy_config_cluster_v3_Cluster_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster* ret = envoy_config_cluster_v3_Cluster_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_serialize(const envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_serialize_ex(const envoy_config_cluster_v3_Cluster* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_cluster_v3_Cluster_cluster_discovery_type_type = 2,
+  envoy_config_cluster_v3_Cluster_cluster_discovery_type_cluster_type = 38,
+  envoy_config_cluster_v3_Cluster_cluster_discovery_type_NOT_SET = 0
+} envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases;
+UPB_INLINE envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases envoy_config_cluster_v3_Cluster_cluster_discovery_type_case(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+typedef enum {
+  envoy_config_cluster_v3_Cluster_lb_config_ring_hash_lb_config = 23,
+  envoy_config_cluster_v3_Cluster_lb_config_maglev_lb_config = 52,
+  envoy_config_cluster_v3_Cluster_lb_config_original_dst_lb_config = 34,
+  envoy_config_cluster_v3_Cluster_lb_config_least_request_lb_config = 37,
+  envoy_config_cluster_v3_Cluster_lb_config_round_robin_lb_config = 56,
+  envoy_config_cluster_v3_Cluster_lb_config_NOT_SET = 0
+} envoy_config_cluster_v3_Cluster_lb_config_oneofcases;
+UPB_INLINE envoy_config_cluster_v3_Cluster_lb_config_oneofcases envoy_config_cluster_v3_Cluster_lb_config_case(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_Cluster_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_name(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_name(const envoy_config_cluster_v3_Cluster* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_type(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_type(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_eds_cluster_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_EdsClusterConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_eds_cluster_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_connect_timeout(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_connect_timeout(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_connect_timeout(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_per_connection_buffer_limit_bytes(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lb_policy(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_lb_policy(const envoy_config_cluster_v3_Cluster* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_health_checks(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_HealthCheck* const* envoy_config_cluster_v3_Cluster_health_checks(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_core_v3_HealthCheck* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_health_checks(const envoy_config_cluster_v3_Cluster* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_health_checks(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_max_requests_per_connection(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_max_requests_per_connection(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_circuit_breakers(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_circuit_breakers(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_cluster_v3_CircuitBreakers* default_val = NULL;
+  const struct envoy_config_cluster_v3_CircuitBreakers* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_circuit_breakers(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL;
+  const struct envoy_config_core_v3_Http1ProtocolOptions* ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_http2_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL;
+  const struct envoy_config_core_v3_Http2ProtocolOptions* ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_http2_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_dns_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_lookup_family(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_dns_lookup_family(const envoy_config_cluster_v3_Cluster* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolvers(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_cluster_v3_Cluster_dns_resolvers(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_core_v3_Address* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_resolvers(const envoy_config_cluster_v3_Cluster* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_dns_resolvers(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_outlier_detection(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_outlier_detection(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_cluster_v3_OutlierDetection* default_val = NULL;
+  const struct envoy_config_cluster_v3_OutlierDetection* ret;
+  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_outlier_detection(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cleanup_interval(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_cleanup_interval(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cleanup_interval(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_upstream_bind_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_BindConfig* default_val = NULL;
+  const struct envoy_config_core_v3_BindConfig* ret;
+  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_bind_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lb_subset_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_lb_subset_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_LbSubsetConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret;
+  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lb_subset_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_RingHashLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret;
+  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_transport_socket(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_TransportSocket* default_val = NULL;
+  const struct envoy_config_core_v3_TransportSocket* ret;
+  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_transport_socket(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_metadata(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_metadata(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_Metadata* default_val = NULL;
+  const struct envoy_config_core_v3_Metadata* ret;
+  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_metadata(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_protocol_selection(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_protocol_selection(const envoy_config_cluster_v3_Cluster* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_common_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_common_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig* ret;
+  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_alt_stat_name(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_alt_stat_name(const envoy_config_cluster_v3_Cluster* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_common_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_HttpProtocolOptions* default_val = NULL;
+  const struct envoy_config_core_v3_HttpProtocolOptions* ret;
+  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_upstream_connection_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_UpstreamConnectionOptions* default_val = NULL;
+  const envoy_config_cluster_v3_UpstreamConnectionOptions* ret;
+  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_connection_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_close_connections_on_host_health_failure(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_ignore_health_on_host_removal(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_load_assignment(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_load_assignment(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_endpoint_v3_ClusterLoadAssignment* default_val = NULL;
+  const struct envoy_config_endpoint_v3_ClusterLoadAssignment* ret;
+  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_assignment(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret;
+  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_extension_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_size(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_get(const envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any** val) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_next(const envoy_config_cluster_v3_Cluster* msg, size_t* iter) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret;
+  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cluster_type(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_CustomClusterType* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_CustomClusterType* ret;
+  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_respect_dns_ttl(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_respect_dns_ttl(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_filters(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_cluster_v3_Filter* const* envoy_config_cluster_v3_Cluster_filters(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_cluster_v3_Filter* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_filters_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_filters_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_filters(const envoy_config_cluster_v3_Cluster* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_filters(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_load_balancing_policy(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_LoadBalancingPolicy* default_val = NULL;
+  const envoy_config_cluster_v3_LoadBalancingPolicy* ret;
+  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_balancing_policy(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lrs_server(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_lrs_server(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_ConfigSource* default_val = NULL;
+  const struct envoy_config_core_v3_ConfigSource* ret;
+  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lrs_server(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const* envoy_config_cluster_v3_Cluster_transport_socket_matches(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_transport_socket_matches(const envoy_config_cluster_v3_Cluster* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_transport_socket_matches(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_RefreshRate* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_RefreshRate* ret;
+  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_failure_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_use_tcp_for_dns_lookups(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* default_val = NULL;
+  const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* ret;
+  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_track_timeout_budgets(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_track_timeout_budgets(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_upstream_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_track_cluster_stats(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_TrackClusterStats* default_val = NULL;
+  const envoy_config_cluster_v3_TrackClusterStats* ret;
+  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_track_cluster_stats(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_preconnect_policy(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_preconnect_policy(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_PreconnectPolicy* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret;
+  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_preconnect_policy(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_connection_pool_per_downstream_connection(const envoy_config_cluster_v3_Cluster* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_MaglevLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret;
+  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_dns_resolution_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_DnsResolutionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_DnsResolutionConfig* ret;
+  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_resolution_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct google_protobuf_BoolValue* default_val = NULL;
+  const struct google_protobuf_BoolValue* ret;
+  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_wait_for_warm_on_init(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_typed_dns_resolver_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret;
+  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_type(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_eds_cluster_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_EdsClusterConfig* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_mutable_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)envoy_config_cluster_v3_Cluster_eds_cluster_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_eds_cluster_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connect_timeout(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_connect_timeout(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_connect_timeout(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_connect_timeout(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_policy(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_mutable_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_core_v3_HealthCheck**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_resize_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_core_v3_HealthCheck**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_core_v3_HealthCheck* envoy_config_cluster_v3_Cluster_add_health_checks(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_core_v3_HealthCheck* sub = (struct envoy_config_core_v3_HealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_max_requests_per_connection(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_circuit_breakers(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_mutable_circuit_breakers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_config_cluster_v3_Cluster_circuit_breakers(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_circuit_breakers(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_config_cluster_v3_Cluster_http_protocol_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_http_protocol_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http2_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_cluster_v3_Cluster_http2_protocol_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_http2_protocol_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_dns_refresh_rate(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_lookup_family(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
+  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_mutable_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_core_v3_Address**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_resize_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_core_v3_Address**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_cluster_v3_Cluster_add_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_outlier_detection(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_OutlierDetection* value) {
+  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_mutable_outlier_detection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_OutlierDetection* sub = (struct envoy_config_cluster_v3_OutlierDetection*)envoy_config_cluster_v3_Cluster_outlier_detection(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy__config__cluster__v3__OutlierDetection_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_outlier_detection(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cleanup_interval(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_cleanup_interval(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_cleanup_interval(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_cleanup_interval(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_bind_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_BindConfig* value) {
+  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_cluster_v3_Cluster_upstream_bind_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy__config__core__v3__BindConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_bind_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_subset_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LbSubsetConfig* value) {
+  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_mutable_lb_subset_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)envoy_config_cluster_v3_Cluster_lb_subset_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_lb_subset_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RingHashLbConfig* value) {
+  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_mutable_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)envoy_config_cluster_v3_Cluster_ring_hash_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_transport_socket(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TransportSocket* value) {
+  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_mutable_transport_socket(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_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_config_cluster_v3_Cluster_set_transport_socket(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_metadata(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Metadata* value) {
+  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_mutable_metadata(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_cluster_v3_Cluster_metadata(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_metadata(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_protocol_selection(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
+  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig* value) {
+  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_mutable_common_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_CommonLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)envoy_config_cluster_v3_Cluster_common_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_common_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_alt_stat_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) {
+  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) {
+  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_config_cluster_v3_Cluster_common_http_protocol_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__HttpProtocolOptions_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_connection_options(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_UpstreamConnectionOptions* value) {
+  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_UpstreamConnectionOptions* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)envoy_config_cluster_v3_Cluster_upstream_connection_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_connection_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_assignment(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_endpoint_v3_ClusterLoadAssignment* value) {
+  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_mutable_load_assignment(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_endpoint_v3_ClusterLoadAssignment* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)envoy_config_cluster_v3_Cluster_load_assignment(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_load_assignment(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* value) {
+  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_mutable_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)envoy_config_cluster_v3_Cluster_original_dst_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_clear(envoy_config_cluster_v3_Cluster* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_set(envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_delete(envoy_config_cluster_v3_Cluster* msg, upb_StringView key) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_nextmutable(envoy_config_cluster_v3_Cluster* msg, size_t* iter) {
+  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_least_request_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* value) {
+  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_mutable_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)envoy_config_cluster_v3_Cluster_least_request_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_least_request_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cluster_type(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CustomClusterType* value) {
+  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_mutable_cluster_type(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_CustomClusterType* sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)envoy_config_cluster_v3_Cluster_cluster_type(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_cluster_type(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_respect_dns_ttl(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_mutable_filters(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_cluster_v3_Filter**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_resize_filters(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_cluster_v3_Filter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Cluster_add_filters(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_cluster_v3_Filter* sub = (struct envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy__config__cluster__v3__Filter_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_balancing_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_LoadBalancingPolicy* value) {
+  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_mutable_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_config_cluster_v3_Cluster_load_balancing_policy(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_load_balancing_policy(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lrs_server(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_ConfigSource* value) {
+  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_mutable_lrs_server(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_lrs_server(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_lrs_server(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_cluster_v3_Cluster_mutable_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
+  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_cluster_v3_Cluster_TransportSocketMatch**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_cluster_v3_Cluster_resize_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_Cluster_TransportSocketMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_add_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* sub = (struct envoy_config_cluster_v3_Cluster_TransportSocketMatch*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RefreshRate* value) {
+  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_mutable_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_RefreshRate* sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) {
+  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_timeout_budgets(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_upstream_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_cluster_stats(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_TrackClusterStats* value) {
+  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_mutable_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_TrackClusterStats* sub = (struct envoy_config_cluster_v3_TrackClusterStats*)envoy_config_cluster_v3_Cluster_track_cluster_stats(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_TrackClusterStats*)_upb_Message_New(&envoy__config__cluster__v3__TrackClusterStats_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_track_cluster_stats(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PreconnectPolicy* value) {
+  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_mutable_preconnect_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)envoy_config_cluster_v3_Cluster_preconnect_policy(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_preconnect_policy(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster *msg, bool value) {
+  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_maglev_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_MaglevLbConfig* value) {
+  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_mutable_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)envoy_config_cluster_v3_Cluster_maglev_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_maglev_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_resolution_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) {
+  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_mutable_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_cluster_v3_Cluster_dns_resolution_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy__config__core__v3__DnsResolutionConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_dns_resolution_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_BoolValue* value) {
+  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mutable_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* value) {
+  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_mutable_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)envoy_config_cluster_v3_Cluster_round_robin_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.TransportSocketMatch */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_TransportSocketMatch*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_TransportSocketMatch* ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_TransportSocketMatch* ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_TransportSocketMatch_serialize(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_TransportSocketMatch_serialize_ex(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_TransportSocketMatch_name(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const struct google_protobuf_Struct* default_val = NULL;
+  const struct google_protobuf_Struct* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_match(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_transport_socket(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const struct envoy_config_core_v3_TransportSocket* default_val = NULL;
+  const struct envoy_config_core_v3_TransportSocket* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_transport_socket(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct google_protobuf_Struct* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) {
+  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct envoy_config_core_v3_TransportSocket* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_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_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.CustomClusterType */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_CustomClusterType*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CustomClusterType* ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CustomClusterType* ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CustomClusterType_serialize(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CustomClusterType_serialize_ex(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_clear_name(envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_CustomClusterType_name(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_clear_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CustomClusterType_has_typed_config(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_name(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_mutable_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.EdsClusterConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_EdsClusterConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_clear_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
+  const struct envoy_config_core_v3_ConfigSource* default_val = NULL;
+  const struct envoy_config_core_v3_ConfigSource* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_EdsClusterConfig_has_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_clear_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, struct envoy_config_core_v3_ConfigSource* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_mutable_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.cluster.v3.Cluster.LbSubsetConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const struct google_protobuf_Struct* default_val = NULL;
+  const struct google_protobuf_Struct* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_has_default_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_has_subset_selectors(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_locality_weight_aware(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_scale_locality_weight(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_panic_mode_any(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_list_as_any(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_metadata_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, struct google_protobuf_Struct* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** envoy_config_cluster_v3_Cluster_LbSubsetConfig_resize_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_add_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_serialize_ex(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_has_keys(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_has_fallback_keys_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  size_t size;
+  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_single_host_per_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_resize_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_add_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, int32_t value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_resize_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_add_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.cluster.v3.Cluster.SlowStartConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_SlowStartConfig* ret = envoy_config_cluster_v3_Cluster_SlowStartConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_SlowStartConfig* ret = envoy_config_cluster_v3_Cluster_SlowStartConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_SlowStartConfig_serialize(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_SlowStartConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_slow_start_window(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
+  const struct envoy_config_core_v3_RuntimeDouble* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_aggression(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const struct envoy_type_v3_Percent* default_val = NULL;
+  const struct envoy_type_v3_Percent* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_min_weight_percent(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy__config__core__v3__RuntimeDouble_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.RoundRobinLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret = envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret = envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_serialize(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_clear_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
+  const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_SlowStartConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_has_slow_start_config(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.LeastRequestLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_serialize(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_choice_count(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
+  const struct envoy_config_core_v3_RuntimeDouble* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_active_request_bias(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_SlowStartConfig* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_slow_start_config(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy__config__core__v3__RuntimeDouble_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.RingHashLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_RingHashLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RingHashLbConfig_serialize(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RingHashLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const struct google_protobuf_UInt64Value* default_val = NULL;
+  const struct google_protobuf_UInt64Value* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_minimum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_RingHashLbConfig_hash_function(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const struct google_protobuf_UInt64Value* default_val = NULL;
+  const struct google_protobuf_UInt64Value* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_maximum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.MaglevLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_MaglevLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_MaglevLbConfig_serialize(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_MaglevLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_clear_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
+  const struct google_protobuf_UInt64Value* default_val = NULL;
+  const struct google_protobuf_UInt64Value* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_MaglevLbConfig_has_table_size(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig *msg, struct google_protobuf_UInt64Value* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_mutable_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.OriginalDstLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_serialize(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_use_http_header(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_http_header_name(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_has_upstream_port_override(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.CommonLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_CommonLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_zone_aware_lb_config = 2,
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_locality_weighted_lb_config = 3,
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_NOT_SET = 0
+} envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases;
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_case(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const struct envoy_type_v3_Percent* default_val = NULL;
+  const struct envoy_type_v3_Percent* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_healthy_panic_threshold(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_zone_aware_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_locality_weighted_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_update_merge_window(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ignore_new_hosts_until_first_hc(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_close_connections_on_host_set_change(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* default_val = NULL;
+  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_consistent_hashing_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const struct envoy_config_core_v3_HealthStatusSet* default_val = NULL;
+  const struct envoy_config_core_v3_HealthStatusSet* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_override_host_status(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_type_v3_Percent* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_config_core_v3_HealthStatusSet* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_HealthStatusSet* sub = (struct envoy_config_core_v3_HealthStatusSet*)envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_HealthStatusSet*)_upb_Message_New(&envoy__config__core__v3__HealthStatusSet_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const struct envoy_type_v3_Percent* default_val = NULL;
+  const struct envoy_type_v3_Percent* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_has_routing_enabled(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const struct google_protobuf_UInt64Value* default_val = NULL;
+  const struct google_protobuf_UInt64Value* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_has_min_cluster_size(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_fail_traffic_on_panic(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_clear_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_use_hostname_for_hashing(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_clear_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_has_hash_balance_factor(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.RefreshRate */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_RefreshRate*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RefreshRate* ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_RefreshRate* ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RefreshRate_serialize(const envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_RefreshRate_serialize_ex(const envoy_config_cluster_v3_Cluster_RefreshRate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_clear_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_base_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_clear_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_max_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.PreconnectPolicy */
+
+UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_Cluster_PreconnectPolicy*)_upb_Message_New(&envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize_ex(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_clear_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const struct google_protobuf_DoubleValue* default_val = NULL;
+  const struct google_protobuf_DoubleValue* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_clear_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const struct google_protobuf_DoubleValue* default_val = NULL;
+  const struct google_protobuf_DoubleValue* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) {
+  struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google__protobuf__DoubleValue_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) {
+  struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google__protobuf__DoubleValue_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry */
+
+UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_key(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_value(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
+  struct google_protobuf_Any* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_has_value(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_set_value(envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry *msg, struct google_protobuf_Any* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(struct google_protobuf_Any*));
+}
+
+/* envoy.config.cluster.v3.LoadBalancingPolicy */
+
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_LoadBalancingPolicy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_LoadBalancingPolicy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_serialize_ex(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_clear_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const* envoy_config_cluster_v3_LoadBalancingPolicy_policies(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_upb_array(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_mutable_upb_array(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_has_policies(const envoy_config_cluster_v3_LoadBalancingPolicy* msg) {
+  size_t size;
+  envoy_config_cluster_v3_LoadBalancingPolicy_policies(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_cluster_v3_LoadBalancingPolicy_mutable_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_cluster_v3_LoadBalancingPolicy_resize_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_add_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy*)_upb_Message_New(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.cluster.v3.LoadBalancingPolicy.Policy */
+
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy*)_upb_Message_New(&envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_LoadBalancingPolicy_Policy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_LoadBalancingPolicy_Policy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_serialize_ex(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_clear_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_Policy_has_typed_extension_config(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_mutable_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.cluster.v3.UpstreamConnectionOptions */
+
+UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_UpstreamConnectionOptions*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_UpstreamConnectionOptions* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_UpstreamConnectionOptions* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_serialize(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_serialize_ex(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
+  const struct envoy_config_core_v3_TcpKeepalive* default_val = NULL;
+  const struct envoy_config_core_v3_TcpKeepalive* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_has_tcp_keepalive(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_set_local_interface_name_on_upstream_connections(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, struct envoy_config_core_v3_TcpKeepalive* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TcpKeepalive* sub = (struct envoy_config_core_v3_TcpKeepalive*)envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy__config__core__v3__TcpKeepalive_msg_init, arena);
+    if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.cluster.v3.TrackClusterStats */
+
+UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_new(upb_Arena* arena) {
+  return (envoy_config_cluster_v3_TrackClusterStats*)_upb_Message_New(&envoy__config__cluster__v3__TrackClusterStats_msg_init, arena);
+}
+UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_cluster_v3_TrackClusterStats* ret = envoy_config_cluster_v3_TrackClusterStats_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__TrackClusterStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_cluster_v3_TrackClusterStats* ret = envoy_config_cluster_v3_TrackClusterStats_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__TrackClusterStats_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_cluster_v3_TrackClusterStats_serialize(const envoy_config_cluster_v3_TrackClusterStats* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__TrackClusterStats_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_cluster_v3_TrackClusterStats_serialize_ex(const envoy_config_cluster_v3_TrackClusterStats* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__TrackClusterStats_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_clear_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_timeout_budgets(const envoy_config_cluster_v3_TrackClusterStats* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_clear_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats* msg) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_request_response_sizes(const envoy_config_cluster_v3_TrackClusterStats* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
new file mode 100644
index 0000000000000..73b91ab8dcbe0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
@@ -0,0 +1,729 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_cluster_v3_ClusterCollection_submsgs[1] = {
+  {.submsg = &xds__core__v3__CollectionEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = {
+  &envoy_config_cluster_v3_ClusterCollection_submsgs[0],
+  &envoy_config_cluster_v3_ClusterCollection__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = {
+  {.submsg = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers_msg_init},
+  {.submsg = &envoy__config__core__v3__Http1ProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Http2ProtocolOptions_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__cluster__v3__OutlierDetection_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__BindConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TransportSocket_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__HttpProtocolOptions_msg_init},
+  {.submsg = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Filter_msg_init},
+  {.submsg = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init},
+  {.submsg = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__TrackClusterStats_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__DnsResolutionConfig_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = {
+  {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = {
+  &envoy_config_cluster_v3_Cluster_submsgs[0],
+  &envoy_config_cluster_v3_Cluster__fields[0],
+  UPB_SIZE(200, 344), 51, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f00000a, &upb_pss_1bt},
+    {0x0148001402000010, &upb_pov4_1bt},
+    {0x003000000100001a, &upb_psm_1bt_max64b},
+    {0x0038000002010022, &upb_psm_1bt_maxmaxb},
+    {0x004000000302002a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004800003f030042, &upb_prm_1bt_maxmaxb},
+    {0x005000000404004a, &upb_psm_1bt_maxmaxb},
+    {0x0058000005050052, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x006000000606006a, &upb_psm_1bt_maxmaxb},
+    {0x0068000007070072, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0070000008080182, &upb_psm_2bt_maxmaxb},
+    {0x000800003f000188, &upb_psv4_2bt},
+    {0x007800003f090192, &upb_prm_2bt_maxmaxb},
+    {0x00800000090a019a, &upb_psm_2bt_maxmaxb},
+    {0x008800000a0b01a2, &upb_psm_2bt_maxmaxb},
+    {0x009000000b0c01aa, &upb_psm_2bt_maxmaxb},
+    {0x009800000c0d01b2, &upb_psm_2bt_max64b},
+    {0x0150001c170e01ba, &upb_pom_2bt_max64b},
+    {0x00a000000d0f01c2, &upb_psm_2bt_maxmaxb},
+    {0x00a800000e1001ca, &upb_psm_2bt_maxmaxb},
+    {0x000c00003f0001d0, &upb_psv4_2bt},
+    {0x00b000000f1101da, &upb_psm_2bt_max64b},
+    {0x00b800003f0001e2, &upb_pss_2bt},
+    {0x00c80000101201ea, &upb_psm_2bt_maxmaxb},
+    {0x00d00000111301f2, &upb_psm_2bt_max64b},
+    {0x001000003f0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__core__v3__TransportSocket_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init = {
+  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterType__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init = {
+  &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[8] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0],
+  UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f01001a, &upb_prm_1bt_max64b},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x000900003f000028, &upb_psb1_1bt},
+    {0x000a00003f000030, &upb_psb1_1bt},
+    {0x000b00003f000038, &upb_psb1_1bt},
+    {0x000c00003f000040, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[4] = {
+  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init = {
+  NULL,
+  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prs_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x001000003f00001a, &upb_prs_1bt},
+    {0x000400003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeDouble_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = {
+  {.submsg = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeDouble_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x0010000002010022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[3] = {
+  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000008, &upb_psb1_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthStatusSet_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[8] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0],
+  UPB_SIZE(32, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0030000402010012, &upb_pom_1bt_max64b},
+    {0x003000040302001a, &upb_pom_1bt_max64b},
+    {0x0018000002030022, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000028, &upb_psb1_1bt},
+    {0x000900003f000030, &upb_psb1_1bt},
+    {0x002000000304003a, &upb_psm_1bt_max64b},
+    {0x0028000004050042, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[2] = {
+  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init = {
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000008, &upb_psb1_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = {
+  &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = {
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init = {
+  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init = {
+  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0],
+  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = {
+  {.submsg = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = {
+  &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0],
+  &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[1] = {
+  {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init = {
+  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0],
+  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TcpKeepalive_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = {
+  &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0],
+  &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_TrackClusterStats__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = {
+  NULL,
+  &envoy_config_cluster_v3_TrackClusterStats__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[24] = {
+  &envoy__config__cluster__v3__ClusterCollection_msg_init,
+  &envoy__config__cluster__v3__Cluster_msg_init,
+  &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init,
+  &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init,
+  &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init,
+  &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init,
+  &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init,
+  &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init,
+  &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init,
+  &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init,
+  &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init,
+  &envoy__config__cluster__v3__TrackClusterStats_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  24,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
new file mode 100644
index 0000000000000..e6bca8583863c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_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__config__cluster__v3__ClusterCollection_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
rename to src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
index 3249f3f955133..01e8f214adde9 100644
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/filter.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_cluster_v3_Filter envoy_config_cluster_v3_Filter;
-extern const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
 
 
 
 /* envoy.config.cluster.v3.Filter */
 
 UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy_config_cluster_v3_Filter_msg_init, arena);
+  return (envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy__config__cluster__v3__Filter_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_cluster_v3_Filter* ret = envoy_config_cluster_v3_Filter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse_
                            int options, upb_Arena* arena) {
   envoy_config_cluster_v3_Filter* ret = envoy_config_cluster_v3_Filter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Filter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse_
 }
 UPB_INLINE char* envoy_config_cluster_v3_Filter_serialize(const envoy_config_cluster_v3_Filter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Filter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Filter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_Filter_serialize_ex(const envoy_config_cluster_v3_Filter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Filter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Filter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_Filter_clear_name(envoy_config_cluster_v3_Filter* msg) {
@@ -97,14 +102,12 @@ UPB_INLINE void envoy_config_cluster_v3_Filter_set_typed_config(envoy_config_clu
 UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_typed_config(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Filter_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_cluster_v3_Filter_set_typed_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
new file mode 100644
index 0000000000000..d5840457033c9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/filter.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_cluster_v3_Filter_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = {
+  &envoy_config_cluster_v3_Filter_submsgs[0],
+  &envoy_config_cluster_v3_Filter__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__cluster__v3__Filter_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_cluster_v3_filter_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/config/cluster/v3/filter.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
new file mode 100644
index 0000000000000..16fdf2a776e90
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/filter.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_FILTER_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__config__cluster__v3__Filter_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
similarity index 96%
rename from src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
rename to src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
index b736d5e695b88..0b0cf467740e1 100644
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/outlier_detection.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,23 +26,20 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_cluster_v3_OutlierDetection envoy_config_cluster_v3_OutlierDetection;
-extern const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.cluster.v3.OutlierDetection */
 
 UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_OutlierDetection_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy_config_cluster_v3_OutlierDetection_msg_init, arena);
+  return (envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy__config__cluster__v3__OutlierDetection_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_OutlierDetection_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_cluster_v3_OutlierDetection* ret = envoy_config_cluster_v3_OutlierDetection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +49,7 @@ UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Out
                            int options, upb_Arena* arena) {
   envoy_config_cluster_v3_OutlierDetection* ret = envoy_config_cluster_v3_OutlierDetection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__OutlierDetection_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +57,13 @@ UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Out
 }
 UPB_INLINE char* envoy_config_cluster_v3_OutlierDetection_serialize(const envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_OutlierDetection_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__OutlierDetection_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_OutlierDetection_serialize_ex(const envoy_config_cluster_v3_OutlierDetection* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_OutlierDetection_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__OutlierDetection_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg) {
@@ -395,7 +400,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(env
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_5xx(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(msg, sub);
   }
   return sub;
@@ -407,7 +412,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_interval(envoy_conf
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_interval(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_interval(msg, sub);
   }
   return sub;
@@ -419,7 +424,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_base_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_base_ejection_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(msg, sub);
   }
   return sub;
@@ -431,7 +436,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percen
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_max_ejection_percent(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percent(msg, sub);
   }
   return sub;
@@ -443,7 +448,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_5xx(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_5xx(msg, sub);
   }
   return sub;
@@ -455,7 +460,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_r
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_success_rate(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_rate(msg, sub);
   }
   return sub;
@@ -467,7 +472,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimu
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_minimum_hosts(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimum_hosts(msg, sub);
   }
   return sub;
@@ -479,7 +484,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_reques
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_request_volume(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_request_volume(msg, sub);
   }
   return sub;
@@ -491,7 +496,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_stdev_factor(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_factor(msg, sub);
   }
   return sub;
@@ -503,7 +508,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_gateway_failure(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway_failure(msg, sub);
   }
   return sub;
@@ -515,7 +520,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_gateway_failure(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_gateway_failure(msg, sub);
   }
   return sub;
@@ -531,7 +536,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_o
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_local_origin_failure(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_origin_failure(msg, sub);
   }
   return sub;
@@ -543,7 +548,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_local_origin_failure(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_local_origin_failure(msg, sub);
   }
   return sub;
@@ -555,7 +560,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_ori
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_local_origin_success_rate(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_origin_success_rate(msg, sub);
   }
   return sub;
@@ -567,7 +572,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_threshold(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_threshold(msg, sub);
   }
   return sub;
@@ -579,7 +584,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_p
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage(msg, sub);
   }
   return sub;
@@ -591,7 +596,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_p
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage_local_origin(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage_local_origin(msg, sub);
   }
   return sub;
@@ -603,7 +608,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_minimum_hosts(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_minimum_hosts(msg, sub);
   }
   return sub;
@@ -615,7 +620,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_request_volume(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_request_volume(msg, sub);
   }
   return sub;
@@ -627,7 +632,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(e
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(msg, sub);
   }
   return sub;
@@ -639,14 +644,12 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_j
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time_jitter(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time_jitter(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_jitter(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
new file mode 100644
index 0000000000000..fed6385aeaeb4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
@@ -0,0 +1,123 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/outlier_detection.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[21] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[22] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(36, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(40, 80), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(44, 88), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(48, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(52, 96), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(56, 104), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(60, 112), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(64, 120), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(68, 128), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(72, 136), 17, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(76, 144), 18, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(80, 152), 19, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(84, 160), 20, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(88, 168), 21, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = {
+  &envoy_config_cluster_v3_OutlierDetection_submsgs[0],
+  &envoy_config_cluster_v3_OutlierDetection__fields[0],
+  UPB_SIZE(96, 176), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
+    {0x003800000706003a, &upb_psm_1bt_maxmaxb},
+    {0x0040000008070042, &upb_psm_1bt_maxmaxb},
+    {0x004800000908004a, &upb_psm_1bt_maxmaxb},
+    {0x005000000a090052, &upb_psm_1bt_maxmaxb},
+    {0x005800000b0a005a, &upb_psm_1bt_maxmaxb},
+    {0x000300003f000060, &upb_psb1_1bt},
+    {0x006000000c0b006a, &upb_psm_1bt_maxmaxb},
+    {0x006800000d0c0072, &upb_psm_1bt_maxmaxb},
+    {0x007000000e0d007a, &upb_psm_1bt_maxmaxb},
+    {0x007800000f0e0182, &upb_psm_2bt_maxmaxb},
+    {0x00800000100f018a, &upb_psm_2bt_maxmaxb},
+    {0x0088000011100192, &upb_psm_2bt_maxmaxb},
+    {0x009000001211019a, &upb_psm_2bt_maxmaxb},
+    {0x00980000131201a2, &upb_psm_2bt_maxmaxb},
+    {0x00a00000141301aa, &upb_psm_2bt_maxmaxb},
+    {0x00a80000151401b2, &upb_psm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__cluster__v3__OutlierDetection_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_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/config/cluster/v3/outlier_detection.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
new file mode 100644
index 0000000000000..5586fc781d7b9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/outlier_detection.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_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__config__cluster__v3__OutlierDetection_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
new file mode 100644
index 0000000000000..69e432c5ee474
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
@@ -0,0 +1,1830 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "xds/annotations/v3/status.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_config_common_matcher_v3_Matcher envoy_config_common_matcher_v3_Matcher;
+typedef struct envoy_config_common_matcher_v3_Matcher_OnMatch envoy_config_common_matcher_v3_Matcher_OnMatch;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList envoy_config_common_matcher_v3_Matcher_MatcherList;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree envoy_config_common_matcher_v3_Matcher_MatcherTree;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap;
+typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry;
+typedef struct envoy_config_common_matcher_v3_MatchPredicate envoy_config_common_matcher_v3_MatchPredicate;
+typedef struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet envoy_config_common_matcher_v3_MatchPredicate_MatchSet;
+typedef struct envoy_config_common_matcher_v3_HttpHeadersMatch envoy_config_common_matcher_v3_HttpHeadersMatch;
+typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch;
+typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch;
+struct envoy_config_core_v3_TypedExtensionConfig;
+struct envoy_config_route_v3_HeaderMatcher;
+struct envoy_type_matcher_v3_StringMatcher;
+
+
+
+/* envoy.config.common.matcher.v3.Matcher */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize(const envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_Matcher_matcher_type_matcher_list = 1,
+  envoy_config_common_matcher_v3_Matcher_matcher_type_matcher_tree = 2,
+  envoy_config_common_matcher_v3_Matcher_matcher_type_NOT_SET = 0
+} envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases envoy_config_common_matcher_v3_Matcher_matcher_type_case(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_matcher_list(envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_matcher_list(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_matcher_list(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_matcher_tree(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_matcher_tree(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_on_no_match(envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_on_no_match(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_on_no_match(const envoy_config_common_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_list(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_mutable_matcher_list(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)envoy_config_common_matcher_v3_Matcher_matcher_list(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_list(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_tree(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_mutable_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherTree* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)envoy_config_common_matcher_v3_Matcher_matcher_tree(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_tree(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_on_no_match(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_mutable_on_no_match(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_on_no_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_set_on_no_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.OnMatch */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize_ex(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_matcher = 1,
+  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_action = 2,
+  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_NOT_SET = 0
+} envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_case(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_clear_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const envoy_config_common_matcher_v3_Matcher* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_matcher(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_clear_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_action(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_action(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, envoy_config_common_matcher_v3_Matcher* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher* sub = (struct envoy_config_common_matcher_v3_Matcher*)envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_OnMatch_action(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherList */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_clear_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* const* envoy_config_common_matcher_v3_Matcher_MatcherList_matchers(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_has_matchers(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg) {
+  size_t size;
+  envoy_config_common_matcher_v3_Matcher_MatcherList_matchers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** envoy_config_common_matcher_v3_Matcher_MatcherList_mutable_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** envoy_config_common_matcher_v3_Matcher_MatcherList_resize_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_add_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_single_predicate = 1,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_or_matcher = 2,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_and_matcher = 3,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_not_matcher = 4,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_NOT_SET = 0
+} envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_case(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_single_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_or_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_and_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_not_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_value_match = 2,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_custom_match = 3,
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_NOT_SET = 0
+} envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_case(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_input(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_StringMatcher* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_value_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* const* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_has_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
+  size_t size;
+  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_resize_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_has_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherTree */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_exact_match_map = 2,
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_prefix_match_map = 3,
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_custom_match = 4,
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_NOT_SET = 0
+} envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_case(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_input(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_input(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_exact_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
+  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_prefix_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_input(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap */
+
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_clear_map(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_size(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch** val) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_clear(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_delete(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
+}
+
+/* envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry */
+
+UPB_INLINE upb_StringView envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_key(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_value(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_has_value(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_value(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(envoy_config_common_matcher_v3_Matcher_OnMatch*));
+}
+
+/* envoy.config.common.matcher.v3.MatchPredicate */
+
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize(const envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_MatchPredicate_rule_or_match = 1,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_and_match = 2,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_not_match = 3,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_any_match = 4,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_headers_match = 5,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_trailers_match = 6,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_headers_match = 7,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_trailers_match = 8,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_generic_body_match = 9,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_generic_body_match = 10,
+  envoy_config_common_matcher_v3_MatchPredicate_rule_NOT_SET = 0
+} envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases envoy_config_common_matcher_v3_MatchPredicate_rule_case(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_or_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL;
+  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_or_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_and_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL;
+  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_and_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_not_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL;
+  const envoy_config_common_matcher_v3_MatchPredicate* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_not_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_any_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_any_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_any_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL;
+  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_or_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_or_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_or_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_and_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_and_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_and_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_not_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_mutable_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_common_matcher_v3_MatchPredicate_not_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_not_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_any_match(envoy_config_common_matcher_v3_MatchPredicate *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
+    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.MatchPredicate.MatchSet */
+
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_MatchSet_clear_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* const* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_common_matcher_v3_MatchPredicate* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_MatchSet_has_rules(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg) {
+  size_t size;
+  envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_matcher_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_common_matcher_v3_MatchPredicate**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_matcher_v3_MatchPredicate_MatchSet_resize_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_MatchPredicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_add_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.HttpHeadersMatch */
+
+UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpHeadersMatch_clear_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_common_matcher_v3_HttpHeadersMatch_headers(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_mutable_upb_array(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_HttpHeadersMatch_has_headers(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg) {
+  size_t size;
+  envoy_config_common_matcher_v3_HttpHeadersMatch_headers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matcher_v3_HttpHeadersMatch_mutable_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matcher_v3_HttpHeadersMatch_resize_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_common_matcher_v3_HttpHeadersMatch_add_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.HttpGenericBodyMatch */
+
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_config_common_matcher_v3_HttpGenericBodyMatch_bytes_limit(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_has_patterns(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
+  size_t size;
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch *msg, uint32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_resize_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_add_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch */
+
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(upb_Arena* arena) {
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_string_match = 1,
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_binary_match = 2,
+  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_NOT_SET = 0
+} envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases;
+UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_case(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_clear_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_string_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_has_string_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_clear_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_binary_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_has_binary_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
new file mode 100644
index 0000000000000..8db283aa1efcf
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
@@ -0,0 +1,395 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_submsgs[3] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3] = {
+  {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040100000a, &upb_pom_1bt_max64b},
+    {0x0010000402010012, &upb_pom_1bt_max64b},
+    {0x000800000102001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
+  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000402010012, &upb_pom_1bt_maxmaxb},
+    {0x001000040302001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000402010012, &upb_pom_1bt_max64b},
+    {0x001000040302001a, &upb_pom_1bt_max64b},
+    {0x0010000404030022, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
+  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = {
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__fields[10] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init = {
+  &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0],
+  &envoy_config_common_matcher_v3_MatchPredicate__fields[0],
+  UPB_SIZE(8, 16), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004000020, &upb_pob1_1bt},
+    {0x000800000503002a, &upb_pom_1bt_max64b},
+    {0x0008000006040032, &upb_pom_1bt_max64b},
+    {0x000800000705003a, &upb_pom_1bt_max64b},
+    {0x0008000008060042, &upb_pom_1bt_max64b},
+    {0x000800000907004a, &upb_pom_1bt_max64b},
+    {0x000800000a080052, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init = {
+  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0],
+  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init = {
+  &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0],
+  &envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = {
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init = {
+  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0],
+  &envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init = {
+  NULL,
+  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pob_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[15] = {
+  &envoy__config__common__matcher__v3__Matcher_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init,
+  &envoy__config__common__matcher__v3__MatchPredicate_msg_init,
+  &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init,
+  &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init,
+  &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init,
+  &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  15,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
new file mode 100644
index 0000000000000..820a3e84f9529
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
@@ -0,0 +1,44 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_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__config__common__matcher__v3__Matcher_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init;
+
+extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
index 0a660c47ef63b..e5369e8bd08bc 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/address.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -25,22 +34,10 @@ typedef struct envoy_config_core_v3_ExtraSourceAddress envoy_config_core_v3_Extr
 typedef struct envoy_config_core_v3_BindConfig envoy_config_core_v3_BindConfig;
 typedef struct envoy_config_core_v3_Address envoy_config_core_v3_Address;
 typedef struct envoy_config_core_v3_CidrRange envoy_config_core_v3_CidrRange;
-extern const upb_MiniTable envoy_config_core_v3_Pipe_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_EnvoyInternalAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtraSourceAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
 struct envoy_config_core_v3_SocketOption;
 struct envoy_config_core_v3_SocketOptionsOverride;
 struct google_protobuf_BoolValue;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOptionsOverride_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 typedef enum {
   envoy_config_core_v3_SocketAddress_TCP = 0,
@@ -52,12 +49,12 @@ typedef enum {
 /* envoy.config.core.v3.Pipe */
 
 UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy_config_core_v3_Pipe_msg_init, arena);
+  return (envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy__config__core__v3__Pipe_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Pipe* ret = envoy_config_core_v3_Pipe_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Pipe_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Pipe_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -67,7 +64,7 @@ UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Pipe* ret = envoy_config_core_v3_Pipe_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Pipe_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Pipe_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -75,13 +72,13 @@ UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse_ex(const c
 }
 UPB_INLINE char* envoy_config_core_v3_Pipe_serialize(const envoy_config_core_v3_Pipe* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Pipe_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Pipe_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Pipe_serialize_ex(const envoy_config_core_v3_Pipe* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Pipe_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Pipe_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Pipe_clear_path(envoy_config_core_v3_Pipe* msg) {
@@ -119,12 +116,12 @@ UPB_INLINE void envoy_config_core_v3_Pipe_set_mode(envoy_config_core_v3_Pipe *ms
 /* envoy.config.core.v3.EnvoyInternalAddress */
 
 UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_EnvoyInternalAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy_config_core_v3_EnvoyInternalAddress_msg_init, arena);
+  return (envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy__config__core__v3__EnvoyInternalAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_EnvoyInternalAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_EnvoyInternalAddress* ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -134,7 +131,7 @@ UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Envoy
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_EnvoyInternalAddress* ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -142,13 +139,13 @@ UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Envoy
 }
 UPB_INLINE char* envoy_config_core_v3_EnvoyInternalAddress_serialize(const envoy_config_core_v3_EnvoyInternalAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_EnvoyInternalAddress_serialize_ex(const envoy_config_core_v3_EnvoyInternalAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -198,12 +195,12 @@ UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_endpoint_id(envoy_
 /* envoy.config.core.v3.SocketAddress */
 
 UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+  return (envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SocketAddress* ret = envoy_config_core_v3_SocketAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -213,7 +210,7 @@ UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddres
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SocketAddress* ret = envoy_config_core_v3_SocketAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -221,13 +218,13 @@ UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddres
 }
 UPB_INLINE char* envoy_config_core_v3_SocketAddress_serialize(const envoy_config_core_v3_SocketAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SocketAddress_serialize_ex(const envoy_config_core_v3_SocketAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -342,12 +339,12 @@ UPB_INLINE void envoy_config_core_v3_SocketAddress_set_ipv4_compat(envoy_config_
 /* envoy.config.core.v3.TcpKeepalive */
 
 UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy_config_core_v3_TcpKeepalive_msg_init, arena);
+  return (envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy__config__core__v3__TcpKeepalive_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_TcpKeepalive* ret = envoy_config_core_v3_TcpKeepalive_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpKeepalive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -357,7 +354,7 @@ UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_TcpKeepalive* ret = envoy_config_core_v3_TcpKeepalive_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpKeepalive_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -365,13 +362,13 @@ UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_
 }
 UPB_INLINE char* envoy_config_core_v3_TcpKeepalive_serialize(const envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpKeepalive_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpKeepalive_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_TcpKeepalive_serialize_ex(const envoy_config_core_v3_TcpKeepalive* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpKeepalive_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpKeepalive_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_TcpKeepalive_clear_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg) {
@@ -427,7 +424,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_probes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(msg, sub);
   }
   return sub;
@@ -439,7 +436,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_time(envoy_confi
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_time(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_time(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_time(msg, sub);
   }
   return sub;
@@ -451,7 +448,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(envoy_c
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_interval(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(msg, sub);
   }
   return sub;
@@ -460,12 +457,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive
 /* envoy.config.core.v3.ExtraSourceAddress */
 
 UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSourceAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy_config_core_v3_ExtraSourceAddress_msg_init, arena);
+  return (envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy__config__core__v3__ExtraSourceAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSourceAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ExtraSourceAddress* ret = envoy_config_core_v3_ExtraSourceAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtraSourceAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtraSourceAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -475,7 +472,7 @@ UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSo
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ExtraSourceAddress* ret = envoy_config_core_v3_ExtraSourceAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtraSourceAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtraSourceAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -483,13 +480,13 @@ UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSo
 }
 UPB_INLINE char* envoy_config_core_v3_ExtraSourceAddress_serialize(const envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtraSourceAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtraSourceAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ExtraSourceAddress_serialize_ex(const envoy_config_core_v3_ExtraSourceAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtraSourceAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtraSourceAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_clear_address(envoy_config_core_v3_ExtraSourceAddress* msg) {
@@ -530,7 +527,7 @@ UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_address(envoy_config
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_ExtraSourceAddress_mutable_address(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_ExtraSourceAddress_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
     if (sub) envoy_config_core_v3_ExtraSourceAddress_set_address(msg, sub);
   }
   return sub;
@@ -542,7 +539,7 @@ UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_socket_options(envoy
 UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_ExtraSourceAddress_mutable_socket_options(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_core_v3_ExtraSourceAddress_socket_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy_config_core_v3_SocketOptionsOverride_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy__config__core__v3__SocketOptionsOverride_msg_init, arena);
     if (sub) envoy_config_core_v3_ExtraSourceAddress_set_socket_options(msg, sub);
   }
   return sub;
@@ -551,12 +548,12 @@ UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_
 /* envoy.config.core.v3.BindConfig */
 
 UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy_config_core_v3_BindConfig_msg_init, arena);
+  return (envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy__config__core__v3__BindConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_BindConfig* ret = envoy_config_core_v3_BindConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BindConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -566,7 +563,7 @@ UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_pars
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_BindConfig* ret = envoy_config_core_v3_BindConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BindConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -574,13 +571,13 @@ UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_pars
 }
 UPB_INLINE char* envoy_config_core_v3_BindConfig_serialize(const envoy_config_core_v3_BindConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BindConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BindConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_BindConfig_serialize_ex(const envoy_config_core_v3_BindConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BindConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BindConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_BindConfig_clear_source_address(envoy_config_core_v3_BindConfig* msg) {
@@ -732,7 +729,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_set_source_address(envoy_config_
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindConfig_mutable_source_address(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_BindConfig_source_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
     if (sub) envoy_config_core_v3_BindConfig_set_source_address(msg, sub);
   }
   return sub;
@@ -744,7 +741,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_set_freebind(envoy_config_core_v
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_BindConfig_mutable_freebind(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_BindConfig_freebind(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_BindConfig_set_freebind(msg, sub);
   }
   return sub;
@@ -770,7 +767,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_BindCo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -796,7 +793,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindC
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -822,7 +819,7 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_ExtraSourceAddress* sub = (struct envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy_config_core_v3_ExtraSourceAddress_msg_init, arena);
+  struct envoy_config_core_v3_ExtraSourceAddress* sub = (struct envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy__config__core__v3__ExtraSourceAddress_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -831,12 +828,12 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_
 /* envoy.config.core.v3.Address */
 
 UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  return (envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Address* ret = envoy_config_core_v3_Address_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Address_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Address_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -846,7 +843,7 @@ UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse_ex(c
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Address* ret = envoy_config_core_v3_Address_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Address_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Address_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -854,13 +851,13 @@ UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse_ex(c
 }
 UPB_INLINE char* envoy_config_core_v3_Address_serialize(const envoy_config_core_v3_Address* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Address_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Address_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Address_serialize_ex(const envoy_config_core_v3_Address* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Address_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Address_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -926,7 +923,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_socket_address(envoy_config_cor
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Address_mutable_socket_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_Address_socket_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
     if (sub) envoy_config_core_v3_Address_set_socket_address(msg, sub);
   }
   return sub;
@@ -938,7 +935,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_pipe(envoy_config_core_v3_Addre
 UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutable_pipe(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Pipe* sub = (struct envoy_config_core_v3_Pipe*)envoy_config_core_v3_Address_pipe(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy_config_core_v3_Pipe_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy__config__core__v3__Pipe_msg_init, arena);
     if (sub) envoy_config_core_v3_Address_set_pipe(msg, sub);
   }
   return sub;
@@ -950,7 +947,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_envoy_internal_address(envoy_co
 UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Address_mutable_envoy_internal_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_EnvoyInternalAddress* sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)envoy_config_core_v3_Address_envoy_internal_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy_config_core_v3_EnvoyInternalAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy__config__core__v3__EnvoyInternalAddress_msg_init, arena);
     if (sub) envoy_config_core_v3_Address_set_envoy_internal_address(msg, sub);
   }
   return sub;
@@ -959,12 +956,12 @@ UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v
 /* envoy.config.core.v3.CidrRange */
 
 UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  return (envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_CidrRange* ret = envoy_config_core_v3_CidrRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -974,7 +971,7 @@ UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_CidrRange* ret = envoy_config_core_v3_CidrRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__CidrRange_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -982,13 +979,13 @@ UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse_
 }
 UPB_INLINE char* envoy_config_core_v3_CidrRange_serialize(const envoy_config_core_v3_CidrRange* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_CidrRange_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__CidrRange_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_CidrRange_serialize_ex(const envoy_config_core_v3_CidrRange* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_CidrRange_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__CidrRange_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_CidrRange_clear_address_prefix(envoy_config_core_v3_CidrRange* msg) {
@@ -1029,14 +1026,12 @@ UPB_INLINE void envoy_config_core_v3_CidrRange_set_prefix_len(envoy_config_core_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mutable_prefix_len(envoy_config_core_v3_CidrRange* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_CidrRange_prefix_len(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_CidrRange_set_prefix_len(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
new file mode 100644
index 0000000000000..7369304fa62f8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
@@ -0,0 +1,224 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/address.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_Pipe__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Pipe_msg_init = {
+  NULL,
+  &envoy_config_core_v3_Pipe__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_EnvoyInternalAddress__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init = {
+  NULL,
+  &envoy_config_core_v3_EnvoyInternalAddress__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_SocketAddress__fields[6] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), -5, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = {
+  NULL,
+  &envoy_config_core_v3_SocketAddress__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x002000003f000012, &upb_pss_1bt},
+    {0x0010000403000018, &upb_pov4_1bt},
+    {0x0010000404000022, &upb_pos_1bt},
+    {0x003000003f00002a, &upb_pss_1bt},
+    {0x000800003f000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_TcpKeepalive_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = {
+  &envoy_config_core_v3_TcpKeepalive_submsgs[0],
+  &envoy_config_core_v3_TcpKeepalive__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOptionsOverride_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = {
+  &envoy_config_core_v3_ExtraSourceAddress_submsgs[0],
+  &envoy_config_core_v3_ExtraSourceAddress__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[5] = {
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__ExtraSourceAddress_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = {
+  &envoy_config_core_v3_BindConfig_submsgs[0],
+  &envoy_config_core_v3_BindConfig__fields[0],
+  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f02001a, &upb_prm_1bt_maxmaxb},
+    {0x002000003f030022, &upb_prm_1bt_max128b},
+    {0x002800003f04002a, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Address_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__Pipe_msg_init},
+  {.submsg = &envoy__config__core__v3__EnvoyInternalAddress_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Address_msg_init = {
+  &envoy_config_core_v3_Address_submsgs[0],
+  &envoy_config_core_v3_Address__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max128b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_CidrRange_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = {
+  &envoy_config_core_v3_CidrRange_submsgs[0],
+  &envoy_config_core_v3_CidrRange__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[8] = {
+  &envoy__config__core__v3__Pipe_msg_init,
+  &envoy__config__core__v3__EnvoyInternalAddress_msg_init,
+  &envoy__config__core__v3__SocketAddress_msg_init,
+  &envoy__config__core__v3__TcpKeepalive_msg_init,
+  &envoy__config__core__v3__ExtraSourceAddress_msg_init,
+  &envoy__config__core__v3__BindConfig_msg_init,
+  &envoy__config__core__v3__Address_msg_init,
+  &envoy__config__core__v3__CidrRange_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  8,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
new file mode 100644
index 0000000000000..b0ffba30e2290
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/address.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_ADDRESS_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__config__core__v3__Pipe_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Address_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
index e472dc28886f0..4ace9193c256e 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/backoff.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_core_v3_BackoffStrategy envoy_config_core_v3_BackoffStrategy;
-extern const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init;
 struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* envoy.config.core.v3.BackoffStrategy */
 
 UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStrategy_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy_config_core_v3_BackoffStrategy_msg_init, arena);
+  return (envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy__config__core__v3__BackoffStrategy_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStrategy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_BackoffStrategy* ret = envoy_config_core_v3_BackoffStrategy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BackoffStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStr
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_BackoffStrategy* ret = envoy_config_core_v3_BackoffStrategy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BackoffStrategy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStr
 }
 UPB_INLINE char* envoy_config_core_v3_BackoffStrategy_serialize(const envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BackoffStrategy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BackoffStrategy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_BackoffStrategy_serialize_ex(const envoy_config_core_v3_BackoffStrategy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BackoffStrategy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BackoffStrategy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_BackoffStrategy_clear_base_interval(envoy_config_core_v3_BackoffStrategy* msg) {
@@ -97,7 +102,7 @@ UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_base_interval(envoy_con
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_base_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_base_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_BackoffStrategy_set_base_interval(msg, sub);
   }
   return sub;
@@ -109,14 +114,12 @@ UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_max_interval(envoy_conf
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_max_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_max_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_BackoffStrategy_set_max_interval(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
new file mode 100644
index 0000000000000..3bb409e76d128
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/backoff.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_BackoffStrategy_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = {
+  &envoy_config_core_v3_BackoffStrategy_submsgs[0],
+  &envoy_config_core_v3_BackoffStrategy__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__BackoffStrategy_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_backoff_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/config/core/v3/backoff.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
new file mode 100644
index 0000000000000..405ad98b76b1e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/backoff.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BACKOFF_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__config__core__v3__BackoffStrategy_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
index 0cea2fd8ccfd2..3c8dd4f9992f1 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/base.proto
  *
@@ -10,7 +9,25 @@
 #define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -41,30 +58,6 @@ typedef struct envoy_config_core_v3_AsyncDataSource envoy_config_core_v3_AsyncDa
 typedef struct envoy_config_core_v3_TransportSocket envoy_config_core_v3_TransportSocket;
 typedef struct envoy_config_core_v3_RuntimeFractionalPercent envoy_config_core_v3_RuntimeFractionalPercent;
 typedef struct envoy_config_core_v3_ControlPlane envoy_config_core_v3_ControlPlane;
-extern const upb_MiniTable envoy_config_core_v3_Locality_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BuildVersion_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Extension_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Node_DynamicParametersEntry_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimePercent_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeFeatureFlag_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_QueryParameter_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValue_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderMap_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RetryPolicy_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RemoteDataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_AsyncDataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeFractionalPercent_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ControlPlane_msg_init;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_BackoffStrategy;
 struct envoy_config_core_v3_HttpUri;
@@ -76,17 +69,6 @@ struct google_protobuf_BoolValue;
 struct google_protobuf_Struct;
 struct google_protobuf_UInt32Value;
 struct xds_core_v3_ContextParams;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HttpUri_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable envoy_type_v3_SemanticVersion_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable xds_core_v3_ContextParams_msg_init;
 
 typedef enum {
   envoy_config_core_v3_HeaderValueOption_APPEND_IF_EXISTS_OR_ADD = 0,
@@ -123,12 +105,12 @@ typedef enum {
 /* envoy.config.core.v3.Locality */
 
 UPB_INLINE envoy_config_core_v3_Locality* envoy_config_core_v3_Locality_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+  return (envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Locality* envoy_config_core_v3_Locality_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Locality* ret = envoy_config_core_v3_Locality_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Locality_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Locality_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -138,7 +120,7 @@ UPB_INLINE envoy_config_core_v3_Locality* envoy_config_core_v3_Locality_parse_ex
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Locality* ret = envoy_config_core_v3_Locality_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Locality_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Locality_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -146,13 +128,13 @@ UPB_INLINE envoy_config_core_v3_Locality* envoy_config_core_v3_Locality_parse_ex
 }
 UPB_INLINE char* envoy_config_core_v3_Locality_serialize(const envoy_config_core_v3_Locality* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Locality_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Locality_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Locality_serialize_ex(const envoy_config_core_v3_Locality* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Locality_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Locality_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Locality_clear_region(envoy_config_core_v3_Locality* msg) {
@@ -205,12 +187,12 @@ UPB_INLINE void envoy_config_core_v3_Locality_set_sub_zone(envoy_config_core_v3_
 /* envoy.config.core.v3.BuildVersion */
 
 UPB_INLINE envoy_config_core_v3_BuildVersion* envoy_config_core_v3_BuildVersion_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy_config_core_v3_BuildVersion_msg_init, arena);
+  return (envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy__config__core__v3__BuildVersion_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_BuildVersion* envoy_config_core_v3_BuildVersion_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_BuildVersion* ret = envoy_config_core_v3_BuildVersion_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BuildVersion_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -220,7 +202,7 @@ UPB_INLINE envoy_config_core_v3_BuildVersion* envoy_config_core_v3_BuildVersion_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_BuildVersion* ret = envoy_config_core_v3_BuildVersion_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BuildVersion_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -228,13 +210,13 @@ UPB_INLINE envoy_config_core_v3_BuildVersion* envoy_config_core_v3_BuildVersion_
 }
 UPB_INLINE char* envoy_config_core_v3_BuildVersion_serialize(const envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BuildVersion_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BuildVersion_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_BuildVersion_serialize_ex(const envoy_config_core_v3_BuildVersion* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BuildVersion_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BuildVersion_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_BuildVersion_clear_version(envoy_config_core_v3_BuildVersion* msg) {
@@ -275,7 +257,7 @@ UPB_INLINE void envoy_config_core_v3_BuildVersion_set_version(envoy_config_core_
 UPB_INLINE struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_BuildVersion_mutable_version(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) {
   struct envoy_type_v3_SemanticVersion* sub = (struct envoy_type_v3_SemanticVersion*)envoy_config_core_v3_BuildVersion_version(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_SemanticVersion*)_upb_Message_New(&envoy_type_v3_SemanticVersion_msg_init, arena);
+    sub = (struct envoy_type_v3_SemanticVersion*)_upb_Message_New(&envoy__type__v3__SemanticVersion_msg_init, arena);
     if (sub) envoy_config_core_v3_BuildVersion_set_version(msg, sub);
   }
   return sub;
@@ -287,7 +269,7 @@ UPB_INLINE void envoy_config_core_v3_BuildVersion_set_metadata(envoy_config_core
 UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_BuildVersion_mutable_metadata(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_BuildVersion_metadata(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_core_v3_BuildVersion_set_metadata(msg, sub);
   }
   return sub;
@@ -296,12 +278,12 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_BuildVersion_muta
 /* envoy.config.core.v3.Extension */
 
 UPB_INLINE envoy_config_core_v3_Extension* envoy_config_core_v3_Extension_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Extension*)_upb_Message_New(&envoy_config_core_v3_Extension_msg_init, arena);
+  return (envoy_config_core_v3_Extension*)_upb_Message_New(&envoy__config__core__v3__Extension_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Extension* envoy_config_core_v3_Extension_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Extension* ret = envoy_config_core_v3_Extension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Extension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Extension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -311,7 +293,7 @@ UPB_INLINE envoy_config_core_v3_Extension* envoy_config_core_v3_Extension_parse_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Extension* ret = envoy_config_core_v3_Extension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Extension_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Extension_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -319,13 +301,13 @@ UPB_INLINE envoy_config_core_v3_Extension* envoy_config_core_v3_Extension_parse_
 }
 UPB_INLINE char* envoy_config_core_v3_Extension_serialize(const envoy_config_core_v3_Extension* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Extension_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Extension_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Extension_serialize_ex(const envoy_config_core_v3_Extension* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Extension_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Extension_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Extension_clear_name(envoy_config_core_v3_Extension* msg) {
@@ -444,7 +426,7 @@ UPB_INLINE void envoy_config_core_v3_Extension_set_version(envoy_config_core_v3_
 UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extension_mutable_version(envoy_config_core_v3_Extension* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Extension_version(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy_config_core_v3_BuildVersion_msg_init, arena);
+    sub = (struct envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy__config__core__v3__BuildVersion_msg_init, arena);
     if (sub) envoy_config_core_v3_Extension_set_version(msg, sub);
   }
   return sub;
@@ -481,12 +463,12 @@ UPB_INLINE bool envoy_config_core_v3_Extension_add_type_urls(envoy_config_core_v
 /* envoy.config.core.v3.Node */
 
 UPB_INLINE envoy_config_core_v3_Node* envoy_config_core_v3_Node_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+  return (envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Node* envoy_config_core_v3_Node_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Node* ret = envoy_config_core_v3_Node_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Node_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Node_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -496,7 +478,7 @@ UPB_INLINE envoy_config_core_v3_Node* envoy_config_core_v3_Node_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Node* ret = envoy_config_core_v3_Node_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Node_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Node_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -504,13 +486,13 @@ UPB_INLINE envoy_config_core_v3_Node* envoy_config_core_v3_Node_parse_ex(const c
 }
 UPB_INLINE char* envoy_config_core_v3_Node_serialize(const envoy_config_core_v3_Node* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Node_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Node_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Node_serialize_ex(const envoy_config_core_v3_Node* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Node_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Node_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -763,7 +745,7 @@ UPB_INLINE void envoy_config_core_v3_Node_set_metadata(envoy_config_core_v3_Node
 UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_Node_mutable_metadata(envoy_config_core_v3_Node* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_Node_metadata(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_core_v3_Node_set_metadata(msg, sub);
   }
   return sub;
@@ -775,7 +757,7 @@ UPB_INLINE void envoy_config_core_v3_Node_set_locality(envoy_config_core_v3_Node
 UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_core_v3_Node_mutable_locality(envoy_config_core_v3_Node* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_core_v3_Node_locality(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
     if (sub) envoy_config_core_v3_Node_set_locality(msg, sub);
   }
   return sub;
@@ -795,7 +777,7 @@ UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_build_version(envoy_con
 UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Node_mutable_user_agent_build_version(envoy_config_core_v3_Node* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Node_user_agent_build_version(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy_config_core_v3_BuildVersion_msg_init, arena);
+    sub = (struct envoy_config_core_v3_BuildVersion*)_upb_Message_New(&envoy__config__core__v3__BuildVersion_msg_init, arena);
     if (sub) envoy_config_core_v3_Node_set_user_agent_build_version(msg, sub);
   }
   return sub;
@@ -821,7 +803,7 @@ UPB_INLINE struct envoy_config_core_v3_Extension* envoy_config_core_v3_Node_add_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_Extension* sub = (struct envoy_config_core_v3_Extension*)_upb_Message_New(&envoy_config_core_v3_Extension_msg_init, arena);
+  struct envoy_config_core_v3_Extension* sub = (struct envoy_config_core_v3_Extension*)_upb_Message_New(&envoy__config__core__v3__Extension_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -871,7 +853,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_Node_add_li
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -925,12 +907,12 @@ UPB_INLINE void envoy_config_core_v3_Node_DynamicParametersEntry_set_value(envoy
 /* envoy.config.core.v3.Metadata */
 
 UPB_INLINE envoy_config_core_v3_Metadata* envoy_config_core_v3_Metadata_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+  return (envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Metadata* envoy_config_core_v3_Metadata_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Metadata* ret = envoy_config_core_v3_Metadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Metadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Metadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -940,7 +922,7 @@ UPB_INLINE envoy_config_core_v3_Metadata* envoy_config_core_v3_Metadata_parse_ex
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Metadata* ret = envoy_config_core_v3_Metadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Metadata_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Metadata_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -948,13 +930,13 @@ UPB_INLINE envoy_config_core_v3_Metadata* envoy_config_core_v3_Metadata_parse_ex
 }
 UPB_INLINE char* envoy_config_core_v3_Metadata_serialize(const envoy_config_core_v3_Metadata* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Metadata_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Metadata_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Metadata_serialize_ex(const envoy_config_core_v3_Metadata* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Metadata_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Metadata_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Metadata_clear_filter_metadata(envoy_config_core_v3_Metadata* msg) {
@@ -1094,12 +1076,12 @@ UPB_INLINE void envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_set_value
 /* envoy.config.core.v3.RuntimeUInt32 */
 
 UPB_INLINE envoy_config_core_v3_RuntimeUInt32* envoy_config_core_v3_RuntimeUInt32_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy_config_core_v3_RuntimeUInt32_msg_init, arena);
+  return (envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy__config__core__v3__RuntimeUInt32_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RuntimeUInt32* envoy_config_core_v3_RuntimeUInt32_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeUInt32* ret = envoy_config_core_v3_RuntimeUInt32_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeUInt32_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1109,7 +1091,7 @@ UPB_INLINE envoy_config_core_v3_RuntimeUInt32* envoy_config_core_v3_RuntimeUInt3
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeUInt32* ret = envoy_config_core_v3_RuntimeUInt32_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeUInt32_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1117,13 +1099,13 @@ UPB_INLINE envoy_config_core_v3_RuntimeUInt32* envoy_config_core_v3_RuntimeUInt3
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeUInt32_serialize(const envoy_config_core_v3_RuntimeUInt32* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeUInt32_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeUInt32_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeUInt32_serialize_ex(const envoy_config_core_v3_RuntimeUInt32* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeUInt32_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeUInt32_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_clear_default_value(envoy_config_core_v3_RuntimeUInt32* msg) {
@@ -1161,12 +1143,12 @@ UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_runtime_key(envoy_config_
 /* envoy.config.core.v3.RuntimePercent */
 
 UPB_INLINE envoy_config_core_v3_RuntimePercent* envoy_config_core_v3_RuntimePercent_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RuntimePercent*)_upb_Message_New(&envoy_config_core_v3_RuntimePercent_msg_init, arena);
+  return (envoy_config_core_v3_RuntimePercent*)_upb_Message_New(&envoy__config__core__v3__RuntimePercent_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RuntimePercent* envoy_config_core_v3_RuntimePercent_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RuntimePercent* ret = envoy_config_core_v3_RuntimePercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimePercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1176,7 +1158,7 @@ UPB_INLINE envoy_config_core_v3_RuntimePercent* envoy_config_core_v3_RuntimePerc
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RuntimePercent* ret = envoy_config_core_v3_RuntimePercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimePercent_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1184,13 +1166,13 @@ UPB_INLINE envoy_config_core_v3_RuntimePercent* envoy_config_core_v3_RuntimePerc
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimePercent_serialize(const envoy_config_core_v3_RuntimePercent* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimePercent_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimePercent_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimePercent_serialize_ex(const envoy_config_core_v3_RuntimePercent* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimePercent_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimePercent_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RuntimePercent_clear_default_value(envoy_config_core_v3_RuntimePercent* msg) {
@@ -1227,7 +1209,7 @@ UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_default_value(envoy_conf
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_mutable_default_value(envoy_config_core_v3_RuntimePercent* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_RuntimePercent_default_value(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_config_core_v3_RuntimePercent_set_default_value(msg, sub);
   }
   return sub;
@@ -1240,12 +1222,12 @@ UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_runtime_key(envoy_config
 /* envoy.config.core.v3.RuntimeDouble */
 
 UPB_INLINE envoy_config_core_v3_RuntimeDouble* envoy_config_core_v3_RuntimeDouble_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy_config_core_v3_RuntimeDouble_msg_init, arena);
+  return (envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy__config__core__v3__RuntimeDouble_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RuntimeDouble* envoy_config_core_v3_RuntimeDouble_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeDouble* ret = envoy_config_core_v3_RuntimeDouble_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeDouble_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1255,7 +1237,7 @@ UPB_INLINE envoy_config_core_v3_RuntimeDouble* envoy_config_core_v3_RuntimeDoubl
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeDouble* ret = envoy_config_core_v3_RuntimeDouble_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeDouble_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1263,13 +1245,13 @@ UPB_INLINE envoy_config_core_v3_RuntimeDouble* envoy_config_core_v3_RuntimeDoubl
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeDouble_serialize(const envoy_config_core_v3_RuntimeDouble* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeDouble_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeDouble_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeDouble_serialize_ex(const envoy_config_core_v3_RuntimeDouble* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeDouble_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeDouble_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RuntimeDouble_clear_default_value(envoy_config_core_v3_RuntimeDouble* msg) {
@@ -1307,12 +1289,12 @@ UPB_INLINE void envoy_config_core_v3_RuntimeDouble_set_runtime_key(envoy_config_
 /* envoy.config.core.v3.RuntimeFeatureFlag */
 
 UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_core_v3_RuntimeFeatureFlag_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RuntimeFeatureFlag*)_upb_Message_New(&envoy_config_core_v3_RuntimeFeatureFlag_msg_init, arena);
+  return (envoy_config_core_v3_RuntimeFeatureFlag*)_upb_Message_New(&envoy__config__core__v3__RuntimeFeatureFlag_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_core_v3_RuntimeFeatureFlag_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeFeatureFlag* ret = envoy_config_core_v3_RuntimeFeatureFlag_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1322,7 +1304,7 @@ UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_core_v3_Runtime
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeFeatureFlag* ret = envoy_config_core_v3_RuntimeFeatureFlag_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1330,13 +1312,13 @@ UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_core_v3_Runtime
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeFeatureFlag_serialize(const envoy_config_core_v3_RuntimeFeatureFlag* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeFeatureFlag_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeFeatureFlag_serialize_ex(const envoy_config_core_v3_RuntimeFeatureFlag* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeFeatureFlag_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_clear_default_value(envoy_config_core_v3_RuntimeFeatureFlag* msg) {
@@ -1373,7 +1355,7 @@ UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_default_value(envoy_
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeFeatureFlag_mutable_default_value(envoy_config_core_v3_RuntimeFeatureFlag* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_RuntimeFeatureFlag_default_value(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_RuntimeFeatureFlag_set_default_value(msg, sub);
   }
   return sub;
@@ -1386,12 +1368,12 @@ UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_runtime_key(envoy_co
 /* envoy.config.core.v3.QueryParameter */
 
 UPB_INLINE envoy_config_core_v3_QueryParameter* envoy_config_core_v3_QueryParameter_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_QueryParameter*)_upb_Message_New(&envoy_config_core_v3_QueryParameter_msg_init, arena);
+  return (envoy_config_core_v3_QueryParameter*)_upb_Message_New(&envoy__config__core__v3__QueryParameter_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_QueryParameter* envoy_config_core_v3_QueryParameter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_QueryParameter* ret = envoy_config_core_v3_QueryParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QueryParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QueryParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1401,7 +1383,7 @@ UPB_INLINE envoy_config_core_v3_QueryParameter* envoy_config_core_v3_QueryParame
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_QueryParameter* ret = envoy_config_core_v3_QueryParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QueryParameter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QueryParameter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1409,13 +1391,13 @@ UPB_INLINE envoy_config_core_v3_QueryParameter* envoy_config_core_v3_QueryParame
 }
 UPB_INLINE char* envoy_config_core_v3_QueryParameter_serialize(const envoy_config_core_v3_QueryParameter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QueryParameter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QueryParameter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_QueryParameter_serialize_ex(const envoy_config_core_v3_QueryParameter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QueryParameter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QueryParameter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_QueryParameter_clear_key(envoy_config_core_v3_QueryParameter* msg) {
@@ -1453,12 +1435,12 @@ UPB_INLINE void envoy_config_core_v3_QueryParameter_set_value(envoy_config_core_
 /* envoy.config.core.v3.HeaderValue */
 
 UPB_INLINE envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValue_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy_config_core_v3_HeaderValue_msg_init, arena);
+  return (envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy__config__core__v3__HeaderValue_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HeaderValue* ret = envoy_config_core_v3_HeaderValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1468,7 +1450,7 @@ UPB_INLINE envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValue_pa
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HeaderValue* ret = envoy_config_core_v3_HeaderValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1476,13 +1458,13 @@ UPB_INLINE envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValue_pa
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderValue_serialize(const envoy_config_core_v3_HeaderValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderValue_serialize_ex(const envoy_config_core_v3_HeaderValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HeaderValue_clear_key(envoy_config_core_v3_HeaderValue* msg) {
@@ -1520,12 +1502,12 @@ UPB_INLINE void envoy_config_core_v3_HeaderValue_set_value(envoy_config_core_v3_
 /* envoy.config.core.v3.HeaderValueOption */
 
 UPB_INLINE envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HeaderValueOption_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  return (envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HeaderValueOption_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HeaderValueOption* ret = envoy_config_core_v3_HeaderValueOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderValueOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1535,7 +1517,7 @@ UPB_INLINE envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HeaderVa
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HeaderValueOption* ret = envoy_config_core_v3_HeaderValueOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderValueOption_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1543,13 +1525,13 @@ UPB_INLINE envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_HeaderVa
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderValueOption_serialize(const envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderValueOption_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderValueOption_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderValueOption_serialize_ex(const envoy_config_core_v3_HeaderValueOption* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderValueOption_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderValueOption_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HeaderValueOption_clear_header(envoy_config_core_v3_HeaderValueOption* msg) {
@@ -1612,7 +1594,7 @@ UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_header(envoy_config_c
 UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValueOption_mutable_header(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)envoy_config_core_v3_HeaderValueOption_header(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy_config_core_v3_HeaderValue_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy__config__core__v3__HeaderValue_msg_init, arena);
     if (sub) envoy_config_core_v3_HeaderValueOption_set_header(msg, sub);
   }
   return sub;
@@ -1624,7 +1606,7 @@ UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_append(envoy_config_c
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderValueOption_mutable_append(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HeaderValueOption_append(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_HeaderValueOption_set_append(msg, sub);
   }
   return sub;
@@ -1641,12 +1623,12 @@ UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_keep_empty_value(envo
 /* envoy.config.core.v3.HeaderMap */
 
 UPB_INLINE envoy_config_core_v3_HeaderMap* envoy_config_core_v3_HeaderMap_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HeaderMap*)_upb_Message_New(&envoy_config_core_v3_HeaderMap_msg_init, arena);
+  return (envoy_config_core_v3_HeaderMap*)_upb_Message_New(&envoy__config__core__v3__HeaderMap_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HeaderMap* envoy_config_core_v3_HeaderMap_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HeaderMap* ret = envoy_config_core_v3_HeaderMap_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1656,7 +1638,7 @@ UPB_INLINE envoy_config_core_v3_HeaderMap* envoy_config_core_v3_HeaderMap_parse_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HeaderMap* ret = envoy_config_core_v3_HeaderMap_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HeaderMap_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1664,13 +1646,13 @@ UPB_INLINE envoy_config_core_v3_HeaderMap* envoy_config_core_v3_HeaderMap_parse_
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderMap_serialize(const envoy_config_core_v3_HeaderMap* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderMap_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderMap_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HeaderMap_serialize_ex(const envoy_config_core_v3_HeaderMap* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HeaderMap_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HeaderMap_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HeaderMap_clear_headers(envoy_config_core_v3_HeaderMap* msg) {
@@ -1732,7 +1714,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderM
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy_config_core_v3_HeaderValue_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy__config__core__v3__HeaderValue_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1741,12 +1723,12 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderM
 /* envoy.config.core.v3.WatchedDirectory */
 
 UPB_INLINE envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_WatchedDirectory_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy_config_core_v3_WatchedDirectory_msg_init, arena);
+  return (envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_WatchedDirectory_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_WatchedDirectory* ret = envoy_config_core_v3_WatchedDirectory_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__WatchedDirectory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1756,7 +1738,7 @@ UPB_INLINE envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_WatchedDi
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_WatchedDirectory* ret = envoy_config_core_v3_WatchedDirectory_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__WatchedDirectory_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1764,13 +1746,13 @@ UPB_INLINE envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_WatchedDi
 }
 UPB_INLINE char* envoy_config_core_v3_WatchedDirectory_serialize(const envoy_config_core_v3_WatchedDirectory* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_WatchedDirectory_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__WatchedDirectory_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_WatchedDirectory_serialize_ex(const envoy_config_core_v3_WatchedDirectory* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_WatchedDirectory_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__WatchedDirectory_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_WatchedDirectory_clear_path(envoy_config_core_v3_WatchedDirectory* msg) {
@@ -1793,12 +1775,12 @@ UPB_INLINE void envoy_config_core_v3_WatchedDirectory_set_path(envoy_config_core
 /* envoy.config.core.v3.DataSource */
 
 UPB_INLINE envoy_config_core_v3_DataSource* envoy_config_core_v3_DataSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+  return (envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_DataSource* envoy_config_core_v3_DataSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_DataSource* ret = envoy_config_core_v3_DataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1808,7 +1790,7 @@ UPB_INLINE envoy_config_core_v3_DataSource* envoy_config_core_v3_DataSource_pars
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_DataSource* ret = envoy_config_core_v3_DataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DataSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DataSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1816,13 +1798,13 @@ UPB_INLINE envoy_config_core_v3_DataSource* envoy_config_core_v3_DataSource_pars
 }
 UPB_INLINE char* envoy_config_core_v3_DataSource_serialize(const envoy_config_core_v3_DataSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DataSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DataSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_DataSource_serialize_ex(const envoy_config_core_v3_DataSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DataSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DataSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1917,12 +1899,12 @@ UPB_INLINE void envoy_config_core_v3_DataSource_set_environment_variable(envoy_c
 /* envoy.config.core.v3.RetryPolicy */
 
 UPB_INLINE envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RetryPolicy_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy_config_core_v3_RetryPolicy_msg_init, arena);
+  return (envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RetryPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RetryPolicy* ret = envoy_config_core_v3_RetryPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RetryPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1932,7 +1914,7 @@ UPB_INLINE envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RetryPolicy_pa
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RetryPolicy* ret = envoy_config_core_v3_RetryPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RetryPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1940,13 +1922,13 @@ UPB_INLINE envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RetryPolicy_pa
 }
 UPB_INLINE char* envoy_config_core_v3_RetryPolicy_serialize(const envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RetryPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RetryPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RetryPolicy_serialize_ex(const envoy_config_core_v3_RetryPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RetryPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RetryPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_back_off(envoy_config_core_v3_RetryPolicy* msg) {
@@ -1987,7 +1969,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_back_off(envoy_config
 UPB_INLINE struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_RetryPolicy_mutable_retry_back_off(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_BackoffStrategy* sub = (struct envoy_config_core_v3_BackoffStrategy*)envoy_config_core_v3_RetryPolicy_retry_back_off(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy_config_core_v3_BackoffStrategy_msg_init, arena);
+    sub = (struct envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy__config__core__v3__BackoffStrategy_msg_init, arena);
     if (sub) envoy_config_core_v3_RetryPolicy_set_retry_back_off(msg, sub);
   }
   return sub;
@@ -1999,7 +1981,7 @@ UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_num_retries(envoy_config_co
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_mutable_num_retries(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RetryPolicy_num_retries(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_RetryPolicy_set_num_retries(msg, sub);
   }
   return sub;
@@ -2008,12 +1990,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_
 /* envoy.config.core.v3.RemoteDataSource */
 
 UPB_INLINE envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_RemoteDataSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RemoteDataSource*)_upb_Message_New(&envoy_config_core_v3_RemoteDataSource_msg_init, arena);
+  return (envoy_config_core_v3_RemoteDataSource*)_upb_Message_New(&envoy__config__core__v3__RemoteDataSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_RemoteDataSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RemoteDataSource* ret = envoy_config_core_v3_RemoteDataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RemoteDataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2023,7 +2005,7 @@ UPB_INLINE envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_RemoteDat
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RemoteDataSource* ret = envoy_config_core_v3_RemoteDataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RemoteDataSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2031,13 +2013,13 @@ UPB_INLINE envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_RemoteDat
 }
 UPB_INLINE char* envoy_config_core_v3_RemoteDataSource_serialize(const envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RemoteDataSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RemoteDataSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RemoteDataSource_serialize_ex(const envoy_config_core_v3_RemoteDataSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RemoteDataSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RemoteDataSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RemoteDataSource_clear_http_uri(envoy_config_core_v3_RemoteDataSource* msg) {
@@ -2089,7 +2071,7 @@ UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_http_uri(envoy_config_
 UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_RemoteDataSource_mutable_http_uri(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_config_core_v3_RemoteDataSource_http_uri(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HttpUri*)_upb_Message_New(&envoy_config_core_v3_HttpUri_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HttpUri*)_upb_Message_New(&envoy__config__core__v3__HttpUri_msg_init, arena);
     if (sub) envoy_config_core_v3_RemoteDataSource_set_http_uri(msg, sub);
   }
   return sub;
@@ -2105,7 +2087,7 @@ UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_retry_policy(envoy_con
 UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RemoteDataSource_mutable_retry_policy(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_RemoteDataSource_retry_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy_config_core_v3_RetryPolicy_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena);
     if (sub) envoy_config_core_v3_RemoteDataSource_set_retry_policy(msg, sub);
   }
   return sub;
@@ -2114,12 +2096,12 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RemoteD
 /* envoy.config.core.v3.AsyncDataSource */
 
 UPB_INLINE envoy_config_core_v3_AsyncDataSource* envoy_config_core_v3_AsyncDataSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_AsyncDataSource*)_upb_Message_New(&envoy_config_core_v3_AsyncDataSource_msg_init, arena);
+  return (envoy_config_core_v3_AsyncDataSource*)_upb_Message_New(&envoy__config__core__v3__AsyncDataSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_AsyncDataSource* envoy_config_core_v3_AsyncDataSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_AsyncDataSource* ret = envoy_config_core_v3_AsyncDataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AsyncDataSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2129,7 +2111,7 @@ UPB_INLINE envoy_config_core_v3_AsyncDataSource* envoy_config_core_v3_AsyncDataS
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_AsyncDataSource* ret = envoy_config_core_v3_AsyncDataSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AsyncDataSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2137,13 +2119,13 @@ UPB_INLINE envoy_config_core_v3_AsyncDataSource* envoy_config_core_v3_AsyncDataS
 }
 UPB_INLINE char* envoy_config_core_v3_AsyncDataSource_serialize(const envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AsyncDataSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AsyncDataSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_AsyncDataSource_serialize_ex(const envoy_config_core_v3_AsyncDataSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AsyncDataSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AsyncDataSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2193,7 +2175,7 @@ UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_local(envoy_config_core
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncDataSource_mutable_local(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_AsyncDataSource_local(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_AsyncDataSource_set_local(msg, sub);
   }
   return sub;
@@ -2205,7 +2187,7 @@ UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_remote(envoy_config_cor
 UPB_INLINE struct envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_AsyncDataSource_mutable_remote(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RemoteDataSource* sub = (struct envoy_config_core_v3_RemoteDataSource*)envoy_config_core_v3_AsyncDataSource_remote(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RemoteDataSource*)_upb_Message_New(&envoy_config_core_v3_RemoteDataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RemoteDataSource*)_upb_Message_New(&envoy__config__core__v3__RemoteDataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_AsyncDataSource_set_remote(msg, sub);
   }
   return sub;
@@ -2214,12 +2196,12 @@ UPB_INLINE struct envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_As
 /* envoy.config.core.v3.TransportSocket */
 
 UPB_INLINE envoy_config_core_v3_TransportSocket* envoy_config_core_v3_TransportSocket_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy_config_core_v3_TransportSocket_msg_init, arena);
+  return (envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy__config__core__v3__TransportSocket_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_TransportSocket* envoy_config_core_v3_TransportSocket_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_TransportSocket* ret = envoy_config_core_v3_TransportSocket_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TransportSocket_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2229,7 +2211,7 @@ UPB_INLINE envoy_config_core_v3_TransportSocket* envoy_config_core_v3_TransportS
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_TransportSocket* ret = envoy_config_core_v3_TransportSocket_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TransportSocket_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2237,13 +2219,13 @@ UPB_INLINE envoy_config_core_v3_TransportSocket* envoy_config_core_v3_TransportS
 }
 UPB_INLINE char* envoy_config_core_v3_TransportSocket_serialize(const envoy_config_core_v3_TransportSocket* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TransportSocket_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TransportSocket_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_TransportSocket_serialize_ex(const envoy_config_core_v3_TransportSocket* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TransportSocket_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TransportSocket_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2292,7 +2274,7 @@ UPB_INLINE void envoy_config_core_v3_TransportSocket_set_typed_config(envoy_conf
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TransportSocket_mutable_typed_config(envoy_config_core_v3_TransportSocket* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TransportSocket_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_core_v3_TransportSocket_set_typed_config(msg, sub);
   }
   return sub;
@@ -2301,12 +2283,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TransportSocket_muta
 /* envoy.config.core.v3.RuntimeFractionalPercent */
 
 UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_core_v3_RuntimeFractionalPercent_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
+  return (envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_core_v3_RuntimeFractionalPercent_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeFractionalPercent* ret = envoy_config_core_v3_RuntimeFractionalPercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeFractionalPercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2316,7 +2298,7 @@ UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_core_v3_R
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RuntimeFractionalPercent* ret = envoy_config_core_v3_RuntimeFractionalPercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RuntimeFractionalPercent_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2324,13 +2306,13 @@ UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_core_v3_R
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeFractionalPercent_serialize(const envoy_config_core_v3_RuntimeFractionalPercent* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeFractionalPercent_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeFractionalPercent_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RuntimeFractionalPercent_serialize_ex(const envoy_config_core_v3_RuntimeFractionalPercent* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RuntimeFractionalPercent_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RuntimeFractionalPercent_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_clear_default_value(envoy_config_core_v3_RuntimeFractionalPercent* msg) {
@@ -2367,7 +2349,7 @@ UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_default_value(
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_RuntimeFractionalPercent_mutable_default_value(envoy_config_core_v3_RuntimeFractionalPercent* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_core_v3_RuntimeFractionalPercent_default_value(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_core_v3_RuntimeFractionalPercent_set_default_value(msg, sub);
   }
   return sub;
@@ -2380,12 +2362,12 @@ UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_runtime_key(en
 /* envoy.config.core.v3.ControlPlane */
 
 UPB_INLINE envoy_config_core_v3_ControlPlane* envoy_config_core_v3_ControlPlane_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy_config_core_v3_ControlPlane_msg_init, arena);
+  return (envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy__config__core__v3__ControlPlane_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ControlPlane* envoy_config_core_v3_ControlPlane_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ControlPlane* ret = envoy_config_core_v3_ControlPlane_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ControlPlane_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2395,7 +2377,7 @@ UPB_INLINE envoy_config_core_v3_ControlPlane* envoy_config_core_v3_ControlPlane_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ControlPlane* ret = envoy_config_core_v3_ControlPlane_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ControlPlane_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2403,13 +2385,13 @@ UPB_INLINE envoy_config_core_v3_ControlPlane* envoy_config_core_v3_ControlPlane_
 }
 UPB_INLINE char* envoy_config_core_v3_ControlPlane_serialize(const envoy_config_core_v3_ControlPlane* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ControlPlane_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ControlPlane_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ControlPlane_serialize_ex(const envoy_config_core_v3_ControlPlane* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ControlPlane_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ControlPlane_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ControlPlane_clear_identifier(envoy_config_core_v3_ControlPlane* msg) {
@@ -2429,8 +2411,6 @@ UPB_INLINE void envoy_config_core_v3_ControlPlane_set_identifier(envoy_config_co
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
new file mode 100644
index 0000000000000..62abef0a25e85
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
@@ -0,0 +1,577 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/base.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_Locality__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Locality_msg_init = {
+  NULL,
+  &envoy_config_core_v3_Locality__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_BuildVersion_submsgs[2] = {
+  {.submsg = &envoy__type__v3__SemanticVersion_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = {
+  &envoy_config_core_v3_BuildVersion_submsgs[0],
+  &envoy_config_core_v3_BuildVersion__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__BuildVersion_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Extension_msg_init = {
+  &envoy_config_core_v3_Extension_submsgs[0],
+  &envoy_config_core_v3_Extension__fields[0],
+  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_pss_1bt},
+    {0x0038000001000022, &upb_psm_1bt_max64b},
+    {0x000100003f000028, &upb_psb1_1bt},
+    {0x004000003f000032, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Node_submsgs[6] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
+  {.submsg = &envoy__config__core__v3__BuildVersion_msg_init},
+  {.submsg = &envoy__config__core__v3__Extension_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = {
+  {1, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(48, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 64), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(32, 8), UPB_SIZE(-13, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 8), UPB_SIZE(-13, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(16, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(20, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(24, 104), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(28, 112), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Node_msg_init = {
+  &envoy_config_core_v3_Node_submsgs[0],
+  &envoy_config_core_v3_Node__fields[0],
+  UPB_SIZE(64, 120), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x002800003f000012, &upb_pss_1bt},
+    {0x003800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0040000002010022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004800003f000032, &upb_pss_1bt},
+    {0x000800040700003a, &upb_pos_1bt},
+    {0x0008000408020042, &upb_pom_1bt_max64b},
+    {0x005800003f03004a, &upb_prm_1bt_max128b},
+    {0x006000003f000052, &upb_prs_1bt},
+    {0x006800003f04005a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = {
+  {.submsg = &xds__core__v3__ContextParams_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init = {
+  &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0],
+  &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Metadata_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = {
+  &envoy_config_core_v3_Metadata_submsgs[0],
+  &envoy_config_core_v3_Metadata__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init = {
+  &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0],
+  &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init = {
+  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0],
+  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RuntimeUInt32__fields[2] = {
+  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = {
+  NULL,
+  &envoy_config_core_v3_RuntimeUInt32__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x000800003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RuntimePercent_submsgs[1] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = {
+  &envoy_config_core_v3_RuntimePercent_submsgs[0],
+  &envoy_config_core_v3_RuntimePercent__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RuntimeDouble__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = {
+  NULL,
+  &envoy_config_core_v3_RuntimeDouble__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = {
+  &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0],
+  &envoy_config_core_v3_RuntimeFeatureFlag__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_QueryParameter__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init = {
+  NULL,
+  &envoy_config_core_v3_QueryParameter__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HeaderValue__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = {
+  NULL,
+  &envoy_config_core_v3_HeaderValue__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HeaderValueOption_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__HeaderValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = {
+  &envoy_config_core_v3_HeaderValueOption_submsgs[0],
+  &envoy_config_core_v3_HeaderValueOption__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_max64b},
+    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HeaderMap_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__HeaderValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = {
+  &envoy_config_core_v3_HeaderMap_submsgs[0],
+  &envoy_config_core_v3_HeaderMap__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_WatchedDirectory__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = {
+  NULL,
+  &envoy_config_core_v3_WatchedDirectory__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[4] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = {
+  NULL,
+  &envoy_config_core_v3_DataSource__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pob_1bt},
+    {0x000800000300001a, &upb_pos_1bt},
+    {0x0008000004000022, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__BackoffStrategy_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = {
+  &envoy_config_core_v3_RetryPolicy_submsgs[0],
+  &envoy_config_core_v3_RetryPolicy__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__HttpUri_msg_init},
+  {.submsg = &envoy__config__core__v3__RetryPolicy_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = {
+  &envoy_config_core_v3_RemoteDataSource_submsgs[0],
+  &envoy_config_core_v3_RemoteDataSource__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_AsyncDataSource_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__RemoteDataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = {
+  &envoy_config_core_v3_AsyncDataSource_submsgs[0],
+  &envoy_config_core_v3_AsyncDataSource__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_TransportSocket_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = {
+  &envoy_config_core_v3_TransportSocket_submsgs[0],
+  &envoy_config_core_v3_TransportSocket__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = {
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = {
+  &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0],
+  &envoy_config_core_v3_RuntimeFractionalPercent__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ControlPlane__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init = {
+  NULL,
+  &envoy_config_core_v3_ControlPlane__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[24] = {
+  &envoy__config__core__v3__Locality_msg_init,
+  &envoy__config__core__v3__BuildVersion_msg_init,
+  &envoy__config__core__v3__Extension_msg_init,
+  &envoy__config__core__v3__Node_msg_init,
+  &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init,
+  &envoy__config__core__v3__Metadata_msg_init,
+  &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init,
+  &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init,
+  &envoy__config__core__v3__RuntimeUInt32_msg_init,
+  &envoy__config__core__v3__RuntimePercent_msg_init,
+  &envoy__config__core__v3__RuntimeDouble_msg_init,
+  &envoy__config__core__v3__RuntimeFeatureFlag_msg_init,
+  &envoy__config__core__v3__QueryParameter_msg_init,
+  &envoy__config__core__v3__HeaderValue_msg_init,
+  &envoy__config__core__v3__HeaderValueOption_msg_init,
+  &envoy__config__core__v3__HeaderMap_msg_init,
+  &envoy__config__core__v3__WatchedDirectory_msg_init,
+  &envoy__config__core__v3__DataSource_msg_init,
+  &envoy__config__core__v3__RetryPolicy_msg_init,
+  &envoy__config__core__v3__RemoteDataSource_msg_init,
+  &envoy__config__core__v3__AsyncDataSource_msg_init,
+  &envoy__config__core__v3__TransportSocket_msg_init,
+  &envoy__config__core__v3__RuntimeFractionalPercent_msg_init,
+  &envoy__config__core__v3__ControlPlane_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  24,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
new file mode 100644
index 0000000000000..0db4cef77a551
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/base.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BASE_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__config__core__v3__Locality_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Extension_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Node_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__DataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
index 242c7baf9f384..3219275a9ba48 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/config_source.proto
  *
@@ -10,7 +9,22 @@
 #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/authority.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -24,13 +38,6 @@ typedef struct envoy_config_core_v3_RateLimitSettings envoy_config_core_v3_RateL
 typedef struct envoy_config_core_v3_PathConfigSource envoy_config_core_v3_PathConfigSource;
 typedef struct envoy_config_core_v3_ConfigSource envoy_config_core_v3_ConfigSource;
 typedef struct envoy_config_core_v3_ExtensionConfigSource envoy_config_core_v3_ExtensionConfigSource;
-extern const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_AggregatedConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SelfConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RateLimitSettings_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_PathConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init;
 struct envoy_config_core_v3_GrpcService;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_config_core_v3_WatchedDirectory;
@@ -39,14 +46,6 @@ struct google_protobuf_DoubleValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
 struct xds_core_v3_Authority;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_DoubleValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable xds_core_v3_Authority_msg_init;
 
 typedef enum {
   envoy_config_core_v3_ApiConfigSource_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE = 0,
@@ -68,12 +67,12 @@ typedef enum {
 /* envoy.config.core.v3.ApiConfigSource */
 
 UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ApiConfigSource* ret = envoy_config_core_v3_ApiConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ApiConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -83,7 +82,7 @@ UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigS
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ApiConfigSource* ret = envoy_config_core_v3_ApiConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ApiConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -91,13 +90,13 @@ UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigS
 }
 UPB_INLINE char* envoy_config_core_v3_ApiConfigSource_serialize(const envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ApiConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ApiConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ApiConfigSource_serialize_ex(const envoy_config_core_v3_ApiConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ApiConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ApiConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ApiConfigSource_clear_api_type(envoy_config_core_v3_ApiConfigSource* msg) {
@@ -325,7 +324,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_refresh_delay(envoy_con
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_refresh_delay(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_refresh_delay(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_ApiConfigSource_set_refresh_delay(msg, sub);
   }
   return sub;
@@ -351,7 +350,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_ApiConf
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -363,7 +362,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_request_timeout(envoy_c
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_request_timeout(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_request_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_ApiConfigSource_set_request_timeout(msg, sub);
   }
   return sub;
@@ -375,7 +374,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(env
 UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_ApiConfigSource_mutable_rate_limit_settings(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RateLimitSettings* sub = (struct envoy_config_core_v3_RateLimitSettings*)envoy_config_core_v3_ApiConfigSource_rate_limit_settings(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy_config_core_v3_RateLimitSettings_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy__config__core__v3__RateLimitSettings_msg_init, arena);
     if (sub) envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(msg, sub);
   }
   return sub;
@@ -409,7 +408,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -418,12 +417,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
 /* envoy.config.core.v3.AggregatedConfigSource */
 
 UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_AggregatedConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy_config_core_v3_AggregatedConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy__config__core__v3__AggregatedConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_AggregatedConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_AggregatedConfigSource* ret = envoy_config_core_v3_AggregatedConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AggregatedConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -433,7 +432,7 @@ UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_Agg
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_AggregatedConfigSource* ret = envoy_config_core_v3_AggregatedConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AggregatedConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -441,13 +440,13 @@ UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_Agg
 }
 UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize(const envoy_config_core_v3_AggregatedConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AggregatedConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AggregatedConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize_ex(const envoy_config_core_v3_AggregatedConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AggregatedConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AggregatedConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -455,12 +454,12 @@ UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize_ex(const
 /* envoy.config.core.v3.SelfConfigSource */
 
 UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy_config_core_v3_SelfConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy__config__core__v3__SelfConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SelfConfigSource* ret = envoy_config_core_v3_SelfConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SelfConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -470,7 +469,7 @@ UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfi
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SelfConfigSource* ret = envoy_config_core_v3_SelfConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SelfConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -478,13 +477,13 @@ UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfi
 }
 UPB_INLINE char* envoy_config_core_v3_SelfConfigSource_serialize(const envoy_config_core_v3_SelfConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SelfConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SelfConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SelfConfigSource_serialize_ex(const envoy_config_core_v3_SelfConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SelfConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SelfConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_SelfConfigSource_clear_transport_api_version(envoy_config_core_v3_SelfConfigSource* msg) {
@@ -507,12 +506,12 @@ UPB_INLINE void envoy_config_core_v3_SelfConfigSource_set_transport_api_version(
 /* envoy.config.core.v3.RateLimitSettings */
 
 UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimitSettings_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy_config_core_v3_RateLimitSettings_msg_init, arena);
+  return (envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy__config__core__v3__RateLimitSettings_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimitSettings_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_RateLimitSettings* ret = envoy_config_core_v3_RateLimitSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RateLimitSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -522,7 +521,7 @@ UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimi
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_RateLimitSettings* ret = envoy_config_core_v3_RateLimitSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RateLimitSettings_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -530,13 +529,13 @@ UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimi
 }
 UPB_INLINE char* envoy_config_core_v3_RateLimitSettings_serialize(const envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RateLimitSettings_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RateLimitSettings_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RateLimitSettings_serialize_ex(const envoy_config_core_v3_RateLimitSettings* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RateLimitSettings_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RateLimitSettings_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RateLimitSettings_clear_max_tokens(envoy_config_core_v3_RateLimitSettings* msg) {
@@ -577,7 +576,7 @@ UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_max_tokens(envoy_conf
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSettings_mutable_max_tokens(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RateLimitSettings_max_tokens(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_RateLimitSettings_set_max_tokens(msg, sub);
   }
   return sub;
@@ -589,7 +588,7 @@ UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_fill_rate(envoy_confi
 UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSettings_mutable_fill_rate(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) {
   struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_core_v3_RateLimitSettings_fill_rate(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google_protobuf_DoubleValue_msg_init, arena);
+    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google__protobuf__DoubleValue_msg_init, arena);
     if (sub) envoy_config_core_v3_RateLimitSettings_set_fill_rate(msg, sub);
   }
   return sub;
@@ -598,12 +597,12 @@ UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSet
 /* envoy.config.core.v3.PathConfigSource */
 
 UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy_config_core_v3_PathConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy__config__core__v3__PathConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_PathConfigSource* ret = envoy_config_core_v3_PathConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_PathConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__PathConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -613,7 +612,7 @@ UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfi
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_PathConfigSource* ret = envoy_config_core_v3_PathConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_PathConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__PathConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -621,13 +620,13 @@ UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfi
 }
 UPB_INLINE char* envoy_config_core_v3_PathConfigSource_serialize(const envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_PathConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__PathConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_PathConfigSource_serialize_ex(const envoy_config_core_v3_PathConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_PathConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__PathConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_PathConfigSource_clear_path(envoy_config_core_v3_PathConfigSource* msg) {
@@ -668,7 +667,7 @@ UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_watched_directory(envo
 UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_PathConfigSource_mutable_watched_directory(envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_PathConfigSource_watched_directory(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy_config_core_v3_WatchedDirectory_msg_init, arena);
+    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena);
     if (sub) envoy_config_core_v3_PathConfigSource_set_watched_directory(msg, sub);
   }
   return sub;
@@ -677,12 +676,12 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_Pa
 /* envoy.config.core.v3.ConfigSource */
 
 UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ConfigSource* ret = envoy_config_core_v3_ConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -692,7 +691,7 @@ UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ConfigSource* ret = envoy_config_core_v3_ConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -700,13 +699,13 @@ UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_
 }
 UPB_INLINE char* envoy_config_core_v3_ConfigSource_serialize(const envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ConfigSource_serialize_ex(const envoy_config_core_v3_ConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -871,7 +870,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_api_config_source(envoy_co
 UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ConfigSource_mutable_api_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_core_v3_ConfigSource_api_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
     if (sub) envoy_config_core_v3_ConfigSource_set_api_config_source(msg, sub);
   }
   return sub;
@@ -883,7 +882,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_ads(envoy_config_core_v3_C
 UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_ConfigSource_mutable_ads(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_AggregatedConfigSource* sub = (struct envoy_config_core_v3_AggregatedConfigSource*)envoy_config_core_v3_ConfigSource_ads(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy_config_core_v3_AggregatedConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy__config__core__v3__AggregatedConfigSource_msg_init, arena);
     if (sub) envoy_config_core_v3_ConfigSource_set_ads(msg, sub);
   }
   return sub;
@@ -895,7 +894,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(envo
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mutable_initial_fetch_timeout(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ConfigSource_initial_fetch_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(msg, sub);
   }
   return sub;
@@ -907,7 +906,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_self(envoy_config_core_v3_
 UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_ConfigSource_mutable_self(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SelfConfigSource* sub = (struct envoy_config_core_v3_SelfConfigSource*)envoy_config_core_v3_ConfigSource_self(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy_config_core_v3_SelfConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy__config__core__v3__SelfConfigSource_msg_init, arena);
     if (sub) envoy_config_core_v3_ConfigSource_set_self(msg, sub);
   }
   return sub;
@@ -937,7 +936,7 @@ UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_a
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_core_v3_Authority* sub = (struct xds_core_v3_Authority*)_upb_Message_New(&xds_core_v3_Authority_msg_init, arena);
+  struct xds_core_v3_Authority* sub = (struct xds_core_v3_Authority*)_upb_Message_New(&xds__core__v3__Authority_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -949,7 +948,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path_config_source(envoy_c
 UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_ConfigSource_mutable_path_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_PathConfigSource* sub = (struct envoy_config_core_v3_PathConfigSource*)envoy_config_core_v3_ConfigSource_path_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy_config_core_v3_PathConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy__config__core__v3__PathConfigSource_msg_init, arena);
     if (sub) envoy_config_core_v3_ConfigSource_set_path_config_source(msg, sub);
   }
   return sub;
@@ -958,12 +957,12 @@ UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_Co
 /* envoy.config.core.v3.ExtensionConfigSource */
 
 UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_ExtensionConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy_config_core_v3_ExtensionConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy__config__core__v3__ExtensionConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_ExtensionConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ExtensionConfigSource* ret = envoy_config_core_v3_ExtensionConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtensionConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -973,7 +972,7 @@ UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_Exte
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ExtensionConfigSource* ret = envoy_config_core_v3_ExtensionConfigSource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtensionConfigSource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -981,13 +980,13 @@ UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_Exte
 }
 UPB_INLINE char* envoy_config_core_v3_ExtensionConfigSource_serialize(const envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtensionConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtensionConfigSource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ExtensionConfigSource_serialize_ex(const envoy_config_core_v3_ExtensionConfigSource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtensionConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtensionConfigSource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_clear_config_source(envoy_config_core_v3_ExtensionConfigSource* msg) {
@@ -1076,7 +1075,7 @@ UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_config_source(env
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ExtensionConfigSource_mutable_config_source(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_core_v3_ExtensionConfigSource_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_core_v3_ExtensionConfigSource_set_config_source(msg, sub);
   }
   return sub;
@@ -1088,7 +1087,7 @@ UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_default_config(en
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSource_mutable_default_config(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_ExtensionConfigSource_default_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_core_v3_ExtensionConfigSource_set_default_config(msg, sub);
   }
   return sub;
@@ -1122,8 +1121,6 @@ UPB_INLINE bool envoy_config_core_v3_ExtensionConfigSource_add_type_urls(envoy_c
   return true;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
new file mode 100644
index 0000000000000..204190477a7f8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
@@ -0,0 +1,225 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/config_source.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/authority.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_ApiConfigSource_submsgs[5] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RateLimitSettings_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(36, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = {
+  &envoy_config_core_v3_ApiConfigSource_submsgs[0],
+  &envoy_config_core_v3_ApiConfigSource__fields[0],
+  UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x001000003f000012, &upb_prs_1bt},
+    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x002000003f010022, &upb_prm_1bt_maxmaxb},
+    {0x002800000202002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000003030032, &upb_psm_1bt_max64b},
+    {0x000800003f000038, &upb_psb1_1bt},
+    {0x000c00003f000040, &upb_psv4_1bt},
+    {0x003800003f04004a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = {
+  NULL,
+  &envoy_config_core_v3_SelfConfigSource__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_RateLimitSettings_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = {
+  &envoy_config_core_v3_RateLimitSettings_submsgs[0],
+  &envoy_config_core_v3_RateLimitSettings__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__WatchedDirectory_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = {
+  &envoy_config_core_v3_PathConfigSource_submsgs[0],
+  &envoy_config_core_v3_PathConfigSource__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_ConfigSource_submsgs[6] = {
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__AggregatedConfigSource_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__SelfConfigSource_msg_init},
+  {.submsg = &xds__core__v3__Authority_msg_init},
+  {.submsg = &envoy__config__core__v3__PathConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = {
+  {1, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 32), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = {
+  &envoy_config_core_v3_ConfigSource_submsgs[0],
+  &envoy_config_core_v3_ConfigSource__fields[0],
+  UPB_SIZE(32, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040100000a, &upb_pos_1bt},
+    {0x0010000402000012, &upb_pom_1bt_max128b},
+    {0x001000040301001a, &upb_pom_1bt_max64b},
+    {0x0020000001020022, &upb_psm_1bt_maxmaxb},
+    {0x001000040503002a, &upb_pom_1bt_max64b},
+    {0x000800003f000030, &upb_psv4_1bt},
+    {0x002800003f04003a, &upb_prm_1bt_maxmaxb},
+    {0x0010000408050042, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = {
+  &envoy_config_core_v3_ExtensionConfigSource_submsgs[0],
+  &envoy_config_core_v3_ExtensionConfigSource__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x001800003f000022, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__config__core__v3__ApiConfigSource_msg_init,
+  &envoy__config__core__v3__AggregatedConfigSource_msg_init,
+  &envoy__config__core__v3__SelfConfigSource_msg_init,
+  &envoy__config__core__v3__RateLimitSettings_msg_init,
+  &envoy__config__core__v3__PathConfigSource_msg_init,
+  &envoy__config__core__v3__ConfigSource_msg_init,
+  &envoy__config__core__v3__ExtensionConfigSource_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
new file mode 100644
index 0000000000000..f06e548a4e290
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/config_source.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_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__config__core__v3__ApiConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
index dc95af0d8e104..fa4dddfb45b4c 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/event_service_config.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_core_v3_EventServiceConfig envoy_config_core_v3_EventServiceConfig;
-extern const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
 
 
 
 /* envoy.config.core.v3.EventServiceConfig */
 
 UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventServiceConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy_config_core_v3_EventServiceConfig_msg_init, arena);
+  return (envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy__config__core__v3__EventServiceConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventServiceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_EventServiceConfig* ret = envoy_config_core_v3_EventServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EventServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventSe
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_EventServiceConfig* ret = envoy_config_core_v3_EventServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EventServiceConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventSe
 }
 UPB_INLINE char* envoy_config_core_v3_EventServiceConfig_serialize(const envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EventServiceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EventServiceConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_EventServiceConfig_serialize_ex(const envoy_config_core_v3_EventServiceConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EventServiceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EventServiceConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -90,14 +95,12 @@ UPB_INLINE void envoy_config_core_v3_EventServiceConfig_set_grpc_service(envoy_c
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventServiceConfig_mutable_grpc_service(envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_core_v3_EventServiceConfig_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_core_v3_EventServiceConfig_set_grpc_service(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
new file mode 100644
index 0000000000000..171dad70b1797
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/event_service_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_EventServiceConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = {
+  &envoy_config_core_v3_EventServiceConfig_submsgs[0],
+  &envoy_config_core_v3_EventServiceConfig__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__EventServiceConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_event_service_config_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/config/core/v3/event_service_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
new file mode 100644
index 0000000000000..b5d0866cefdbf
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/event_service_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_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__config__core__v3__EventServiceConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
new file mode 100644
index 0000000000000..0d76bd9c1bc77
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
@@ -0,0 +1,116 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+
+#include "google/protobuf/any.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_config_core_v3_TypedExtensionConfig envoy_config_core_v3_TypedExtensionConfig;
+struct google_protobuf_Any;
+
+
+
+/* envoy.config.core.v3.TypedExtensionConfig */
+
+UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_new(upb_Arena* arena) {
+  return (envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TypedExtensionConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize(const envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__core__v3__TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize_ex(const envoy_config_core_v3_TypedExtensionConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__core__v3__TypedExtensionConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_clear_name(envoy_config_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_core_v3_TypedExtensionConfig_name(const envoy_config_core_v3_TypedExtensionConfig* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_clear_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_typed_config(const envoy_config_core_v3_TypedExtensionConfig* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_core_v3_TypedExtensionConfig_has_typed_config(const envoy_config_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_name(envoy_config_core_v3_TypedExtensionConfig *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_typed_config(envoy_config_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_mutable_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TypedExtensionConfig_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) envoy_config_core_v3_TypedExtensionConfig_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
new file mode 100644
index 0000000000000..6cdadc9e45002
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = {
+  &envoy_config_core_v3_TypedExtensionConfig_submsgs[0],
+  &envoy_config_core_v3_TypedExtensionConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__TypedExtensionConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_extension_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/config/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
new file mode 100644
index 0000000000000..fd3d7b76d3930
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_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__config__core__v3__TypedExtensionConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
index 3b10a2dd1c7ec..01909015e6ace 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_method_list.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/grpc_method_list.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,20 +25,18 @@ extern "C" {
 
 typedef struct envoy_config_core_v3_GrpcMethodList envoy_config_core_v3_GrpcMethodList;
 typedef struct envoy_config_core_v3_GrpcMethodList_Service envoy_config_core_v3_GrpcMethodList_Service;
-extern const upb_MiniTable envoy_config_core_v3_GrpcMethodList_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcMethodList_Service_msg_init;
 
 
 
 /* envoy.config.core.v3.GrpcMethodList */
 
 UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodList_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcMethodList*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_msg_init, arena);
+  return (envoy_config_core_v3_GrpcMethodList*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodList_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcMethodList* ret = envoy_config_core_v3_GrpcMethodList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodL
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcMethodList* ret = envoy_config_core_v3_GrpcMethodList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodL
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_serialize(const envoy_config_core_v3_GrpcMethodList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_serialize_ex(const envoy_config_core_v3_GrpcMethodList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcMethodList_clear_services(envoy_config_core_v3_GrpcMethodList* msg) {
@@ -118,7 +122,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_GrpcMethodList_Service* sub = (struct envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_Service_msg_init, arena);
+  struct envoy_config_core_v3_GrpcMethodList_Service* sub = (struct envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList__Service_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -127,12 +131,12 @@ UPB_INLINE struct envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core
 /* envoy.config.core.v3.GrpcMethodList.Service */
 
 UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_GrpcMethodList_Service_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_Service_msg_init, arena);
+  return (envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList__Service_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_GrpcMethodList_Service_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcMethodList_Service* ret = envoy_config_core_v3_GrpcMethodList_Service_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -142,7 +146,7 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_Grp
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcMethodList_Service* ret = envoy_config_core_v3_GrpcMethodList_Service_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -150,13 +154,13 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_Grp
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_Service_serialize(const envoy_config_core_v3_GrpcMethodList_Service* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_Service_serialize_ex(const envoy_config_core_v3_GrpcMethodList_Service* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcMethodList_Service_clear_name(envoy_config_core_v3_GrpcMethodList_Service* msg) {
@@ -237,8 +241,6 @@ UPB_INLINE bool envoy_config_core_v3_GrpcMethodList_Service_add_method_names(env
   return true;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
new file mode 100644
index 0000000000000..533e08d0e693f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
@@ -0,0 +1,68 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/grpc_method_list.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/grpc_method_list.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcMethodList_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcMethodList__Service_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = {
+  &envoy_config_core_v3_GrpcMethodList_submsgs[0],
+  &envoy_config_core_v3_GrpcMethodList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList_Service__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init = {
+  NULL,
+  &envoy_config_core_v3_GrpcMethodList_Service__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__core__v3__GrpcMethodList_msg_init,
+  &envoy__config__core__v3__GrpcMethodList__Service_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
new file mode 100644
index 0000000000000..7721c3f5b14f8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/grpc_method_list.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_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__config__core__v3__GrpcMethodList_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
index df819c2a7e796..802df91b65110 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_service.proto
  *
@@ -10,7 +9,21 @@
 #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/empty.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -31,20 +44,6 @@ typedef struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsSe
 typedef struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs;
 typedef struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value;
 typedef struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msg_init;
 struct envoy_config_core_v3_DataSource;
 struct envoy_config_core_v3_HeaderValue;
 struct envoy_config_core_v3_RetryPolicy;
@@ -53,26 +52,18 @@ struct google_protobuf_Duration;
 struct google_protobuf_Empty;
 struct google_protobuf_Struct;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValue_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RetryPolicy_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Empty_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.core.v3.GrpcService */
 
 UPB_INLINE envoy_config_core_v3_GrpcService* envoy_config_core_v3_GrpcService_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService* envoy_config_core_v3_GrpcService_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService* ret = envoy_config_core_v3_GrpcService_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -82,7 +73,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService* envoy_config_core_v3_GrpcService_pa
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService* ret = envoy_config_core_v3_GrpcService_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -90,13 +81,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService* envoy_config_core_v3_GrpcService_pa
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_serialize(const envoy_config_core_v3_GrpcService* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_serialize_ex(const envoy_config_core_v3_GrpcService* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -198,7 +189,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_set_envoy_grpc(envoy_config_cor
 UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_mutable_envoy_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_EnvoyGrpc* sub = (struct envoy_config_core_v3_GrpcService_EnvoyGrpc*)envoy_config_core_v3_GrpcService_envoy_grpc(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_EnvoyGrpc*)_upb_Message_New(&envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_EnvoyGrpc*)_upb_Message_New(&envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_set_envoy_grpc(msg, sub);
   }
   return sub;
@@ -210,7 +201,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_set_google_grpc(envoy_config_co
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_mutable_google_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc*)envoy_config_core_v3_GrpcService_google_grpc(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_set_google_grpc(msg, sub);
   }
   return sub;
@@ -222,7 +213,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_set_timeout(envoy_config_core_v
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_GrpcService_mutable_timeout(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_GrpcService_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_set_timeout(msg, sub);
   }
   return sub;
@@ -248,7 +239,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcSer
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy_config_core_v3_HeaderValue_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)_upb_Message_New(&envoy__config__core__v3__HeaderValue_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -257,12 +248,12 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcSer
 /* envoy.config.core.v3.GrpcService.EnvoyGrpc */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_EnvoyGrpc_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_EnvoyGrpc*)_upb_Message_New(&envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_EnvoyGrpc*)_upb_Message_New(&envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_EnvoyGrpc_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_EnvoyGrpc* ret = envoy_config_core_v3_GrpcService_EnvoyGrpc_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -272,7 +263,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_Grpc
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_EnvoyGrpc* ret = envoy_config_core_v3_GrpcService_EnvoyGrpc_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -280,13 +271,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_Grpc
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_EnvoyGrpc_serialize(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_EnvoyGrpc_serialize_ex(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_cluster_name(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) {
@@ -342,7 +333,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_retry_policy(envo
 UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_EnvoyGrpc_mutable_retry_policy(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_GrpcService_EnvoyGrpc_retry_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy_config_core_v3_RetryPolicy_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_EnvoyGrpc_set_retry_policy(msg, sub);
   }
   return sub;
@@ -351,12 +342,12 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcSer
 /* envoy.config.core.v3.GrpcService.GoogleGrpc */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_GoogleGrpc_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_GoogleGrpc_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -366,7 +357,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_Grp
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -374,13 +365,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_Grp
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_clear_target_uri(envoy_config_core_v3_GrpcService_GoogleGrpc* msg) {
@@ -525,7 +516,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_credenti
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_credentials(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_credentials(msg, sub);
   }
   return sub;
@@ -551,7 +542,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, arena);
+  struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -571,7 +562,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_config(envoy_con
 UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_config(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_GrpcService_GoogleGrpc_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_set_config(msg, sub);
   }
   return sub;
@@ -583,7 +574,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_per_stream_buffe
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_per_stream_buffer_limit_bytes(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_GrpcService_GoogleGrpc_per_stream_buffer_limit_bytes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_set_per_stream_buffer_limit_bytes(msg, sub);
   }
   return sub;
@@ -595,7 +586,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_args(env
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_args(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_args(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_args(msg, sub);
   }
   return sub;
@@ -604,12 +595,12 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.SslCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -619,7 +610,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_con
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -627,13 +618,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_con
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_clear_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg) {
@@ -689,7 +680,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_r
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_root_certs(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_root_certs(msg, sub);
   }
   return sub;
@@ -701,7 +692,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_p
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_private_key(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_private_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_private_key(msg, sub);
   }
   return sub;
@@ -713,7 +704,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_c
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_cert_chain(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_cert_chain(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_cert_chain(msg, sub);
   }
   return sub;
@@ -722,12 +713,12 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcServ
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.GoogleLocalCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -737,7 +728,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* e
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -745,13 +736,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* e
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -759,12 +750,12 @@ UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredenti
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -774,7 +765,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -782,13 +773,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -854,7 +845,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_s
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_ssl_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_ssl_credentials(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_ssl_credentials(msg, sub);
   }
   return sub;
@@ -866,7 +857,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_s
 UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_google_default(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) {
   struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_google_default(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google_protobuf_Empty_msg_init, arena);
+    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google__protobuf__Empty_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_google_default(msg, sub);
   }
   return sub;
@@ -878,7 +869,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_s
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_local_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_local_credentials(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_local_credentials(msg, sub);
   }
   return sub;
@@ -887,12 +878,12 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredent
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -902,7 +893,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* envoy_co
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -910,13 +901,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* envoy_co
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1050,7 +1041,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_
 UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_compute_engine(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) {
   struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_compute_engine(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google_protobuf_Empty_msg_init, arena);
+    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google__protobuf__Empty_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_compute_engine(msg, sub);
   }
   return sub;
@@ -1066,7 +1057,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_service_account_jwt_access(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_service_account_jwt_access(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_service_account_jwt_access(msg, sub);
   }
   return sub;
@@ -1078,7 +1069,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_iam(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_iam(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_iam(msg, sub);
   }
   return sub;
@@ -1090,7 +1081,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_from_plugin(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_from_plugin(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_from_plugin(msg, sub);
   }
   return sub;
@@ -1102,7 +1093,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_
 UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_sts_service(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_sts_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_sts_service(msg, sub);
   }
   return sub;
@@ -1111,12 +1102,12 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_St
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.ServiceAccountJWTAccessCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1126,7 +1117,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAc
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1134,13 +1125,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAc
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_clear_json_key(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* msg) {
@@ -1178,12 +1169,12 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Serv
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1193,7 +1184,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAM
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1201,13 +1192,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAM
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_clear_authorization_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* msg) {
@@ -1245,12 +1236,12 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Goog
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1260,7 +1251,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataC
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1268,13 +1259,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataC
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1323,7 +1314,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Meta
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_mutable_typed_config(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_set_typed_config(msg, sub);
   }
   return sub;
@@ -1332,12 +1323,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_GrpcService_GoogleGr
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.StsService */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1347,7 +1338,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsServic
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1355,13 +1346,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsServic
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_clear_token_exchange_service_uri(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* msg) {
@@ -1504,12 +1495,12 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsS
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1519,7 +1510,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1527,13 +1518,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_clear_args(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* msg) {
@@ -1586,12 +1577,12 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry* en
 /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.Value */
 
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value*)_upb_Message_New(&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init, arena);
+  return (envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value*)_upb_Message_New(&envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1601,7 +1592,7 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* envoy_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1609,13 +1600,13 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* envoy_
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_serialize_ex(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1688,8 +1679,6 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntr
   _upb_msg_map_set_value(msg, &value, sizeof(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value*));
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
new file mode 100644
index 0000000000000..f0c15bd72d84e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
@@ -0,0 +1,378 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/grpc_service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/empty.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[4] = {
+  {.submsg = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[4] = {
+  {1, UPB_SIZE(16, 24), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 16), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = {
+  &envoy_config_core_v3_GrpcService_submsgs[0],
+  &envoy_config_core_v3_GrpcService__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800040100000a, &upb_pom_1bt_max64b},
+    {0x0018000402010012, &upb_pom_1bt_max128b},
+    {0x000800000102001a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f03002a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__RetryPolicy_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = {
+  &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0],
+  &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = {
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fields[8] = {
+  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 72), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 80), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 88), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0],
+  UPB_SIZE(48, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x002000003f01001a, &upb_prm_1bt_max64b},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x003800003f00002a, &upb_pss_1bt},
+    {0x0048000002020032, &upb_psm_1bt_maxmaxb},
+    {0x005000000303003a, &upb_psm_1bt_maxmaxb},
+    {0x0058000004040042, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init},
+  {.submsg = &google__protobuf__Empty_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = {
+  {.submsg = &google__protobuf__Empty_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[7] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0],
+  UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pom_1bt_maxmaxb},
+    {0x000800000300001a, &upb_pos_1bt},
+    {0x0008000004010022, &upb_pom_1bt_max64b},
+    {0x000800000502002a, &upb_pom_1bt_max64b},
+    {0x0008000006030032, &upb_pom_1bt_max64b},
+    {0x000800000704003a, &upb_pom_1bt_max192b},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init = {
+  NULL,
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init = {
+  NULL,
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[9] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(40, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(48, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(56, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(64, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init = {
+  NULL,
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[0],
+  UPB_SIZE(72, 144), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_pss_1bt},
+    {0x003000003f000022, &upb_pss_1bt},
+    {0x004000003f00002a, &upb_pss_1bt},
+    {0x005000003f000032, &upb_pss_1bt},
+    {0x006000003f00003a, &upb_pss_1bt},
+    {0x007000003f000042, &upb_pss_1bt},
+    {0x008000003f00004a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init = {
+  NULL,
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000010, &upb_pov8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init = {
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0],
+  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[14] = {
+  &envoy__config__core__v3__GrpcService_msg_init,
+  &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init,
+  &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  14,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
new file mode 100644
index 0000000000000..a29a44a33e79c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
@@ -0,0 +1,43 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/grpc_service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_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__config__core__v3__GrpcService_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
index 64141aee329f5..8d561c8a46748 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/health_check.proto
  *
@@ -10,7 +9,25 @@
 #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/v3/http.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -26,15 +43,6 @@ typedef struct envoy_config_core_v3_HealthCheck_RedisHealthCheck envoy_config_co
 typedef struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck envoy_config_core_v3_HealthCheck_GrpcHealthCheck;
 typedef struct envoy_config_core_v3_HealthCheck_CustomHealthCheck envoy_config_core_v3_HealthCheck_CustomHealthCheck;
 typedef struct envoy_config_core_v3_HealthCheck_TlsOptions envoy_config_core_v3_HealthCheck_TlsOptions;
-extern const upb_MiniTable envoy_config_core_v3_HealthStatusSet_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_Payload_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_TlsOptions_msg_init;
 struct envoy_config_core_v3_EventServiceConfig;
 struct envoy_config_core_v3_HeaderValueOption;
 struct envoy_config_core_v3_TypedExtensionConfig;
@@ -46,17 +54,6 @@ struct google_protobuf_Duration;
 struct google_protobuf_Struct;
 struct google_protobuf_UInt32Value;
 struct google_protobuf_UInt64Value;
-extern const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_v3_Int64Range_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
 
 typedef enum {
   envoy_config_core_v3_UNKNOWN = 0,
@@ -72,12 +69,12 @@ typedef enum {
 /* envoy.config.core.v3.HealthStatusSet */
 
 UPB_INLINE envoy_config_core_v3_HealthStatusSet* envoy_config_core_v3_HealthStatusSet_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthStatusSet*)_upb_Message_New(&envoy_config_core_v3_HealthStatusSet_msg_init, arena);
+  return (envoy_config_core_v3_HealthStatusSet*)_upb_Message_New(&envoy__config__core__v3__HealthStatusSet_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthStatusSet* envoy_config_core_v3_HealthStatusSet_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthStatusSet* ret = envoy_config_core_v3_HealthStatusSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthStatusSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthStatusSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -87,7 +84,7 @@ UPB_INLINE envoy_config_core_v3_HealthStatusSet* envoy_config_core_v3_HealthStat
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthStatusSet* ret = envoy_config_core_v3_HealthStatusSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthStatusSet_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthStatusSet_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -95,13 +92,13 @@ UPB_INLINE envoy_config_core_v3_HealthStatusSet* envoy_config_core_v3_HealthStat
 }
 UPB_INLINE char* envoy_config_core_v3_HealthStatusSet_serialize(const envoy_config_core_v3_HealthStatusSet* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthStatusSet_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthStatusSet_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthStatusSet_serialize_ex(const envoy_config_core_v3_HealthStatusSet* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthStatusSet_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthStatusSet_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthStatusSet_clear_statuses(envoy_config_core_v3_HealthStatusSet* msg) {
@@ -170,12 +167,12 @@ UPB_INLINE bool envoy_config_core_v3_HealthStatusSet_add_statuses(envoy_config_c
 /* envoy.config.core.v3.HealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck* envoy_config_core_v3_HealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck* envoy_config_core_v3_HealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck* ret = envoy_config_core_v3_HealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -185,7 +182,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck* envoy_config_core_v3_HealthCheck_pa
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck* ret = envoy_config_core_v3_HealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -193,13 +190,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck* envoy_config_core_v3_HealthCheck_pa
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_serialize(const envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -591,7 +588,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_timeout(envoy_config_core_v
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_timeout(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_timeout(msg, sub);
   }
   return sub;
@@ -603,7 +600,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval(envoy_config_core_
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_interval(msg, sub);
   }
   return sub;
@@ -615,7 +612,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval_jitter(envoy_confi
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval_jitter(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_interval_jitter(msg, sub);
   }
   return sub;
@@ -627,7 +624,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_threshold(envoy_c
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_unhealthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_unhealthy_threshold(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_unhealthy_threshold(msg, sub);
   }
   return sub;
@@ -639,7 +636,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_threshold(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_healthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_healthy_threshold(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_healthy_threshold(msg, sub);
   }
   return sub;
@@ -651,7 +648,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_alt_port(envoy_config_core_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_alt_port(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_alt_port(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_alt_port(msg, sub);
   }
   return sub;
@@ -663,7 +660,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_reuse_connection(envoy_conf
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mutable_reuse_connection(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HealthCheck_reuse_connection(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_reuse_connection(msg, sub);
   }
   return sub;
@@ -675,7 +672,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_http_health_check(envoy_con
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_http_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_HttpHealthCheck*)envoy_config_core_v3_HealthCheck_http_health_check(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_HttpHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_HttpHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_http_health_check(msg, sub);
   }
   return sub;
@@ -687,7 +684,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tcp_health_check(envoy_conf
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_tcp_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_TcpHealthCheck*)envoy_config_core_v3_HealthCheck_tcp_health_check(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_TcpHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_TcpHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_tcp_health_check(msg, sub);
   }
   return sub;
@@ -699,7 +696,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_grpc_health_check(envoy_con
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_mutable_grpc_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)envoy_config_core_v3_HealthCheck_grpc_health_check(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_grpc_health_check(msg, sub);
   }
   return sub;
@@ -711,7 +708,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_interval(envoy_c
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_no_traffic_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_no_traffic_interval(msg, sub);
   }
   return sub;
@@ -723,7 +720,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_custom_health_check(envoy_c
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_mutable_custom_health_check(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_CustomHealthCheck*)envoy_config_core_v3_HealthCheck_custom_health_check(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_CustomHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_CustomHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_custom_health_check(msg, sub);
   }
   return sub;
@@ -735,7 +732,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_interval(envoy_co
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_unhealthy_interval(msg, sub);
   }
   return sub;
@@ -747,7 +744,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_edge_interval(env
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_edge_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_unhealthy_edge_interval(msg, sub);
   }
   return sub;
@@ -759,7 +756,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_edge_interval(envoy
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_healthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_healthy_edge_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_healthy_edge_interval(msg, sub);
   }
   return sub;
@@ -783,7 +780,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_initial_jitter(envoy_config
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_initial_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_initial_jitter(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_initial_jitter(msg, sub);
   }
   return sub;
@@ -795,7 +792,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tls_options(envoy_config_co
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_HealthCheck_mutable_tls_options(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_TlsOptions* sub = (struct envoy_config_core_v3_HealthCheck_TlsOptions*)envoy_config_core_v3_HealthCheck_tls_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_TlsOptions*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_TlsOptions*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_tls_options(msg, sub);
   }
   return sub;
@@ -807,7 +804,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_event_service(envoy_config_
 UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_HealthCheck_mutable_event_service(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_core_v3_HealthCheck_event_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy_config_core_v3_EventServiceConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy__config__core__v3__EventServiceConfig_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_event_service(msg, sub);
   }
   return sub;
@@ -819,7 +816,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_transport_socket_match_crit
 UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutable_transport_socket_match_criteria(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_HealthCheck_transport_socket_match_criteria(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_transport_socket_match_criteria(msg, sub);
   }
   return sub;
@@ -831,7 +828,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_no_traffic_healthy_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval(msg, sub);
   }
   return sub;
@@ -857,7 +854,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -866,12 +863,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
 /* envoy.config.core.v3.HealthCheck.Payload */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_Payload_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_Payload_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__Payload_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_Payload_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_Payload* ret = envoy_config_core_v3_HealthCheck_Payload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__Payload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -881,7 +878,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_Health
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_Payload* ret = envoy_config_core_v3_HealthCheck_Payload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__Payload_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -889,13 +886,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_Health
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_Payload_serialize(const envoy_config_core_v3_HealthCheck_Payload* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_Payload_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__Payload_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_Payload_serialize_ex(const envoy_config_core_v3_HealthCheck_Payload* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_Payload_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__Payload_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -950,12 +947,12 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_Payload_set_binary(envoy_config
 /* envoy.config.core.v3.HealthCheck.HttpHealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_HttpHealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_HttpHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_HttpHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_HttpHealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_HttpHealthCheck* ret = envoy_config_core_v3_HealthCheck_HttpHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -965,7 +962,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_HttpHealthCheck* ret = envoy_config_core_v3_HealthCheck_HttpHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -973,13 +970,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_HttpHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_HttpHealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_clear_host(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg) {
@@ -1272,7 +1269,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_send(envoy_
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_send(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_Payload_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__Payload_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_send(msg, sub);
   }
   return sub;
@@ -1298,7 +1295,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_Payload_msg_init, arena);
+  struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__Payload_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1324,7 +1321,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1374,7 +1371,7 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy_type_v3_Int64Range_msg_init, arena);
+  struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy__type__v3__Int64Range_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1390,7 +1387,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_service_nam
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_service_name_matcher(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_service_name_matcher(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_service_name_matcher(msg, sub);
   }
   return sub;
@@ -1416,7 +1413,7 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy_type_v3_Int64Range_msg_init, arena);
+  struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy__type__v3__Int64Range_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1432,7 +1429,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_response_bu
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_response_buffer_size(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_response_buffer_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_response_buffer_size(msg, sub);
   }
   return sub;
@@ -1441,12 +1438,12 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_HealthCheck_
 /* envoy.config.core.v3.HealthCheck.TcpHealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_TcpHealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_TcpHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_TcpHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_TcpHealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_TcpHealthCheck* ret = envoy_config_core_v3_HealthCheck_TcpHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1456,7 +1453,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_TcpHealthCheck* ret = envoy_config_core_v3_HealthCheck_TcpHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1464,13 +1461,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_TcpHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_TcpHealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_clear_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) {
@@ -1533,7 +1530,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_send(envoy_c
 UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_TcpHealthCheck_send(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_Payload_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__Payload_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_send(msg, sub);
   }
   return sub;
@@ -1559,7 +1556,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_Payload_msg_init, arena);
+  struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__Payload_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1568,12 +1565,12 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3
 /* envoy.config.core.v3.HealthCheck.RedisHealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck* envoy_config_core_v3_HealthCheck_RedisHealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_RedisHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_RedisHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck* envoy_config_core_v3_HealthCheck_RedisHealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_RedisHealthCheck* ret = envoy_config_core_v3_HealthCheck_RedisHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1583,7 +1580,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck* envoy_config_core_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_RedisHealthCheck* ret = envoy_config_core_v3_HealthCheck_RedisHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1591,13 +1588,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck* envoy_config_core_
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_RedisHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_RedisHealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_RedisHealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck_RedisHealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthCheck_RedisHealthCheck_clear_key(envoy_config_core_v3_HealthCheck_RedisHealthCheck* msg) {
@@ -1620,12 +1617,12 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_RedisHealthCheck_set_key(envoy_
 /* envoy.config.core.v3.HealthCheck.GrpcHealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_GrpcHealthCheck* ret = envoy_config_core_v3_HealthCheck_GrpcHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1635,7 +1632,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_GrpcHealthCheck* ret = envoy_config_core_v3_HealthCheck_GrpcHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1643,13 +1640,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_GrpcHealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_clear_service_name(envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg) {
@@ -1741,7 +1738,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1750,12 +1747,12 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H
 /* envoy.config.core.v3.HealthCheck.CustomHealthCheck */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_CustomHealthCheck_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_CustomHealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_CustomHealthCheck*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_CustomHealthCheck_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_CustomHealthCheck* ret = envoy_config_core_v3_HealthCheck_CustomHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1765,7 +1762,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_CustomHealthCheck* ret = envoy_config_core_v3_HealthCheck_CustomHealthCheck_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1773,13 +1770,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_CustomHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_CustomHealthCheck* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_CustomHealthCheck_serialize_ex(const envoy_config_core_v3_HealthCheck_CustomHealthCheck* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1828,7 +1825,7 @@ UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_typed_con
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_HealthCheck_CustomHealthCheck_mutable_typed_config(envoy_config_core_v3_HealthCheck_CustomHealthCheck* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_HealthCheck_CustomHealthCheck_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_typed_config(msg, sub);
   }
   return sub;
@@ -1837,12 +1834,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_HealthCheck_CustomHe
 /* envoy.config.core.v3.HealthCheck.TlsOptions */
 
 UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_HealthCheck_TlsOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HealthCheck_TlsOptions*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, arena);
+  return (envoy_config_core_v3_HealthCheck_TlsOptions*)_upb_Message_New(&envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_HealthCheck_TlsOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_TlsOptions* ret = envoy_config_core_v3_HealthCheck_TlsOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1852,7 +1849,7 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_Hea
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HealthCheck_TlsOptions* ret = envoy_config_core_v3_HealthCheck_TlsOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1860,13 +1857,13 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_Hea
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_TlsOptions_serialize(const envoy_config_core_v3_HealthCheck_TlsOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HealthCheck_TlsOptions_serialize_ex(const envoy_config_core_v3_HealthCheck_TlsOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HealthCheck_TlsOptions_clear_alpn_protocols(envoy_config_core_v3_HealthCheck_TlsOptions* msg) {
@@ -1932,8 +1929,6 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_TlsOptions_add_alpn_protocols(e
   return true;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
new file mode 100644
index 0000000000000..479c264cf857b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
@@ -0,0 +1,315 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/health_check.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/v3/http.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_HealthStatusSet__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = {
+  NULL,
+  &envoy_config_core_v3_HealthStatusSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_ppv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_submsgs[21] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__EventServiceConfig_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 56), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 64), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(32, 72), 8, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(40, 80), 9, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(44, 88), 10, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(48, 96), 11, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(88, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(52, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(56, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(60, 120), 12, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(64, 128), 13, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(68, 136), 14, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(72, 144), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(76, 152), 16, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(80, 160), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = {
+  &envoy_config_core_v3_HealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck__fields[0],
+  UPB_SIZE(96, 176), 24, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
+    {0x002000000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000004030022, &upb_psm_1bt_maxmaxb},
+    {0x003000000504002a, &upb_psm_1bt_maxmaxb},
+    {0x0038000006050032, &upb_psm_1bt_maxmaxb},
+    {0x004000000706003a, &upb_psm_1bt_maxmaxb},
+    {0x00a8000408070042, &upb_pom_1bt_max128b},
+    {0x00a800040908004a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00a800040b09005a, &upb_pom_1bt_max64b},
+    {0x00480000080a0062, &upb_psm_1bt_maxmaxb},
+    {0x00a800040d0b006a, &upb_pom_1bt_max64b},
+    {0x00500000090c0072, &upb_psm_1bt_maxmaxb},
+    {0x005800000a0d007a, &upb_psm_1bt_maxmaxb},
+    {0x006000000b0e0182, &upb_psm_2bt_maxmaxb},
+    {0x006800003f00018a, &upb_pss_2bt},
+    {0x000800003f000190, &upb_psv4_2bt},
+    {0x000c00003f000198, &upb_psb1_2bt},
+    {0x007800000c0f01a2, &upb_psm_2bt_maxmaxb},
+    {0x008000000d1001aa, &upb_psm_2bt_max64b},
+    {0x008800000e1101b2, &upb_psm_2bt_maxmaxb},
+    {0x009000000f1201ba, &upb_psm_2bt_maxmaxb},
+    {0x00980000101301c2, &upb_psm_2bt_maxmaxb},
+    {0x00a000003f1401ca, &upb_prm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_Payload__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = {
+  NULL,
+  &envoy_config_core_v3_HealthCheck_Payload__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pob_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = {
+  {.submsg = &envoy__config__core__v3__HealthCheck__Payload_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__Payload_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__type__v3__Int64Range_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__type__v3__Int64Range_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[12] = {
+  {1, UPB_SIZE(44, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(52, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(24, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(28, 88), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(32, 96), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(36, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(40, 104), 3, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init = {
+  &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0],
+  UPB_SIZE(64, 112), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x002000003f000012, &upb_pss_1bt},
+    {0x003000000100001a, &upb_psm_1bt_max64b},
+    {0x003800003f010022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004000003f020032, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004800003f000042, &upb_prs_1bt},
+    {0x005000003f03004a, &upb_prm_1bt_maxmaxb},
+    {0x000400003f000050, &upb_psv4_1bt},
+    {0x005800000204005a, &upb_psm_1bt_maxmaxb},
+    {0x006000003f050062, &upb_prm_1bt_maxmaxb},
+    {0x000800003f000068, &upb_psv4_1bt},
+    {0x0068000003060072, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__HealthCheck__Payload_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck__Payload_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init = {
+  &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init = {
+  NULL,
+  &envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[3] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(0, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init = {
+  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init = {
+  &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0],
+  &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TlsOptions__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init = {
+  NULL,
+  &envoy_config_core_v3_HealthCheck_TlsOptions__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prs_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[9] = {
+  &envoy__config__core__v3__HealthStatusSet_msg_init,
+  &envoy__config__core__v3__HealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__Payload_msg_init,
+  &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init,
+  &envoy__config__core__v3__HealthCheck__TlsOptions_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  9,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
new file mode 100644
index 0000000000000..bd761e1e57af0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/health_check.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_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__config__core__v3__HealthStatusSet_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
index 8d02a5085ccf8..d69ed5600cdea 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/http_uri.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_core_v3_HttpUri envoy_config_core_v3_HttpUri;
-extern const upb_MiniTable envoy_config_core_v3_HttpUri_msg_init;
 struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* envoy.config.core.v3.HttpUri */
 
 UPB_INLINE envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpUri_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HttpUri*)_upb_Message_New(&envoy_config_core_v3_HttpUri_msg_init, arena);
+  return (envoy_config_core_v3_HttpUri*)_upb_Message_New(&envoy__config__core__v3__HttpUri_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpUri_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HttpUri* ret = envoy_config_core_v3_HttpUri_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HttpUri_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpUri_parse_ex(c
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HttpUri* ret = envoy_config_core_v3_HttpUri_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HttpUri_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpUri_parse_ex(c
 }
 UPB_INLINE char* envoy_config_core_v3_HttpUri_serialize(const envoy_config_core_v3_HttpUri* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HttpUri_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HttpUri_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HttpUri_serialize_ex(const envoy_config_core_v3_HttpUri* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HttpUri_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HttpUri_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -124,14 +129,12 @@ UPB_INLINE void envoy_config_core_v3_HttpUri_set_timeout(envoy_config_core_v3_Ht
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable_timeout(envoy_config_core_v3_HttpUri* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpUri_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpUri_set_timeout(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
new file mode 100644
index 0000000000000..72aed7ad0c074
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/http_uri.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_HttpUri_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = {
+  {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = {
+  &envoy_config_core_v3_HttpUri_submsgs[0],
+  &envoy_config_core_v3_HttpUri__fields[0],
+  UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0008000402000012, &upb_pos_1bt},
+    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__HttpUri_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_http_uri_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/config/core/v3/http_uri.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
new file mode 100644
index 0000000000000..a25910b22b70e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/http_uri.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_URI_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__config__core__v3__HttpUri_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
index bb404e70deb41..8f8570277f11a 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/protocol.proto
  *
@@ -10,7 +9,20 @@
 #define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -33,32 +45,11 @@ typedef struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter envoy
 typedef struct envoy_config_core_v3_GrpcProtocolOptions envoy_config_core_v3_GrpcProtocolOptions;
 typedef struct envoy_config_core_v3_Http3ProtocolOptions envoy_config_core_v3_Http3ProtocolOptions;
 typedef struct envoy_config_core_v3_SchemeHeaderTransformation envoy_config_core_v3_SchemeHeaderTransformation;
-extern const upb_MiniTable envoy_config_core_v3_TcpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_QuicKeepAliveSettings_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_QuicProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HttpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_KeepaliveSettings_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http3ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SchemeHeaderTransformation_msg_init;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_type_v3_Percent;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 typedef enum {
   envoy_config_core_v3_HttpProtocolOptions_ALLOW = 0,
@@ -71,12 +62,12 @@ typedef enum {
 /* envoy.config.core.v3.TcpProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_TcpProtocolOptions* envoy_config_core_v3_TcpProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TcpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_TcpProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_TcpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__TcpProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_TcpProtocolOptions* envoy_config_core_v3_TcpProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_TcpProtocolOptions* ret = envoy_config_core_v3_TcpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -86,7 +77,7 @@ UPB_INLINE envoy_config_core_v3_TcpProtocolOptions* envoy_config_core_v3_TcpProt
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_TcpProtocolOptions* ret = envoy_config_core_v3_TcpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -94,13 +85,13 @@ UPB_INLINE envoy_config_core_v3_TcpProtocolOptions* envoy_config_core_v3_TcpProt
 }
 UPB_INLINE char* envoy_config_core_v3_TcpProtocolOptions_serialize(const envoy_config_core_v3_TcpProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_TcpProtocolOptions_serialize_ex(const envoy_config_core_v3_TcpProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -108,12 +99,12 @@ UPB_INLINE char* envoy_config_core_v3_TcpProtocolOptions_serialize_ex(const envo
 /* envoy.config.core.v3.QuicKeepAliveSettings */
 
 UPB_INLINE envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_QuicKeepAliveSettings_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_QuicKeepAliveSettings*)_upb_Message_New(&envoy_config_core_v3_QuicKeepAliveSettings_msg_init, arena);
+  return (envoy_config_core_v3_QuicKeepAliveSettings*)_upb_Message_New(&envoy__config__core__v3__QuicKeepAliveSettings_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_QuicKeepAliveSettings_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_QuicKeepAliveSettings* ret = envoy_config_core_v3_QuicKeepAliveSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QuicKeepAliveSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QuicKeepAliveSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -123,7 +114,7 @@ UPB_INLINE envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_Quic
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_QuicKeepAliveSettings* ret = envoy_config_core_v3_QuicKeepAliveSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QuicKeepAliveSettings_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QuicKeepAliveSettings_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -131,13 +122,13 @@ UPB_INLINE envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_Quic
 }
 UPB_INLINE char* envoy_config_core_v3_QuicKeepAliveSettings_serialize(const envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QuicKeepAliveSettings_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QuicKeepAliveSettings_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_QuicKeepAliveSettings_serialize_ex(const envoy_config_core_v3_QuicKeepAliveSettings* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QuicKeepAliveSettings_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QuicKeepAliveSettings_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_clear_max_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg) {
@@ -178,7 +169,7 @@ UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_max_interval(envo
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_max_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_max_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicKeepAliveSettings_set_max_interval(msg, sub);
   }
   return sub;
@@ -190,7 +181,7 @@ UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_initial_interval(
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_initial_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_initial_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicKeepAliveSettings_set_initial_interval(msg, sub);
   }
   return sub;
@@ -199,12 +190,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSe
 /* envoy.config.core.v3.QuicProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_QuicProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_QuicProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__QuicProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_QuicProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_QuicProtocolOptions* ret = envoy_config_core_v3_QuicProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QuicProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -214,7 +205,7 @@ UPB_INLINE envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_QuicPr
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_QuicProtocolOptions* ret = envoy_config_core_v3_QuicProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__QuicProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -222,13 +213,13 @@ UPB_INLINE envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_QuicPr
 }
 UPB_INLINE char* envoy_config_core_v3_QuicProtocolOptions_serialize(const envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QuicProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QuicProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_QuicProtocolOptions_serialize_ex(const envoy_config_core_v3_QuicProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_QuicProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__QuicProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions* msg) {
@@ -314,7 +305,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_max_concurrent_stre
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_max_concurrent_streams(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicProtocolOptions_set_max_concurrent_streams(msg, sub);
   }
   return sub;
@@ -326,7 +317,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_stream_wind
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_stream_window_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicProtocolOptions_set_initial_stream_window_size(msg, sub);
   }
   return sub;
@@ -338,7 +329,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_connection_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_connection_window_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicProtocolOptions_set_initial_connection_window_size(msg, sub);
   }
   return sub;
@@ -350,7 +341,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_num_timeouts_to_tri
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_num_timeouts_to_trigger_port_migration(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_num_timeouts_to_trigger_port_migration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicProtocolOptions_set_num_timeouts_to_trigger_port_migration(msg, sub);
   }
   return sub;
@@ -362,7 +353,7 @@ UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_connection_keepaliv
 UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_QuicProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_QuicKeepAliveSettings* sub = (struct envoy_config_core_v3_QuicKeepAliveSettings*)envoy_config_core_v3_QuicProtocolOptions_connection_keepalive(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_QuicKeepAliveSettings*)_upb_Message_New(&envoy_config_core_v3_QuicKeepAliveSettings_msg_init, arena);
+    sub = (struct envoy_config_core_v3_QuicKeepAliveSettings*)_upb_Message_New(&envoy__config__core__v3__QuicKeepAliveSettings_msg_init, arena);
     if (sub) envoy_config_core_v3_QuicProtocolOptions_set_connection_keepalive(msg, sub);
   }
   return sub;
@@ -371,12 +362,12 @@ UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_
 /* envoy.config.core.v3.UpstreamHttpProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_core_v3_UpstreamHttpProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_UpstreamHttpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_UpstreamHttpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_core_v3_UpstreamHttpProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_UpstreamHttpProtocolOptions* ret = envoy_config_core_v3_UpstreamHttpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -386,7 +377,7 @@ UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_core_v
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_UpstreamHttpProtocolOptions* ret = envoy_config_core_v3_UpstreamHttpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -394,13 +385,13 @@ UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_core_v
 }
 UPB_INLINE char* envoy_config_core_v3_UpstreamHttpProtocolOptions_serialize(const envoy_config_core_v3_UpstreamHttpProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_UpstreamHttpProtocolOptions_serialize_ex(const envoy_config_core_v3_UpstreamHttpProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_clear_auto_sni(envoy_config_core_v3_UpstreamHttpProtocolOptions* msg) {
@@ -453,12 +444,12 @@ UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_override_au
 /* envoy.config.core.v3.AlternateProtocolsCacheOptions */
 
 UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_config_core_v3_AlternateProtocolsCacheOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_AlternateProtocolsCacheOptions*)_upb_Message_New(&envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init, arena);
+  return (envoy_config_core_v3_AlternateProtocolsCacheOptions*)_upb_Message_New(&envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_config_core_v3_AlternateProtocolsCacheOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_AlternateProtocolsCacheOptions* ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -468,7 +459,7 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_config_cor
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_AlternateProtocolsCacheOptions* ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -476,13 +467,13 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_config_cor
 }
 UPB_INLINE char* envoy_config_core_v3_AlternateProtocolsCacheOptions_serialize(const envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_AlternateProtocolsCacheOptions_serialize_ex(const envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_clear_name(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg) {
@@ -612,7 +603,7 @@ UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_max_entr
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_max_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_AlternateProtocolsCacheOptions_max_entries(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_AlternateProtocolsCacheOptions_set_max_entries(msg, sub);
   }
   return sub;
@@ -624,7 +615,7 @@ UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_key_valu
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_key_value_store_config(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_AlternateProtocolsCacheOptions_key_value_store_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_core_v3_AlternateProtocolsCacheOptions_set_key_value_store_config(msg, sub);
   }
   return sub;
@@ -650,7 +641,7 @@ UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateP
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* sub = (struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry*)_upb_Message_New(&envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, arena);
+  struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* sub = (struct envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry*)_upb_Message_New(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -683,12 +674,12 @@ UPB_INLINE bool envoy_config_core_v3_AlternateProtocolsCacheOptions_add_canonica
 /* envoy.config.core.v3.AlternateProtocolsCacheOptions.AlternateProtocolsCacheEntry */
 
 UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry*)_upb_Message_New(&envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, arena);
+  return (envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry*)_upb_Message_New(&envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -698,7 +689,7 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocol
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -706,13 +697,13 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocol
 }
 UPB_INLINE char* envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_serialize(const envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_serialize_ex(const envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_clear_hostname(envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry* msg) {
@@ -750,12 +741,12 @@ UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternatePro
 /* envoy.config.core.v3.HttpProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_HttpProtocolOptions* envoy_config_core_v3_HttpProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_HttpProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__HttpProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_HttpProtocolOptions* envoy_config_core_v3_HttpProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_HttpProtocolOptions* ret = envoy_config_core_v3_HttpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HttpProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -765,7 +756,7 @@ UPB_INLINE envoy_config_core_v3_HttpProtocolOptions* envoy_config_core_v3_HttpPr
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_HttpProtocolOptions* ret = envoy_config_core_v3_HttpProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__HttpProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -773,13 +764,13 @@ UPB_INLINE envoy_config_core_v3_HttpProtocolOptions* envoy_config_core_v3_HttpPr
 }
 UPB_INLINE char* envoy_config_core_v3_HttpProtocolOptions_serialize(const envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HttpProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HttpProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_HttpProtocolOptions_serialize_ex(const envoy_config_core_v3_HttpProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_HttpProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__HttpProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_clear_idle_timeout(envoy_config_core_v3_HttpProtocolOptions* msg) {
@@ -876,7 +867,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_idle_timeout(envoy_
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_idle_timeout(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_idle_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpProtocolOptions_set_idle_timeout(msg, sub);
   }
   return sub;
@@ -888,7 +879,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_headers_count(e
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_headers_count(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_headers_count(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpProtocolOptions_set_max_headers_count(msg, sub);
   }
   return sub;
@@ -900,7 +891,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_connection_dura
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_connection_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_connection_duration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpProtocolOptions_set_max_connection_duration(msg, sub);
   }
   return sub;
@@ -912,7 +903,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_stream_duration
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_stream_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_stream_duration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpProtocolOptions_set_max_stream_duration(msg, sub);
   }
   return sub;
@@ -928,7 +919,7 @@ UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_requests_per_co
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_requests_per_connection(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_requests_per_connection(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_HttpProtocolOptions_set_max_requests_per_connection(msg, sub);
   }
   return sub;
@@ -937,12 +928,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocol
 /* envoy.config.core.v3.Http1ProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions* envoy_config_core_v3_Http1ProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions* envoy_config_core_v3_Http1ProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions* ret = envoy_config_core_v3_Http1ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -952,7 +943,7 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions* envoy_config_core_v3_Http1
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions* ret = envoy_config_core_v3_Http1ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -960,13 +951,13 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions* envoy_config_core_v3_Http1
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_serialize(const envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_serialize_ex(const envoy_config_core_v3_Http1ProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_clear_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions* msg) {
@@ -1103,7 +1094,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_absolute_url
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_allow_absolute_url(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_set_allow_absolute_url(msg, sub);
   }
   return sub;
@@ -1123,7 +1114,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_header_key_format(
 UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_config_core_v3_Http1ProtocolOptions_mutable_header_key_format(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)envoy_config_core_v3_Http1ProtocolOptions_header_key_format(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_set_header_key_format(msg, sub);
   }
   return sub;
@@ -1143,7 +1134,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_override_stream_er
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_override_stream_error_on_invalid_http_message(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_set_override_stream_error_on_invalid_http_message(msg, sub);
   }
   return sub;
@@ -1159,7 +1150,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_use_balsa_parser(e
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_use_balsa_parser(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_use_balsa_parser(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_set_use_balsa_parser(msg, sub);
   }
   return sub;
@@ -1172,12 +1163,12 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_custom_metho
 /* envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat */
 
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, arena);
+  return (envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1187,7 +1178,7 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_conf
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1195,13 +1186,13 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_conf
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_serialize(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_serialize_ex(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1251,7 +1242,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_pr
 UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_proper_case_words(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_proper_case_words(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_proper_case_words(msg, sub);
   }
   return sub;
@@ -1263,7 +1254,7 @@ UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_st
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_stateful_formatter(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_stateful_formatter(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_stateful_formatter(msg, sub);
   }
   return sub;
@@ -1272,12 +1263,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
 /* envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat.ProperCaseWords */
 
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, arena);
+  return (envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1287,7 +1278,7 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseW
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1295,13 +1286,13 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseW
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_serialize(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_serialize_ex(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1309,12 +1300,12 @@ UPB_INLINE char* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_Prope
 /* envoy.config.core.v3.KeepaliveSettings */
 
 UPB_INLINE envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_KeepaliveSettings_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_KeepaliveSettings*)_upb_Message_New(&envoy_config_core_v3_KeepaliveSettings_msg_init, arena);
+  return (envoy_config_core_v3_KeepaliveSettings*)_upb_Message_New(&envoy__config__core__v3__KeepaliveSettings_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_KeepaliveSettings_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_KeepaliveSettings* ret = envoy_config_core_v3_KeepaliveSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__KeepaliveSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1324,7 +1315,7 @@ UPB_INLINE envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Keepaliv
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_KeepaliveSettings* ret = envoy_config_core_v3_KeepaliveSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__KeepaliveSettings_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1332,13 +1323,13 @@ UPB_INLINE envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Keepaliv
 }
 UPB_INLINE char* envoy_config_core_v3_KeepaliveSettings_serialize(const envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_KeepaliveSettings_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__KeepaliveSettings_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_KeepaliveSettings_serialize_ex(const envoy_config_core_v3_KeepaliveSettings* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_KeepaliveSettings_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__KeepaliveSettings_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_clear_interval(envoy_config_core_v3_KeepaliveSettings* msg) {
@@ -1409,7 +1400,7 @@ UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval(envoy_config
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_KeepaliveSettings_set_interval(msg, sub);
   }
   return sub;
@@ -1421,7 +1412,7 @@ UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_timeout(envoy_config_
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_timeout(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_KeepaliveSettings_set_timeout(msg, sub);
   }
   return sub;
@@ -1433,7 +1424,7 @@ UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval_jitter(envoy
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSettings_mutable_interval_jitter(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_KeepaliveSettings_interval_jitter(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_config_core_v3_KeepaliveSettings_set_interval_jitter(msg, sub);
   }
   return sub;
@@ -1445,7 +1436,7 @@ UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_connection_idle_inter
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_connection_idle_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_connection_idle_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_core_v3_KeepaliveSettings_set_connection_idle_interval(msg, sub);
   }
   return sub;
@@ -1454,12 +1445,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettin
 /* envoy.config.core.v3.Http2ProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_Http2ProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_Http2ProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http2ProtocolOptions* ret = envoy_config_core_v3_Http2ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http2ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1469,7 +1460,7 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_Http2
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http2ProtocolOptions* ret = envoy_config_core_v3_Http2ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http2ProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1477,13 +1468,13 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_Http2
 }
 UPB_INLINE char* envoy_config_core_v3_Http2ProtocolOptions_serialize(const envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http2ProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http2ProtocolOptions_serialize_ex(const envoy_config_core_v3_Http2ProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http2ProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_clear_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions* msg) {
@@ -1744,7 +1735,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_hpack_table_size(e
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_hpack_table_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_hpack_table_size(msg, sub);
   }
   return sub;
@@ -1756,7 +1747,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_concurrent_str
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_concurrent_streams(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_concurrent_streams(msg, sub);
   }
   return sub;
@@ -1768,7 +1759,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_stream_win
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_stream_window_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_initial_stream_window_size(msg, sub);
   }
   return sub;
@@ -1780,7 +1771,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_connection
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_connection_window_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_initial_connection_window_size(msg, sub);
   }
   return sub;
@@ -1800,7 +1791,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_frame
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_frames(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_frames(msg, sub);
   }
   return sub;
@@ -1812,7 +1803,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_contr
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_control_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_control_frames(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_control_frames(msg, sub);
   }
   return sub;
@@ -1824,7 +1815,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_consecutive_in
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_consecutive_inbound_frames_with_empty_payload(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_consecutive_inbound_frames_with_empty_payload(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_consecutive_inbound_frames_with_empty_payload(msg, sub);
   }
   return sub;
@@ -1836,7 +1827,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_priori
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_priority_frames_per_stream(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_priority_frames_per_stream(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_priority_frames_per_stream(msg, sub);
   }
   return sub;
@@ -1848,7 +1839,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_window
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_window_update_frames_per_data_frame_sent(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_window_update_frames_per_data_frame_sent(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_window_update_frames_per_data_frame_sent(msg, sub);
   }
   return sub;
@@ -1878,7 +1869,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* sub = (struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, arena);
+  struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* sub = (struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1890,7 +1881,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_override_stream_er
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_override_stream_error_on_invalid_http_message(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_override_stream_error_on_invalid_http_message(msg, sub);
   }
   return sub;
@@ -1902,7 +1893,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_connection_keepali
 UPB_INLINE struct envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Http2ProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_KeepaliveSettings* sub = (struct envoy_config_core_v3_KeepaliveSettings*)envoy_config_core_v3_Http2ProtocolOptions_connection_keepalive(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_KeepaliveSettings*)_upb_Message_New(&envoy_config_core_v3_KeepaliveSettings_msg_init, arena);
+    sub = (struct envoy_config_core_v3_KeepaliveSettings*)_upb_Message_New(&envoy__config__core__v3__KeepaliveSettings_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_connection_keepalive(msg, sub);
   }
   return sub;
@@ -1914,7 +1905,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_use_oghttp2_codec(
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_use_oghttp2_codec(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_use_oghttp2_codec(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_set_use_oghttp2_codec(msg, sub);
   }
   return sub;
@@ -1923,12 +1914,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolO
 /* envoy.config.core.v3.Http2ProtocolOptions.SettingsParameter */
 
 UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, arena);
+  return (envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* ret = envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1938,7 +1929,7 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* envoy_co
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* ret = envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1946,13 +1937,13 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* envoy_co
 }
 UPB_INLINE char* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_serialize(const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_serialize_ex(const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_clear_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg) {
@@ -1993,7 +1984,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_identifier(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_identifier(msg, sub);
   }
   return sub;
@@ -2005,7 +1996,7 @@ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_value(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_value(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_value(msg, sub);
   }
   return sub;
@@ -2014,12 +2005,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco
 /* envoy.config.core.v3.GrpcProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions* envoy_config_core_v3_GrpcProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_GrpcProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_GrpcProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__GrpcProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions* envoy_config_core_v3_GrpcProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_GrpcProtocolOptions* ret = envoy_config_core_v3_GrpcProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2029,7 +2020,7 @@ UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions* envoy_config_core_v3_GrpcPr
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_GrpcProtocolOptions* ret = envoy_config_core_v3_GrpcProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2037,13 +2028,13 @@ UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions* envoy_config_core_v3_GrpcPr
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcProtocolOptions_serialize(const envoy_config_core_v3_GrpcProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcProtocolOptions_serialize_ex(const envoy_config_core_v3_GrpcProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcProtocolOptions_clear_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions* msg) {
@@ -2069,7 +2060,7 @@ UPB_INLINE void envoy_config_core_v3_GrpcProtocolOptions_set_http2_protocol_opti
 UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_GrpcProtocolOptions_mutable_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_core_v3_GrpcProtocolOptions_http2_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions_msg_init, arena);
     if (sub) envoy_config_core_v3_GrpcProtocolOptions_set_http2_protocol_options(msg, sub);
   }
   return sub;
@@ -2078,12 +2069,12 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v
 /* envoy.config.core.v3.Http3ProtocolOptions */
 
 UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions* envoy_config_core_v3_Http3ProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Http3ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http3ProtocolOptions_msg_init, arena);
+  return (envoy_config_core_v3_Http3ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http3ProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions* envoy_config_core_v3_Http3ProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_Http3ProtocolOptions* ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http3ProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2093,7 +2084,7 @@ UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions* envoy_config_core_v3_Http3
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_Http3ProtocolOptions* ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Http3ProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2101,13 +2092,13 @@ UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions* envoy_config_core_v3_Http3
 }
 UPB_INLINE char* envoy_config_core_v3_Http3ProtocolOptions_serialize(const envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http3ProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http3ProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Http3ProtocolOptions_serialize_ex(const envoy_config_core_v3_Http3ProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Http3ProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Http3ProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_clear_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions* msg) {
@@ -2159,7 +2150,7 @@ UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_quic_protocol_opti
 UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_Http3ProtocolOptions_mutable_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_core_v3_Http3ProtocolOptions_quic_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_QuicProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__QuicProtocolOptions_msg_init, arena);
     if (sub) envoy_config_core_v3_Http3ProtocolOptions_set_quic_protocol_options(msg, sub);
   }
   return sub;
@@ -2171,7 +2162,7 @@ UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_override_stream_er
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http3ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http3ProtocolOptions_override_stream_error_on_invalid_http_message(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_Http3ProtocolOptions_set_override_stream_error_on_invalid_http_message(msg, sub);
   }
   return sub;
@@ -2184,12 +2175,12 @@ UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_allow_extended_con
 /* envoy.config.core.v3.SchemeHeaderTransformation */
 
 UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation* envoy_config_core_v3_SchemeHeaderTransformation_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SchemeHeaderTransformation*)_upb_Message_New(&envoy_config_core_v3_SchemeHeaderTransformation_msg_init, arena);
+  return (envoy_config_core_v3_SchemeHeaderTransformation*)_upb_Message_New(&envoy__config__core__v3__SchemeHeaderTransformation_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation* envoy_config_core_v3_SchemeHeaderTransformation_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SchemeHeaderTransformation* ret = envoy_config_core_v3_SchemeHeaderTransformation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SchemeHeaderTransformation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2199,7 +2190,7 @@ UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation* envoy_config_core_v3
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SchemeHeaderTransformation* ret = envoy_config_core_v3_SchemeHeaderTransformation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SchemeHeaderTransformation_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2207,13 +2198,13 @@ UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation* envoy_config_core_v3
 }
 UPB_INLINE char* envoy_config_core_v3_SchemeHeaderTransformation_serialize(const envoy_config_core_v3_SchemeHeaderTransformation* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SchemeHeaderTransformation_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SchemeHeaderTransformation_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SchemeHeaderTransformation_serialize_ex(const envoy_config_core_v3_SchemeHeaderTransformation* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SchemeHeaderTransformation_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SchemeHeaderTransformation_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2245,8 +2236,6 @@ UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_scheme_to_ov
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
new file mode 100644
index 0000000000000..68ab85c448797
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
@@ -0,0 +1,481 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/protocol.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = {
+  &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0],
+  &envoy_config_core_v3_QuicKeepAliveSettings__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[5] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = {
+  &envoy_config_core_v3_QuicProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_QuicProtocolOptions__fields[0],
+  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800000504002a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init = {
+  NULL,
+  &envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000800003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init = {
+  &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0],
+  &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init = {
+  NULL,
+  &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields[6] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = {
+  &envoy_config_core_v3_HttpProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_HttpProtocolOptions__fields[0],
+  UPB_SIZE(32, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0028000005040032, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__fields[10] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(17, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 5), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = {
+  &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http1ProtocolOptions__fields[0],
+  UPB_SIZE(48, 56), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x001000003f00001a, &upb_pss_1bt},
+    {0x0020000002010022, &upb_psm_1bt_max64b},
+    {0x000200003f000028, &upb_psb1_1bt},
+    {0x000300003f000030, &upb_psb1_1bt},
+    {0x002800000302003a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000040, &upb_psb1_1bt},
+    {0x003000000403004a, &upb_psm_1bt_maxmaxb},
+    {0x000500003f000050, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init = {
+  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0],
+  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000008010042, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_KeepaliveSettings_submsgs[4] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = {
+  &envoy_config_core_v3_KeepaliveSettings_submsgs[0],
+  &envoy_config_core_v3_KeepaliveSettings__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__KeepaliveSettings_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__fields[16] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(21, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(40, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(44, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(48, 80), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(52, 88), 10, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(56, 96), 11, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(60, 104), 12, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = {
+  &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http2ProtocolOptions__fields[0],
+  UPB_SIZE(64, 112), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x000200003f000028, &upb_psb1_1bt},
+    {0x000300003f000030, &upb_psb1_1bt},
+    {0x002800000504003a, &upb_psm_1bt_maxmaxb},
+    {0x0030000006050042, &upb_psm_1bt_maxmaxb},
+    {0x003800000706004a, &upb_psm_1bt_maxmaxb},
+    {0x0040000008070052, &upb_psm_1bt_maxmaxb},
+    {0x004800000908005a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000060, &upb_psb1_1bt},
+    {0x005000003f09006a, &upb_prm_1bt_max64b},
+    {0x005800000a0a0072, &upb_psm_1bt_maxmaxb},
+    {0x006000000b0b007a, &upb_psm_1bt_max64b},
+    {0x006800000c0c0182, &upb_psm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init = {
+  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0],
+  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__Http2ProtocolOptions_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = {
+  &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_GrpcProtocolOptions__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__QuicProtocolOptions_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = {
+  &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0],
+  &envoy_config_core_v3_Http3ProtocolOptions__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init = {
+  NULL,
+  &envoy_config_core_v3_SchemeHeaderTransformation__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[16] = {
+  &envoy__config__core__v3__TcpProtocolOptions_msg_init,
+  &envoy__config__core__v3__QuicKeepAliveSettings_msg_init,
+  &envoy__config__core__v3__QuicProtocolOptions_msg_init,
+  &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init,
+  &envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init,
+  &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init,
+  &envoy__config__core__v3__HttpProtocolOptions_msg_init,
+  &envoy__config__core__v3__Http1ProtocolOptions_msg_init,
+  &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init,
+  &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init,
+  &envoy__config__core__v3__KeepaliveSettings_msg_init,
+  &envoy__config__core__v3__Http2ProtocolOptions_msg_init,
+  &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init,
+  &envoy__config__core__v3__GrpcProtocolOptions_msg_init,
+  &envoy__config__core__v3__Http3ProtocolOptions_msg_init,
+  &envoy__config__core__v3__SchemeHeaderTransformation_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  16,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
new file mode 100644
index 0000000000000..2d5f775a60271
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/protocol.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_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__config__core__v3__TcpProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
index cf407473f1b18..6dce8ba4fa1b7 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/proxy_protocol.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/proxy_protocol.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
@@ -19,8 +24,6 @@ extern "C" {
 
 typedef struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs envoy_config_core_v3_ProxyProtocolPassThroughTLVs;
 typedef struct envoy_config_core_v3_ProxyProtocolConfig envoy_config_core_v3_ProxyProtocolConfig;
-extern const upb_MiniTable envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ProxyProtocolConfig_msg_init;
 
 typedef enum {
   envoy_config_core_v3_ProxyProtocolConfig_V1 = 0,
@@ -37,12 +40,12 @@ typedef enum {
 /* envoy.config.core.v3.ProxyProtocolPassThroughTLVs */
 
 UPB_INLINE envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)_upb_Message_New(&envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, arena);
+  return (envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ProxyProtocolPassThroughTLVs* ret = envoy_config_core_v3_ProxyProtocolPassThroughTLVs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -52,7 +55,7 @@ UPB_INLINE envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ProxyProtocolPassThroughTLVs* ret = envoy_config_core_v3_ProxyProtocolPassThroughTLVs_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -60,13 +63,13 @@ UPB_INLINE envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_
 }
 UPB_INLINE char* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_serialize(const envoy_config_core_v3_ProxyProtocolPassThroughTLVs* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_serialize_ex(const envoy_config_core_v3_ProxyProtocolPassThroughTLVs* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ProxyProtocolPassThroughTLVs_clear_match_type(envoy_config_core_v3_ProxyProtocolPassThroughTLVs* msg) {
@@ -150,12 +153,12 @@ UPB_INLINE bool envoy_config_core_v3_ProxyProtocolPassThroughTLVs_add_tlv_type(e
 /* envoy.config.core.v3.ProxyProtocolConfig */
 
 UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_ProxyProtocolConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy_config_core_v3_ProxyProtocolConfig_msg_init, arena);
+  return (envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_ProxyProtocolConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_ProxyProtocolConfig* ret = envoy_config_core_v3_ProxyProtocolConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ProxyProtocolConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -165,7 +168,7 @@ UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_ProxyP
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_ProxyProtocolConfig* ret = envoy_config_core_v3_ProxyProtocolConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ProxyProtocolConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -173,13 +176,13 @@ UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_ProxyP
 }
 UPB_INLINE char* envoy_config_core_v3_ProxyProtocolConfig_serialize(const envoy_config_core_v3_ProxyProtocolConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ProxyProtocolConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ProxyProtocolConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ProxyProtocolConfig_serialize_ex(const envoy_config_core_v3_ProxyProtocolConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ProxyProtocolConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ProxyProtocolConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_clear_version(envoy_config_core_v3_ProxyProtocolConfig* msg) {
@@ -220,14 +223,12 @@ UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_pass_through_tlvs(e
 UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_v3_ProxyProtocolConfig_mutable_pass_through_tlvs(envoy_config_core_v3_ProxyProtocolConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* sub = (struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)envoy_config_core_v3_ProxyProtocolConfig_pass_through_tlvs(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)_upb_Message_New(&envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init, arena);
     if (sub) envoy_config_core_v3_ProxyProtocolConfig_set_pass_through_tlvs(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
new file mode 100644
index 0000000000000..de0ec9748b402
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
@@ -0,0 +1,70 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/proxy_protocol.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init = {
+  NULL,
+  &envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_ppv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields[2] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = {
+  &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0],
+  &envoy_config_core_v3_ProxyProtocolConfig__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init,
+  &envoy__config__core__v3__ProxyProtocolConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
new file mode 100644
index 0000000000000..2df5f85f6eace
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/proxy_protocol.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_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__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
index 577f37b6539c0..e40d64b808cfd 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/resolver.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.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
@@ -19,22 +25,19 @@ extern "C" {
 
 typedef struct envoy_config_core_v3_DnsResolverOptions envoy_config_core_v3_DnsResolverOptions;
 typedef struct envoy_config_core_v3_DnsResolutionConfig envoy_config_core_v3_DnsResolutionConfig;
-extern const upb_MiniTable envoy_config_core_v3_DnsResolverOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DnsResolutionConfig_msg_init;
 struct envoy_config_core_v3_Address;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
 
 
 
 /* envoy.config.core.v3.DnsResolverOptions */
 
 UPB_INLINE envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsResolverOptions_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_DnsResolverOptions*)_upb_Message_New(&envoy_config_core_v3_DnsResolverOptions_msg_init, arena);
+  return (envoy_config_core_v3_DnsResolverOptions*)_upb_Message_New(&envoy__config__core__v3__DnsResolverOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsResolverOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_DnsResolverOptions* ret = envoy_config_core_v3_DnsResolverOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DnsResolverOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsReso
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_DnsResolverOptions* ret = envoy_config_core_v3_DnsResolverOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DnsResolverOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsReso
 }
 UPB_INLINE char* envoy_config_core_v3_DnsResolverOptions_serialize(const envoy_config_core_v3_DnsResolverOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DnsResolverOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DnsResolverOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_DnsResolverOptions_serialize_ex(const envoy_config_core_v3_DnsResolverOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DnsResolverOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DnsResolverOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_clear_use_tcp_for_dns_lookups(envoy_config_core_v3_DnsResolverOptions* msg) {
@@ -96,12 +99,12 @@ UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_set_no_default_search_do
 /* envoy.config.core.v3.DnsResolutionConfig */
 
 UPB_INLINE envoy_config_core_v3_DnsResolutionConfig* envoy_config_core_v3_DnsResolutionConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy_config_core_v3_DnsResolutionConfig_msg_init, arena);
+  return (envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy__config__core__v3__DnsResolutionConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_DnsResolutionConfig* envoy_config_core_v3_DnsResolutionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_DnsResolutionConfig* ret = envoy_config_core_v3_DnsResolutionConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DnsResolutionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -111,7 +114,7 @@ UPB_INLINE envoy_config_core_v3_DnsResolutionConfig* envoy_config_core_v3_DnsRes
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_DnsResolutionConfig* ret = envoy_config_core_v3_DnsResolutionConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__DnsResolutionConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -119,13 +122,13 @@ UPB_INLINE envoy_config_core_v3_DnsResolutionConfig* envoy_config_core_v3_DnsRes
 }
 UPB_INLINE char* envoy_config_core_v3_DnsResolutionConfig_serialize(const envoy_config_core_v3_DnsResolutionConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DnsResolutionConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DnsResolutionConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_DnsResolutionConfig_serialize_ex(const envoy_config_core_v3_DnsResolutionConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_DnsResolutionConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__DnsResolutionConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_DnsResolutionConfig_clear_resolvers(envoy_config_core_v3_DnsResolutionConfig* msg) {
@@ -202,7 +205,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_DnsResoluti
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -214,14 +217,12 @@ UPB_INLINE void envoy_config_core_v3_DnsResolutionConfig_set_dns_resolver_option
 UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsResolutionConfig_mutable_dns_resolver_options(envoy_config_core_v3_DnsResolutionConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DnsResolverOptions* sub = (struct envoy_config_core_v3_DnsResolverOptions*)envoy_config_core_v3_DnsResolutionConfig_dns_resolver_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DnsResolverOptions*)_upb_Message_New(&envoy_config_core_v3_DnsResolverOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DnsResolverOptions*)_upb_Message_New(&envoy__config__core__v3__DnsResolverOptions_msg_init, arena);
     if (sub) envoy_config_core_v3_DnsResolutionConfig_set_dns_resolver_options(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
new file mode 100644
index 0000000000000..4da813cb1b4c4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
@@ -0,0 +1,72 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/resolver.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_DnsResolverOptions__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = {
+  NULL,
+  &envoy_config_core_v3_DnsResolverOptions__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__DnsResolverOptions_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = {
+  &envoy_config_core_v3_DnsResolutionConfig_submsgs[0],
+  &envoy_config_core_v3_DnsResolutionConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__core__v3__DnsResolverOptions_msg_init,
+  &envoy__config__core__v3__DnsResolutionConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
new file mode 100644
index 0000000000000..0f70a2a9bc958
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/resolver.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_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__config__core__v3__DnsResolverOptions_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
index f241d38b5191a..0f51afc1735bf 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/socket_option.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,8 +25,6 @@ extern "C" {
 
 typedef struct envoy_config_core_v3_SocketOption envoy_config_core_v3_SocketOption;
 typedef struct envoy_config_core_v3_SocketOptionsOverride envoy_config_core_v3_SocketOptionsOverride;
-extern const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOptionsOverride_msg_init;
 
 typedef enum {
   envoy_config_core_v3_SocketOption_STATE_PREBIND = 0,
@@ -33,12 +37,12 @@ typedef enum {
 /* envoy.config.core.v3.SocketOption */
 
 UPB_INLINE envoy_config_core_v3_SocketOption* envoy_config_core_v3_SocketOption_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  return (envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SocketOption* envoy_config_core_v3_SocketOption_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SocketOption* ret = envoy_config_core_v3_SocketOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +52,7 @@ UPB_INLINE envoy_config_core_v3_SocketOption* envoy_config_core_v3_SocketOption_
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SocketOption* ret = envoy_config_core_v3_SocketOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketOption_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +60,13 @@ UPB_INLINE envoy_config_core_v3_SocketOption* envoy_config_core_v3_SocketOption_
 }
 UPB_INLINE char* envoy_config_core_v3_SocketOption_serialize(const envoy_config_core_v3_SocketOption* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketOption_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketOption_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SocketOption_serialize_ex(const envoy_config_core_v3_SocketOption* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketOption_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketOption_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -177,12 +181,12 @@ UPB_INLINE void envoy_config_core_v3_SocketOption_set_state(envoy_config_core_v3
 /* envoy.config.core.v3.SocketOptionsOverride */
 
 UPB_INLINE envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_SocketOptionsOverride_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy_config_core_v3_SocketOptionsOverride_msg_init, arena);
+  return (envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy__config__core__v3__SocketOptionsOverride_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_SocketOptionsOverride_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SocketOptionsOverride* ret = envoy_config_core_v3_SocketOptionsOverride_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketOptionsOverride_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketOptionsOverride_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -192,7 +196,7 @@ UPB_INLINE envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_Sock
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SocketOptionsOverride* ret = envoy_config_core_v3_SocketOptionsOverride_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketOptionsOverride_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketOptionsOverride_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -200,13 +204,13 @@ UPB_INLINE envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_Sock
 }
 UPB_INLINE char* envoy_config_core_v3_SocketOptionsOverride_serialize(const envoy_config_core_v3_SocketOptionsOverride* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketOptionsOverride_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketOptionsOverride_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SocketOptionsOverride_serialize_ex(const envoy_config_core_v3_SocketOptionsOverride* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketOptionsOverride_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketOptionsOverride_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_SocketOptionsOverride_clear_socket_options(envoy_config_core_v3_SocketOptionsOverride* msg) {
@@ -268,14 +272,12 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_Socket
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
new file mode 100644
index 0000000000000..ad3f5a49e5fc6
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
@@ -0,0 +1,76 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/socket_option.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_core_v3_SocketOption__fields[6] = {
+  {1, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 8), -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = {
+  NULL,
+  &envoy_config_core_v3_SocketOption__fields[0],
+  UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x002800003f000010, &upb_psv8_1bt},
+    {0x003000003f000018, &upb_psv8_1bt},
+    {0x0008000004000020, &upb_pov8_1bt},
+    {0x000800000500002a, &upb_pob_1bt},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = {
+  &envoy_config_core_v3_SocketOptionsOverride_submsgs[0],
+  &envoy_config_core_v3_SocketOptionsOverride__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__core__v3__SocketOption_msg_init,
+  &envoy__config__core__v3__SocketOptionsOverride_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
new file mode 100644
index 0000000000000..6a1f2b1b755ce
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/socket_option.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_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__config__core__v3__SocketOption_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
index d1093e08bc119..140ab6c781eb4 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/substitution_format_string.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/substitution_format_string.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "envoy/annotations/deprecation.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
@@ -18,25 +27,21 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_core_v3_SubstitutionFormatString envoy_config_core_v3_SubstitutionFormatString;
-extern const upb_MiniTable envoy_config_core_v3_SubstitutionFormatString_msg_init;
 struct envoy_config_core_v3_DataSource;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct google_protobuf_Struct;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
 
 
 
 /* envoy.config.core.v3.SubstitutionFormatString */
 
 UPB_INLINE envoy_config_core_v3_SubstitutionFormatString* envoy_config_core_v3_SubstitutionFormatString_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy_config_core_v3_SubstitutionFormatString_msg_init, arena);
+  return (envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy__config__core__v3__SubstitutionFormatString_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SubstitutionFormatString* envoy_config_core_v3_SubstitutionFormatString_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_SubstitutionFormatString* ret = envoy_config_core_v3_SubstitutionFormatString_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SubstitutionFormatString_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +51,7 @@ UPB_INLINE envoy_config_core_v3_SubstitutionFormatString* envoy_config_core_v3_S
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_SubstitutionFormatString* ret = envoy_config_core_v3_SubstitutionFormatString_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SubstitutionFormatString_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +59,13 @@ UPB_INLINE envoy_config_core_v3_SubstitutionFormatString* envoy_config_core_v3_S
 }
 UPB_INLINE char* envoy_config_core_v3_SubstitutionFormatString_serialize(const envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SubstitutionFormatString_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SubstitutionFormatString_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SubstitutionFormatString_serialize_ex(const envoy_config_core_v3_SubstitutionFormatString* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SubstitutionFormatString_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SubstitutionFormatString_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -189,7 +194,7 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format(en
 UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionFormatString_mutable_json_format(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_SubstitutionFormatString_json_format(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_core_v3_SubstitutionFormatString_set_json_format(msg, sub);
   }
   return sub;
@@ -209,7 +214,7 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format_so
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_SubstitutionFormatString_mutable_text_format_source(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_SubstitutionFormatString_text_format_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_core_v3_SubstitutionFormatString_set_text_format_source(msg, sub);
   }
   return sub;
@@ -235,14 +240,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
new file mode 100644
index 0000000000000..f02ed2ca69b92
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
@@ -0,0 +1,66 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/substitution_format_string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/substitution_format_string.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_SubstitutionFormatString_submsgs[3] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__fields[6] = {
+  {1, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 8), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 8), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(8, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = {
+  &envoy_config_core_v3_SubstitutionFormatString_submsgs[0],
+  &envoy_config_core_v3_SubstitutionFormatString__fields[0],
+  UPB_SIZE(32, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040100000a, &upb_pos_1bt},
+    {0x0008000402000012, &upb_pom_1bt_maxmaxb},
+    {0x000000003f000018, &upb_psb1_1bt},
+    {0x001800003f000022, &upb_pss_1bt},
+    {0x000800040501002a, &upb_pom_1bt_maxmaxb},
+    {0x002800003f020032, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__SubstitutionFormatString_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_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/config/core/v3/substitution_format_string.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
new file mode 100644
index 0000000000000..3b00f64f8fa13
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/substitution_format_string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_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__config__core__v3__SubstitutionFormatString_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h
rename to src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
index 618f63e28d2bd..0de177bb9e1ef 100644
--- a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/udp_socket_config.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/udp_socket_config.upb_minitable.h"
+
+#include "google/protobuf/wrappers.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
@@ -18,23 +24,20 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_core_v3_UdpSocketConfig envoy_config_core_v3_UdpSocketConfig;
-extern const upb_MiniTable envoy_config_core_v3_UdpSocketConfig_msg_init;
 struct google_protobuf_BoolValue;
 struct google_protobuf_UInt64Value;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
 
 
 
 /* envoy.config.core.v3.UdpSocketConfig */
 
 UPB_INLINE envoy_config_core_v3_UdpSocketConfig* envoy_config_core_v3_UdpSocketConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_UdpSocketConfig*)_upb_Message_New(&envoy_config_core_v3_UdpSocketConfig_msg_init, arena);
+  return (envoy_config_core_v3_UdpSocketConfig*)_upb_Message_New(&envoy__config__core__v3__UdpSocketConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_UdpSocketConfig* envoy_config_core_v3_UdpSocketConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_core_v3_UdpSocketConfig* ret = envoy_config_core_v3_UdpSocketConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__UdpSocketConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_UdpSocketConfig* envoy_config_core_v3_UdpSocketC
                            int options, upb_Arena* arena) {
   envoy_config_core_v3_UdpSocketConfig* ret = envoy_config_core_v3_UdpSocketConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__UdpSocketConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_UdpSocketConfig* envoy_config_core_v3_UdpSocketC
 }
 UPB_INLINE char* envoy_config_core_v3_UdpSocketConfig_serialize(const envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_UdpSocketConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__UdpSocketConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_UdpSocketConfig_serialize_ex(const envoy_config_core_v3_UdpSocketConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_UdpSocketConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__UdpSocketConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_clear_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig* msg) {
@@ -99,7 +102,7 @@ UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_max_rx_datagram_size(en
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSocketConfig_mutable_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_UdpSocketConfig_max_rx_datagram_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_config_core_v3_UdpSocketConfig_set_max_rx_datagram_size(msg, sub);
   }
   return sub;
@@ -111,14 +114,12 @@ UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_prefer_gro(envoy_config
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfig_mutable_prefer_gro(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_UdpSocketConfig_prefer_gro(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_core_v3_UdpSocketConfig_set_prefer_gro(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
new file mode 100644
index 0000000000000..32f7c6b232973
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/udp_socket_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/core/v3/udp_socket_config.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_core_v3_UdpSocketConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = {
+  &envoy_config_core_v3_UdpSocketConfig_submsgs[0],
+  &envoy_config_core_v3_UdpSocketConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__core__v3__UdpSocketConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_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/config/core/v3/udp_socket_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
new file mode 100644
index 0000000000000..070c9d3f418b1
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/udp_socket_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_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__config__core__v3__UdpSocketConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h
rename to src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
index bf6446ed7fae5..76fc0a285e8f1 100644
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
+
+#include "envoy/config/endpoint/v3/endpoint_components.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -21,32 +31,23 @@ typedef struct envoy_config_endpoint_v3_ClusterLoadAssignment envoy_config_endpo
 typedef struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy envoy_config_endpoint_v3_ClusterLoadAssignment_Policy;
 typedef struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload;
 typedef struct envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msg_init;
 struct envoy_config_endpoint_v3_Endpoint;
 struct envoy_config_endpoint_v3_LocalityLbEndpoints;
 struct envoy_type_v3_FractionalPercent;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_endpoint_v3_Endpoint_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.endpoint.v3.ClusterLoadAssignment */
 
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_endpoint_v3_ClusterLoadAssignment_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_ClusterLoadAssignment*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, arena);
+  return (envoy_config_endpoint_v3_ClusterLoadAssignment*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_endpoint_v3_ClusterLoadAssignment_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -56,7 +57,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_endpoint
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -64,13 +65,13 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_endpoint
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_serialize_ex(const envoy_config_endpoint_v3_ClusterLoadAssignment* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_clear_cluster_name(envoy_config_endpoint_v3_ClusterLoadAssignment* msg) {
@@ -183,7 +184,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_end
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_LocalityLbEndpoints* sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints*)_upb_Message_New(&envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, arena);
+  struct envoy_config_endpoint_v3_LocalityLbEndpoints* sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints*)_upb_Message_New(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -195,7 +196,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_policy(envoy_
 UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_endpoint_v3_ClusterLoadAssignment_mutable_policy(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* arena) {
   struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)envoy_config_endpoint_v3_ClusterLoadAssignment_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, arena);
+    sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_ClusterLoadAssignment_set_policy(msg, sub);
   }
   return sub;
@@ -228,12 +229,12 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry* e
 /* envoy.config.endpoint.v3.ClusterLoadAssignment.Policy */
 
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, arena);
+  return (envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -243,7 +244,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_e
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -251,13 +252,13 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_e
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_serialize_ex(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_clear_drop_overloads(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg) {
@@ -349,7 +350,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOver
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, arena);
+  struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -361,7 +362,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_overpr
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_overprovisioning_factor(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_overprovisioning_factor(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_overprovisioning_factor(msg, sub);
   }
   return sub;
@@ -373,7 +374,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_endpoi
 UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_endpoint_stale_after(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_endpoint_stale_after(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_endpoint_stale_after(msg, sub);
   }
   return sub;
@@ -382,12 +383,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoad
 /* envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload */
 
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, arena);
+  return (envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -397,7 +398,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* e
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -405,13 +406,13 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* e
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_serialize_ex(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_clear_category(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg) {
@@ -452,7 +453,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverlo
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_mutable_drop_percentage(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_drop_percentage(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_set_drop_percentage(msg, sub);
   }
   return sub;
@@ -479,8 +480,6 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEnt
   _upb_msg_map_set_value(msg, &value, sizeof(struct envoy_config_endpoint_v3_Endpoint*));
 }
 
-extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
new file mode 100644
index 0000000000000..ae9ab25a8129d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
@@ -0,0 +1,138 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/endpoint.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
+#include "envoy/config/endpoint/v3/endpoint_components.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = {
+  {.submsg = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__fields[4] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init = {
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0020000001010022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = {
+  {.submsg = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[3] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init = {
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x001000000101001a, &upb_psm_1bt_maxmaxb},
+    {0x0018000002020022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = {
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init = {
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = {
+  {.submsg = &envoy__config__endpoint__v3__Endpoint_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init = {
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init,
+  &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init,
+  &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init,
+  &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
new file mode 100644
index 0000000000000..0205f63b97aad
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/endpoint.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_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__config__endpoint__v3__ClusterLoadAssignment_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init;
+
+extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h
rename to src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
index 4ea8bbcdf41f8..14f1e73e994ba 100644
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint_components.proto
  *
@@ -10,7 +9,19 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/endpoint/v3/endpoint_components.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -24,35 +35,23 @@ typedef struct envoy_config_endpoint_v3_LbEndpoint envoy_config_endpoint_v3_LbEn
 typedef struct envoy_config_endpoint_v3_LedsClusterLocalityConfig envoy_config_endpoint_v3_LedsClusterLocalityConfig;
 typedef struct envoy_config_endpoint_v3_LocalityLbEndpoints envoy_config_endpoint_v3_LocalityLbEndpoints;
 typedef struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList;
-extern const upb_MiniTable envoy_config_endpoint_v3_Endpoint_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_LbEndpoint_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_ConfigSource;
 struct envoy_config_core_v3_Locality;
 struct envoy_config_core_v3_Metadata;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Locality_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.endpoint.v3.Endpoint */
 
 UPB_INLINE envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Endpoint_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_Endpoint*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_msg_init, arena);
+  return (envoy_config_endpoint_v3_Endpoint*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Endpoint_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint* ret = envoy_config_endpoint_v3_Endpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -62,7 +61,7 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Endpoint_
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint* ret = envoy_config_endpoint_v3_Endpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -70,13 +69,13 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Endpoint_
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_serialize(const envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_serialize_ex(const envoy_config_endpoint_v3_Endpoint* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_Endpoint_clear_address(envoy_config_endpoint_v3_Endpoint* msg) {
@@ -165,7 +164,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_address(envoy_config_endpo
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_mutable_address(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_Endpoint_set_address(msg, sub);
   }
   return sub;
@@ -177,7 +176,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_health_check_config(envoy_
 UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_endpoint_v3_Endpoint_mutable_health_check_config(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) {
   struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* sub = (struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)envoy_config_endpoint_v3_Endpoint_health_check_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, arena);
+    sub = (struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_Endpoint_set_health_check_config(msg, sub);
   }
   return sub;
@@ -207,7 +206,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_con
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress* sub = (struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, arena);
+  struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress* sub = (struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -216,12 +215,12 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_con
 /* envoy.config.endpoint.v3.Endpoint.HealthCheckConfig */
 
 UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, arena);
+  return (envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* ret = envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -231,7 +230,7 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_end
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* ret = envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -239,13 +238,13 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_end
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_serialize(const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_serialize_ex(const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_clear_port_value(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg) {
@@ -312,7 +311,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_address(
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_mutable_address(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_address(msg, sub);
   }
   return sub;
@@ -325,12 +324,12 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_disable_
 /* envoy.config.endpoint.v3.Endpoint.AdditionalAddress */
 
 UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_Endpoint_AdditionalAddress*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, arena);
+  return (envoy_config_endpoint_v3_Endpoint_AdditionalAddress*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint_AdditionalAddress* ret = envoy_config_endpoint_v3_Endpoint_AdditionalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -340,7 +339,7 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_config_end
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_Endpoint_AdditionalAddress* ret = envoy_config_endpoint_v3_Endpoint_AdditionalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -348,13 +347,13 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress* envoy_config_end
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_serialize(const envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_serialize_ex(const envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_Endpoint_AdditionalAddress_clear_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg) {
@@ -380,7 +379,7 @@ UPB_INLINE void envoy_config_endpoint_v3_Endpoint_AdditionalAddress_set_address(
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_mutable_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_AdditionalAddress_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_Endpoint_AdditionalAddress_set_address(msg, sub);
   }
   return sub;
@@ -389,12 +388,12 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoin
 /* envoy.config.endpoint.v3.LbEndpoint */
 
 UPB_INLINE envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LbEndpoint_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy_config_endpoint_v3_LbEndpoint_msg_init, arena);
+  return (envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy__config__endpoint__v3__LbEndpoint_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LbEndpoint_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_LbEndpoint* ret = envoy_config_endpoint_v3_LbEndpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LbEndpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -404,7 +403,7 @@ UPB_INLINE envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LbEndpo
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_LbEndpoint* ret = envoy_config_endpoint_v3_LbEndpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LbEndpoint_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -412,13 +411,13 @@ UPB_INLINE envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_LbEndpo
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LbEndpoint_serialize(const envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LbEndpoint_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LbEndpoint_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LbEndpoint_serialize_ex(const envoy_config_endpoint_v3_LbEndpoint* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LbEndpoint_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LbEndpoint_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -509,7 +508,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint(envoy_config_en
 UPB_INLINE struct envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_LbEndpoint_mutable_endpoint(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) {
   struct envoy_config_endpoint_v3_Endpoint* sub = (struct envoy_config_endpoint_v3_Endpoint*)envoy_config_endpoint_v3_LbEndpoint_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_Endpoint*)_upb_Message_New(&envoy_config_endpoint_v3_Endpoint_msg_init, arena);
+    sub = (struct envoy_config_endpoint_v3_Endpoint*)_upb_Message_New(&envoy__config__endpoint__v3__Endpoint_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LbEndpoint_set_endpoint(msg, sub);
   }
   return sub;
@@ -525,7 +524,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_metadata(envoy_config_en
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LbEndpoint_mutable_metadata(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_endpoint_v3_LbEndpoint_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LbEndpoint_set_metadata(msg, sub);
   }
   return sub;
@@ -537,7 +536,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_load_balancing_weight(en
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LbEndpoint_mutable_load_balancing_weight(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LbEndpoint_load_balancing_weight(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LbEndpoint_set_load_balancing_weight(msg, sub);
   }
   return sub;
@@ -550,12 +549,12 @@ UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint_name(envoy_conf
 /* envoy.config.endpoint.v3.LedsClusterLocalityConfig */
 
 UPB_INLINE envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LedsClusterLocalityConfig_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_LedsClusterLocalityConfig*)_upb_Message_New(&envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, arena);
+  return (envoy_config_endpoint_v3_LedsClusterLocalityConfig*)_upb_Message_New(&envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LedsClusterLocalityConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_LedsClusterLocalityConfig* ret = envoy_config_endpoint_v3_LedsClusterLocalityConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -565,7 +564,7 @@ UPB_INLINE envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endp
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_LedsClusterLocalityConfig* ret = envoy_config_endpoint_v3_LedsClusterLocalityConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -573,13 +572,13 @@ UPB_INLINE envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endp
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LedsClusterLocalityConfig_serialize(const envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LedsClusterLocalityConfig_serialize_ex(const envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_clear_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg) {
@@ -616,7 +615,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_conf
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint_v3_LedsClusterLocalityConfig_mutable_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_endpoint_v3_LedsClusterLocalityConfig_leds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_config(msg, sub);
   }
   return sub;
@@ -629,12 +628,12 @@ UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_coll
 /* envoy.config.endpoint.v3.LocalityLbEndpoints */
 
 UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_endpoint_v3_LocalityLbEndpoints_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_LocalityLbEndpoints*)_upb_Message_New(&envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, arena);
+  return (envoy_config_endpoint_v3_LocalityLbEndpoints*)_upb_Message_New(&envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_endpoint_v3_LocalityLbEndpoints_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_LocalityLbEndpoints* ret = envoy_config_endpoint_v3_LocalityLbEndpoints_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -644,7 +643,7 @@ UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_endpoint_v
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_LocalityLbEndpoints* ret = envoy_config_endpoint_v3_LocalityLbEndpoints_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -652,13 +651,13 @@ UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_endpoint_v
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LocalityLbEndpoints_serialize(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LocalityLbEndpoints_serialize_ex(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -801,7 +800,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_locality(envoy_
 UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_locality(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_LocalityLbEndpoints_locality(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_locality(msg, sub);
   }
   return sub;
@@ -827,7 +826,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_LbEndpoint* sub = (struct envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy_config_endpoint_v3_LbEndpoint_msg_init, arena);
+  struct envoy_config_endpoint_v3_LbEndpoint* sub = (struct envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy__config__endpoint__v3__LbEndpoint_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -839,7 +838,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancing_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancing_weight(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancing_weight(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancing_weight(msg, sub);
   }
   return sub;
@@ -855,7 +854,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_proximity(envoy
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_proximity(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_proximity(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_proximity(msg, sub);
   }
   return sub;
@@ -867,7 +866,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancer_e
 UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) {
   struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancer_endpoints(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)_upb_Message_New(&envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, arena);
+    sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)_upb_Message_New(&envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancer_endpoints(msg, sub);
   }
   return sub;
@@ -879,7 +878,7 @@ UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_leds_cluster_lo
 UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) {
   struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* sub = (struct envoy_config_endpoint_v3_LedsClusterLocalityConfig*)envoy_config_endpoint_v3_LocalityLbEndpoints_leds_cluster_locality_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_LedsClusterLocalityConfig*)_upb_Message_New(&envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init, arena);
+    sub = (struct envoy_config_endpoint_v3_LedsClusterLocalityConfig*)_upb_Message_New(&envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_leds_cluster_locality_config(msg, sub);
   }
   return sub;
@@ -888,12 +887,12 @@ UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_conf
 /* envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList */
 
 UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)_upb_Message_New(&envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, arena);
+  return (envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)_upb_Message_New(&envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* ret = envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -903,7 +902,7 @@ UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_co
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* ret = envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -911,13 +910,13 @@ UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_co
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_serialize(const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_serialize_ex(const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_clear_lb_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* msg) {
@@ -979,14 +978,12 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_LbEndpoint* sub = (struct envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy_config_endpoint_v3_LbEndpoint_msg_init, arena);
+  struct envoy_config_endpoint_v3_LbEndpoint* sub = (struct envoy_config_endpoint_v3_LbEndpoint*)_upb_Message_New(&envoy__config__endpoint__v3__LbEndpoint_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
new file mode 100644
index 0000000000000..df959b8fa7289
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
@@ -0,0 +1,229 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/endpoint_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/endpoint/v3/endpoint_components.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = {
+  &envoy_config_endpoint_v3_Endpoint_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[4] = {
+  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init = {
+  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000000100001a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init = {
+  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0],
+  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = {
+  {.submsg = &envoy__config__endpoint__v3__Endpoint_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] = {
+  {1, UPB_SIZE(20, 16), UPB_SIZE(-17, -9), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 16), UPB_SIZE(-17, -9), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = {
+  &envoy_config_endpoint_v3_LbEndpoint_submsgs[0],
+  &envoy_config_endpoint_v3_LbEndpoint__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000080100000a, &upb_pom_1bt_max64b},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000002020022, &upb_psm_1bt_maxmaxb},
+    {0x001000080500002a, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init = {
+  &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0],
+  &envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[6] = {
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__LbEndpoint_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[7] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 40), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 48), UPB_SIZE(-25, -9), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 48), UPB_SIZE(-25, -9), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = {
+  &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0],
+  &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0],
+  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001800003f010012, &upb_prm_1bt_max64b},
+    {0x002000000202001a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x0028000003030032, &upb_psm_1bt_maxmaxb},
+    {0x003000080704003a, &upb_pom_1bt_max64b},
+    {0x0030000808050042, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = {
+  {.submsg = &envoy__config__endpoint__v3__LbEndpoint_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init = {
+  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0],
+  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__config__endpoint__v3__Endpoint_msg_init,
+  &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init,
+  &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init,
+  &envoy__config__endpoint__v3__LbEndpoint_msg_init,
+  &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init,
+  &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init,
+  &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
new file mode 100644
index 0000000000000..ae90403d70c1f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/endpoint_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_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__config__endpoint__v3__Endpoint_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init;
+
+extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h
rename to src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
index d4879ed647170..36d7d648d4a6c 100644
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/load_report.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/endpoint/v3/load_report.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -22,31 +32,22 @@ typedef struct envoy_config_endpoint_v3_UpstreamEndpointStats envoy_config_endpo
 typedef struct envoy_config_endpoint_v3_EndpointLoadMetricStats envoy_config_endpoint_v3_EndpointLoadMetricStats;
 typedef struct envoy_config_endpoint_v3_ClusterStats envoy_config_endpoint_v3_ClusterStats;
 typedef struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests envoy_config_endpoint_v3_ClusterStats_DroppedRequests;
-extern const upb_MiniTable envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterStats_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_Locality;
 struct google_protobuf_Duration;
 struct google_protobuf_Struct;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Locality_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
 
 
 
 /* envoy.config.endpoint.v3.UpstreamLocalityStats */
 
 UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_endpoint_v3_UpstreamLocalityStats_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_UpstreamLocalityStats*)_upb_Message_New(&envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, arena);
+  return (envoy_config_endpoint_v3_UpstreamLocalityStats*)_upb_Message_New(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_endpoint_v3_UpstreamLocalityStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_UpstreamLocalityStats* ret = envoy_config_endpoint_v3_UpstreamLocalityStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -56,7 +57,7 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_endpoint
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_UpstreamLocalityStats* ret = envoy_config_endpoint_v3_UpstreamLocalityStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -64,13 +65,13 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_endpoint
 }
 UPB_INLINE char* envoy_config_endpoint_v3_UpstreamLocalityStats_serialize(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_UpstreamLocalityStats_serialize_ex(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_locality(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) {
@@ -225,7 +226,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_locality(envo
 UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_UpstreamLocalityStats_locality(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_locality(msg, sub);
   }
   return sub;
@@ -263,7 +264,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_EndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, arena);
+  struct envoy_config_endpoint_v3_EndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -293,7 +294,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_UpstreamEndpointStats* sub = (struct envoy_config_endpoint_v3_UpstreamEndpointStats*)_upb_Message_New(&envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, arena);
+  struct envoy_config_endpoint_v3_UpstreamEndpointStats* sub = (struct envoy_config_endpoint_v3_UpstreamEndpointStats*)_upb_Message_New(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -306,12 +307,12 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_
 /* envoy.config.endpoint.v3.UpstreamEndpointStats */
 
 UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_endpoint_v3_UpstreamEndpointStats_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_UpstreamEndpointStats*)_upb_Message_New(&envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, arena);
+  return (envoy_config_endpoint_v3_UpstreamEndpointStats*)_upb_Message_New(&envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_endpoint_v3_UpstreamEndpointStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_UpstreamEndpointStats* ret = envoy_config_endpoint_v3_UpstreamEndpointStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -321,7 +322,7 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_endpoint
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_UpstreamEndpointStats* ret = envoy_config_endpoint_v3_UpstreamEndpointStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -329,13 +330,13 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_endpoint
 }
 UPB_INLINE char* envoy_config_endpoint_v3_UpstreamEndpointStats_serialize(const envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_UpstreamEndpointStats_serialize_ex(const envoy_config_endpoint_v3_UpstreamEndpointStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_clear_address(envoy_config_endpoint_v3_UpstreamEndpointStats* msg) {
@@ -457,7 +458,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_address(envoy
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_address(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_UpstreamEndpointStats_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_UpstreamEndpointStats_set_address(msg, sub);
   }
   return sub;
@@ -495,7 +496,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_EndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, arena);
+  struct envoy_config_endpoint_v3_EndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -507,7 +508,7 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_metadata(envo
 UPB_INLINE struct google_protobuf_Struct* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_metadata(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_endpoint_v3_UpstreamEndpointStats_metadata(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_UpstreamEndpointStats_set_metadata(msg, sub);
   }
   return sub;
@@ -520,12 +521,12 @@ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_issued_
 /* envoy.config.endpoint.v3.EndpointLoadMetricStats */
 
 UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoint_v3_EndpointLoadMetricStats_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, arena);
+  return (envoy_config_endpoint_v3_EndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoint_v3_EndpointLoadMetricStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_EndpointLoadMetricStats* ret = envoy_config_endpoint_v3_EndpointLoadMetricStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -535,7 +536,7 @@ UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoi
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_EndpointLoadMetricStats* ret = envoy_config_endpoint_v3_EndpointLoadMetricStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -543,13 +544,13 @@ UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config_endpoi
 }
 UPB_INLINE char* envoy_config_endpoint_v3_EndpointLoadMetricStats_serialize(const envoy_config_endpoint_v3_EndpointLoadMetricStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_EndpointLoadMetricStats_serialize_ex(const envoy_config_endpoint_v3_EndpointLoadMetricStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_clear_metric_name(envoy_config_endpoint_v3_EndpointLoadMetricStats* msg) {
@@ -602,12 +603,12 @@ UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_total_metri
 /* envoy.config.endpoint.v3.ClusterStats */
 
 UPB_INLINE envoy_config_endpoint_v3_ClusterStats* envoy_config_endpoint_v3_ClusterStats_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_ClusterStats*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterStats_msg_init, arena);
+  return (envoy_config_endpoint_v3_ClusterStats*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterStats_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_ClusterStats* envoy_config_endpoint_v3_ClusterStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterStats* ret = envoy_config_endpoint_v3_ClusterStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -617,7 +618,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats* envoy_config_endpoint_v3_Clust
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterStats* ret = envoy_config_endpoint_v3_ClusterStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -625,13 +626,13 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats* envoy_config_endpoint_v3_Clust
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterStats_serialize(const envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterStats_serialize_ex(const envoy_config_endpoint_v3_ClusterStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_clear_cluster_name(envoy_config_endpoint_v3_ClusterStats* msg) {
@@ -782,7 +783,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_UpstreamLocalityStats* sub = (struct envoy_config_endpoint_v3_UpstreamLocalityStats*)_upb_Message_New(&envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init, arena);
+  struct envoy_config_endpoint_v3_UpstreamLocalityStats* sub = (struct envoy_config_endpoint_v3_UpstreamLocalityStats*)_upb_Message_New(&envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -798,7 +799,7 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_load_report_interval(e
 UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterStats_mutable_load_report_interval(envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterStats_load_report_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_endpoint_v3_ClusterStats_set_load_report_interval(msg, sub);
   }
   return sub;
@@ -824,7 +825,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_c
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* sub = (struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, arena);
+  struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* sub = (struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -837,12 +838,12 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_service_name(e
 /* envoy.config.endpoint.v3.ClusterStats.DroppedRequests */
 
 UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_config_endpoint_v3_ClusterStats_DroppedRequests_new(upb_Arena* arena) {
-  return (envoy_config_endpoint_v3_ClusterStats_DroppedRequests*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, arena);
+  return (envoy_config_endpoint_v3_ClusterStats_DroppedRequests*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, arena);
 }
 UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_config_endpoint_v3_ClusterStats_DroppedRequests_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterStats_DroppedRequests* ret = envoy_config_endpoint_v3_ClusterStats_DroppedRequests_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -852,7 +853,7 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_config_e
                            int options, upb_Arena* arena) {
   envoy_config_endpoint_v3_ClusterStats_DroppedRequests* ret = envoy_config_endpoint_v3_ClusterStats_DroppedRequests_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -860,13 +861,13 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_config_e
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterStats_DroppedRequests_serialize(const envoy_config_endpoint_v3_ClusterStats_DroppedRequests* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_endpoint_v3_ClusterStats_DroppedRequests_serialize_ex(const envoy_config_endpoint_v3_ClusterStats_DroppedRequests* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_clear_category(envoy_config_endpoint_v3_ClusterStats_DroppedRequests* msg) {
@@ -901,8 +902,6 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_droppe
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
new file mode 100644
index 0000000000000..7f77ec521e40f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
@@ -0,0 +1,179 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/load_report.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/endpoint/v3/load_report.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[8] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(48, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = {
+  &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0],
+  &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x001800003f000018, &upb_psv8_1bt},
+    {0x002000003f000020, &upb_psv8_1bt},
+    {0x002800003f01002a, &upb_prm_1bt_max64b},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x003000003f02003a, &upb_prm_1bt_max128b},
+    {0x003800003f000040, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__fields[7] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init = {
+  &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0],
+  &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0],
+  UPB_SIZE(48, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x001800003f000018, &upb_psv8_1bt},
+    {0x002000003f000020, &upb_psv8_1bt},
+    {0x002800003f01002a, &upb_prm_1bt_max64b},
+    {0x0030000002020032, &upb_psm_1bt_maxmaxb},
+    {0x003800003f000038, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init = {
+  NULL,
+  &envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x001800003f000019, &upb_psf8_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterStats_submsgs[3] = {
+  {.submsg = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = {
+  &envoy_config_endpoint_v3_ClusterStats_submsgs[0],
+  &envoy_config_endpoint_v3_ClusterStats__fields[0],
+  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000003f000018, &upb_psv8_1bt},
+    {0x0028000001010022, &upb_psm_1bt_maxmaxb},
+    {0x003000003f02002a, &upb_prm_1bt_max64b},
+    {0x003800003f000032, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init = {
+  NULL,
+  &envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init,
+  &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init,
+  &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init,
+  &envoy__config__endpoint__v3__ClusterStats_msg_init,
+  &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
new file mode 100644
index 0000000000000..2bfb250c74d6f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/endpoint/v3/load_report.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_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__config__endpoint__v3__UpstreamLocalityStats_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init;
+extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init;
+
+extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
similarity index 82%
rename from src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h
rename to src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
index 8678805365a2a..7af9d953e406c 100644
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/api_listener.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/listener/v3/api_listener.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +24,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_listener_v3_ApiListener envoy_config_listener_v3_ApiListener;
-extern const upb_MiniTable envoy_config_listener_v3_ApiListener_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
 
 
 
 /* envoy.config.listener.v3.ApiListener */
 
 UPB_INLINE envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_ApiListener_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ApiListener*)_upb_Message_New(&envoy_config_listener_v3_ApiListener_msg_init, arena);
+  return (envoy_config_listener_v3_ApiListener*)_upb_Message_New(&envoy__config__listener__v3__ApiListener_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_ApiListener_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ApiListener* ret = envoy_config_listener_v3_ApiListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ApiListener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_ApiLis
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ApiListener* ret = envoy_config_listener_v3_ApiListener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ApiListener_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_ApiLis
 }
 UPB_INLINE char* envoy_config_listener_v3_ApiListener_serialize(const envoy_config_listener_v3_ApiListener* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ApiListener_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ApiListener_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ApiListener_serialize_ex(const envoy_config_listener_v3_ApiListener* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ApiListener_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ApiListener_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_ApiListener_clear_api_listener(envoy_config_listener_v3_ApiListener* msg) {
@@ -82,14 +86,12 @@ UPB_INLINE void envoy_config_listener_v3_ApiListener_set_api_listener(envoy_conf
 UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_mutable_api_listener(envoy_config_listener_v3_ApiListener* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ApiListener_api_listener(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_listener_v3_ApiListener_set_api_listener(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
new file mode 100644
index 0000000000000..ec25b97d617c8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/api_listener.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/listener/v3/api_listener.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_listener_v3_ApiListener_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = {
+  &envoy_config_listener_v3_ApiListener_submsgs[0],
+  &envoy_config_listener_v3_ApiListener__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__listener__v3__ApiListener_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_listener_v3_api_listener_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/config/listener/v3/api_listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
new file mode 100644
index 0000000000000..f7ca2d1fb42de
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/api_listener.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_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__config__listener__v3__ApiListener_msg_init;
+
+extern const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h
rename to src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
index 3aecb3f21074d..9efa6b3f74d9f 100644
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener.proto
  *
@@ -10,7 +9,29 @@
 #define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "envoy/config/listener/v3/api_listener.upb_minitable.h"
+#include "envoy/config/listener/v3/listener_components.upb_minitable.h"
+#include "envoy/config/listener/v3/udp_listener_config.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -27,16 +48,6 @@ typedef struct envoy_config_listener_v3_Listener_InternalListenerConfig envoy_co
 typedef struct envoy_config_listener_v3_ListenerManager envoy_config_listener_v3_ListenerManager;
 typedef struct envoy_config_listener_v3_ValidationListenerManager envoy_config_listener_v3_ValidationListenerManager;
 typedef struct envoy_config_listener_v3_ApiListenerManager envoy_config_listener_v3_ApiListenerManager;
-extern const upb_MiniTable envoy_config_listener_v3_AdditionalAddress_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerCollection_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_DeprecatedV1_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerManager_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ValidationListenerManager_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ApiListenerManager_msg_init;
 struct envoy_config_accesslog_v3_AccessLog;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_Metadata;
@@ -52,21 +63,6 @@ struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
 struct xds_core_v3_CollectionEntry;
 struct xds_type_matcher_v3_Matcher;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOptionsOverride_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ApiListener_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_FilterChain_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerFilter_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_UdpListenerConfig_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable xds_core_v3_CollectionEntry_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_msg_init;
 
 typedef enum {
   envoy_config_listener_v3_Listener_DEFAULT = 0,
@@ -78,12 +74,12 @@ typedef enum {
 /* envoy.config.listener.v3.AdditionalAddress */
 
 UPB_INLINE envoy_config_listener_v3_AdditionalAddress* envoy_config_listener_v3_AdditionalAddress_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_AdditionalAddress*)_upb_Message_New(&envoy_config_listener_v3_AdditionalAddress_msg_init, arena);
+  return (envoy_config_listener_v3_AdditionalAddress*)_upb_Message_New(&envoy__config__listener__v3__AdditionalAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_AdditionalAddress* envoy_config_listener_v3_AdditionalAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_AdditionalAddress* ret = envoy_config_listener_v3_AdditionalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_AdditionalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__AdditionalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -93,7 +89,7 @@ UPB_INLINE envoy_config_listener_v3_AdditionalAddress* envoy_config_listener_v3_
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_AdditionalAddress* ret = envoy_config_listener_v3_AdditionalAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_AdditionalAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__AdditionalAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -101,13 +97,13 @@ UPB_INLINE envoy_config_listener_v3_AdditionalAddress* envoy_config_listener_v3_
 }
 UPB_INLINE char* envoy_config_listener_v3_AdditionalAddress_serialize(const envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_AdditionalAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__AdditionalAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_AdditionalAddress_serialize_ex(const envoy_config_listener_v3_AdditionalAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_AdditionalAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__AdditionalAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_clear_address(envoy_config_listener_v3_AdditionalAddress* msg) {
@@ -148,7 +144,7 @@ UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_address(envoy_con
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_AdditionalAddress_mutable_address(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_AdditionalAddress_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_listener_v3_AdditionalAddress_set_address(msg, sub);
   }
   return sub;
@@ -160,7 +156,7 @@ UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_socket_options(en
 UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_listener_v3_AdditionalAddress_mutable_socket_options(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_listener_v3_AdditionalAddress_socket_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy_config_core_v3_SocketOptionsOverride_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy__config__core__v3__SocketOptionsOverride_msg_init, arena);
     if (sub) envoy_config_listener_v3_AdditionalAddress_set_socket_options(msg, sub);
   }
   return sub;
@@ -169,12 +165,12 @@ UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_liste
 /* envoy.config.listener.v3.ListenerCollection */
 
 UPB_INLINE envoy_config_listener_v3_ListenerCollection* envoy_config_listener_v3_ListenerCollection_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ListenerCollection*)_upb_Message_New(&envoy_config_listener_v3_ListenerCollection_msg_init, arena);
+  return (envoy_config_listener_v3_ListenerCollection*)_upb_Message_New(&envoy__config__listener__v3__ListenerCollection_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ListenerCollection* envoy_config_listener_v3_ListenerCollection_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerCollection* ret = envoy_config_listener_v3_ListenerCollection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerCollection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -184,7 +180,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerCollection* envoy_config_listener_v3
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerCollection* ret = envoy_config_listener_v3_ListenerCollection_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerCollection_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -192,13 +188,13 @@ UPB_INLINE envoy_config_listener_v3_ListenerCollection* envoy_config_listener_v3
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerCollection_serialize(const envoy_config_listener_v3_ListenerCollection* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerCollection_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerCollection_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerCollection_serialize_ex(const envoy_config_listener_v3_ListenerCollection* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerCollection_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerCollection_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_ListenerCollection_clear_entries(envoy_config_listener_v3_ListenerCollection* msg) {
@@ -260,7 +256,7 @@ UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_listener_v3_Listener
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)_upb_Message_New(&xds_core_v3_CollectionEntry_msg_init, arena);
+  struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)_upb_Message_New(&xds__core__v3__CollectionEntry_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -269,12 +265,12 @@ UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_listener_v3_Listener
 /* envoy.config.listener.v3.Listener */
 
 UPB_INLINE envoy_config_listener_v3_Listener* envoy_config_listener_v3_Listener_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Listener*)_upb_Message_New(&envoy_config_listener_v3_Listener_msg_init, arena);
+  return (envoy_config_listener_v3_Listener*)_upb_Message_New(&envoy__config__listener__v3__Listener_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Listener* envoy_config_listener_v3_Listener_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Listener* ret = envoy_config_listener_v3_Listener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -284,7 +280,7 @@ UPB_INLINE envoy_config_listener_v3_Listener* envoy_config_listener_v3_Listener_
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Listener* ret = envoy_config_listener_v3_Listener_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -292,13 +288,13 @@ UPB_INLINE envoy_config_listener_v3_Listener* envoy_config_listener_v3_Listener_
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_serialize(const envoy_config_listener_v3_Listener* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_serialize_ex(const envoy_config_listener_v3_Listener* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -879,7 +875,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_address(envoy_config_liste
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listener_mutable_address(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_Listener_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_address(msg, sub);
   }
   return sub;
@@ -905,7 +901,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy_config_listener_v3_FilterChain_msg_init, arena);
+  struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy__config__listener__v3__FilterChain_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -917,7 +913,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_use_original_dst(envoy_con
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_use_original_dst(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_use_original_dst(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_use_original_dst(msg, sub);
   }
   return sub;
@@ -929,7 +925,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_per_connection_buffer_limi
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_per_connection_buffer_limit_bytes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_per_connection_buffer_limit_bytes(msg, sub);
   }
   return sub;
@@ -941,7 +937,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_metadata(envoy_config_list
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listener_mutable_metadata(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_Listener_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_metadata(msg, sub);
   }
   return sub;
@@ -953,7 +949,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_deprecated_v1(envoy_config
 UPB_INLINE struct envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_mutable_deprecated_v1(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_Listener_DeprecatedV1* sub = (struct envoy_config_listener_v3_Listener_DeprecatedV1*)envoy_config_listener_v3_Listener_deprecated_v1(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_Listener_DeprecatedV1*)_upb_Message_New(&envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_Listener_DeprecatedV1*)_upb_Message_New(&envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_deprecated_v1(msg, sub);
   }
   return sub;
@@ -983,7 +979,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilter* envoy_config_listener
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_ListenerFilter* sub = (struct envoy_config_listener_v3_ListenerFilter*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilter_msg_init, arena);
+  struct envoy_config_listener_v3_ListenerFilter* sub = (struct envoy_config_listener_v3_ListenerFilter*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -995,7 +991,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_transparent(envoy_config_l
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_transparent(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_transparent(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_transparent(msg, sub);
   }
   return sub;
@@ -1007,7 +1003,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_freebind(envoy_config_list
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_freebind(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_freebind(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_freebind(msg, sub);
   }
   return sub;
@@ -1019,7 +1015,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_fast_open_queue_length
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_fast_open_queue_length(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_fast_open_queue_length(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_tcp_fast_open_queue_length(msg, sub);
   }
   return sub;
@@ -1045,7 +1041,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_listener_v3_Li
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1057,7 +1053,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_listener_filters_timeout(e
 UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_Listener_mutable_listener_filters_timeout(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_Listener_listener_filters_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_listener_filters_timeout(msg, sub);
   }
   return sub;
@@ -1077,7 +1073,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_udp_listener_config(envoy_
 UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_Listener_mutable_udp_listener_config(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_UdpListenerConfig* sub = (struct envoy_config_listener_v3_UdpListenerConfig*)envoy_config_listener_v3_Listener_udp_listener_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_UdpListenerConfig*)_upb_Message_New(&envoy_config_listener_v3_UdpListenerConfig_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_UdpListenerConfig*)_upb_Message_New(&envoy__config__listener__v3__UdpListenerConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_udp_listener_config(msg, sub);
   }
   return sub;
@@ -1089,7 +1085,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_api_listener(envoy_config_
 UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_Listener_mutable_api_listener(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_ApiListener* sub = (struct envoy_config_listener_v3_ApiListener*)envoy_config_listener_v3_Listener_api_listener(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_ApiListener*)_upb_Message_New(&envoy_config_listener_v3_ApiListener_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_ApiListener*)_upb_Message_New(&envoy__config__listener__v3__ApiListener_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_api_listener(msg, sub);
   }
   return sub;
@@ -1101,7 +1097,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_connection_balance_config(
 UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_mutable_connection_balance_config(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)envoy_config_listener_v3_Listener_connection_balance_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)_upb_Message_New(&envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)_upb_Message_New(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_connection_balance_config(msg, sub);
   }
   return sub;
@@ -1131,7 +1127,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_listener_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1143,7 +1139,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_backlog_size(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_backlog_size(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_backlog_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_tcp_backlog_size(msg, sub);
   }
   return sub;
@@ -1155,7 +1151,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_default_filter_chain(envoy
 UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_mutable_default_filter_chain(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)envoy_config_listener_v3_Listener_default_filter_chain(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy_config_listener_v3_FilterChain_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy__config__listener__v3__FilterChain_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_default_filter_chain(msg, sub);
   }
   return sub;
@@ -1167,7 +1163,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_bind_to_port(envoy_config_
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_bind_to_port(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_bind_to_port(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_bind_to_port(msg, sub);
   }
   return sub;
@@ -1179,7 +1175,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_internal_listener(envoy_co
 UPB_INLINE struct envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_mutable_internal_listener(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_Listener_InternalListenerConfig* sub = (struct envoy_config_listener_v3_Listener_InternalListenerConfig*)envoy_config_listener_v3_Listener_internal_listener(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_Listener_InternalListenerConfig*)_upb_Message_New(&envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_Listener_InternalListenerConfig*)_upb_Message_New(&envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_internal_listener(msg, sub);
   }
   return sub;
@@ -1195,7 +1191,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_enable_reuse_port(envoy_co
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_enable_reuse_port(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_enable_reuse_port(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_enable_reuse_port(msg, sub);
   }
   return sub;
@@ -1215,7 +1211,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_filter_chain_matcher(envoy
 UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_listener_v3_Listener_mutable_filter_chain_matcher(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_listener_v3_Listener_filter_chain_matcher(msg);
   if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
+    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_filter_chain_matcher(msg, sub);
   }
   return sub;
@@ -1241,7 +1237,7 @@ UPB_INLINE struct envoy_config_listener_v3_AdditionalAddress* envoy_config_liste
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_AdditionalAddress* sub = (struct envoy_config_listener_v3_AdditionalAddress*)_upb_Message_New(&envoy_config_listener_v3_AdditionalAddress_msg_init, arena);
+  struct envoy_config_listener_v3_AdditionalAddress* sub = (struct envoy_config_listener_v3_AdditionalAddress*)_upb_Message_New(&envoy__config__listener__v3__AdditionalAddress_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1253,7 +1249,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_max_connections_to_accept_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_max_connections_to_accept_per_socket_event(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_max_connections_to_accept_per_socket_event(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_set_max_connections_to_accept_per_socket_event(msg, sub);
   }
   return sub;
@@ -1262,12 +1258,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener
 /* envoy.config.listener.v3.Listener.DeprecatedV1 */
 
 UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_DeprecatedV1_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Listener_DeprecatedV1*)_upb_Message_New(&envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, arena);
+  return (envoy_config_listener_v3_Listener_DeprecatedV1*)_upb_Message_New(&envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_DeprecatedV1_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_DeprecatedV1* ret = envoy_config_listener_v3_Listener_DeprecatedV1_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1277,7 +1273,7 @@ UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_DeprecatedV1* ret = envoy_config_listener_v3_Listener_DeprecatedV1_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1285,13 +1281,13 @@ UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_DeprecatedV1_serialize(const envoy_config_listener_v3_Listener_DeprecatedV1* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_DeprecatedV1_serialize_ex(const envoy_config_listener_v3_Listener_DeprecatedV1* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_Listener_DeprecatedV1_clear_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1* msg) {
@@ -1317,7 +1313,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_DeprecatedV1_set_bind_to_port(
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_DeprecatedV1_mutable_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_DeprecatedV1_bind_to_port(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_DeprecatedV1_set_bind_to_port(msg, sub);
   }
   return sub;
@@ -1326,12 +1322,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_D
 /* envoy.config.listener.v3.Listener.ConnectionBalanceConfig */
 
 UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)_upb_Message_New(&envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, arena);
+  return (envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)_upb_Message_New(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_ConnectionBalanceConfig* ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1341,7 +1337,7 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_conf
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_ConnectionBalanceConfig* ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1349,13 +1345,13 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_conf
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_serialize(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_serialize_ex(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1405,7 +1401,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_ex
 UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_exact_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_exact_balance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)_upb_Message_New(&envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)_upb_Message_New(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_exact_balance(msg, sub);
   }
   return sub;
@@ -1417,7 +1413,7 @@ UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_ex
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_extend_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_extend_balance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_extend_balance(msg, sub);
   }
   return sub;
@@ -1426,12 +1422,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen
 /* envoy.config.listener.v3.Listener.ConnectionBalanceConfig.ExactBalance */
 
 UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)_upb_Message_New(&envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, arena);
+  return (envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)_upb_Message_New(&envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1441,7 +1437,7 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalanc
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1449,13 +1445,13 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalanc
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_serialize(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_serialize_ex(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1463,12 +1459,12 @@ UPB_INLINE char* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_Exact
 /* envoy.config.listener.v3.Listener.InternalListenerConfig */
 
 UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_InternalListenerConfig_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Listener_InternalListenerConfig*)_upb_Message_New(&envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, arena);
+  return (envoy_config_listener_v3_Listener_InternalListenerConfig*)_upb_Message_New(&envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_InternalListenerConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_InternalListenerConfig* ret = envoy_config_listener_v3_Listener_InternalListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1478,7 +1474,7 @@ UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_confi
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Listener_InternalListenerConfig* ret = envoy_config_listener_v3_Listener_InternalListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1486,13 +1482,13 @@ UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_confi
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_InternalListenerConfig_serialize(const envoy_config_listener_v3_Listener_InternalListenerConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Listener_InternalListenerConfig_serialize_ex(const envoy_config_listener_v3_Listener_InternalListenerConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1500,12 +1496,12 @@ UPB_INLINE char* envoy_config_listener_v3_Listener_InternalListenerConfig_serial
 /* envoy.config.listener.v3.ListenerManager */
 
 UPB_INLINE envoy_config_listener_v3_ListenerManager* envoy_config_listener_v3_ListenerManager_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ListenerManager*)_upb_Message_New(&envoy_config_listener_v3_ListenerManager_msg_init, arena);
+  return (envoy_config_listener_v3_ListenerManager*)_upb_Message_New(&envoy__config__listener__v3__ListenerManager_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ListenerManager* envoy_config_listener_v3_ListenerManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerManager* ret = envoy_config_listener_v3_ListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1515,7 +1511,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerManager* envoy_config_listener_v3_Li
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerManager* ret = envoy_config_listener_v3_ListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1523,13 +1519,13 @@ UPB_INLINE envoy_config_listener_v3_ListenerManager* envoy_config_listener_v3_Li
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerManager_serialize(const envoy_config_listener_v3_ListenerManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerManager_serialize_ex(const envoy_config_listener_v3_ListenerManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1537,12 +1533,12 @@ UPB_INLINE char* envoy_config_listener_v3_ListenerManager_serialize_ex(const env
 /* envoy.config.listener.v3.ValidationListenerManager */
 
 UPB_INLINE envoy_config_listener_v3_ValidationListenerManager* envoy_config_listener_v3_ValidationListenerManager_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ValidationListenerManager*)_upb_Message_New(&envoy_config_listener_v3_ValidationListenerManager_msg_init, arena);
+  return (envoy_config_listener_v3_ValidationListenerManager*)_upb_Message_New(&envoy__config__listener__v3__ValidationListenerManager_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ValidationListenerManager* envoy_config_listener_v3_ValidationListenerManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ValidationListenerManager* ret = envoy_config_listener_v3_ValidationListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ValidationListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ValidationListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1552,7 +1548,7 @@ UPB_INLINE envoy_config_listener_v3_ValidationListenerManager* envoy_config_list
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ValidationListenerManager* ret = envoy_config_listener_v3_ValidationListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ValidationListenerManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ValidationListenerManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1560,13 +1556,13 @@ UPB_INLINE envoy_config_listener_v3_ValidationListenerManager* envoy_config_list
 }
 UPB_INLINE char* envoy_config_listener_v3_ValidationListenerManager_serialize(const envoy_config_listener_v3_ValidationListenerManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ValidationListenerManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ValidationListenerManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ValidationListenerManager_serialize_ex(const envoy_config_listener_v3_ValidationListenerManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ValidationListenerManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ValidationListenerManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1574,12 +1570,12 @@ UPB_INLINE char* envoy_config_listener_v3_ValidationListenerManager_serialize_ex
 /* envoy.config.listener.v3.ApiListenerManager */
 
 UPB_INLINE envoy_config_listener_v3_ApiListenerManager* envoy_config_listener_v3_ApiListenerManager_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ApiListenerManager*)_upb_Message_New(&envoy_config_listener_v3_ApiListenerManager_msg_init, arena);
+  return (envoy_config_listener_v3_ApiListenerManager*)_upb_Message_New(&envoy__config__listener__v3__ApiListenerManager_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ApiListenerManager* envoy_config_listener_v3_ApiListenerManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ApiListenerManager* ret = envoy_config_listener_v3_ApiListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ApiListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ApiListenerManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1589,7 +1585,7 @@ UPB_INLINE envoy_config_listener_v3_ApiListenerManager* envoy_config_listener_v3
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ApiListenerManager* ret = envoy_config_listener_v3_ApiListenerManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ApiListenerManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ApiListenerManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1597,19 +1593,17 @@ UPB_INLINE envoy_config_listener_v3_ApiListenerManager* envoy_config_listener_v3
 }
 UPB_INLINE char* envoy_config_listener_v3_ApiListenerManager_serialize(const envoy_config_listener_v3_ApiListenerManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ApiListenerManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ApiListenerManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ApiListenerManager_serialize_ex(const envoy_config_listener_v3_ApiListenerManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ApiListenerManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ApiListenerManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
 
-extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
new file mode 100644
index 0000000000000..26374127350da
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
@@ -0,0 +1,268 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/listener.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "envoy/config/listener/v3/api_listener.upb_minitable.h"
+#include "envoy/config/listener/v3/listener_components.upb_minitable.h"
+#include "envoy/config/listener/v3/udp_listener_config.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_listener_v3_AdditionalAddress_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOptionsOverride_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = {
+  &envoy_config_listener_v3_AdditionalAddress_submsgs[0],
+  &envoy_config_listener_v3_AdditionalAddress__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_ListenerCollection_submsgs[1] = {
+  {.submsg = &xds__core__v3__CollectionEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = {
+  &envoy_config_listener_v3_ListenerCollection_submsgs[0],
+  &envoy_config_listener_v3_ListenerCollection__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_Listener_submsgs[24] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__listener__v3__FilterChain_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init},
+  {.submsg = &envoy__config__listener__v3__ListenerFilter_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__listener__v3__UdpListenerConfig_msg_init},
+  {.submsg = &envoy__config__listener__v3__ApiListener_msg_init},
+  {.submsg = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLog_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__listener__v3__FilterChain_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher_msg_init},
+  {.submsg = &envoy__config__listener__v3__AdditionalAddress_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = {
+  {1, UPB_SIZE(124, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 56), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 64), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 72), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 80), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 88), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 96), 6, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(40, 104), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(44, 112), 8, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(48, 120), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(52, 128), 9, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(56, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(64, 136), 10, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(68, 144), 11, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(72, 152), 12, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(76, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(80, 160), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(84, 168), 13, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(88, 176), 14, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(92, 184), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(120, 240), UPB_SIZE(-97, -17), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(132, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {29, UPB_SIZE(100, 208), 16, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(104, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(105, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(108, 216), 17, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(112, 224), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(116, 232), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = {
+  &envoy_config_listener_v3_Listener_submsgs[0],
+  &envoy_config_listener_v3_Listener__fields[0],
+  UPB_SIZE(144, 248), 32, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0028000001000012, &upb_psm_1bt_maxmaxb},
+    {0x003000003f01001a, &upb_prm_1bt_maxmaxb},
+    {0x0038000002020022, &upb_psm_1bt_maxmaxb},
+    {0x004000000303002a, &upb_psm_1bt_maxmaxb},
+    {0x0048000004040032, &upb_psm_1bt_maxmaxb},
+    {0x005000000505003a, &upb_psm_1bt_max64b},
+    {0x000400003f000040, &upb_psv4_1bt},
+    {0x005800003f06004a, &upb_prm_1bt_maxmaxb},
+    {0x0060000006070052, &upb_psm_1bt_maxmaxb},
+    {0x006800000708005a, &upb_psm_1bt_maxmaxb},
+    {0x0070000008090062, &upb_psm_1bt_maxmaxb},
+    {0x007800003f0a006a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00800000090b007a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000180, &upb_psv4_2bt},
+    {0x000c00003f000188, &upb_psb1_2bt},
+    {0x008800000a0c0192, &upb_psm_2bt_maxmaxb},
+    {0x009000000b0d019a, &upb_psm_2bt_maxmaxb},
+    {0x009800000c0e01a2, &upb_psm_2bt_max64b},
+    {0x000d00003f0001a8, &upb_psb1_2bt},
+    {0x00a000003f0f01b2, &upb_prm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00a800000d1001c2, &upb_psm_2bt_maxmaxb},
+    {0x00b000000e1101ca, &upb_psm_2bt_maxmaxb},
+    {0x00b800000f1201d2, &upb_psm_2bt_maxmaxb},
+    {0x00f000101b1301da, &upb_pom_2bt_max64b},
+    {0x00c000003f0001e2, &upb_pss_2bt},
+    {0x00d00000101401ea, &upb_psm_2bt_maxmaxb},
+    {0x001400003f0001f0, &upb_psb1_2bt},
+    {0x001500003f0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init = {
+  &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0],
+  &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = {
+  {.submsg = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init = {
+  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0],
+  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[10] = {
+  &envoy__config__listener__v3__AdditionalAddress_msg_init,
+  &envoy__config__listener__v3__ListenerCollection_msg_init,
+  &envoy__config__listener__v3__Listener_msg_init,
+  &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init,
+  &envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init,
+  &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init,
+  &envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init,
+  &envoy__config__listener__v3__ListenerManager_msg_init,
+  &envoy__config__listener__v3__ValidationListenerManager_msg_init,
+  &envoy__config__listener__v3__ApiListenerManager_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  10,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
new file mode 100644
index 0000000000000..116916f808790
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/listener.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_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__config__listener__v3__AdditionalAddress_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__Listener_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init;
+
+extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h
rename to src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
index 0bcdb1fa2d68d..f2f908316e092 100644
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener_components.proto
  *
@@ -10,7 +9,22 @@
 #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/listener/v3/listener_components.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -24,13 +38,6 @@ typedef struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration envoy_
 typedef struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate envoy_config_listener_v3_ListenerFilterChainMatchPredicate;
 typedef struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet;
 typedef struct envoy_config_listener_v3_ListenerFilter envoy_config_listener_v3_ListenerFilter;
-extern const upb_MiniTable envoy_config_listener_v3_Filter_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_FilterChainMatch_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_FilterChain_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ListenerFilter_msg_init;
 struct envoy_config_core_v3_CidrRange;
 struct envoy_config_core_v3_ExtensionConfigSource;
 struct envoy_config_core_v3_Metadata;
@@ -40,15 +47,6 @@ struct google_protobuf_Any;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init;
-extern const upb_MiniTable envoy_type_v3_Int32Range_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 typedef enum {
   envoy_config_listener_v3_FilterChainMatch_ANY = 0,
@@ -61,12 +59,12 @@ typedef enum {
 /* envoy.config.listener.v3.Filter */
 
 UPB_INLINE envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filter_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_Filter*)_upb_Message_New(&envoy_config_listener_v3_Filter_msg_init, arena);
+  return (envoy_config_listener_v3_Filter*)_upb_Message_New(&envoy__config__listener__v3__Filter_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_Filter* ret = envoy_config_listener_v3_Filter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -76,7 +74,7 @@ UPB_INLINE envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filter_pars
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_Filter* ret = envoy_config_listener_v3_Filter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_Filter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__Filter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -84,13 +82,13 @@ UPB_INLINE envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filter_pars
 }
 UPB_INLINE char* envoy_config_listener_v3_Filter_serialize(const envoy_config_listener_v3_Filter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Filter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Filter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_Filter_serialize_ex(const envoy_config_listener_v3_Filter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_Filter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__Filter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -155,7 +153,7 @@ UPB_INLINE void envoy_config_listener_v3_Filter_set_typed_config(envoy_config_li
 UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_typed_config(envoy_config_listener_v3_Filter* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_Filter_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_listener_v3_Filter_set_typed_config(msg, sub);
   }
   return sub;
@@ -167,7 +165,7 @@ UPB_INLINE void envoy_config_listener_v3_Filter_set_config_discovery(envoy_confi
 UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_Filter_mutable_config_discovery(envoy_config_listener_v3_Filter* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_Filter_config_discovery(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy_config_core_v3_ExtensionConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy__config__core__v3__ExtensionConfigSource_msg_init, arena);
     if (sub) envoy_config_listener_v3_Filter_set_config_discovery(msg, sub);
   }
   return sub;
@@ -176,12 +174,12 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_liste
 /* envoy.config.listener.v3.FilterChainMatch */
 
 UPB_INLINE envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChainMatch_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_FilterChainMatch*)_upb_Message_New(&envoy_config_listener_v3_FilterChainMatch_msg_init, arena);
+  return (envoy_config_listener_v3_FilterChainMatch*)_upb_Message_New(&envoy__config__listener__v3__FilterChainMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChainMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChainMatch* ret = envoy_config_listener_v3_FilterChainMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChainMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -191,7 +189,7 @@ UPB_INLINE envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_F
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChainMatch* ret = envoy_config_listener_v3_FilterChainMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChainMatch_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -199,13 +197,13 @@ UPB_INLINE envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_F
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChainMatch_serialize(const envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChainMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChainMatch_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChainMatch_serialize_ex(const envoy_config_listener_v3_FilterChainMatch* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChainMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChainMatch_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_clear_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg) {
@@ -515,7 +513,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -531,7 +529,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_suffix_len(envoy_c
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_suffix_len(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_suffix_len(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChainMatch_set_suffix_len(msg, sub);
   }
   return sub;
@@ -557,7 +555,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -593,7 +591,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_destination_port(e
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_destination_port(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_destination_port(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChainMatch_set_destination_port(msg, sub);
   }
   return sub;
@@ -675,7 +673,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -684,12 +682,12 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte
 /* envoy.config.listener.v3.FilterChain */
 
 UPB_INLINE envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_FilterChain_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy_config_listener_v3_FilterChain_msg_init, arena);
+  return (envoy_config_listener_v3_FilterChain*)_upb_Message_New(&envoy__config__listener__v3__FilterChain_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_FilterChain_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChain* ret = envoy_config_listener_v3_FilterChain_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChain_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -699,7 +697,7 @@ UPB_INLINE envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Filter
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChain* ret = envoy_config_listener_v3_FilterChain_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChain_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -707,13 +705,13 @@ UPB_INLINE envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Filter
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChain_serialize(const envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChain_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChain_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChain_serialize_ex(const envoy_config_listener_v3_FilterChain* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChain_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChain_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_FilterChain_clear_filter_chain_match(envoy_config_listener_v3_FilterChain* msg) {
@@ -862,7 +860,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_filter_chain_match(envo
 UPB_INLINE struct envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChain_mutable_filter_chain_match(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_FilterChainMatch* sub = (struct envoy_config_listener_v3_FilterChainMatch*)envoy_config_listener_v3_FilterChain_filter_chain_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_FilterChainMatch*)_upb_Message_New(&envoy_config_listener_v3_FilterChainMatch_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_FilterChainMatch*)_upb_Message_New(&envoy__config__listener__v3__FilterChainMatch_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_filter_chain_match(msg, sub);
   }
   return sub;
@@ -888,7 +886,7 @@ UPB_INLINE struct envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filt
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_Filter* sub = (struct envoy_config_listener_v3_Filter*)_upb_Message_New(&envoy_config_listener_v3_Filter_msg_init, arena);
+  struct envoy_config_listener_v3_Filter* sub = (struct envoy_config_listener_v3_Filter*)_upb_Message_New(&envoy__config__listener__v3__Filter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -900,7 +898,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_use_proxy_proto(envoy_c
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChain_mutable_use_proxy_proto(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_FilterChain_use_proxy_proto(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_use_proxy_proto(msg, sub);
   }
   return sub;
@@ -912,7 +910,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_metadata(envoy_config_l
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_FilterChain_mutable_metadata(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_FilterChain_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_metadata(msg, sub);
   }
   return sub;
@@ -924,7 +922,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket(envoy_
 UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_listener_v3_FilterChain_mutable_transport_socket(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_listener_v3_FilterChain_transport_socket(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy_config_core_v3_TransportSocket_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy__config__core__v3__TransportSocket_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_transport_socket(msg, sub);
   }
   return sub;
@@ -940,7 +938,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_on_demand_configuration
 UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_mutable_on_demand_configuration(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* sub = (struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)envoy_config_listener_v3_FilterChain_on_demand_configuration(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)_upb_Message_New(&envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)_upb_Message_New(&envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_on_demand_configuration(msg, sub);
   }
   return sub;
@@ -952,7 +950,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket_connec
 UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_mutable_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_transport_socket_connect_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_set_transport_socket_connect_timeout(msg, sub);
   }
   return sub;
@@ -961,12 +959,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain
 /* envoy.config.listener.v3.FilterChain.OnDemandConfiguration */
 
 UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)_upb_Message_New(&envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, arena);
+  return (envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)_upb_Message_New(&envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChain_OnDemandConfiguration* ret = envoy_config_listener_v3_FilterChain_OnDemandConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -976,7 +974,7 @@ UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_con
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_FilterChain_OnDemandConfiguration* ret = envoy_config_listener_v3_FilterChain_OnDemandConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -984,13 +982,13 @@ UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_con
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_serialize(const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_serialize_ex(const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_FilterChain_OnDemandConfiguration_clear_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg) {
@@ -1016,7 +1014,7 @@ UPB_INLINE void envoy_config_listener_v3_FilterChain_OnDemandConfiguration_set_r
 UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_mutable_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_OnDemandConfiguration_rebuild_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_listener_v3_FilterChain_OnDemandConfiguration_set_rebuild_timeout(msg, sub);
   }
   return sub;
@@ -1025,12 +1023,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain
 /* envoy.config.listener.v3.ListenerFilterChainMatchPredicate */
 
 UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, arena);
+  return (envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilterChainMatchPredicate* ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1040,7 +1038,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_con
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilterChainMatchPredicate* ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1048,13 +1046,13 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_con
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_serialize(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_serialize_ex(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1152,7 +1150,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_o
 UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_or_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_or_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_or_match(msg, sub);
   }
   return sub;
@@ -1164,7 +1162,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_a
 UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_and_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_and_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_and_match(msg, sub);
   }
   return sub;
@@ -1176,7 +1174,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_n
 UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_not_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_not_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_not_match(msg, sub);
   }
   return sub;
@@ -1192,7 +1190,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_d
 UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_destination_port_range(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) {
   struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_destination_port_range(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Int32Range*)_upb_Message_New(&envoy_type_v3_Int32Range_msg_init, arena);
+    sub = (struct envoy_type_v3_Int32Range*)_upb_Message_New(&envoy__type__v3__Int32Range_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_destination_port_range(msg, sub);
   }
   return sub;
@@ -1201,12 +1199,12 @@ UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_listener_v3_ListenerFil
 /* envoy.config.listener.v3.ListenerFilterChainMatchPredicate.MatchSet */
 
 UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, arena);
+  return (envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1216,7 +1214,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1224,13 +1222,13 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_serialize(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_serialize_ex(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_clear_rules(envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* msg) {
@@ -1292,7 +1290,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, arena);
+  struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1301,12 +1299,12 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en
 /* envoy.config.listener.v3.ListenerFilter */
 
 UPB_INLINE envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_ListenerFilter_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ListenerFilter*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilter_msg_init, arena);
+  return (envoy_config_listener_v3_ListenerFilter*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_ListenerFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilter* ret = envoy_config_listener_v3_ListenerFilter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1316,7 +1314,7 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_Lis
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ListenerFilter* ret = envoy_config_listener_v3_ListenerFilter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ListenerFilter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1324,13 +1322,13 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_Lis
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilter_serialize(const envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ListenerFilter_serialize_ex(const envoy_config_listener_v3_ListenerFilter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ListenerFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ListenerFilter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1410,7 +1408,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_typed_config(envoy_c
 UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ListenerFilter_mutable_typed_config(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ListenerFilter_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilter_set_typed_config(msg, sub);
   }
   return sub;
@@ -1422,7 +1420,7 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_filter_disabled(envo
 UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilter_mutable_filter_disabled(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilter_filter_disabled(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)_upb_Message_New(&envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilter_set_filter_disabled(msg, sub);
   }
   return sub;
@@ -1434,14 +1432,12 @@ UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_config_discovery(env
 UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_ListenerFilter_mutable_config_discovery(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_ListenerFilter_config_discovery(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy_config_core_v3_ExtensionConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy__config__core__v3__ExtensionConfigSource_msg_init, arena);
     if (sub) envoy_config_listener_v3_ListenerFilter_set_config_discovery(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
new file mode 100644
index 0000000000000..7aa8d65a7b783
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
@@ -0,0 +1,260 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/listener_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/listener/v3/listener_components.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_listener_v3_Filter_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__config__core__v3__ExtensionConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = {
+  &envoy_config_listener_v3_Filter_submsgs[0],
+  &envoy_config_listener_v3_Filter__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0018000004000022, &upb_pom_1bt_maxmaxb},
+    {0x001800000501002a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_FilterChainMatch_submsgs[5] = {
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__fields[11] = {
+  {3, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 48), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 56), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(24, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(28, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = {
+  &envoy_config_listener_v3_FilterChainMatch_submsgs[0],
+  &envoy_config_listener_v3_FilterChainMatch__fields[0],
+  UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00001a, &upb_prm_1bt_maxmaxb},
+    {0x001000003f000022, &upb_pss_1bt},
+    {0x002000000101002a, &upb_psm_1bt_maxmaxb},
+    {0x002800003f020032, &upb_prm_1bt_maxmaxb},
+    {0x003000003f00003a, &upb_ppv4_1bt},
+    {0x0038000002030042, &upb_psm_1bt_maxmaxb},
+    {0x004000003f00004a, &upb_pss_1bt},
+    {0x005000003f000052, &upb_prs_1bt},
+    {0x005800003f00005a, &upb_prs_1bt},
+    {0x000400003f000060, &upb_psv4_1bt},
+    {0x006000003f04006a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_submsgs[7] = {
+  {.submsg = &envoy__config__listener__v3__FilterChainMatch_msg_init},
+  {.submsg = &envoy__config__listener__v3__Filter_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__core__v3__TransportSocket_msg_init},
+  {.submsg = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 40), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 64), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 72), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = {
+  &envoy_config_listener_v3_FilterChain_submsgs[0],
+  &envoy_config_listener_v3_FilterChain__fields[0],
+  UPB_SIZE(40, 80), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f01001a, &upb_prm_1bt_max64b},
+    {0x0018000002020022, &upb_psm_1bt_maxmaxb},
+    {0x002000000303002a, &upb_psm_1bt_maxmaxb},
+    {0x0028000004040032, &upb_psm_1bt_maxmaxb},
+    {0x003000003f00003a, &upb_pss_1bt},
+    {0x0040000005050042, &upb_psm_1bt_max64b},
+    {0x004800000606004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init = {
+  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0],
+  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = {
+  {.submsg = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init},
+  {.submsg = &envoy__type__v3__Int32Range_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[5] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init = {
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0],
+  UPB_SIZE(8, 16), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004000020, &upb_pob1_1bt},
+    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = {
+  {.submsg = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init = {
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilter_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init},
+  {.submsg = &envoy__config__core__v3__ExtensionConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[4] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = {
+  &envoy_config_listener_v3_ListenerFilter_submsgs[0],
+  &envoy_config_listener_v3_ListenerFilter__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000040300001a, &upb_pom_1bt_maxmaxb},
+    {0x0018000001010022, &upb_psm_1bt_max64b},
+    {0x002000040502002a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__config__listener__v3__Filter_msg_init,
+  &envoy__config__listener__v3__FilterChainMatch_msg_init,
+  &envoy__config__listener__v3__FilterChain_msg_init,
+  &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init,
+  &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init,
+  &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init,
+  &envoy__config__listener__v3__ListenerFilter_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_listener_v3_listener_components_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
new file mode 100644
index 0000000000000..faa918cc65abd
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/listener_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_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__config__listener__v3__Filter_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init;
+
+extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h
rename to src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
index 03cbc7cfdc4a2..fa241490df118 100644
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/quic_config.proto
  *
@@ -10,7 +9,20 @@
 #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/listener/v3/quic_config.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,29 +30,23 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_listener_v3_QuicProtocolOptions envoy_config_listener_v3_QuicProtocolOptions;
-extern const upb_MiniTable envoy_config_listener_v3_QuicProtocolOptions_msg_init;
 struct envoy_config_core_v3_QuicProtocolOptions;
 struct envoy_config_core_v3_RuntimeFeatureFlag;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_QuicProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeFeatureFlag_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.listener.v3.QuicProtocolOptions */
 
 UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v3_QuicProtocolOptions_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_QuicProtocolOptions*)_upb_Message_New(&envoy_config_listener_v3_QuicProtocolOptions_msg_init, arena);
+  return (envoy_config_listener_v3_QuicProtocolOptions*)_upb_Message_New(&envoy__config__listener__v3__QuicProtocolOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v3_QuicProtocolOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_QuicProtocolOptions* ret = envoy_config_listener_v3_QuicProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__QuicProtocolOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +56,7 @@ UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_QuicProtocolOptions* ret = envoy_config_listener_v3_QuicProtocolOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__QuicProtocolOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +64,13 @@ UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v
 }
 UPB_INLINE char* envoy_config_listener_v3_QuicProtocolOptions_serialize(const envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_QuicProtocolOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__QuicProtocolOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_QuicProtocolOptions_serialize_ex(const envoy_config_listener_v3_QuicProtocolOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_QuicProtocolOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__QuicProtocolOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_clear_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions* msg) {
@@ -210,7 +216,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_quic_protocol_o
 UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_listener_v3_QuicProtocolOptions_mutable_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_listener_v3_QuicProtocolOptions_quic_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_QuicProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_QuicProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__QuicProtocolOptions_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_quic_protocol_options(msg, sub);
   }
   return sub;
@@ -222,7 +228,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_idle_timeout(en
 UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_idle_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_idle_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_idle_timeout(msg, sub);
   }
   return sub;
@@ -234,7 +240,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_handshak
 UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_handshake_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_crypto_handshake_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_crypto_handshake_timeout(msg, sub);
   }
   return sub;
@@ -246,7 +252,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_enabled(envoy_c
 UPB_INLINE struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_listener_v3_QuicProtocolOptions_mutable_enabled(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RuntimeFeatureFlag* sub = (struct envoy_config_core_v3_RuntimeFeatureFlag*)envoy_config_listener_v3_QuicProtocolOptions_enabled(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFeatureFlag*)_upb_Message_New(&envoy_config_core_v3_RuntimeFeatureFlag_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeFeatureFlag*)_upb_Message_New(&envoy__config__core__v3__RuntimeFeatureFlag_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_enabled(msg, sub);
   }
   return sub;
@@ -258,7 +264,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_packets_to_read
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_QuicProtocolOptions_mutable_packets_to_read_to_connection_count_ratio(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_QuicProtocolOptions_packets_to_read_to_connection_count_ratio(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_packets_to_read_to_connection_count_ratio(msg, sub);
   }
   return sub;
@@ -270,7 +276,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_stream_c
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_stream_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_crypto_stream_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_crypto_stream_config(msg, sub);
   }
   return sub;
@@ -282,7 +288,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_proof_source_co
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_proof_source_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_proof_source_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_proof_source_config(msg, sub);
   }
   return sub;
@@ -294,7 +300,7 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_connection_id_g
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_connection_id_generator_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_connection_id_generator_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_connection_id_generator_config(msg, sub);
   }
   return sub;
@@ -306,14 +312,12 @@ UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_server_preferre
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_server_preferred_address_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_server_preferred_address_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_server_preferred_address_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
new file mode 100644
index 0000000000000..dd570c468a4de
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
@@ -0,0 +1,86 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/quic_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/listener/v3/quic_config.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[9] = {
+  {.submsg = &envoy__config__core__v3__QuicProtocolOptions_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeFeatureFlag_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[9] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(36, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = {
+  &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0],
+  &envoy_config_listener_v3_QuicProtocolOptions__fields[0],
+  UPB_SIZE(40, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
+    {0x003800000706003a, &upb_psm_1bt_maxmaxb},
+    {0x0040000008070042, &upb_psm_1bt_maxmaxb},
+    {0x004800000908004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__listener__v3__QuicProtocolOptions_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_listener_v3_quic_config_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/config/listener/v3/quic_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
new file mode 100644
index 0000000000000..fa62cf23c57e5
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/quic_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_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__config__listener__v3__QuicProtocolOptions_msg_init;
+
+extern const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h
rename to src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
index 203c8807413f4..9942f74835c7d 100644
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/udp_listener_config.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/listener/v3/udp_listener_config.upb_minitable.h"
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/udp_socket_config.upb_minitable.h"
+#include "envoy/config/listener/v3/quic_config.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,26 +27,21 @@ extern "C" {
 
 typedef struct envoy_config_listener_v3_UdpListenerConfig envoy_config_listener_v3_UdpListenerConfig;
 typedef struct envoy_config_listener_v3_ActiveRawUdpListenerConfig envoy_config_listener_v3_ActiveRawUdpListenerConfig;
-extern const upb_MiniTable envoy_config_listener_v3_UdpListenerConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_config_core_v3_UdpSocketConfig;
 struct envoy_config_listener_v3_QuicProtocolOptions;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_UdpSocketConfig_msg_init;
-extern const upb_MiniTable envoy_config_listener_v3_QuicProtocolOptions_msg_init;
 
 
 
 /* envoy.config.listener.v3.UdpListenerConfig */
 
 UPB_INLINE envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_UdpListenerConfig_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_UdpListenerConfig*)_upb_Message_New(&envoy_config_listener_v3_UdpListenerConfig_msg_init, arena);
+  return (envoy_config_listener_v3_UdpListenerConfig*)_upb_Message_New(&envoy__config__listener__v3__UdpListenerConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_UdpListenerConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_UdpListenerConfig* ret = envoy_config_listener_v3_UdpListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__UdpListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +51,7 @@ UPB_INLINE envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_UdpListenerConfig* ret = envoy_config_listener_v3_UdpListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__UdpListenerConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +59,13 @@ UPB_INLINE envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_
 }
 UPB_INLINE char* envoy_config_listener_v3_UdpListenerConfig_serialize(const envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_UdpListenerConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__UdpListenerConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_UdpListenerConfig_serialize_ex(const envoy_config_listener_v3_UdpListenerConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_UdpListenerConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__UdpListenerConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_clear_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig* msg) {
@@ -118,7 +121,7 @@ UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_downstream_socket
 UPB_INLINE struct envoy_config_core_v3_UdpSocketConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_UdpSocketConfig* sub = (struct envoy_config_core_v3_UdpSocketConfig*)envoy_config_listener_v3_UdpListenerConfig_downstream_socket_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_UdpSocketConfig*)_upb_Message_New(&envoy_config_core_v3_UdpSocketConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_UdpSocketConfig*)_upb_Message_New(&envoy__config__core__v3__UdpSocketConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_UdpListenerConfig_set_downstream_socket_config(msg, sub);
   }
   return sub;
@@ -130,7 +133,7 @@ UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_quic_options(envo
 UPB_INLINE struct envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v3_UdpListenerConfig_mutable_quic_options(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) {
   struct envoy_config_listener_v3_QuicProtocolOptions* sub = (struct envoy_config_listener_v3_QuicProtocolOptions*)envoy_config_listener_v3_UdpListenerConfig_quic_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_listener_v3_QuicProtocolOptions*)_upb_Message_New(&envoy_config_listener_v3_QuicProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_listener_v3_QuicProtocolOptions*)_upb_Message_New(&envoy__config__listener__v3__QuicProtocolOptions_msg_init, arena);
     if (sub) envoy_config_listener_v3_UdpListenerConfig_set_quic_options(msg, sub);
   }
   return sub;
@@ -142,7 +145,7 @@ UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_udp_packet_packet
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_udp_packet_packet_writer_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_UdpListenerConfig_udp_packet_packet_writer_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_listener_v3_UdpListenerConfig_set_udp_packet_packet_writer_config(msg, sub);
   }
   return sub;
@@ -151,12 +154,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen
 /* envoy.config.listener.v3.ActiveRawUdpListenerConfig */
 
 UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig* envoy_config_listener_v3_ActiveRawUdpListenerConfig_new(upb_Arena* arena) {
-  return (envoy_config_listener_v3_ActiveRawUdpListenerConfig*)_upb_Message_New(&envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init, arena);
+  return (envoy_config_listener_v3_ActiveRawUdpListenerConfig*)_upb_Message_New(&envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig* envoy_config_listener_v3_ActiveRawUdpListenerConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_listener_v3_ActiveRawUdpListenerConfig* ret = envoy_config_listener_v3_ActiveRawUdpListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -166,7 +169,7 @@ UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig* envoy_config_lis
                            int options, upb_Arena* arena) {
   envoy_config_listener_v3_ActiveRawUdpListenerConfig* ret = envoy_config_listener_v3_ActiveRawUdpListenerConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -174,19 +177,17 @@ UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig* envoy_config_lis
 }
 UPB_INLINE char* envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize(const envoy_config_listener_v3_ActiveRawUdpListenerConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize_ex(const envoy_config_listener_v3_ActiveRawUdpListenerConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
 
-extern const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
new file mode 100644
index 0000000000000..f31f1c8df0427
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
@@ -0,0 +1,77 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/udp_listener_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/listener/v3/udp_listener_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/udp_socket_config.upb_minitable.h"
+#include "envoy/config/listener/v3/quic_config.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__UdpSocketConfig_msg_init},
+  {.submsg = &envoy__config__listener__v3__QuicProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fields[3] = {
+  {5, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = {
+  &envoy_config_listener_v3_UdpListenerConfig_submsgs[0],
+  &envoy_config_listener_v3_UdpListenerConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100002a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000201003a, &upb_psm_1bt_maxmaxb},
+    {0x0018000003020042, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__listener__v3__UdpListenerConfig_msg_init,
+  &envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
new file mode 100644
index 0000000000000..b5df95ff851ca
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/listener/v3/udp_listener_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_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__config__listener__v3__UdpListenerConfig_msg_init;
+extern const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h
rename to src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
index b94efa253961a..696a859fd051d 100644
--- a/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/metrics_service.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/metrics/v3/metrics_service.upb_minitable.h"
+
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,11 +27,8 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_metrics_v3_MetricsServiceConfig envoy_config_metrics_v3_MetricsServiceConfig;
-extern const upb_MiniTable envoy_config_metrics_v3_MetricsServiceConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
 struct google_protobuf_BoolValue;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
 
 typedef enum {
   envoy_config_metrics_v3_SUMMARY_AND_HISTOGRAM = 0,
@@ -35,12 +41,12 @@ typedef enum {
 /* envoy.config.metrics.v3.MetricsServiceConfig */
 
 UPB_INLINE envoy_config_metrics_v3_MetricsServiceConfig* envoy_config_metrics_v3_MetricsServiceConfig_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_MetricsServiceConfig*)_upb_Message_New(&envoy_config_metrics_v3_MetricsServiceConfig_msg_init, arena);
+  return (envoy_config_metrics_v3_MetricsServiceConfig*)_upb_Message_New(&envoy__config__metrics__v3__MetricsServiceConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_MetricsServiceConfig* envoy_config_metrics_v3_MetricsServiceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_MetricsServiceConfig* ret = envoy_config_metrics_v3_MetricsServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_MetricsServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__MetricsServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +56,7 @@ UPB_INLINE envoy_config_metrics_v3_MetricsServiceConfig* envoy_config_metrics_v3
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_MetricsServiceConfig* ret = envoy_config_metrics_v3_MetricsServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_MetricsServiceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__MetricsServiceConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +64,13 @@ UPB_INLINE envoy_config_metrics_v3_MetricsServiceConfig* envoy_config_metrics_v3
 }
 UPB_INLINE char* envoy_config_metrics_v3_MetricsServiceConfig_serialize(const envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_MetricsServiceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__MetricsServiceConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_MetricsServiceConfig_serialize_ex(const envoy_config_metrics_v3_MetricsServiceConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_MetricsServiceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__MetricsServiceConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_clear_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig* msg) {
@@ -138,7 +144,7 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_grpc_service(en
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v3_MetricsServiceConfig_mutable_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_metrics_v3_MetricsServiceConfig_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_metrics_v3_MetricsServiceConfig_set_grpc_service(msg, sub);
   }
   return sub;
@@ -150,7 +156,7 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_report_counters
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_MetricsServiceConfig_mutable_report_counters_as_deltas(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_MetricsServiceConfig_report_counters_as_deltas(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_metrics_v3_MetricsServiceConfig_set_report_counters_as_deltas(msg, sub);
   }
   return sub;
@@ -168,8 +174,6 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
new file mode 100644
index 0000000000000..47915b489c54b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
@@ -0,0 +1,64 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/metrics/v3/metrics_service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/metrics/v3/metrics_service.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fields[5] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = {
+  &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0],
+  &envoy_config_metrics_v3_MetricsServiceConfig__fields[0],
+  UPB_SIZE(24, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x000c00003f000028, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__metrics__v3__MetricsServiceConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_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/config/metrics/v3/metrics_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
new file mode 100644
index 0000000000000..b755b7324c40c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/metrics/v3/metrics_service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_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__config__metrics__v3__MetricsServiceConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h
rename to src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
index bc427ae1d1c24..b2a37f59c97cd 100644
--- a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/stats.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -25,38 +35,24 @@ typedef struct envoy_config_metrics_v3_HistogramBucketSettings envoy_config_metr
 typedef struct envoy_config_metrics_v3_StatsdSink envoy_config_metrics_v3_StatsdSink;
 typedef struct envoy_config_metrics_v3_DogStatsdSink envoy_config_metrics_v3_DogStatsdSink;
 typedef struct envoy_config_metrics_v3_HystrixSink envoy_config_metrics_v3_HystrixSink;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsSink_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsConfig_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsMatcher_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_TagSpecifier_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_HistogramBucketSettings_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_StatsdSink_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_DogStatsdSink_msg_init;
-extern const upb_MiniTable envoy_config_metrics_v3_HystrixSink_msg_init;
 struct envoy_config_core_v3_Address;
 struct envoy_type_matcher_v3_ListStringMatcher;
 struct envoy_type_matcher_v3_StringMatcher;
 struct google_protobuf_Any;
 struct google_protobuf_BoolValue;
 struct google_protobuf_UInt64Value;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_ListStringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
 
 
 
 /* envoy.config.metrics.v3.StatsSink */
 
 UPB_INLINE envoy_config_metrics_v3_StatsSink* envoy_config_metrics_v3_StatsSink_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_StatsSink*)_upb_Message_New(&envoy_config_metrics_v3_StatsSink_msg_init, arena);
+  return (envoy_config_metrics_v3_StatsSink*)_upb_Message_New(&envoy__config__metrics__v3__StatsSink_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_StatsSink* envoy_config_metrics_v3_StatsSink_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsSink* ret = envoy_config_metrics_v3_StatsSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -66,7 +62,7 @@ UPB_INLINE envoy_config_metrics_v3_StatsSink* envoy_config_metrics_v3_StatsSink_
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsSink* ret = envoy_config_metrics_v3_StatsSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsSink_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -74,13 +70,13 @@ UPB_INLINE envoy_config_metrics_v3_StatsSink* envoy_config_metrics_v3_StatsSink_
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsSink_serialize(const envoy_config_metrics_v3_StatsSink* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsSink_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsSink_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsSink_serialize_ex(const envoy_config_metrics_v3_StatsSink* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsSink_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsSink_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -129,7 +125,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_typed_config(envoy_config_
 UPB_INLINE struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_mutable_typed_config(envoy_config_metrics_v3_StatsSink* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_metrics_v3_StatsSink_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsSink_set_typed_config(msg, sub);
   }
   return sub;
@@ -138,12 +134,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_mutable
 /* envoy.config.metrics.v3.StatsConfig */
 
 UPB_INLINE envoy_config_metrics_v3_StatsConfig* envoy_config_metrics_v3_StatsConfig_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_StatsConfig*)_upb_Message_New(&envoy_config_metrics_v3_StatsConfig_msg_init, arena);
+  return (envoy_config_metrics_v3_StatsConfig*)_upb_Message_New(&envoy__config__metrics__v3__StatsConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_StatsConfig* envoy_config_metrics_v3_StatsConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsConfig* ret = envoy_config_metrics_v3_StatsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -153,7 +149,7 @@ UPB_INLINE envoy_config_metrics_v3_StatsConfig* envoy_config_metrics_v3_StatsCon
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsConfig* ret = envoy_config_metrics_v3_StatsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -161,13 +157,13 @@ UPB_INLINE envoy_config_metrics_v3_StatsConfig* envoy_config_metrics_v3_StatsCon
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsConfig_serialize(const envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsConfig_serialize_ex(const envoy_config_metrics_v3_StatsConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_metrics_v3_StatsConfig_clear_stats_tags(envoy_config_metrics_v3_StatsConfig* msg) {
@@ -296,7 +292,7 @@ UPB_INLINE struct envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_metrics_v3_TagSpecifier* sub = (struct envoy_config_metrics_v3_TagSpecifier*)_upb_Message_New(&envoy_config_metrics_v3_TagSpecifier_msg_init, arena);
+  struct envoy_config_metrics_v3_TagSpecifier* sub = (struct envoy_config_metrics_v3_TagSpecifier*)_upb_Message_New(&envoy__config__metrics__v3__TagSpecifier_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -308,7 +304,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(env
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig_mutable_use_all_default_tags(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_StatsConfig_use_all_default_tags(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(msg, sub);
   }
   return sub;
@@ -320,7 +316,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_stats_matcher(envoy_conf
 UPB_INLINE struct envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsConfig_mutable_stats_matcher(envoy_config_metrics_v3_StatsConfig* msg, upb_Arena* arena) {
   struct envoy_config_metrics_v3_StatsMatcher* sub = (struct envoy_config_metrics_v3_StatsMatcher*)envoy_config_metrics_v3_StatsConfig_stats_matcher(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_metrics_v3_StatsMatcher*)_upb_Message_New(&envoy_config_metrics_v3_StatsMatcher_msg_init, arena);
+    sub = (struct envoy_config_metrics_v3_StatsMatcher*)_upb_Message_New(&envoy__config__metrics__v3__StatsMatcher_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsConfig_set_stats_matcher(msg, sub);
   }
   return sub;
@@ -346,7 +342,7 @@ UPB_INLINE struct envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_metrics_v3_HistogramBucketSettings* sub = (struct envoy_config_metrics_v3_HistogramBucketSettings*)_upb_Message_New(&envoy_config_metrics_v3_HistogramBucketSettings_msg_init, arena);
+  struct envoy_config_metrics_v3_HistogramBucketSettings* sub = (struct envoy_config_metrics_v3_HistogramBucketSettings*)_upb_Message_New(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -355,12 +351,12 @@ UPB_INLINE struct envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_
 /* envoy.config.metrics.v3.StatsMatcher */
 
 UPB_INLINE envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsMatcher_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_StatsMatcher*)_upb_Message_New(&envoy_config_metrics_v3_StatsMatcher_msg_init, arena);
+  return (envoy_config_metrics_v3_StatsMatcher*)_upb_Message_New(&envoy__config__metrics__v3__StatsMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsMatcher* ret = envoy_config_metrics_v3_StatsMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -370,7 +366,7 @@ UPB_INLINE envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsMa
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsMatcher* ret = envoy_config_metrics_v3_StatsMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -378,13 +374,13 @@ UPB_INLINE envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsMa
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsMatcher_serialize(const envoy_config_metrics_v3_StatsMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsMatcher_serialize_ex(const envoy_config_metrics_v3_StatsMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -454,7 +450,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(envoy_co
 UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_exclusion_list(envoy_config_metrics_v3_StatsMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_exclusion_list(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ListStringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ListStringMatcher_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(msg, sub);
   }
   return sub;
@@ -466,7 +462,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(envoy_co
 UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_inclusion_list(envoy_config_metrics_v3_StatsMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_inclusion_list(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ListStringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ListStringMatcher_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(msg, sub);
   }
   return sub;
@@ -475,12 +471,12 @@ UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_
 /* envoy.config.metrics.v3.TagSpecifier */
 
 UPB_INLINE envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_TagSpecifier_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_TagSpecifier*)_upb_Message_New(&envoy_config_metrics_v3_TagSpecifier_msg_init, arena);
+  return (envoy_config_metrics_v3_TagSpecifier*)_upb_Message_New(&envoy__config__metrics__v3__TagSpecifier_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_TagSpecifier_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_TagSpecifier* ret = envoy_config_metrics_v3_TagSpecifier_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__TagSpecifier_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -490,7 +486,7 @@ UPB_INLINE envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_TagSpec
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_TagSpecifier* ret = envoy_config_metrics_v3_TagSpecifier_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__TagSpecifier_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -498,13 +494,13 @@ UPB_INLINE envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_TagSpec
 }
 UPB_INLINE char* envoy_config_metrics_v3_TagSpecifier_serialize(const envoy_config_metrics_v3_TagSpecifier* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_TagSpecifier_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__TagSpecifier_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_TagSpecifier_serialize_ex(const envoy_config_metrics_v3_TagSpecifier* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_TagSpecifier_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__TagSpecifier_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -574,12 +570,12 @@ UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_fixed_value(envoy_confi
 /* envoy.config.metrics.v3.HistogramBucketSettings */
 
 UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics_v3_HistogramBucketSettings_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_HistogramBucketSettings*)_upb_Message_New(&envoy_config_metrics_v3_HistogramBucketSettings_msg_init, arena);
+  return (envoy_config_metrics_v3_HistogramBucketSettings*)_upb_Message_New(&envoy__config__metrics__v3__HistogramBucketSettings_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics_v3_HistogramBucketSettings_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_HistogramBucketSettings* ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__HistogramBucketSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -589,7 +585,7 @@ UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_HistogramBucketSettings* ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__HistogramBucketSettings_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -597,13 +593,13 @@ UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics
 }
 UPB_INLINE char* envoy_config_metrics_v3_HistogramBucketSettings_serialize(const envoy_config_metrics_v3_HistogramBucketSettings* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_HistogramBucketSettings_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__HistogramBucketSettings_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_HistogramBucketSettings_serialize_ex(const envoy_config_metrics_v3_HistogramBucketSettings* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_HistogramBucketSettings_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__HistogramBucketSettings_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_metrics_v3_HistogramBucketSettings_clear_match(envoy_config_metrics_v3_HistogramBucketSettings* msg) {
@@ -666,7 +662,7 @@ UPB_INLINE void envoy_config_metrics_v3_HistogramBucketSettings_set_match(envoy_
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_metrics_v3_HistogramBucketSettings_mutable_match(envoy_config_metrics_v3_HistogramBucketSettings* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_metrics_v3_HistogramBucketSettings_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_config_metrics_v3_HistogramBucketSettings_set_match(msg, sub);
   }
   return sub;
@@ -699,12 +695,12 @@ UPB_INLINE bool envoy_config_metrics_v3_HistogramBucketSettings_add_buckets(envo
 /* envoy.config.metrics.v3.StatsdSink */
 
 UPB_INLINE envoy_config_metrics_v3_StatsdSink* envoy_config_metrics_v3_StatsdSink_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_StatsdSink*)_upb_Message_New(&envoy_config_metrics_v3_StatsdSink_msg_init, arena);
+  return (envoy_config_metrics_v3_StatsdSink*)_upb_Message_New(&envoy__config__metrics__v3__StatsdSink_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_StatsdSink* envoy_config_metrics_v3_StatsdSink_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsdSink* ret = envoy_config_metrics_v3_StatsdSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsdSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -714,7 +710,7 @@ UPB_INLINE envoy_config_metrics_v3_StatsdSink* envoy_config_metrics_v3_StatsdSin
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_StatsdSink* ret = envoy_config_metrics_v3_StatsdSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__StatsdSink_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -722,13 +718,13 @@ UPB_INLINE envoy_config_metrics_v3_StatsdSink* envoy_config_metrics_v3_StatsdSin
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsdSink_serialize(const envoy_config_metrics_v3_StatsdSink* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsdSink_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsdSink_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_StatsdSink_serialize_ex(const envoy_config_metrics_v3_StatsdSink* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_StatsdSink_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__StatsdSink_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -789,7 +785,7 @@ UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_address(envoy_config_metr
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSink_mutable_address(envoy_config_metrics_v3_StatsdSink* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_StatsdSink_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_metrics_v3_StatsdSink_set_address(msg, sub);
   }
   return sub;
@@ -806,12 +802,12 @@ UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_prefix(envoy_config_metri
 /* envoy.config.metrics.v3.DogStatsdSink */
 
 UPB_INLINE envoy_config_metrics_v3_DogStatsdSink* envoy_config_metrics_v3_DogStatsdSink_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_DogStatsdSink*)_upb_Message_New(&envoy_config_metrics_v3_DogStatsdSink_msg_init, arena);
+  return (envoy_config_metrics_v3_DogStatsdSink*)_upb_Message_New(&envoy__config__metrics__v3__DogStatsdSink_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_DogStatsdSink* envoy_config_metrics_v3_DogStatsdSink_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_DogStatsdSink* ret = envoy_config_metrics_v3_DogStatsdSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__DogStatsdSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -821,7 +817,7 @@ UPB_INLINE envoy_config_metrics_v3_DogStatsdSink* envoy_config_metrics_v3_DogSta
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_DogStatsdSink* ret = envoy_config_metrics_v3_DogStatsdSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__DogStatsdSink_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -829,13 +825,13 @@ UPB_INLINE envoy_config_metrics_v3_DogStatsdSink* envoy_config_metrics_v3_DogSta
 }
 UPB_INLINE char* envoy_config_metrics_v3_DogStatsdSink_serialize(const envoy_config_metrics_v3_DogStatsdSink* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_DogStatsdSink_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__DogStatsdSink_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_DogStatsdSink_serialize_ex(const envoy_config_metrics_v3_DogStatsdSink* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_DogStatsdSink_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__DogStatsdSink_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -895,7 +891,7 @@ UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_address(envoy_config_m
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStatsdSink_mutable_address(envoy_config_metrics_v3_DogStatsdSink* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_DogStatsdSink_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
     if (sub) envoy_config_metrics_v3_DogStatsdSink_set_address(msg, sub);
   }
   return sub;
@@ -911,7 +907,7 @@ UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_max_bytes_per_datagram
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_metrics_v3_DogStatsdSink_mutable_max_bytes_per_datagram(envoy_config_metrics_v3_DogStatsdSink* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_metrics_v3_DogStatsdSink_max_bytes_per_datagram(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_config_metrics_v3_DogStatsdSink_set_max_bytes_per_datagram(msg, sub);
   }
   return sub;
@@ -920,12 +916,12 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_metrics_v3_DogStatsd
 /* envoy.config.metrics.v3.HystrixSink */
 
 UPB_INLINE envoy_config_metrics_v3_HystrixSink* envoy_config_metrics_v3_HystrixSink_new(upb_Arena* arena) {
-  return (envoy_config_metrics_v3_HystrixSink*)_upb_Message_New(&envoy_config_metrics_v3_HystrixSink_msg_init, arena);
+  return (envoy_config_metrics_v3_HystrixSink*)_upb_Message_New(&envoy__config__metrics__v3__HystrixSink_msg_init, arena);
 }
 UPB_INLINE envoy_config_metrics_v3_HystrixSink* envoy_config_metrics_v3_HystrixSink_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_metrics_v3_HystrixSink* ret = envoy_config_metrics_v3_HystrixSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__HystrixSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -935,7 +931,7 @@ UPB_INLINE envoy_config_metrics_v3_HystrixSink* envoy_config_metrics_v3_HystrixS
                            int options, upb_Arena* arena) {
   envoy_config_metrics_v3_HystrixSink* ret = envoy_config_metrics_v3_HystrixSink_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__metrics__v3__HystrixSink_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -943,13 +939,13 @@ UPB_INLINE envoy_config_metrics_v3_HystrixSink* envoy_config_metrics_v3_HystrixS
 }
 UPB_INLINE char* envoy_config_metrics_v3_HystrixSink_serialize(const envoy_config_metrics_v3_HystrixSink* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_HystrixSink_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__HystrixSink_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_metrics_v3_HystrixSink_serialize_ex(const envoy_config_metrics_v3_HystrixSink* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_metrics_v3_HystrixSink_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__metrics__v3__HystrixSink_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_metrics_v3_HystrixSink_clear_num_buckets(envoy_config_metrics_v3_HystrixSink* msg) {
@@ -969,8 +965,6 @@ UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
new file mode 100644
index 0000000000000..c53abb1ad7698
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
@@ -0,0 +1,219 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/metrics/v3/stats.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_metrics_v3_StatsSink_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = {
+  &envoy_config_metrics_v3_StatsSink_submsgs[0],
+  &envoy_config_metrics_v3_StatsSink__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_metrics_v3_StatsConfig_submsgs[4] = {
+  {.submsg = &envoy__config__metrics__v3__TagSpecifier_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__metrics__v3__StatsMatcher_msg_init},
+  {.submsg = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = {
+  &envoy_config_metrics_v3_StatsConfig_submsgs[0],
+  &envoy_config_metrics_v3_StatsConfig__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000202001a, &upb_psm_1bt_max64b},
+    {0x002000003f030022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_metrics_v3_StatsMatcher_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__ListStringMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__ListStringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = {
+  &envoy_config_metrics_v3_StatsMatcher_submsgs[0],
+  &envoy_config_metrics_v3_StatsMatcher__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_pob1_1bt},
+    {0x0008000002000012, &upb_pom_1bt_maxmaxb},
+    {0x000800000301001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_TagSpecifier__fields[3] = {
+  {1, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = {
+  NULL,
+  &envoy_config_metrics_v3_TagSpecifier__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x000800000300001a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init = {
+  &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0],
+  &envoy_config_metrics_v3_HistogramBucketSettings__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_ppf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_metrics_v3_StatsdSink_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = {
+  &envoy_config_metrics_v3_StatsdSink_submsgs[0],
+  &envoy_config_metrics_v3_StatsdSink__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3] = {
+  {1, UPB_SIZE(12, 32), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 24), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = {
+  &envoy_config_metrics_v3_DogStatsdSink_submsgs[0],
+  &envoy_config_metrics_v3_DogStatsdSink__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000040100000a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00001a, &upb_pss_1bt},
+    {0x0018000001010022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_metrics_v3_HystrixSink__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init = {
+  NULL,
+  &envoy_config_metrics_v3_HystrixSink__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[8] = {
+  &envoy__config__metrics__v3__StatsSink_msg_init,
+  &envoy__config__metrics__v3__StatsConfig_msg_init,
+  &envoy__config__metrics__v3__StatsMatcher_msg_init,
+  &envoy__config__metrics__v3__TagSpecifier_msg_init,
+  &envoy__config__metrics__v3__HistogramBucketSettings_msg_init,
+  &envoy__config__metrics__v3__StatsdSink_msg_init,
+  &envoy__config__metrics__v3__DogStatsdSink_msg_init,
+  &envoy__config__metrics__v3__HystrixSink_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  8,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
new file mode 100644
index 0000000000000..ab6dbb2df4b83
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/metrics/v3/stats.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_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__config__metrics__v3__StatsSink_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init;
+extern const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init;
+
+extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h
rename to src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
index e2ae5b48cc2bb..015933313fa98 100644
--- a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/overload/v3/overload.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
+
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -27,22 +36,9 @@ typedef struct envoy_config_overload_v3_OverloadAction envoy_config_overload_v3_
 typedef struct envoy_config_overload_v3_LoadShedPoint envoy_config_overload_v3_LoadShedPoint;
 typedef struct envoy_config_overload_v3_BufferFactoryConfig envoy_config_overload_v3_BufferFactoryConfig;
 typedef struct envoy_config_overload_v3_OverloadManager envoy_config_overload_v3_OverloadManager;
-extern const upb_MiniTable envoy_config_overload_v3_ResourceMonitor_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_ThresholdTrigger_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_ScaledTrigger_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_Trigger_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_OverloadAction_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_LoadShedPoint_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_BufferFactoryConfig_msg_init;
-extern const upb_MiniTable envoy_config_overload_v3_OverloadManager_msg_init;
 struct envoy_type_v3_Percent;
 struct google_protobuf_Any;
 struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 typedef enum {
   envoy_config_overload_v3_ScaleTimersOverloadActionConfig_UNSPECIFIED = 0,
@@ -56,12 +52,12 @@ typedef enum {
 /* envoy.config.overload.v3.ResourceMonitor */
 
 UPB_INLINE envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_ResourceMonitor_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_ResourceMonitor*)_upb_Message_New(&envoy_config_overload_v3_ResourceMonitor_msg_init, arena);
+  return (envoy_config_overload_v3_ResourceMonitor*)_upb_Message_New(&envoy__config__overload__v3__ResourceMonitor_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_ResourceMonitor_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_ResourceMonitor* ret = envoy_config_overload_v3_ResourceMonitor_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ResourceMonitor_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -71,7 +67,7 @@ UPB_INLINE envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_Re
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_ResourceMonitor* ret = envoy_config_overload_v3_ResourceMonitor_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ResourceMonitor_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -79,13 +75,13 @@ UPB_INLINE envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_Re
 }
 UPB_INLINE char* envoy_config_overload_v3_ResourceMonitor_serialize(const envoy_config_overload_v3_ResourceMonitor* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ResourceMonitor_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ResourceMonitor_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_ResourceMonitor_serialize_ex(const envoy_config_overload_v3_ResourceMonitor* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ResourceMonitor_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ResourceMonitor_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -134,7 +130,7 @@ UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_typed_config(envoy_
 UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_ResourceMonitor_mutable_typed_config(envoy_config_overload_v3_ResourceMonitor* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_ResourceMonitor_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_overload_v3_ResourceMonitor_set_typed_config(msg, sub);
   }
   return sub;
@@ -143,12 +139,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_ResourceMonitor_
 /* envoy.config.overload.v3.ThresholdTrigger */
 
 UPB_INLINE envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_ThresholdTrigger_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_ThresholdTrigger*)_upb_Message_New(&envoy_config_overload_v3_ThresholdTrigger_msg_init, arena);
+  return (envoy_config_overload_v3_ThresholdTrigger*)_upb_Message_New(&envoy__config__overload__v3__ThresholdTrigger_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_ThresholdTrigger_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_ThresholdTrigger* ret = envoy_config_overload_v3_ThresholdTrigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ThresholdTrigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -158,7 +154,7 @@ UPB_INLINE envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_T
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_ThresholdTrigger* ret = envoy_config_overload_v3_ThresholdTrigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ThresholdTrigger_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -166,13 +162,13 @@ UPB_INLINE envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_T
 }
 UPB_INLINE char* envoy_config_overload_v3_ThresholdTrigger_serialize(const envoy_config_overload_v3_ThresholdTrigger* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ThresholdTrigger_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ThresholdTrigger_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_ThresholdTrigger_serialize_ex(const envoy_config_overload_v3_ThresholdTrigger* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ThresholdTrigger_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ThresholdTrigger_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_ThresholdTrigger_clear_value(envoy_config_overload_v3_ThresholdTrigger* msg) {
@@ -195,12 +191,12 @@ UPB_INLINE void envoy_config_overload_v3_ThresholdTrigger_set_value(envoy_config
 /* envoy.config.overload.v3.ScaledTrigger */
 
 UPB_INLINE envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_ScaledTrigger_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_ScaledTrigger*)_upb_Message_New(&envoy_config_overload_v3_ScaledTrigger_msg_init, arena);
+  return (envoy_config_overload_v3_ScaledTrigger*)_upb_Message_New(&envoy__config__overload__v3__ScaledTrigger_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_ScaledTrigger_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_ScaledTrigger* ret = envoy_config_overload_v3_ScaledTrigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaledTrigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -210,7 +206,7 @@ UPB_INLINE envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Scal
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_ScaledTrigger* ret = envoy_config_overload_v3_ScaledTrigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaledTrigger_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -218,13 +214,13 @@ UPB_INLINE envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Scal
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaledTrigger_serialize(const envoy_config_overload_v3_ScaledTrigger* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaledTrigger_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaledTrigger_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaledTrigger_serialize_ex(const envoy_config_overload_v3_ScaledTrigger* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaledTrigger_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaledTrigger_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_clear_scaling_threshold(envoy_config_overload_v3_ScaledTrigger* msg) {
@@ -262,12 +258,12 @@ UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_saturation_threshold(
 /* envoy.config.overload.v3.Trigger */
 
 UPB_INLINE envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Trigger_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy_config_overload_v3_Trigger_msg_init, arena);
+  return (envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy__config__overload__v3__Trigger_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Trigger_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_Trigger* ret = envoy_config_overload_v3_Trigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__Trigger_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -277,7 +273,7 @@ UPB_INLINE envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Trigger_pa
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_Trigger* ret = envoy_config_overload_v3_Trigger_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__Trigger_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -285,13 +281,13 @@ UPB_INLINE envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Trigger_pa
 }
 UPB_INLINE char* envoy_config_overload_v3_Trigger_serialize(const envoy_config_overload_v3_Trigger* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_Trigger_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__Trigger_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_Trigger_serialize_ex(const envoy_config_overload_v3_Trigger* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_Trigger_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__Trigger_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -356,7 +352,7 @@ UPB_INLINE void envoy_config_overload_v3_Trigger_set_threshold(envoy_config_over
 UPB_INLINE struct envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_Trigger_mutable_threshold(envoy_config_overload_v3_Trigger* msg, upb_Arena* arena) {
   struct envoy_config_overload_v3_ThresholdTrigger* sub = (struct envoy_config_overload_v3_ThresholdTrigger*)envoy_config_overload_v3_Trigger_threshold(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_overload_v3_ThresholdTrigger*)_upb_Message_New(&envoy_config_overload_v3_ThresholdTrigger_msg_init, arena);
+    sub = (struct envoy_config_overload_v3_ThresholdTrigger*)_upb_Message_New(&envoy__config__overload__v3__ThresholdTrigger_msg_init, arena);
     if (sub) envoy_config_overload_v3_Trigger_set_threshold(msg, sub);
   }
   return sub;
@@ -368,7 +364,7 @@ UPB_INLINE void envoy_config_overload_v3_Trigger_set_scaled(envoy_config_overloa
 UPB_INLINE struct envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Trigger_mutable_scaled(envoy_config_overload_v3_Trigger* msg, upb_Arena* arena) {
   struct envoy_config_overload_v3_ScaledTrigger* sub = (struct envoy_config_overload_v3_ScaledTrigger*)envoy_config_overload_v3_Trigger_scaled(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_overload_v3_ScaledTrigger*)_upb_Message_New(&envoy_config_overload_v3_ScaledTrigger_msg_init, arena);
+    sub = (struct envoy_config_overload_v3_ScaledTrigger*)_upb_Message_New(&envoy__config__overload__v3__ScaledTrigger_msg_init, arena);
     if (sub) envoy_config_overload_v3_Trigger_set_scaled(msg, sub);
   }
   return sub;
@@ -377,12 +373,12 @@ UPB_INLINE struct envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_
 /* envoy.config.overload.v3.ScaleTimersOverloadActionConfig */
 
 UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig*)_upb_Message_New(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init, arena);
+  return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig*)_upb_Message_New(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_ScaleTimersOverloadActionConfig* ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -392,7 +388,7 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig* envoy_confi
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_ScaleTimersOverloadActionConfig* ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -400,13 +396,13 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig* envoy_confi
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_serialize_ex(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_clear_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig* msg) {
@@ -468,7 +464,7 @@ UPB_INLINE struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_Scale
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* sub = (struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*)_upb_Message_New(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, arena);
+  struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* sub = (struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*)_upb_Message_New(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -477,12 +473,12 @@ UPB_INLINE struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_Scale
 /* envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer */
 
 UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*)_upb_Message_New(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, arena);
+  return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*)_upb_Message_New(&envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -492,7 +488,7 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -500,13 +496,13 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_serialize_ex(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -571,7 +567,7 @@ UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTi
 UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_timeout(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_timeout(msg, sub);
   }
   return sub;
@@ -583,7 +579,7 @@ UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTi
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_scale(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_scale(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_scale(msg, sub);
   }
   return sub;
@@ -592,12 +588,12 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTimersOve
 /* envoy.config.overload.v3.OverloadAction */
 
 UPB_INLINE envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_OverloadAction_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_OverloadAction*)_upb_Message_New(&envoy_config_overload_v3_OverloadAction_msg_init, arena);
+  return (envoy_config_overload_v3_OverloadAction*)_upb_Message_New(&envoy__config__overload__v3__OverloadAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_OverloadAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_OverloadAction* ret = envoy_config_overload_v3_OverloadAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__OverloadAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -607,7 +603,7 @@ UPB_INLINE envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_Ove
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_OverloadAction* ret = envoy_config_overload_v3_OverloadAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__OverloadAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -615,13 +611,13 @@ UPB_INLINE envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_Ove
 }
 UPB_INLINE char* envoy_config_overload_v3_OverloadAction_serialize(const envoy_config_overload_v3_OverloadAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_OverloadAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__OverloadAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_OverloadAction_serialize_ex(const envoy_config_overload_v3_OverloadAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_OverloadAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__OverloadAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_OverloadAction_clear_name(envoy_config_overload_v3_OverloadAction* msg) {
@@ -713,7 +709,7 @@ UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Ove
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_Trigger* sub = (struct envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy_config_overload_v3_Trigger_msg_init, arena);
+  struct envoy_config_overload_v3_Trigger* sub = (struct envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy__config__overload__v3__Trigger_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -725,7 +721,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_typed_config(envoy_c
 UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_OverloadAction_mutable_typed_config(envoy_config_overload_v3_OverloadAction* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_OverloadAction_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_overload_v3_OverloadAction_set_typed_config(msg, sub);
   }
   return sub;
@@ -734,12 +730,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_OverloadAction_m
 /* envoy.config.overload.v3.LoadShedPoint */
 
 UPB_INLINE envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_v3_LoadShedPoint_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_LoadShedPoint*)_upb_Message_New(&envoy_config_overload_v3_LoadShedPoint_msg_init, arena);
+  return (envoy_config_overload_v3_LoadShedPoint*)_upb_Message_New(&envoy__config__overload__v3__LoadShedPoint_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_v3_LoadShedPoint_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_LoadShedPoint* ret = envoy_config_overload_v3_LoadShedPoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_LoadShedPoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__LoadShedPoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -749,7 +745,7 @@ UPB_INLINE envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_v3_Load
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_LoadShedPoint* ret = envoy_config_overload_v3_LoadShedPoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_LoadShedPoint_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__LoadShedPoint_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -757,13 +753,13 @@ UPB_INLINE envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_v3_Load
 }
 UPB_INLINE char* envoy_config_overload_v3_LoadShedPoint_serialize(const envoy_config_overload_v3_LoadShedPoint* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_LoadShedPoint_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__LoadShedPoint_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_LoadShedPoint_serialize_ex(const envoy_config_overload_v3_LoadShedPoint* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_LoadShedPoint_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__LoadShedPoint_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_LoadShedPoint_clear_name(envoy_config_overload_v3_LoadShedPoint* msg) {
@@ -840,7 +836,7 @@ UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Loa
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_Trigger* sub = (struct envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy_config_overload_v3_Trigger_msg_init, arena);
+  struct envoy_config_overload_v3_Trigger* sub = (struct envoy_config_overload_v3_Trigger*)_upb_Message_New(&envoy__config__overload__v3__Trigger_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -849,12 +845,12 @@ UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Loa
 /* envoy.config.overload.v3.BufferFactoryConfig */
 
 UPB_INLINE envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v3_BufferFactoryConfig_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_BufferFactoryConfig*)_upb_Message_New(&envoy_config_overload_v3_BufferFactoryConfig_msg_init, arena);
+  return (envoy_config_overload_v3_BufferFactoryConfig*)_upb_Message_New(&envoy__config__overload__v3__BufferFactoryConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v3_BufferFactoryConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_BufferFactoryConfig* ret = envoy_config_overload_v3_BufferFactoryConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_BufferFactoryConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__BufferFactoryConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -864,7 +860,7 @@ UPB_INLINE envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_BufferFactoryConfig* ret = envoy_config_overload_v3_BufferFactoryConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_BufferFactoryConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__BufferFactoryConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -872,13 +868,13 @@ UPB_INLINE envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v
 }
 UPB_INLINE char* envoy_config_overload_v3_BufferFactoryConfig_serialize(const envoy_config_overload_v3_BufferFactoryConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_BufferFactoryConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__BufferFactoryConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_BufferFactoryConfig_serialize_ex(const envoy_config_overload_v3_BufferFactoryConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_BufferFactoryConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__BufferFactoryConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_BufferFactoryConfig_clear_minimum_account_to_track_power_of_two(envoy_config_overload_v3_BufferFactoryConfig* msg) {
@@ -901,12 +897,12 @@ UPB_INLINE void envoy_config_overload_v3_BufferFactoryConfig_set_minimum_account
 /* envoy.config.overload.v3.OverloadManager */
 
 UPB_INLINE envoy_config_overload_v3_OverloadManager* envoy_config_overload_v3_OverloadManager_new(upb_Arena* arena) {
-  return (envoy_config_overload_v3_OverloadManager*)_upb_Message_New(&envoy_config_overload_v3_OverloadManager_msg_init, arena);
+  return (envoy_config_overload_v3_OverloadManager*)_upb_Message_New(&envoy__config__overload__v3__OverloadManager_msg_init, arena);
 }
 UPB_INLINE envoy_config_overload_v3_OverloadManager* envoy_config_overload_v3_OverloadManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_overload_v3_OverloadManager* ret = envoy_config_overload_v3_OverloadManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__OverloadManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -916,7 +912,7 @@ UPB_INLINE envoy_config_overload_v3_OverloadManager* envoy_config_overload_v3_Ov
                            int options, upb_Arena* arena) {
   envoy_config_overload_v3_OverloadManager* ret = envoy_config_overload_v3_OverloadManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__overload__v3__OverloadManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -924,13 +920,13 @@ UPB_INLINE envoy_config_overload_v3_OverloadManager* envoy_config_overload_v3_Ov
 }
 UPB_INLINE char* envoy_config_overload_v3_OverloadManager_serialize(const envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_OverloadManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__OverloadManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_overload_v3_OverloadManager_serialize_ex(const envoy_config_overload_v3_OverloadManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_overload_v3_OverloadManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__overload__v3__OverloadManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_overload_v3_OverloadManager_clear_refresh_interval(envoy_config_overload_v3_OverloadManager* msg) {
@@ -1082,7 +1078,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_refresh_interval(en
 UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_OverloadManager_mutable_refresh_interval(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_OverloadManager_refresh_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_overload_v3_OverloadManager_set_refresh_interval(msg, sub);
   }
   return sub;
@@ -1108,7 +1104,7 @@ UPB_INLINE struct envoy_config_overload_v3_ResourceMonitor* envoy_config_overloa
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_ResourceMonitor* sub = (struct envoy_config_overload_v3_ResourceMonitor*)_upb_Message_New(&envoy_config_overload_v3_ResourceMonitor_msg_init, arena);
+  struct envoy_config_overload_v3_ResourceMonitor* sub = (struct envoy_config_overload_v3_ResourceMonitor*)_upb_Message_New(&envoy__config__overload__v3__ResourceMonitor_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1134,7 +1130,7 @@ UPB_INLINE struct envoy_config_overload_v3_OverloadAction* envoy_config_overload
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_OverloadAction* sub = (struct envoy_config_overload_v3_OverloadAction*)_upb_Message_New(&envoy_config_overload_v3_OverloadAction_msg_init, arena);
+  struct envoy_config_overload_v3_OverloadAction* sub = (struct envoy_config_overload_v3_OverloadAction*)_upb_Message_New(&envoy__config__overload__v3__OverloadAction_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1146,7 +1142,7 @@ UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_buffer_factory_conf
 UPB_INLINE struct envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v3_OverloadManager_mutable_buffer_factory_config(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) {
   struct envoy_config_overload_v3_BufferFactoryConfig* sub = (struct envoy_config_overload_v3_BufferFactoryConfig*)envoy_config_overload_v3_OverloadManager_buffer_factory_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_overload_v3_BufferFactoryConfig*)_upb_Message_New(&envoy_config_overload_v3_BufferFactoryConfig_msg_init, arena);
+    sub = (struct envoy_config_overload_v3_BufferFactoryConfig*)_upb_Message_New(&envoy__config__overload__v3__BufferFactoryConfig_msg_init, arena);
     if (sub) envoy_config_overload_v3_OverloadManager_set_buffer_factory_config(msg, sub);
   }
   return sub;
@@ -1172,14 +1168,12 @@ UPB_INLINE struct envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_overload_v3_LoadShedPoint* sub = (struct envoy_config_overload_v3_LoadShedPoint*)_upb_Message_New(&envoy_config_overload_v3_LoadShedPoint_msg_init, arena);
+  struct envoy_config_overload_v3_LoadShedPoint* sub = (struct envoy_config_overload_v3_LoadShedPoint*)_upb_Message_New(&envoy__config__overload__v3__LoadShedPoint_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
new file mode 100644
index 0000000000000..87d7b34e0a787
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
@@ -0,0 +1,250 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/overload/v3/overload.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_overload_v3_ResourceMonitor_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = {
+  &envoy_config_overload_v3_ResourceMonitor_submsgs[0],
+  &envoy_config_overload_v3_ResourceMonitor__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_ThresholdTrigger__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init = {
+  NULL,
+  &envoy_config_overload_v3_ThresholdTrigger__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_ScaledTrigger__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = {
+  NULL,
+  &envoy_config_overload_v3_ScaledTrigger__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+    {0x000800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_Trigger_submsgs[2] = {
+  {.submsg = &envoy__config__overload__v3__ThresholdTrigger_msg_init},
+  {.submsg = &envoy__config__overload__v3__ScaledTrigger_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = {
+  &envoy_config_overload_v3_Trigger_submsgs[0],
+  &envoy_config_overload_v3_Trigger__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_max64b},
+    {0x001800000301001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = {
+  {.submsg = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init = {
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0],
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init = {
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0],
+  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0],
+  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x0008000402000012, &upb_pom_1bt_maxmaxb},
+    {0x000800040301001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_OverloadAction_submsgs[2] = {
+  {.submsg = &envoy__config__overload__v3__Trigger_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = {
+  &envoy_config_overload_v3_OverloadAction_submsgs[0],
+  &envoy_config_overload_v3_OverloadAction__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_LoadShedPoint_submsgs[1] = {
+  {.submsg = &envoy__config__overload__v3__Trigger_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = {
+  &envoy_config_overload_v3_LoadShedPoint_submsgs[0],
+  &envoy_config_overload_v3_LoadShedPoint__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_BufferFactoryConfig__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init = {
+  NULL,
+  &envoy_config_overload_v3_BufferFactoryConfig__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_overload_v3_OverloadManager_submsgs[5] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__overload__v3__ResourceMonitor_msg_init},
+  {.submsg = &envoy__config__overload__v3__OverloadAction_msg_init},
+  {.submsg = &envoy__config__overload__v3__BufferFactoryConfig_msg_init},
+  {.submsg = &envoy__config__overload__v3__LoadShedPoint_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = {
+  &envoy_config_overload_v3_OverloadManager_submsgs[0],
+  &envoy_config_overload_v3_OverloadManager__fields[0],
+  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x001800003f02001a, &upb_prm_1bt_max64b},
+    {0x0020000002030022, &upb_psm_1bt_max64b},
+    {0x002800003f04002a, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[10] = {
+  &envoy__config__overload__v3__ResourceMonitor_msg_init,
+  &envoy__config__overload__v3__ThresholdTrigger_msg_init,
+  &envoy__config__overload__v3__ScaledTrigger_msg_init,
+  &envoy__config__overload__v3__Trigger_msg_init,
+  &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init,
+  &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init,
+  &envoy__config__overload__v3__OverloadAction_msg_init,
+  &envoy__config__overload__v3__LoadShedPoint_msg_init,
+  &envoy__config__overload__v3__BufferFactoryConfig_msg_init,
+  &envoy__config__overload__v3__OverloadManager_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  10,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
new file mode 100644
index 0000000000000..d5659754b669e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/overload/v3/overload.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_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__config__overload__v3__ResourceMonitor_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init;
+extern const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init;
+
+extern const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
new file mode 100644
index 0000000000000..c456f83646898
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
@@ -0,0 +1,1704 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/rbac/v3/rbac.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/matcher/v3/path.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_config_rbac_v3_RBAC envoy_config_rbac_v3_RBAC;
+typedef struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions envoy_config_rbac_v3_RBAC_AuditLoggingOptions;
+typedef struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig;
+typedef struct envoy_config_rbac_v3_RBAC_PoliciesEntry envoy_config_rbac_v3_RBAC_PoliciesEntry;
+typedef struct envoy_config_rbac_v3_Policy envoy_config_rbac_v3_Policy;
+typedef struct envoy_config_rbac_v3_Permission envoy_config_rbac_v3_Permission;
+typedef struct envoy_config_rbac_v3_Permission_Set envoy_config_rbac_v3_Permission_Set;
+typedef struct envoy_config_rbac_v3_Principal envoy_config_rbac_v3_Principal;
+typedef struct envoy_config_rbac_v3_Principal_Set envoy_config_rbac_v3_Principal_Set;
+typedef struct envoy_config_rbac_v3_Principal_Authenticated envoy_config_rbac_v3_Principal_Authenticated;
+typedef struct envoy_config_rbac_v3_Action envoy_config_rbac_v3_Action;
+struct envoy_config_core_v3_CidrRange;
+struct envoy_config_core_v3_TypedExtensionConfig;
+struct envoy_config_route_v3_HeaderMatcher;
+struct envoy_type_matcher_v3_FilterStateMatcher;
+struct envoy_type_matcher_v3_MetadataMatcher;
+struct envoy_type_matcher_v3_PathMatcher;
+struct envoy_type_matcher_v3_StringMatcher;
+struct envoy_type_v3_Int32Range;
+struct google_api_expr_v1alpha1_CheckedExpr;
+struct google_api_expr_v1alpha1_Expr;
+
+typedef enum {
+  envoy_config_rbac_v3_RBAC_ALLOW = 0,
+  envoy_config_rbac_v3_RBAC_DENY = 1,
+  envoy_config_rbac_v3_RBAC_LOG = 2
+} envoy_config_rbac_v3_RBAC_Action;
+
+typedef enum {
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_NONE = 0,
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_DENY = 1,
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_ALLOW = 2,
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_DENY_AND_ALLOW = 3
+} envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditCondition;
+
+
+
+/* envoy.config.rbac.v3.RBAC */
+
+UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy__config__rbac__v3__RBAC_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC* ret = envoy_config_rbac_v3_RBAC_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC* ret = envoy_config_rbac_v3_RBAC_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_serialize(const envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_serialize_ex(const envoy_config_rbac_v3_RBAC* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_action(envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_rbac_v3_RBAC_action(const envoy_config_rbac_v3_RBAC* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_policies(envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_config_rbac_v3_RBAC_policies_size(const envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_get(const envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy** val) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_next(const envoy_config_rbac_v3_RBAC* msg, size_t* iter) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_audit_logging_options(envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_audit_logging_options(const envoy_config_rbac_v3_RBAC* msg) {
+  const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* default_val = NULL;
+  const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_has_audit_logging_options(const envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_rbac_v3_RBAC_set_action(envoy_config_rbac_v3_RBAC *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_policies_clear(envoy_config_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_set(envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy* val, upb_Arena* a) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_delete(envoy_config_rbac_v3_RBAC* msg, upb_StringView key) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_nextmutable(envoy_config_rbac_v3_RBAC* msg, size_t* iter) {
+  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_set_audit_logging_options(envoy_config_rbac_v3_RBAC *msg, envoy_config_rbac_v3_RBAC_AuditLoggingOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_mutable_audit_logging_options(envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)envoy_config_rbac_v3_RBAC_audit_logging_options(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)_upb_Message_New(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_RBAC_set_audit_logging_options(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.rbac.v3.RBAC.AuditLoggingOptions */
+
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)_upb_Message_New(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_serialize(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_serialize_ex(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_clear_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_rbac_v3_RBAC_AuditLoggingOptions_audit_condition(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_clear_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* const* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_upb_array(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_mutable_upb_array(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_has_logger_configs(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
+  size_t size;
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_set_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_mutable_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_resize_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_add_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig*)_upb_Message_New(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig */
+
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig*)_upb_Message_New(&envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_serialize(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_serialize_ex(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_clear_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_has_audit_logger(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_clear_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_is_optional(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_mutable_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, bool value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.rbac.v3.RBAC.PoliciesEntry */
+
+UPB_INLINE upb_StringView envoy_config_rbac_v3_RBAC_PoliciesEntry_key(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_RBAC_PoliciesEntry_value(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
+  envoy_config_rbac_v3_Policy* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_RBAC_PoliciesEntry_has_value(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_rbac_v3_RBAC_PoliciesEntry_set_value(envoy_config_rbac_v3_RBAC_PoliciesEntry *msg, envoy_config_rbac_v3_Policy* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(envoy_config_rbac_v3_Policy*));
+}
+
+/* envoy.config.rbac.v3.Policy */
+
+UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Policy*)_upb_Message_New(&envoy__config__rbac__v3__Policy_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Policy* ret = envoy_config_rbac_v3_Policy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Policy* ret = envoy_config_rbac_v3_Policy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Policy_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Policy_serialize(const envoy_config_rbac_v3_Policy* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Policy_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Policy_serialize_ex(const envoy_config_rbac_v3_Policy* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Policy_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_clear_permissions(envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Policy_permissions(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_rbac_v3_Permission* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_permissions_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_permissions_mutable_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Policy_has_permissions(const envoy_config_rbac_v3_Policy* msg) {
+  size_t size;
+  envoy_config_rbac_v3_Policy_permissions(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_clear_principals(envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Policy_principals(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_rbac_v3_Principal* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_principals_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_principals_mutable_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Policy_has_principals(const envoy_config_rbac_v3_Policy* msg) {
+  size_t size;
+  envoy_config_rbac_v3_Policy_principals(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_clear_condition(envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_condition(const envoy_config_rbac_v3_Policy* msg) {
+  const struct google_api_expr_v1alpha1_Expr* default_val = NULL;
+  const struct google_api_expr_v1alpha1_Expr* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Policy_has_condition(const envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_clear_checked_condition(envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_checked_condition(const envoy_config_rbac_v3_Policy* msg) {
+  const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL;
+  const struct google_api_expr_v1alpha1_CheckedExpr* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Policy_has_checked_condition(const envoy_config_rbac_v3_Policy* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_mutable_permissions(envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_rbac_v3_Permission**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_resize_permissions(envoy_config_rbac_v3_Policy* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Permission**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Policy_add_permissions(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy__config__rbac__v3__Permission_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_mutable_principals(envoy_config_rbac_v3_Policy* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_rbac_v3_Principal**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_resize_principals(envoy_config_rbac_v3_Policy* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Principal**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Policy_add_principals(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy__config__rbac__v3__Principal_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_set_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_Expr* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mutable_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
+  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)envoy_config_rbac_v3_Policy_condition(msg);
+  if (sub == NULL) {
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Policy_set_condition(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Policy_set_checked_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_mutable_checked_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
+  struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)envoy_config_rbac_v3_Policy_checked_condition(msg);
+  if (sub == NULL) {
+    sub = (struct google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google__api__expr__v1alpha1__CheckedExpr_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Policy_set_checked_condition(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Permission */
+
+UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy__config__rbac__v3__Permission_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Permission* ret = envoy_config_rbac_v3_Permission_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Permission_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Permission* ret = envoy_config_rbac_v3_Permission_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Permission_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Permission_serialize(const envoy_config_rbac_v3_Permission* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Permission_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Permission_serialize_ex(const envoy_config_rbac_v3_Permission* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Permission_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_rbac_v3_Permission_rule_and_rules = 1,
+  envoy_config_rbac_v3_Permission_rule_or_rules = 2,
+  envoy_config_rbac_v3_Permission_rule_any = 3,
+  envoy_config_rbac_v3_Permission_rule_header = 4,
+  envoy_config_rbac_v3_Permission_rule_url_path = 10,
+  envoy_config_rbac_v3_Permission_rule_destination_ip = 5,
+  envoy_config_rbac_v3_Permission_rule_destination_port = 6,
+  envoy_config_rbac_v3_Permission_rule_destination_port_range = 11,
+  envoy_config_rbac_v3_Permission_rule_metadata = 7,
+  envoy_config_rbac_v3_Permission_rule_not_rule = 8,
+  envoy_config_rbac_v3_Permission_rule_requested_server_name = 9,
+  envoy_config_rbac_v3_Permission_rule_matcher = 12,
+  envoy_config_rbac_v3_Permission_rule_NOT_SET = 0
+} envoy_config_rbac_v3_Permission_rule_oneofcases;
+UPB_INLINE envoy_config_rbac_v3_Permission_rule_oneofcases envoy_config_rbac_v3_Permission_rule_case(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Permission_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_and_rules(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_and_rules(const envoy_config_rbac_v3_Permission* msg) {
+  const envoy_config_rbac_v3_Permission_Set* default_val = NULL;
+  const envoy_config_rbac_v3_Permission_Set* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_and_rules(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_or_rules(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_or_rules(const envoy_config_rbac_v3_Permission* msg) {
+  const envoy_config_rbac_v3_Permission_Set* default_val = NULL;
+  const envoy_config_rbac_v3_Permission_Set* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_or_rules(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_any(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_any(const envoy_config_rbac_v3_Permission* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_any(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_header(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_header(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
+  const struct envoy_config_route_v3_HeaderMatcher* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_header(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_ip(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_destination_ip(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
+  const struct envoy_config_core_v3_CidrRange* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_ip(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_port(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_config_rbac_v3_Permission_destination_port(const envoy_config_rbac_v3_Permission* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_port(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_metadata(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_metadata(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_metadata(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_not_rule(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_not_rule(const envoy_config_rbac_v3_Permission* msg) {
+  const envoy_config_rbac_v3_Permission* default_val = NULL;
+  const envoy_config_rbac_v3_Permission* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_not_rule(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_requested_server_name(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_requested_server_name(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_StringMatcher* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_requested_server_name(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_url_path(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_url_path(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_PathMatcher* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_url_path(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_port_range(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_destination_port_range(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_type_v3_Int32Range* default_val = NULL;
+  const struct envoy_type_v3_Int32Range* ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_port_range(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_clear_matcher(envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_matcher(const envoy_config_rbac_v3_Permission* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_has_matcher(const envoy_config_rbac_v3_Permission* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_and_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_and_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_and_rules(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy__config__rbac__v3__Permission__Set_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_and_rules(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_or_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_or_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_or_rules(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy__config__rbac__v3__Permission__Set_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_or_rules(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_any(envoy_config_rbac_v3_Permission *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_header(envoy_config_rbac_v3_Permission *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_mutable_header(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Permission_header(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_header(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_ip(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_CidrRange* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_mutable_destination_ip(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Permission_destination_ip(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_destination_ip(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port(envoy_config_rbac_v3_Permission *msg, uint32_t value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_metadata(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_mutable_metadata(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Permission_metadata(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_metadata(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_not_rule(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_mutable_not_rule(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)envoy_config_rbac_v3_Permission_not_rule(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy__config__rbac__v3__Permission_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_not_rule(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_requested_server_name(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_mutable_requested_server_name(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Permission_requested_server_name(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_requested_server_name(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_url_path(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_PathMatcher* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_mutable_url_path(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Permission_url_path(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy__type__matcher__v3__PathMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_url_path(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port_range(envoy_config_rbac_v3_Permission *msg, struct envoy_type_v3_Int32Range* value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_mutable_destination_port_range(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_rbac_v3_Permission_destination_port_range(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Int32Range*)_upb_Message_New(&envoy__type__v3__Int32Range_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_destination_port_range(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_set_matcher(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_matcher(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Permission_set_matcher(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Permission.Set */
+
+UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy__config__rbac__v3__Permission__Set_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Permission_Set* ret = envoy_config_rbac_v3_Permission_Set_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Permission__Set_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Permission_Set* ret = envoy_config_rbac_v3_Permission_Set_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Permission__Set_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Permission_Set_serialize(const envoy_config_rbac_v3_Permission_Set* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Permission__Set_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Permission_Set_serialize_ex(const envoy_config_rbac_v3_Permission_Set* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Permission__Set_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_Permission_Set_clear_rules(envoy_config_rbac_v3_Permission_Set* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Permission_Set_rules(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_rbac_v3_Permission* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_upb_array(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_mutable_upb_array(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Permission_Set_has_rules(const envoy_config_rbac_v3_Permission_Set* msg) {
+  size_t size;
+  envoy_config_rbac_v3_Permission_Set_rules(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set_mutable_rules(envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_rbac_v3_Permission**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set_resize_rules(envoy_config_rbac_v3_Permission_Set* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Permission**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_Set_add_rules(envoy_config_rbac_v3_Permission_Set* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy__config__rbac__v3__Permission_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Principal */
+
+UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy__config__rbac__v3__Principal_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal* ret = envoy_config_rbac_v3_Principal_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal* ret = envoy_config_rbac_v3_Principal_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_serialize(const envoy_config_rbac_v3_Principal* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_serialize_ex(const envoy_config_rbac_v3_Principal* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_rbac_v3_Principal_identifier_and_ids = 1,
+  envoy_config_rbac_v3_Principal_identifier_or_ids = 2,
+  envoy_config_rbac_v3_Principal_identifier_any = 3,
+  envoy_config_rbac_v3_Principal_identifier_authenticated = 4,
+  envoy_config_rbac_v3_Principal_identifier_source_ip = 5,
+  envoy_config_rbac_v3_Principal_identifier_direct_remote_ip = 10,
+  envoy_config_rbac_v3_Principal_identifier_remote_ip = 11,
+  envoy_config_rbac_v3_Principal_identifier_header = 6,
+  envoy_config_rbac_v3_Principal_identifier_url_path = 9,
+  envoy_config_rbac_v3_Principal_identifier_metadata = 7,
+  envoy_config_rbac_v3_Principal_identifier_filter_state = 12,
+  envoy_config_rbac_v3_Principal_identifier_not_id = 8,
+  envoy_config_rbac_v3_Principal_identifier_NOT_SET = 0
+} envoy_config_rbac_v3_Principal_identifier_oneofcases;
+UPB_INLINE envoy_config_rbac_v3_Principal_identifier_oneofcases envoy_config_rbac_v3_Principal_identifier_case(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Principal_identifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_and_ids(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_and_ids(const envoy_config_rbac_v3_Principal* msg) {
+  const envoy_config_rbac_v3_Principal_Set* default_val = NULL;
+  const envoy_config_rbac_v3_Principal_Set* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_and_ids(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_or_ids(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_or_ids(const envoy_config_rbac_v3_Principal* msg) {
+  const envoy_config_rbac_v3_Principal_Set* default_val = NULL;
+  const envoy_config_rbac_v3_Principal_Set* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_or_ids(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_any(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_any(const envoy_config_rbac_v3_Principal* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_any(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_authenticated(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_authenticated(const envoy_config_rbac_v3_Principal* msg) {
+  const envoy_config_rbac_v3_Principal_Authenticated* default_val = NULL;
+  const envoy_config_rbac_v3_Principal_Authenticated* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_authenticated(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_source_ip(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_source_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
+  const struct envoy_config_core_v3_CidrRange* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_source_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_header(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_header(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
+  const struct envoy_config_route_v3_HeaderMatcher* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_header(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_metadata(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_metadata(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_metadata(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_not_id(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_not_id(const envoy_config_rbac_v3_Principal* msg) {
+  const envoy_config_rbac_v3_Principal* default_val = NULL;
+  const envoy_config_rbac_v3_Principal* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_not_id(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_url_path(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_url_path(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_PathMatcher* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_url_path(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_direct_remote_ip(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_direct_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
+  const struct envoy_config_core_v3_CidrRange* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_direct_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_remote_ip(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
+  const struct envoy_config_core_v3_CidrRange* ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_clear_filter_state(envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_filter_state(const envoy_config_rbac_v3_Principal* msg) {
+  const struct envoy_type_matcher_v3_FilterStateMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_FilterStateMatcher* ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_has_filter_state(const envoy_config_rbac_v3_Principal* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_and_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_and_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_and_ids(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy__config__rbac__v3__Principal__Set_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_and_ids(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_or_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_or_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_or_ids(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy__config__rbac__v3__Principal__Set_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_or_ids(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_any(envoy_config_rbac_v3_Principal *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_authenticated(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Authenticated* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_mutable_authenticated(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Principal_Authenticated* sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)envoy_config_rbac_v3_Principal_authenticated(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)_upb_Message_New(&envoy__config__rbac__v3__Principal__Authenticated_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_authenticated(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_source_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_source_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_source_ip(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_source_ip(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_header(envoy_config_rbac_v3_Principal *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_mutable_header(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Principal_header(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_header(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_metadata(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_mutable_metadata(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Principal_metadata(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_metadata(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_not_id(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_mutable_not_id(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)envoy_config_rbac_v3_Principal_not_id(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy__config__rbac__v3__Principal_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_not_id(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_url_path(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_PathMatcher* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_mutable_url_path(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Principal_url_path(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy__type__matcher__v3__PathMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_url_path(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_direct_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_direct_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_direct_remote_ip(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_direct_remote_ip(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_remote_ip(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_remote_ip(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_set_filter_state(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_FilterStateMatcher* value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_mutable_filter_state(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_FilterStateMatcher* sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)envoy_config_rbac_v3_Principal_filter_state(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)_upb_Message_New(&envoy__type__matcher__v3__FilterStateMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_set_filter_state(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Principal.Set */
+
+UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy__config__rbac__v3__Principal__Set_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal_Set* ret = envoy_config_rbac_v3_Principal_Set_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal__Set_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal_Set* ret = envoy_config_rbac_v3_Principal_Set_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal__Set_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_Set_serialize(const envoy_config_rbac_v3_Principal_Set* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal__Set_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_Set_serialize_ex(const envoy_config_rbac_v3_Principal_Set* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal__Set_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_Set_clear_ids(envoy_config_rbac_v3_Principal_Set* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Principal_Set_ids(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_rbac_v3_Principal* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_upb_array(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_mutable_upb_array(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_Set_has_ids(const envoy_config_rbac_v3_Principal_Set* msg) {
+  size_t size;
+  envoy_config_rbac_v3_Principal_Set_ids(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_mutable_ids(envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_rbac_v3_Principal**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_resize_ids(envoy_config_rbac_v3_Principal_Set* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_rbac_v3_Principal**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_Set_add_ids(envoy_config_rbac_v3_Principal_Set* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy__config__rbac__v3__Principal_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Principal.Authenticated */
+
+UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Principal_Authenticated*)_upb_Message_New(&envoy__config__rbac__v3__Principal__Authenticated_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal_Authenticated* ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal__Authenticated_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Principal_Authenticated* ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Principal__Authenticated_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_Authenticated_serialize(const envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal__Authenticated_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Principal_Authenticated_serialize_ex(const envoy_config_rbac_v3_Principal_Authenticated* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Principal__Authenticated_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_clear_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_principal_name(const envoy_config_rbac_v3_Principal_Authenticated* msg) {
+  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_StringMatcher* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_rbac_v3_Principal_Authenticated_has_principal_name(const envoy_config_rbac_v3_Principal_Authenticated* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(envoy_config_rbac_v3_Principal_Authenticated *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_mutable_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Principal_Authenticated_principal_name(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+    if (sub) envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.rbac.v3.Action */
+
+UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_new(upb_Arena* arena) {
+  return (envoy_config_rbac_v3_Action*)_upb_Message_New(&envoy__config__rbac__v3__Action_msg_init, arena);
+}
+UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_rbac_v3_Action* ret = envoy_config_rbac_v3_Action_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Action_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_rbac_v3_Action* ret = envoy_config_rbac_v3_Action_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__rbac__v3__Action_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Action_serialize(const envoy_config_rbac_v3_Action* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Action_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_rbac_v3_Action_serialize_ex(const envoy_config_rbac_v3_Action* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__rbac__v3__Action_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_rbac_v3_Action_clear_name(envoy_config_rbac_v3_Action* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_rbac_v3_Action_name(const envoy_config_rbac_v3_Action* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_rbac_v3_Action_clear_action(envoy_config_rbac_v3_Action* msg) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_rbac_v3_Action_action(const envoy_config_rbac_v3_Action* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_rbac_v3_Action_set_name(envoy_config_rbac_v3_Action *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Action *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
new file mode 100644
index 0000000000000..4d44625dd2a6e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
@@ -0,0 +1,348 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/rbac/v3/rbac.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/matcher/v3/path.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_submsgs[2] = {
+  {.submsg = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init},
+  {.submsg = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = {
+  &envoy_config_rbac_v3_RBAC_submsgs[0],
+  &envoy_config_rbac_v3_RBAC__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000101001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = {
+  {.submsg = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init = {
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init = {
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = {
+  {.submsg = &envoy__config__rbac__v3__Policy_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = {
+  &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0],
+  &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Policy_submsgs[4] = {
+  {.submsg = &envoy__config__rbac__v3__Permission_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Principal_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__CheckedExpr_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = {
+  &envoy_config_rbac_v3_Policy_submsgs[0],
+  &envoy_config_rbac_v3_Policy__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x001800000102001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000002030022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = {
+  {.submsg = &envoy__config__rbac__v3__Permission__Set_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Permission__Set_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Permission_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__PathMatcher_msg_init},
+  {.submsg = &envoy__type__v3__Int32Range_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = {
+  &envoy_config_rbac_v3_Permission_submsgs[0],
+  &envoy_config_rbac_v3_Permission__fields[0],
+  UPB_SIZE(8, 16), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0008000003000018, &upb_pob1_1bt},
+    {0x0008000004020022, &upb_pom_1bt_maxmaxb},
+    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
+    {0x0008000006000030, &upb_pov4_1bt},
+    {0x000800000704003a, &upb_pom_1bt_maxmaxb},
+    {0x0008000008050042, &upb_pom_1bt_max64b},
+    {0x000800000906004a, &upb_pom_1bt_maxmaxb},
+    {0x000800000a070052, &upb_pom_1bt_maxmaxb},
+    {0x000800000b08005a, &upb_pom_1bt_maxmaxb},
+    {0x000800000c090062, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Permission_Set_submsgs[1] = {
+  {.submsg = &envoy__config__rbac__v3__Permission_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = {
+  &envoy_config_rbac_v3_Permission_Set_submsgs[0],
+  &envoy_config_rbac_v3_Permission_Set__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Principal_submsgs[11] = {
+  {.submsg = &envoy__config__rbac__v3__Principal__Set_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Principal__Set_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Principal__Authenticated_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher_msg_init},
+  {.submsg = &envoy__config__rbac__v3__Principal_msg_init},
+  {.submsg = &envoy__type__matcher__v3__PathMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &envoy__type__matcher__v3__FilterStateMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = {
+  &envoy_config_rbac_v3_Principal_submsgs[0],
+  &envoy_config_rbac_v3_Principal__fields[0],
+  UPB_SIZE(8, 16), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0008000003000018, &upb_pob1_1bt},
+    {0x0008000004020022, &upb_pom_1bt_max64b},
+    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
+    {0x0008000006040032, &upb_pom_1bt_maxmaxb},
+    {0x000800000705003a, &upb_pom_1bt_maxmaxb},
+    {0x0008000008060042, &upb_pom_1bt_max64b},
+    {0x000800000907004a, &upb_pom_1bt_maxmaxb},
+    {0x000800000a080052, &upb_pom_1bt_maxmaxb},
+    {0x000800000b09005a, &upb_pom_1bt_maxmaxb},
+    {0x000800000c0a0062, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Set_submsgs[1] = {
+  {.submsg = &envoy__config__rbac__v3__Principal_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = {
+  &envoy_config_rbac_v3_Principal_Set_submsgs[0],
+  &envoy_config_rbac_v3_Principal_Set__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fields[1] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = {
+  &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0],
+  &envoy_config_rbac_v3_Principal_Authenticated__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_rbac_v3_Action__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__rbac__v3__Action_msg_init = {
+  NULL,
+  &envoy_config_rbac_v3_Action__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[11] = {
+  &envoy__config__rbac__v3__RBAC_msg_init,
+  &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init,
+  &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init,
+  &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init,
+  &envoy__config__rbac__v3__Policy_msg_init,
+  &envoy__config__rbac__v3__Permission_msg_init,
+  &envoy__config__rbac__v3__Permission__Set_msg_init,
+  &envoy__config__rbac__v3__Principal_msg_init,
+  &envoy__config__rbac__v3__Principal__Set_msg_init,
+  &envoy__config__rbac__v3__Principal__Authenticated_msg_init,
+  &envoy__config__rbac__v3__Action_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  11,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
new file mode 100644
index 0000000000000..a2612fde041fe
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_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__config__rbac__v3__RBAC_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init;
+extern const upb_MiniTable envoy__config__rbac__v3__Action_msg_init;
+
+extern const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
similarity index 95%
rename from src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h
rename to src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
index 09f927a95715a..2aaa57562a6de 100644
--- a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route.proto
  *
@@ -10,7 +9,19 @@
 #define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/route/v3/route.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,9 +31,6 @@ extern "C" {
 typedef struct envoy_config_route_v3_RouteConfiguration envoy_config_route_v3_RouteConfiguration;
 typedef struct envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry;
 typedef struct envoy_config_route_v3_Vhds envoy_config_route_v3_Vhds;
-extern const upb_MiniTable envoy_config_route_v3_RouteConfiguration_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_Vhds_msg_init;
 struct envoy_config_core_v3_ConfigSource;
 struct envoy_config_core_v3_HeaderValueOption;
 struct envoy_config_route_v3_ClusterSpecifierPlugin;
@@ -31,26 +39,18 @@ struct envoy_config_route_v3_VirtualHost;
 struct google_protobuf_Any;
 struct google_protobuf_BoolValue;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_ClusterSpecifierPlugin_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_VirtualHost_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.route.v3.RouteConfiguration */
 
 UPB_INLINE envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_RouteConfiguration_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy_config_route_v3_RouteConfiguration_msg_init, arena);
+  return (envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy__config__route__v3__RouteConfiguration_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_RouteConfiguration_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteConfiguration* ret = envoy_config_route_v3_RouteConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -60,7 +60,7 @@ UPB_INLINE envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_Route
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteConfiguration* ret = envoy_config_route_v3_RouteConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteConfiguration_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -68,13 +68,13 @@ UPB_INLINE envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_Route
 }
 UPB_INLINE char* envoy_config_route_v3_RouteConfiguration_serialize(const envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteConfiguration_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteConfiguration_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteConfiguration_serialize_ex(const envoy_config_route_v3_RouteConfiguration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteConfiguration_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteConfiguration_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteConfiguration_clear_name(envoy_config_route_v3_RouteConfiguration* msg) {
@@ -509,7 +509,7 @@ UPB_INLINE struct envoy_config_route_v3_VirtualHost* envoy_config_route_v3_Route
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_VirtualHost* sub = (struct envoy_config_route_v3_VirtualHost*)_upb_Message_New(&envoy_config_route_v3_VirtualHost_msg_init, arena);
+  struct envoy_config_route_v3_VirtualHost* sub = (struct envoy_config_route_v3_VirtualHost*)_upb_Message_New(&envoy__config__route__v3__VirtualHost_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -559,7 +559,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -609,7 +609,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -621,7 +621,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_validate_clusters(e
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteConfiguration_mutable_validate_clusters(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteConfiguration_validate_clusters(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteConfiguration_set_validate_clusters(msg, sub);
   }
   return sub;
@@ -657,7 +657,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_vhds(envoy_config_r
 UPB_INLINE struct envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfiguration_mutable_vhds(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_Vhds* sub = (struct envoy_config_route_v3_Vhds*)envoy_config_route_v3_RouteConfiguration_vhds(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_Vhds*)_upb_Message_New(&envoy_config_route_v3_Vhds_msg_init, arena);
+    sub = (struct envoy_config_route_v3_Vhds*)_upb_Message_New(&envoy__config__route__v3__Vhds_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteConfiguration_set_vhds(msg, sub);
   }
   return sub;
@@ -673,7 +673,7 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_max_direct_response
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteConfiguration_mutable_max_direct_response_body_size_bytes(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteConfiguration_max_direct_response_body_size_bytes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteConfiguration_set_max_direct_response_body_size_bytes(msg, sub);
   }
   return sub;
@@ -699,7 +699,7 @@ UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_rou
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_ClusterSpecifierPlugin* sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, arena);
+  struct envoy_config_route_v3_ClusterSpecifierPlugin* sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -725,7 +725,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -787,12 +787,12 @@ UPB_INLINE void envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEnt
 /* envoy.config.route.v3.Vhds */
 
 UPB_INLINE envoy_config_route_v3_Vhds* envoy_config_route_v3_Vhds_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_Vhds*)_upb_Message_New(&envoy_config_route_v3_Vhds_msg_init, arena);
+  return (envoy_config_route_v3_Vhds*)_upb_Message_New(&envoy__config__route__v3__Vhds_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_Vhds* envoy_config_route_v3_Vhds_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_Vhds* ret = envoy_config_route_v3_Vhds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Vhds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Vhds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -802,7 +802,7 @@ UPB_INLINE envoy_config_route_v3_Vhds* envoy_config_route_v3_Vhds_parse_ex(const
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_Vhds* ret = envoy_config_route_v3_Vhds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Vhds_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Vhds_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -810,13 +810,13 @@ UPB_INLINE envoy_config_route_v3_Vhds* envoy_config_route_v3_Vhds_parse_ex(const
 }
 UPB_INLINE char* envoy_config_route_v3_Vhds_serialize(const envoy_config_route_v3_Vhds* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Vhds_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Vhds_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_Vhds_serialize_ex(const envoy_config_route_v3_Vhds* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Vhds_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Vhds_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_Vhds_clear_config_source(envoy_config_route_v3_Vhds* msg) {
@@ -842,14 +842,12 @@ UPB_INLINE void envoy_config_route_v3_Vhds_set_config_source(envoy_config_route_
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_mutable_config_source(envoy_config_route_v3_Vhds* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_route_v3_Vhds_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_config_route_v3_Vhds_set_config_source(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
new file mode 100644
index 0000000000000..6d610ec7e5d59
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
@@ -0,0 +1,133 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/route.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/route/v3/route.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_submsgs[9] = {
+  {.submsg = &envoy__config__route__v3__VirtualHost_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__Vhds_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration__fields[16] = {
+  {1, UPB_SIZE(60, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(40, 88), 3, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(44, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(48, 104), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(52, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(53, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(56, 112), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = {
+  &envoy_config_route_v3_RouteConfiguration_submsgs[0],
+  &envoy_config_route_v3_RouteConfiguration__fields[0],
+  UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_prs_1bt},
+    {0x002800003f010022, &upb_prm_1bt_maxmaxb},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x003800003f020032, &upb_prm_1bt_maxmaxb},
+    {0x004000000103003a, &upb_psm_1bt_maxmaxb},
+    {0x004800003f000042, &upb_prs_1bt},
+    {0x005000000204004a, &upb_psm_1bt_max64b},
+    {0x000100003f000050, &upb_psb1_1bt},
+    {0x005800000305005a, &upb_psm_1bt_maxmaxb},
+    {0x006000003f060062, &upb_prm_1bt_maxmaxb},
+    {0x006800003f07006a, &upb_prm_1bt_maxmaxb},
+    {0x000200003f000070, &upb_psb1_1bt},
+    {0x000300003f000078, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init = {
+  &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0],
+  &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_Vhds_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_Vhds__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = {
+  &envoy_config_route_v3_Vhds_submsgs[0],
+  &envoy_config_route_v3_Vhds__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__config__route__v3__RouteConfiguration_msg_init,
+  &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init,
+  &envoy__config__route__v3__Vhds_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
new file mode 100644
index 0000000000000..b4f9e07e0edd9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/route.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_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__config__route__v3__RouteConfiguration_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__Vhds_msg_init;
+
+extern const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h
rename to src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
index 0f6707b66545f..d3499b8a01ee2 100644
--- a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route_components.proto
  *
@@ -10,7 +9,31 @@
 #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -75,64 +98,6 @@ typedef struct envoy_config_route_v3_HeaderMatcher envoy_config_route_v3_HeaderM
 typedef struct envoy_config_route_v3_QueryParameterMatcher envoy_config_route_v3_QueryParameterMatcher;
 typedef struct envoy_config_route_v3_InternalRedirectPolicy envoy_config_route_v3_InternalRedirectPolicy;
 typedef struct envoy_config_route_v3_FilterConfig envoy_config_route_v3_FilterConfig;
-extern const upb_MiniTable envoy_config_route_v3_VirtualHost_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_FilterAction_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteList_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_Route_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_Route_TypedPerFilterConfigEntry_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_WeightedCluster_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_ClusterSpecifierPlugin_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteMatch_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_CorsPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HedgePolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RedirectAction_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_DirectResponseAction_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_NonForwardingAction_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_Decorator_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_Tracing_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_VirtualCluster_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_MetaData_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Override_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_QueryParameterMatcher_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_InternalRedirectPolicy_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_FilterConfig_msg_init;
 struct envoy_config_core_v3_DataSource;
 struct envoy_config_core_v3_HeaderValueOption;
 struct envoy_config_core_v3_Metadata;
@@ -152,25 +117,6 @@ struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
 struct xds_type_matcher_v3_Matcher;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ProxyProtocolConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeFractionalPercent_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKey_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable envoy_type_v3_Int64Range_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_msg_init;
 
 typedef enum {
   envoy_config_route_v3_RateLimit_Action_MetaData_DYNAMIC = 0,
@@ -212,12 +158,12 @@ typedef enum {
 /* envoy.config.route.v3.VirtualHost */
 
 UPB_INLINE envoy_config_route_v3_VirtualHost* envoy_config_route_v3_VirtualHost_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_VirtualHost*)_upb_Message_New(&envoy_config_route_v3_VirtualHost_msg_init, arena);
+  return (envoy_config_route_v3_VirtualHost*)_upb_Message_New(&envoy__config__route__v3__VirtualHost_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_VirtualHost* envoy_config_route_v3_VirtualHost_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_VirtualHost* ret = envoy_config_route_v3_VirtualHost_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__VirtualHost_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -227,7 +173,7 @@ UPB_INLINE envoy_config_route_v3_VirtualHost* envoy_config_route_v3_VirtualHost_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_VirtualHost* ret = envoy_config_route_v3_VirtualHost_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__VirtualHost_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -235,13 +181,13 @@ UPB_INLINE envoy_config_route_v3_VirtualHost* envoy_config_route_v3_VirtualHost_
 }
 UPB_INLINE char* envoy_config_route_v3_VirtualHost_serialize(const envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_VirtualHost_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__VirtualHost_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_VirtualHost_serialize_ex(const envoy_config_route_v3_VirtualHost* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_VirtualHost_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__VirtualHost_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_VirtualHost_clear_name(envoy_config_route_v3_VirtualHost* msg) {
@@ -793,7 +739,7 @@ UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_VirtualHost
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_Route* sub = (struct envoy_config_route_v3_Route*)_upb_Message_New(&envoy_config_route_v3_Route_msg_init, arena);
+  struct envoy_config_route_v3_Route* sub = (struct envoy_config_route_v3_Route*)_upb_Message_New(&envoy__config__route__v3__Route_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -823,7 +769,7 @@ UPB_INLINE struct envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_Vi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_VirtualCluster* sub = (struct envoy_config_route_v3_VirtualCluster*)_upb_Message_New(&envoy_config_route_v3_VirtualCluster_msg_init, arena);
+  struct envoy_config_route_v3_VirtualCluster* sub = (struct envoy_config_route_v3_VirtualCluster*)_upb_Message_New(&envoy__config__route__v3__VirtualCluster_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -849,7 +795,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_Virtual
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RateLimit* sub = (struct envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy_config_route_v3_RateLimit_msg_init, arena);
+  struct envoy_config_route_v3_RateLimit* sub = (struct envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy__config__route__v3__RateLimit_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -875,7 +821,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -887,7 +833,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_cors(envoy_config_route_v3
 UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_VirtualHost_mutable_cors(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_VirtualHost_cors(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy_config_route_v3_CorsPolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy__config__route__v3__CorsPolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_cors(msg, sub);
   }
   return sub;
@@ -913,7 +859,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1001,7 +947,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy(envoy_config_
 UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_VirtualHost_mutable_retry_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_VirtualHost_retry_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_retry_policy(msg, sub);
   }
   return sub;
@@ -1013,7 +959,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_hedge_policy(envoy_config_
 UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_VirtualHost_mutable_hedge_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_VirtualHost_hedge_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy_config_route_v3_HedgePolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy__config__route__v3__HedgePolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_hedge_policy(msg, sub);
   }
   return sub;
@@ -1025,7 +971,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_per_request_buffer_limit_b
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_VirtualHost_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_VirtualHost_per_request_buffer_limit_bytes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_per_request_buffer_limit_bytes(msg, sub);
   }
   return sub;
@@ -1041,7 +987,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy_typed_config(
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_mutable_retry_policy_typed_config(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_VirtualHost_retry_policy_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_retry_policy_typed_config(msg, sub);
   }
   return sub;
@@ -1053,7 +999,7 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_set_matcher(envoy_config_route
 UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_route_v3_VirtualHost_mutable_matcher(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) {
   struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_route_v3_VirtualHost_matcher(msg);
   if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
+    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
     if (sub) envoy_config_route_v3_VirtualHost_set_matcher(msg, sub);
   }
   return sub;
@@ -1079,7 +1025,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1113,12 +1059,12 @@ UPB_INLINE void envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_set_
 /* envoy.config.route.v3.FilterAction */
 
 UPB_INLINE envoy_config_route_v3_FilterAction* envoy_config_route_v3_FilterAction_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_FilterAction*)_upb_Message_New(&envoy_config_route_v3_FilterAction_msg_init, arena);
+  return (envoy_config_route_v3_FilterAction*)_upb_Message_New(&envoy__config__route__v3__FilterAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_FilterAction* envoy_config_route_v3_FilterAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_FilterAction* ret = envoy_config_route_v3_FilterAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__FilterAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1128,7 +1074,7 @@ UPB_INLINE envoy_config_route_v3_FilterAction* envoy_config_route_v3_FilterActio
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_FilterAction* ret = envoy_config_route_v3_FilterAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__FilterAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1136,13 +1082,13 @@ UPB_INLINE envoy_config_route_v3_FilterAction* envoy_config_route_v3_FilterActio
 }
 UPB_INLINE char* envoy_config_route_v3_FilterAction_serialize(const envoy_config_route_v3_FilterAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_FilterAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__FilterAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_FilterAction_serialize_ex(const envoy_config_route_v3_FilterAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_FilterAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__FilterAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_FilterAction_clear_action(envoy_config_route_v3_FilterAction* msg) {
@@ -1168,7 +1114,7 @@ UPB_INLINE void envoy_config_route_v3_FilterAction_set_action(envoy_config_route
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterAction_mutable_action(envoy_config_route_v3_FilterAction* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterAction_action(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_FilterAction_set_action(msg, sub);
   }
   return sub;
@@ -1177,12 +1123,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterAction_mutabl
 /* envoy.config.route.v3.RouteList */
 
 UPB_INLINE envoy_config_route_v3_RouteList* envoy_config_route_v3_RouteList_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteList*)_upb_Message_New(&envoy_config_route_v3_RouteList_msg_init, arena);
+  return (envoy_config_route_v3_RouteList*)_upb_Message_New(&envoy__config__route__v3__RouteList_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteList* envoy_config_route_v3_RouteList_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteList* ret = envoy_config_route_v3_RouteList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1192,7 +1138,7 @@ UPB_INLINE envoy_config_route_v3_RouteList* envoy_config_route_v3_RouteList_pars
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteList* ret = envoy_config_route_v3_RouteList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1200,13 +1146,13 @@ UPB_INLINE envoy_config_route_v3_RouteList* envoy_config_route_v3_RouteList_pars
 }
 UPB_INLINE char* envoy_config_route_v3_RouteList_serialize(const envoy_config_route_v3_RouteList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteList_serialize_ex(const envoy_config_route_v3_RouteList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteList_clear_routes(envoy_config_route_v3_RouteList* msg) {
@@ -1268,7 +1214,7 @@ UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_RouteList_a
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_Route* sub = (struct envoy_config_route_v3_Route*)_upb_Message_New(&envoy_config_route_v3_Route_msg_init, arena);
+  struct envoy_config_route_v3_Route* sub = (struct envoy_config_route_v3_Route*)_upb_Message_New(&envoy__config__route__v3__Route_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1277,12 +1223,12 @@ UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_RouteList_a
 /* envoy.config.route.v3.Route */
 
 UPB_INLINE envoy_config_route_v3_Route* envoy_config_route_v3_Route_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_Route*)_upb_Message_New(&envoy_config_route_v3_Route_msg_init, arena);
+  return (envoy_config_route_v3_Route*)_upb_Message_New(&envoy__config__route__v3__Route_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_Route* envoy_config_route_v3_Route_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_Route* ret = envoy_config_route_v3_Route_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Route_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Route_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1292,7 +1238,7 @@ UPB_INLINE envoy_config_route_v3_Route* envoy_config_route_v3_Route_parse_ex(con
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_Route* ret = envoy_config_route_v3_Route_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Route_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Route_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1300,13 +1246,13 @@ UPB_INLINE envoy_config_route_v3_Route* envoy_config_route_v3_Route_parse_ex(con
 }
 UPB_INLINE char* envoy_config_route_v3_Route_serialize(const envoy_config_route_v3_Route* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Route_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Route_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_Route_serialize_ex(const envoy_config_route_v3_Route* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Route_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Route_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1670,7 +1616,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_match(envoy_config_route_v3_Rout
 UPB_INLINE struct envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_mutable_match(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteMatch* sub = (struct envoy_config_route_v3_RouteMatch*)envoy_config_route_v3_Route_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteMatch*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteMatch*)_upb_Message_New(&envoy__config__route__v3__RouteMatch_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_match(msg, sub);
   }
   return sub;
@@ -1682,7 +1628,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_route(envoy_config_route_v3_Rout
 UPB_INLINE struct envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route_mutable_route(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction* sub = (struct envoy_config_route_v3_RouteAction*)envoy_config_route_v3_Route_route(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction*)_upb_Message_New(&envoy_config_route_v3_RouteAction_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction*)_upb_Message_New(&envoy__config__route__v3__RouteAction_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_route(msg, sub);
   }
   return sub;
@@ -1694,7 +1640,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_redirect(envoy_config_route_v3_R
 UPB_INLINE struct envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Route_mutable_redirect(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RedirectAction* sub = (struct envoy_config_route_v3_RedirectAction*)envoy_config_route_v3_Route_redirect(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RedirectAction*)_upb_Message_New(&envoy_config_route_v3_RedirectAction_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RedirectAction*)_upb_Message_New(&envoy__config__route__v3__RedirectAction_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_redirect(msg, sub);
   }
   return sub;
@@ -1706,7 +1652,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_metadata(envoy_config_route_v3_R
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Route_mutable_metadata(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_Route_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_metadata(msg, sub);
   }
   return sub;
@@ -1718,7 +1664,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_decorator(envoy_config_route_v3_
 UPB_INLINE struct envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_mutable_decorator(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_Decorator* sub = (struct envoy_config_route_v3_Decorator*)envoy_config_route_v3_Route_decorator(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_Decorator*)_upb_Message_New(&envoy_config_route_v3_Decorator_msg_init, arena);
+    sub = (struct envoy_config_route_v3_Decorator*)_upb_Message_New(&envoy__config__route__v3__Decorator_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_decorator(msg, sub);
   }
   return sub;
@@ -1730,7 +1676,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_direct_response(envoy_config_rou
 UPB_INLINE struct envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_Route_mutable_direct_response(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_DirectResponseAction* sub = (struct envoy_config_route_v3_DirectResponseAction*)envoy_config_route_v3_Route_direct_response(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_DirectResponseAction*)_upb_Message_New(&envoy_config_route_v3_DirectResponseAction_msg_init, arena);
+    sub = (struct envoy_config_route_v3_DirectResponseAction*)_upb_Message_New(&envoy__config__route__v3__DirectResponseAction_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_direct_response(msg, sub);
   }
   return sub;
@@ -1756,7 +1702,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1782,7 +1728,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1870,7 +1816,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_tracing(envoy_config_route_v3_Ro
 UPB_INLINE struct envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_mutable_tracing(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_Tracing* sub = (struct envoy_config_route_v3_Tracing*)envoy_config_route_v3_Route_tracing(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_Tracing*)_upb_Message_New(&envoy_config_route_v3_Tracing_msg_init, arena);
+    sub = (struct envoy_config_route_v3_Tracing*)_upb_Message_New(&envoy__config__route__v3__Tracing_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_tracing(msg, sub);
   }
   return sub;
@@ -1882,7 +1828,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_per_request_buffer_limit_bytes(e
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_Route_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_Route_per_request_buffer_limit_bytes(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_per_request_buffer_limit_bytes(msg, sub);
   }
   return sub;
@@ -1894,7 +1840,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_filter_action(envoy_config_route
 UPB_INLINE struct envoy_config_route_v3_FilterAction* envoy_config_route_v3_Route_mutable_filter_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_FilterAction* sub = (struct envoy_config_route_v3_FilterAction*)envoy_config_route_v3_Route_filter_action(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_FilterAction*)_upb_Message_New(&envoy_config_route_v3_FilterAction_msg_init, arena);
+    sub = (struct envoy_config_route_v3_FilterAction*)_upb_Message_New(&envoy__config__route__v3__FilterAction_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_filter_action(msg, sub);
   }
   return sub;
@@ -1906,7 +1852,7 @@ UPB_INLINE void envoy_config_route_v3_Route_set_non_forwarding_action(envoy_conf
 UPB_INLINE struct envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_Route_mutable_non_forwarding_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_NonForwardingAction* sub = (struct envoy_config_route_v3_NonForwardingAction*)envoy_config_route_v3_Route_non_forwarding_action(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_NonForwardingAction*)_upb_Message_New(&envoy_config_route_v3_NonForwardingAction_msg_init, arena);
+    sub = (struct envoy_config_route_v3_NonForwardingAction*)_upb_Message_New(&envoy__config__route__v3__NonForwardingAction_msg_init, arena);
     if (sub) envoy_config_route_v3_Route_set_non_forwarding_action(msg, sub);
   }
   return sub;
@@ -1940,12 +1886,12 @@ UPB_INLINE void envoy_config_route_v3_Route_TypedPerFilterConfigEntry_set_value(
 /* envoy.config.route.v3.WeightedCluster */
 
 UPB_INLINE envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_WeightedCluster_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_WeightedCluster*)_upb_Message_New(&envoy_config_route_v3_WeightedCluster_msg_init, arena);
+  return (envoy_config_route_v3_WeightedCluster*)_upb_Message_New(&envoy__config__route__v3__WeightedCluster_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_WeightedCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_WeightedCluster* ret = envoy_config_route_v3_WeightedCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__WeightedCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1955,7 +1901,7 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_Weighted
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_WeightedCluster* ret = envoy_config_route_v3_WeightedCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__WeightedCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1963,13 +1909,13 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_Weighted
 }
 UPB_INLINE char* envoy_config_route_v3_WeightedCluster_serialize(const envoy_config_route_v3_WeightedCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_WeightedCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__WeightedCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_WeightedCluster_serialize_ex(const envoy_config_route_v3_WeightedCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_WeightedCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__WeightedCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2080,7 +2026,7 @@ UPB_INLINE struct envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_con
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_WeightedCluster_ClusterWeight* sub = (struct envoy_config_route_v3_WeightedCluster_ClusterWeight*)_upb_Message_New(&envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, arena);
+  struct envoy_config_route_v3_WeightedCluster_ClusterWeight* sub = (struct envoy_config_route_v3_WeightedCluster_ClusterWeight*)_upb_Message_New(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2096,7 +2042,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_total_weight(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_mutable_total_weight(envoy_config_route_v3_WeightedCluster* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_total_weight(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_WeightedCluster_set_total_weight(msg, sub);
   }
   return sub;
@@ -2109,12 +2055,12 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_header_name(envoy_conf
 /* envoy.config.route.v3.WeightedCluster.ClusterWeight */
 
 UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_config_route_v3_WeightedCluster_ClusterWeight_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_WeightedCluster_ClusterWeight*)_upb_Message_New(&envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, arena);
+  return (envoy_config_route_v3_WeightedCluster_ClusterWeight*)_upb_Message_New(&envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_config_route_v3_WeightedCluster_ClusterWeight_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_WeightedCluster_ClusterWeight* ret = envoy_config_route_v3_WeightedCluster_ClusterWeight_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2124,7 +2070,7 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_config_rou
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_WeightedCluster_ClusterWeight* ret = envoy_config_route_v3_WeightedCluster_ClusterWeight_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2132,13 +2078,13 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_config_rou
 }
 UPB_INLINE char* envoy_config_route_v3_WeightedCluster_ClusterWeight_serialize(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_WeightedCluster_ClusterWeight_serialize_ex(const envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2397,7 +2343,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_weight(e
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_weight(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_ClusterWeight_weight(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_WeightedCluster_ClusterWeight_set_weight(msg, sub);
   }
   return sub;
@@ -2409,7 +2355,7 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_metadata
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_metadata_match(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_WeightedCluster_ClusterWeight_metadata_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_route_v3_WeightedCluster_ClusterWeight_set_metadata_match(msg, sub);
   }
   return sub;
@@ -2435,7 +2381,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2461,7 +2407,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2571,12 +2517,12 @@ UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilt
 /* envoy.config.route.v3.ClusterSpecifierPlugin */
 
 UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_ClusterSpecifierPlugin_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, arena);
+  return (envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_ClusterSpecifierPlugin_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_ClusterSpecifierPlugin* ret = envoy_config_route_v3_ClusterSpecifierPlugin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2586,7 +2532,7 @@ UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_C
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_ClusterSpecifierPlugin* ret = envoy_config_route_v3_ClusterSpecifierPlugin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2594,13 +2540,13 @@ UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_C
 }
 UPB_INLINE char* envoy_config_route_v3_ClusterSpecifierPlugin_serialize(const envoy_config_route_v3_ClusterSpecifierPlugin* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_ClusterSpecifierPlugin_serialize_ex(const envoy_config_route_v3_ClusterSpecifierPlugin* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_clear_extension(envoy_config_route_v3_ClusterSpecifierPlugin* msg) {
@@ -2637,7 +2583,7 @@ UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_extension(envoy
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_ClusterSpecifierPlugin_mutable_extension(envoy_config_route_v3_ClusterSpecifierPlugin* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_ClusterSpecifierPlugin_extension(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_ClusterSpecifierPlugin_set_extension(msg, sub);
   }
   return sub;
@@ -2650,12 +2596,12 @@ UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_is_optional(env
 /* envoy.config.route.v3.RouteMatch */
 
 UPB_INLINE envoy_config_route_v3_RouteMatch* envoy_config_route_v3_RouteMatch_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteMatch*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_msg_init, arena);
+  return (envoy_config_route_v3_RouteMatch*)_upb_Message_New(&envoy__config__route__v3__RouteMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteMatch* envoy_config_route_v3_RouteMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch* ret = envoy_config_route_v3_RouteMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2665,7 +2611,7 @@ UPB_INLINE envoy_config_route_v3_RouteMatch* envoy_config_route_v3_RouteMatch_pa
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch* ret = envoy_config_route_v3_RouteMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2673,13 +2619,13 @@ UPB_INLINE envoy_config_route_v3_RouteMatch* envoy_config_route_v3_RouteMatch_pa
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_serialize(const envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_serialize_ex(const envoy_config_route_v3_RouteMatch* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2972,7 +2918,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_case_sensitive(envoy_config
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_mutable_case_sensitive(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_case_sensitive(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_case_sensitive(msg, sub);
   }
   return sub;
@@ -2998,7 +2944,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Rou
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3024,7 +2970,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_QueryParameterMatcher* sub = (struct envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy_config_route_v3_QueryParameterMatcher_msg_init, arena);
+  struct envoy_config_route_v3_QueryParameterMatcher* sub = (struct envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy__config__route__v3__QueryParameterMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3036,7 +2982,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_grpc(envoy_config_route_v3_
 UPB_INLINE struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_route_v3_RouteMatch_mutable_grpc(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)envoy_config_route_v3_RouteMatch_grpc(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_grpc(msg, sub);
   }
   return sub;
@@ -3048,7 +2994,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_runtime_fraction(envoy_conf
 UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteMatch_mutable_runtime_fraction(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteMatch_runtime_fraction(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_runtime_fraction(msg, sub);
   }
   return sub;
@@ -3060,7 +3006,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_safe_regex(envoy_config_rou
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_RouteMatch_mutable_safe_regex(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_RouteMatch_safe_regex(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_safe_regex(msg, sub);
   }
   return sub;
@@ -3072,7 +3018,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_tls_context(envoy_config_ro
 UPB_INLINE struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config_route_v3_RouteMatch_mutable_tls_context(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)envoy_config_route_v3_RouteMatch_tls_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_tls_context(msg, sub);
   }
   return sub;
@@ -3084,7 +3030,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_connect_matcher(envoy_confi
 UPB_INLINE struct envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v3_RouteMatch_mutable_connect_matcher(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteMatch_ConnectMatcher* sub = (struct envoy_config_route_v3_RouteMatch_ConnectMatcher*)envoy_config_route_v3_RouteMatch_connect_matcher(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteMatch_ConnectMatcher*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteMatch_ConnectMatcher*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_connect_matcher(msg, sub);
   }
   return sub;
@@ -3110,7 +3056,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_route_v3_R
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
+  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3126,7 +3072,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_match_policy(envoy_con
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteMatch_mutable_path_match_policy(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteMatch_path_match_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_set_path_match_policy(msg, sub);
   }
   return sub;
@@ -3135,12 +3081,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_
 /* envoy.config.route.v3.RouteMatch.GrpcRouteMatchOptions */
 
 UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, arena);
+  return (envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* ret = envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3150,7 +3096,7 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* ret = envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3158,13 +3104,13 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_serialize(const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_serialize_ex(const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -3172,12 +3118,12 @@ UPB_INLINE char* envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_serializ
 /* envoy.config.route.v3.RouteMatch.TlsContextMatchOptions */
 
 UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, arena);
+  return (envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* ret = envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3187,7 +3133,7 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* ret = envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3195,13 +3141,13 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_serialize(const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_serialize_ex(const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_clear_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg) {
@@ -3242,7 +3188,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_pres
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_presented(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_presented(msg, sub);
   }
   return sub;
@@ -3254,7 +3200,7 @@ UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_vali
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_validated(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_validated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_validated(msg, sub);
   }
   return sub;
@@ -3263,12 +3209,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_Tl
 /* envoy.config.route.v3.RouteMatch.ConnectMatcher */
 
 UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v3_RouteMatch_ConnectMatcher_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteMatch_ConnectMatcher*)_upb_Message_New(&envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, arena);
+  return (envoy_config_route_v3_RouteMatch_ConnectMatcher*)_upb_Message_New(&envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v3_RouteMatch_ConnectMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_ConnectMatcher* ret = envoy_config_route_v3_RouteMatch_ConnectMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3278,7 +3224,7 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteMatch_ConnectMatcher* ret = envoy_config_route_v3_RouteMatch_ConnectMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3286,13 +3232,13 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_ConnectMatcher_serialize(const envoy_config_route_v3_RouteMatch_ConnectMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteMatch_ConnectMatcher_serialize_ex(const envoy_config_route_v3_RouteMatch_ConnectMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -3300,12 +3246,12 @@ UPB_INLINE char* envoy_config_route_v3_RouteMatch_ConnectMatcher_serialize_ex(co
 /* envoy.config.route.v3.CorsPolicy */
 
 UPB_INLINE envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_CorsPolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy_config_route_v3_CorsPolicy_msg_init, arena);
+  return (envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy__config__route__v3__CorsPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_CorsPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_CorsPolicy* ret = envoy_config_route_v3_CorsPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__CorsPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3315,7 +3261,7 @@ UPB_INLINE envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_CorsPolicy_pa
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_CorsPolicy* ret = envoy_config_route_v3_CorsPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__CorsPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3323,13 +3269,13 @@ UPB_INLINE envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_CorsPolicy_pa
 }
 UPB_INLINE char* envoy_config_route_v3_CorsPolicy_serialize(const envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_CorsPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__CorsPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_CorsPolicy_serialize_ex(const envoy_config_route_v3_CorsPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_CorsPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__CorsPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3505,7 +3451,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_credentials(envoy_con
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_credentials(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_credentials(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_CorsPolicy_set_allow_credentials(msg, sub);
   }
   return sub;
@@ -3517,7 +3463,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_filter_enabled(envoy_config
 UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_filter_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_filter_enabled(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_CorsPolicy_set_filter_enabled(msg, sub);
   }
   return sub;
@@ -3529,7 +3475,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_shadow_enabled(envoy_config
 UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_shadow_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_shadow_enabled(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_CorsPolicy_set_shadow_enabled(msg, sub);
   }
   return sub;
@@ -3555,7 +3501,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Cor
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3567,7 +3513,7 @@ UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_private_network_acces
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_private_network_access(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_private_network_access(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_CorsPolicy_set_allow_private_network_access(msg, sub);
   }
   return sub;
@@ -3576,12 +3522,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu
 /* envoy.config.route.v3.RouteAction */
 
 UPB_INLINE envoy_config_route_v3_RouteAction* envoy_config_route_v3_RouteAction_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction*)_upb_Message_New(&envoy_config_route_v3_RouteAction_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction*)_upb_Message_New(&envoy__config__route__v3__RouteAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction* envoy_config_route_v3_RouteAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction* ret = envoy_config_route_v3_RouteAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3591,7 +3537,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction* envoy_config_route_v3_RouteAction_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction* ret = envoy_config_route_v3_RouteAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3599,13 +3545,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction* envoy_config_route_v3_RouteAction_
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_serialize(const envoy_config_route_v3_RouteAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_serialize_ex(const envoy_config_route_v3_RouteAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -4225,7 +4171,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_weighted_clusters(envoy_co
 UPB_INLINE struct envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_RouteAction_mutable_weighted_clusters(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_WeightedCluster* sub = (struct envoy_config_route_v3_WeightedCluster*)envoy_config_route_v3_RouteAction_weighted_clusters(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_WeightedCluster*)_upb_Message_New(&envoy_config_route_v3_WeightedCluster_msg_init, arena);
+    sub = (struct envoy_config_route_v3_WeightedCluster*)_upb_Message_New(&envoy__config__route__v3__WeightedCluster_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_weighted_clusters(msg, sub);
   }
   return sub;
@@ -4237,7 +4183,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_metadata_match(envoy_confi
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteAction_mutable_metadata_match(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_RouteAction_metadata_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_metadata_match(msg, sub);
   }
   return sub;
@@ -4257,7 +4203,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_auto_host_rewrite(envoy_co
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_auto_host_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_auto_host_rewrite(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_auto_host_rewrite(msg, sub);
   }
   return sub;
@@ -4269,7 +4215,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_timeout(envoy_config_route
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_timeout(msg, sub);
   }
   return sub;
@@ -4281,7 +4227,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy(envoy_config_
 UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RouteAction_mutable_retry_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_RouteAction_retry_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_retry_policy(msg, sub);
   }
   return sub;
@@ -4311,7 +4257,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_RouteAc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RateLimit* sub = (struct envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy_config_route_v3_RateLimit_msg_init, arena);
+  struct envoy_config_route_v3_RateLimit* sub = (struct envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy__config__route__v3__RateLimit_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4323,7 +4269,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_include_vh_rate_limits(env
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_include_vh_rate_limits(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_include_vh_rate_limits(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_include_vh_rate_limits(msg, sub);
   }
   return sub;
@@ -4349,7 +4295,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_rou
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_HashPolicy* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_HashPolicy* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4361,7 +4307,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_cors(envoy_config_route_v3
 UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteAction_mutable_cors(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_RouteAction_cors(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy_config_route_v3_CorsPolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_CorsPolicy*)_upb_Message_New(&envoy__config__route__v3__CorsPolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_cors(msg, sub);
   }
   return sub;
@@ -4377,7 +4323,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_grpc_timeout(envoy_con
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_max_grpc_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_max_grpc_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_max_grpc_timeout(msg, sub);
   }
   return sub;
@@ -4389,7 +4335,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_idle_timeout(envoy_config_
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_idle_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_idle_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_idle_timeout(msg, sub);
   }
   return sub;
@@ -4415,7 +4361,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_UpgradeConfig* sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig*)_upb_Message_New(&envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_UpgradeConfig* sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig*)_upb_Message_New(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4431,7 +4377,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_hedge_policy(envoy_config_
 UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_RouteAction_mutable_hedge_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_RouteAction_hedge_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy_config_route_v3_HedgePolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy__config__route__v3__HedgePolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_hedge_policy(msg, sub);
   }
   return sub;
@@ -4443,7 +4389,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_grpc_timeout_offset(envoy_
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_grpc_timeout_offset(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_grpc_timeout_offset(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_grpc_timeout_offset(msg, sub);
   }
   return sub;
@@ -4473,7 +4419,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* sub = (struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4485,7 +4431,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_internal_redirects(env
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteAction_mutable_max_internal_redirects(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteAction_max_internal_redirects(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_max_internal_redirects(msg, sub);
   }
   return sub;
@@ -4497,7 +4443,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_regex_rewrite(envoy_config
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_regex_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_regex_rewrite(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_regex_rewrite(msg, sub);
   }
   return sub;
@@ -4509,7 +4455,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy_typed_config(
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RouteAction_mutable_retry_policy_typed_config(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RouteAction_retry_policy_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_retry_policy_typed_config(msg, sub);
   }
   return sub;
@@ -4521,7 +4467,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_policy(e
 UPB_INLINE struct envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_RouteAction_mutable_internal_redirect_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_InternalRedirectPolicy* sub = (struct envoy_config_route_v3_InternalRedirectPolicy*)envoy_config_route_v3_RouteAction_internal_redirect_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_InternalRedirectPolicy*)_upb_Message_New(&envoy_config_route_v3_InternalRedirectPolicy_msg_init, arena);
+    sub = (struct envoy_config_route_v3_InternalRedirectPolicy*)_upb_Message_New(&envoy__config__route__v3__InternalRedirectPolicy_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_internal_redirect_policy(msg, sub);
   }
   return sub;
@@ -4533,7 +4479,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_path_regex(en
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_host_rewrite_path_regex(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_host_rewrite_path_regex(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_host_rewrite_path_regex(msg, sub);
   }
   return sub;
@@ -4545,7 +4491,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_stream_duration(envoy_
 UPB_INLINE struct envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_route_v3_RouteAction_mutable_max_stream_duration(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_MaxStreamDuration* sub = (struct envoy_config_route_v3_RouteAction_MaxStreamDuration*)envoy_config_route_v3_RouteAction_max_stream_duration(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_MaxStreamDuration*)_upb_Message_New(&envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_MaxStreamDuration*)_upb_Message_New(&envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_max_stream_duration(msg, sub);
   }
   return sub;
@@ -4565,7 +4511,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_inline_cluster_specifier_p
 UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_RouteAction_mutable_inline_cluster_specifier_plugin(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_ClusterSpecifierPlugin* sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)envoy_config_route_v3_RouteAction_inline_cluster_specifier_plugin(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy_config_route_v3_ClusterSpecifierPlugin_msg_init, arena);
+    sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)_upb_Message_New(&envoy__config__route__v3__ClusterSpecifierPlugin_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_inline_cluster_specifier_plugin(msg, sub);
   }
   return sub;
@@ -4577,7 +4523,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_early_data_policy(envoy_co
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_early_data_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_early_data_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_early_data_policy(msg, sub);
   }
   return sub;
@@ -4589,7 +4535,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_set_path_rewrite_policy(envoy_
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_path_rewrite_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_path_rewrite_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_set_path_rewrite_policy(msg, sub);
   }
   return sub;
@@ -4598,12 +4544,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_
 /* envoy.config.route.v3.RouteAction.RequestMirrorPolicy */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_RequestMirrorPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_RequestMirrorPolicy* ret = envoy_config_route_v3_RouteAction_RequestMirrorPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4613,7 +4559,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_r
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_RequestMirrorPolicy* ret = envoy_config_route_v3_RouteAction_RequestMirrorPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4621,13 +4567,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_config_r
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_serialize(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_serialize_ex(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_cluster(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) {
@@ -4694,7 +4640,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_runtim
 UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_runtime_fraction(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_runtime_fraction(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_runtime_fraction(msg, sub);
   }
   return sub;
@@ -4706,7 +4652,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_trace_
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_trace_sampled(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_trace_sampled(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_trace_sampled(msg, sub);
   }
   return sub;
@@ -4719,12 +4665,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluste
 /* envoy.config.route.v3.RouteAction.HashPolicy */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_route_v3_RouteAction_HashPolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_route_v3_RouteAction_HashPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy* ret = envoy_config_route_v3_RouteAction_HashPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4734,7 +4680,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_route_v3_R
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy* ret = envoy_config_route_v3_RouteAction_HashPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4742,13 +4688,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_route_v3_R
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_serialize(const envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -4857,7 +4803,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_header(envoy_co
 UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_route_v3_RouteAction_HashPolicy_mutable_header(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_HashPolicy_Header* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Header*)envoy_config_route_v3_RouteAction_HashPolicy_header(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Header*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Header*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_set_header(msg, sub);
   }
   return sub;
@@ -4869,7 +4815,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_cookie(envoy_co
 UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_route_v3_RouteAction_HashPolicy_mutable_cookie(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)envoy_config_route_v3_RouteAction_HashPolicy_cookie(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_set_cookie(msg, sub);
   }
   return sub;
@@ -4881,7 +4827,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_connection_prop
 UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* envoy_config_route_v3_RouteAction_HashPolicy_mutable_connection_properties(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)envoy_config_route_v3_RouteAction_HashPolicy_connection_properties(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_set_connection_properties(msg, sub);
   }
   return sub;
@@ -4897,7 +4843,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_query_parameter
 UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_config_route_v3_RouteAction_HashPolicy_mutable_query_parameter(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)envoy_config_route_v3_RouteAction_HashPolicy_query_parameter(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_set_query_parameter(msg, sub);
   }
   return sub;
@@ -4909,7 +4855,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_filter_state(en
 UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_config_route_v3_RouteAction_HashPolicy_mutable_filter_state(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)envoy_config_route_v3_RouteAction_HashPolicy_filter_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_set_filter_state(msg, sub);
   }
   return sub;
@@ -4918,12 +4864,12 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envo
 /* envoy.config.route.v3.RouteAction.HashPolicy.Header */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_route_v3_RouteAction_HashPolicy_Header_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_Header*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_Header*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_route_v3_RouteAction_HashPolicy_Header_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_Header* ret = envoy_config_route_v3_RouteAction_HashPolicy_Header_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4933,7 +4879,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_rou
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_Header* ret = envoy_config_route_v3_RouteAction_HashPolicy_Header_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4941,13 +4887,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_rou
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_Header_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_Header* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_Header_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_Header* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_clear_header_name(envoy_config_route_v3_RouteAction_HashPolicy_Header* msg) {
@@ -4988,7 +4934,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_regex_re
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_HashPolicy_Header_mutable_regex_rewrite(envoy_config_route_v3_RouteAction_HashPolicy_Header* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_Header_set_regex_rewrite(msg, sub);
   }
   return sub;
@@ -4997,12 +4943,12 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro
 /* envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* ret = envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5012,7 +4958,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* envoy_c
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* ret = envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5020,13 +4966,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* envoy_c
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_clear_name(envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* msg) {
@@ -5064,12 +5010,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_set
 /* envoy.config.route.v3.RouteAction.HashPolicy.Cookie */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_Cookie* ret = envoy_config_route_v3_RouteAction_HashPolicy_Cookie_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5079,7 +5025,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_rou
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_Cookie* ret = envoy_config_route_v3_RouteAction_HashPolicy_Cookie_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5087,13 +5033,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_rou
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_clear_name(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg) {
@@ -5182,7 +5128,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_ttl(envo
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_mutable_ttl(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_HashPolicy_Cookie_ttl(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_ttl(msg, sub);
   }
   return sub;
@@ -5212,7 +5158,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init, arena);
+  struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -5221,12 +5167,12 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute*
 /* envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* ret = envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5236,7 +5182,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* en
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* ret = envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5244,13 +5190,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* en
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_clear_source_ip(envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* msg) {
@@ -5273,12 +5219,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_ConnectionPropertie
 /* envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* ret = envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5288,7 +5234,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_co
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* ret = envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5296,13 +5242,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_co
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_clear_name(envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* msg) {
@@ -5325,12 +5271,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_set_
 /* envoy.config.route.v3.RouteAction.HashPolicy.FilterState */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_config_route_v3_RouteAction_HashPolicy_FilterState_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)_upb_Message_New(&envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)_upb_Message_New(&envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_config_route_v3_RouteAction_HashPolicy_FilterState_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_FilterState* ret = envoy_config_route_v3_RouteAction_HashPolicy_FilterState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5340,7 +5286,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_confi
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_HashPolicy_FilterState* ret = envoy_config_route_v3_RouteAction_HashPolicy_FilterState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5348,13 +5294,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_confi
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_FilterState_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_HashPolicy_FilterState_serialize_ex(const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_FilterState_clear_key(envoy_config_route_v3_RouteAction_HashPolicy_FilterState* msg) {
@@ -5377,12 +5323,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_FilterState_set_key
 /* envoy.config.route.v3.RouteAction.UpgradeConfig */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_UpgradeConfig*)_upb_Message_New(&envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_UpgradeConfig*)_upb_Message_New(&envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_UpgradeConfig* ret = envoy_config_route_v3_RouteAction_UpgradeConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5392,7 +5338,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_route_v
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_UpgradeConfig* ret = envoy_config_route_v3_RouteAction_UpgradeConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5400,13 +5346,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_route_v
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_UpgradeConfig_serialize(const envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_UpgradeConfig_serialize_ex(const envoy_config_route_v3_RouteAction_UpgradeConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_clear_upgrade_type(envoy_config_route_v3_RouteAction_UpgradeConfig* msg) {
@@ -5462,7 +5408,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_enabled(envo
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_enabled(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_UpgradeConfig_enabled(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_UpgradeConfig_set_enabled(msg, sub);
   }
   return sub;
@@ -5474,7 +5420,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_connect_conf
 UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_connect_config(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_connect_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)_upb_Message_New(&envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)_upb_Message_New(&envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_UpgradeConfig_set_connect_config(msg, sub);
   }
   return sub;
@@ -5483,12 +5429,12 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*
 /* envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)_upb_Message_New(&envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)_upb_Message_New(&envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* ret = envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5498,7 +5444,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* ret = envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5506,13 +5452,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_serialize(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_serialize_ex(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_clear_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg) {
@@ -5549,7 +5495,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_se
 UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_mutable_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ProxyProtocolConfig* sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_proxy_protocol_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy_config_core_v3_ProxyProtocolConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_proxy_protocol_config(msg, sub);
   }
   return sub;
@@ -5562,12 +5508,12 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_se
 /* envoy.config.route.v3.RouteAction.MaxStreamDuration */
 
 UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_route_v3_RouteAction_MaxStreamDuration_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RouteAction_MaxStreamDuration*)_upb_Message_New(&envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, arena);
+  return (envoy_config_route_v3_RouteAction_MaxStreamDuration*)_upb_Message_New(&envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_route_v3_RouteAction_MaxStreamDuration_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_MaxStreamDuration* ret = envoy_config_route_v3_RouteAction_MaxStreamDuration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5577,7 +5523,7 @@ UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_rou
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RouteAction_MaxStreamDuration* ret = envoy_config_route_v3_RouteAction_MaxStreamDuration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5585,13 +5531,13 @@ UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_rou
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_MaxStreamDuration_serialize(const envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RouteAction_MaxStreamDuration_serialize_ex(const envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_clear_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg) {
@@ -5647,7 +5593,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_max_stre
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_max_stream_duration(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_MaxStreamDuration_set_max_stream_duration(msg, sub);
   }
   return sub;
@@ -5659,7 +5605,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_tim
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_max(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_max(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_max(msg, sub);
   }
   return sub;
@@ -5671,7 +5617,7 @@ UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_tim
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_offset(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_offset(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_offset(msg, sub);
   }
   return sub;
@@ -5680,12 +5626,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ma
 /* envoy.config.route.v3.RetryPolicy */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RetryPolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RetryPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy* ret = envoy_config_route_v3_RetryPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5695,7 +5641,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RetryPolicy_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy* ret = envoy_config_route_v3_RetryPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5703,13 +5649,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RetryPolicy_
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_serialize(const envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_serialize_ex(const envoy_config_route_v3_RetryPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RetryPolicy_clear_retry_on(envoy_config_route_v3_RetryPolicy* msg) {
@@ -6021,7 +5967,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_num_retries(envoy_config_r
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RetryPolicy_mutable_num_retries(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RetryPolicy_num_retries(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_num_retries(msg, sub);
   }
   return sub;
@@ -6033,7 +5979,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_timeout(envoy_conf
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_per_try_timeout(msg, sub);
   }
   return sub;
@@ -6045,7 +5991,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_priority(envoy_confi
 UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v3_RetryPolicy_mutable_retry_priority(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RetryPolicy_RetryPriority* sub = (struct envoy_config_route_v3_RetryPolicy_RetryPriority*)envoy_config_route_v3_RetryPolicy_retry_priority(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_retry_priority(msg, sub);
   }
   return sub;
@@ -6071,7 +6017,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_co
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* sub = (struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, arena);
+  struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* sub = (struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6111,7 +6057,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_back_off(envoy_confi
 UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RetryPolicy_RetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RetryBackOff*)envoy_config_route_v3_RetryPolicy_retry_back_off(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RetryPolicy_RetryBackOff*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RetryPolicy_RetryBackOff*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_retry_back_off(msg, sub);
   }
   return sub;
@@ -6137,7 +6083,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Ret
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6163,7 +6109,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Ret
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6175,7 +6121,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_rate_limited_retry_back_of
 UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_rate_limited_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)envoy_config_route_v3_RetryPolicy_rate_limited_retry_back_off(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_rate_limited_retry_back_off(msg, sub);
   }
   return sub;
@@ -6201,7 +6147,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6213,7 +6159,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_idle_timeout(envoy
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_idle_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_idle_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_set_per_try_idle_timeout(msg, sub);
   }
   return sub;
@@ -6222,12 +6168,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mu
 /* envoy.config.route.v3.RetryPolicy.RetryPriority */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v3_RetryPolicy_RetryPriority_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v3_RetryPolicy_RetryPriority_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryPriority* ret = envoy_config_route_v3_RetryPolicy_RetryPriority_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6237,7 +6183,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryPriority* ret = envoy_config_route_v3_RetryPolicy_RetryPriority_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6245,13 +6191,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryPriority_serialize(const envoy_config_route_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryPriority_serialize_ex(const envoy_config_route_v3_RetryPolicy_RetryPriority* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -6300,7 +6246,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_typed_config
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryPriority_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryPriority_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_RetryPriority_set_typed_config(msg, sub);
   }
   return sub;
@@ -6309,12 +6255,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryPr
 /* envoy.config.route.v3.RetryPolicy.RetryHostPredicate */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_route_v3_RetryPolicy_RetryHostPredicate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6324,7 +6270,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_config_ro
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_route_v3_RetryPolicy_RetryHostPredicate_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6332,13 +6278,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_config_ro
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_serialize(const envoy_config_route_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_serialize_ex(const envoy_config_route_v3_RetryPolicy_RetryHostPredicate* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -6387,7 +6333,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_typed_c
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryHostPredicate_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_typed_config(msg, sub);
   }
   return sub;
@@ -6396,12 +6342,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryHo
 /* envoy.config.route.v3.RetryPolicy.RetryBackOff */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3_RetryPolicy_RetryBackOff_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy_RetryBackOff*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy_RetryBackOff*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3_RetryPolicy_RetryBackOff_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryBackOff* ret = envoy_config_route_v3_RetryPolicy_RetryBackOff_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6411,7 +6357,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RetryBackOff* ret = envoy_config_route_v3_RetryPolicy_RetryBackOff_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6419,13 +6365,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryBackOff_serialize(const envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RetryBackOff_serialize_ex(const envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_clear_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg) {
@@ -6466,7 +6412,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_base_interval
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_base_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_RetryBackOff_set_base_interval(msg, sub);
   }
   return sub;
@@ -6478,7 +6424,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_max_interval(
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_max_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_RetryBackOff_set_max_interval(msg, sub);
   }
   return sub;
@@ -6487,12 +6433,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_Re
 /* envoy.config.route.v3.RetryPolicy.ResetHeader */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_route_v3_RetryPolicy_ResetHeader_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy_ResetHeader*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy_ResetHeader*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_route_v3_RetryPolicy_ResetHeader_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_ResetHeader* ret = envoy_config_route_v3_RetryPolicy_ResetHeader_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6502,7 +6448,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_route_v3_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_ResetHeader* ret = envoy_config_route_v3_RetryPolicy_ResetHeader_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6510,13 +6456,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_route_v3_
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_ResetHeader_serialize(const envoy_config_route_v3_RetryPolicy_ResetHeader* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_ResetHeader_serialize_ex(const envoy_config_route_v3_RetryPolicy_ResetHeader* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_clear_name(envoy_config_route_v3_RetryPolicy_ResetHeader* msg) {
@@ -6554,12 +6500,12 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_set_format(envoy_c
 /* envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff */
 
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, arena);
+  return (envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* ret = envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6569,7 +6515,7 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_conf
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* ret = envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6577,13 +6523,13 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_conf
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_serialize(const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_serialize_ex(const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_clear_reset_headers(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg) {
@@ -6660,7 +6606,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_ro
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RetryPolicy_ResetHeader* sub = (struct envoy_config_route_v3_RetryPolicy_ResetHeader*)_upb_Message_New(&envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init, arena);
+  struct envoy_config_route_v3_RetryPolicy_ResetHeader* sub = (struct envoy_config_route_v3_RetryPolicy_ResetHeader*)_upb_Message_New(&envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6672,7 +6618,7 @@ UPB_INLINE void envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_set_ma
 UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_max_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_set_max_interval(msg, sub);
   }
   return sub;
@@ -6681,12 +6627,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_Ra
 /* envoy.config.route.v3.HedgePolicy */
 
 UPB_INLINE envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_HedgePolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy_config_route_v3_HedgePolicy_msg_init, arena);
+  return (envoy_config_route_v3_HedgePolicy*)_upb_Message_New(&envoy__config__route__v3__HedgePolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_HedgePolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_HedgePolicy* ret = envoy_config_route_v3_HedgePolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__HedgePolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6696,7 +6642,7 @@ UPB_INLINE envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_HedgePolicy_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_HedgePolicy* ret = envoy_config_route_v3_HedgePolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__HedgePolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6704,13 +6650,13 @@ UPB_INLINE envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_HedgePolicy_
 }
 UPB_INLINE char* envoy_config_route_v3_HedgePolicy_serialize(const envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_HedgePolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__HedgePolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_HedgePolicy_serialize_ex(const envoy_config_route_v3_HedgePolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_HedgePolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__HedgePolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_HedgePolicy_clear_initial_requests(envoy_config_route_v3_HedgePolicy* msg) {
@@ -6762,7 +6708,7 @@ UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_initial_requests(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_HedgePolicy_mutable_initial_requests(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_HedgePolicy_initial_requests(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_HedgePolicy_set_initial_requests(msg, sub);
   }
   return sub;
@@ -6774,7 +6720,7 @@ UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_additional_request_chance(
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_HedgePolicy_mutable_additional_request_chance(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_HedgePolicy_additional_request_chance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_HedgePolicy_set_additional_request_chance(msg, sub);
   }
   return sub;
@@ -6787,12 +6733,12 @@ UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_hedge_on_per_try_timeout(e
 /* envoy.config.route.v3.RedirectAction */
 
 UPB_INLINE envoy_config_route_v3_RedirectAction* envoy_config_route_v3_RedirectAction_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RedirectAction*)_upb_Message_New(&envoy_config_route_v3_RedirectAction_msg_init, arena);
+  return (envoy_config_route_v3_RedirectAction*)_upb_Message_New(&envoy__config__route__v3__RedirectAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RedirectAction* envoy_config_route_v3_RedirectAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RedirectAction* ret = envoy_config_route_v3_RedirectAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RedirectAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6802,7 +6748,7 @@ UPB_INLINE envoy_config_route_v3_RedirectAction* envoy_config_route_v3_RedirectA
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RedirectAction* ret = envoy_config_route_v3_RedirectAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RedirectAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6810,13 +6756,13 @@ UPB_INLINE envoy_config_route_v3_RedirectAction* envoy_config_route_v3_RedirectA
 }
 UPB_INLINE char* envoy_config_route_v3_RedirectAction_serialize(const envoy_config_route_v3_RedirectAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RedirectAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RedirectAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RedirectAction_serialize_ex(const envoy_config_route_v3_RedirectAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RedirectAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RedirectAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -6997,7 +6943,7 @@ UPB_INLINE void envoy_config_route_v3_RedirectAction_set_regex_rewrite(envoy_con
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RedirectAction_mutable_regex_rewrite(envoy_config_route_v3_RedirectAction* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RedirectAction_regex_rewrite(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, arena);
     if (sub) envoy_config_route_v3_RedirectAction_set_regex_rewrite(msg, sub);
   }
   return sub;
@@ -7006,12 +6952,12 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro
 /* envoy.config.route.v3.DirectResponseAction */
 
 UPB_INLINE envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_DirectResponseAction_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_DirectResponseAction*)_upb_Message_New(&envoy_config_route_v3_DirectResponseAction_msg_init, arena);
+  return (envoy_config_route_v3_DirectResponseAction*)_upb_Message_New(&envoy__config__route__v3__DirectResponseAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_DirectResponseAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_DirectResponseAction* ret = envoy_config_route_v3_DirectResponseAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__DirectResponseAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7021,7 +6967,7 @@ UPB_INLINE envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_Dir
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_DirectResponseAction* ret = envoy_config_route_v3_DirectResponseAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__DirectResponseAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7029,13 +6975,13 @@ UPB_INLINE envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_Dir
 }
 UPB_INLINE char* envoy_config_route_v3_DirectResponseAction_serialize(const envoy_config_route_v3_DirectResponseAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_DirectResponseAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__DirectResponseAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_DirectResponseAction_serialize_ex(const envoy_config_route_v3_DirectResponseAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_DirectResponseAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__DirectResponseAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_DirectResponseAction_clear_status(envoy_config_route_v3_DirectResponseAction* msg) {
@@ -7076,7 +7022,7 @@ UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_body(envoy_config
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_route_v3_DirectResponseAction_mutable_body(envoy_config_route_v3_DirectResponseAction* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_route_v3_DirectResponseAction_body(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_route_v3_DirectResponseAction_set_body(msg, sub);
   }
   return sub;
@@ -7085,12 +7031,12 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_route_v3_DirectR
 /* envoy.config.route.v3.NonForwardingAction */
 
 UPB_INLINE envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_NonForwardingAction_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_NonForwardingAction*)_upb_Message_New(&envoy_config_route_v3_NonForwardingAction_msg_init, arena);
+  return (envoy_config_route_v3_NonForwardingAction*)_upb_Message_New(&envoy__config__route__v3__NonForwardingAction_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_NonForwardingAction_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_NonForwardingAction* ret = envoy_config_route_v3_NonForwardingAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__NonForwardingAction_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7100,7 +7046,7 @@ UPB_INLINE envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_NonF
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_NonForwardingAction* ret = envoy_config_route_v3_NonForwardingAction_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__NonForwardingAction_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7108,13 +7054,13 @@ UPB_INLINE envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_NonF
 }
 UPB_INLINE char* envoy_config_route_v3_NonForwardingAction_serialize(const envoy_config_route_v3_NonForwardingAction* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_NonForwardingAction_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__NonForwardingAction_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_NonForwardingAction_serialize_ex(const envoy_config_route_v3_NonForwardingAction* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_NonForwardingAction_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__NonForwardingAction_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -7122,12 +7068,12 @@ UPB_INLINE char* envoy_config_route_v3_NonForwardingAction_serialize_ex(const en
 /* envoy.config.route.v3.Decorator */
 
 UPB_INLINE envoy_config_route_v3_Decorator* envoy_config_route_v3_Decorator_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_Decorator*)_upb_Message_New(&envoy_config_route_v3_Decorator_msg_init, arena);
+  return (envoy_config_route_v3_Decorator*)_upb_Message_New(&envoy__config__route__v3__Decorator_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_Decorator* envoy_config_route_v3_Decorator_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_Decorator* ret = envoy_config_route_v3_Decorator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Decorator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Decorator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7137,7 +7083,7 @@ UPB_INLINE envoy_config_route_v3_Decorator* envoy_config_route_v3_Decorator_pars
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_Decorator* ret = envoy_config_route_v3_Decorator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Decorator_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Decorator_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7145,13 +7091,13 @@ UPB_INLINE envoy_config_route_v3_Decorator* envoy_config_route_v3_Decorator_pars
 }
 UPB_INLINE char* envoy_config_route_v3_Decorator_serialize(const envoy_config_route_v3_Decorator* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Decorator_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Decorator_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_Decorator_serialize_ex(const envoy_config_route_v3_Decorator* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Decorator_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Decorator_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_Decorator_clear_operation(envoy_config_route_v3_Decorator* msg) {
@@ -7192,7 +7138,7 @@ UPB_INLINE void envoy_config_route_v3_Decorator_set_propagate(envoy_config_route
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_Decorator_mutable_propagate(envoy_config_route_v3_Decorator* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_Decorator_propagate(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_Decorator_set_propagate(msg, sub);
   }
   return sub;
@@ -7201,12 +7147,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_Decorator_mut
 /* envoy.config.route.v3.Tracing */
 
 UPB_INLINE envoy_config_route_v3_Tracing* envoy_config_route_v3_Tracing_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_Tracing*)_upb_Message_New(&envoy_config_route_v3_Tracing_msg_init, arena);
+  return (envoy_config_route_v3_Tracing*)_upb_Message_New(&envoy__config__route__v3__Tracing_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_Tracing* envoy_config_route_v3_Tracing_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_Tracing* ret = envoy_config_route_v3_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7216,7 +7162,7 @@ UPB_INLINE envoy_config_route_v3_Tracing* envoy_config_route_v3_Tracing_parse_ex
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_Tracing* ret = envoy_config_route_v3_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_Tracing_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__Tracing_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7224,13 +7170,13 @@ UPB_INLINE envoy_config_route_v3_Tracing* envoy_config_route_v3_Tracing_parse_ex
 }
 UPB_INLINE char* envoy_config_route_v3_Tracing_serialize(const envoy_config_route_v3_Tracing* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Tracing_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Tracing_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_Tracing_serialize_ex(const envoy_config_route_v3_Tracing* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_Tracing_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__Tracing_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_Tracing_clear_client_sampling(envoy_config_route_v3_Tracing* msg) {
@@ -7323,7 +7269,7 @@ UPB_INLINE void envoy_config_route_v3_Tracing_set_client_sampling(envoy_config_r
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_client_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_client_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_Tracing_set_client_sampling(msg, sub);
   }
   return sub;
@@ -7335,7 +7281,7 @@ UPB_INLINE void envoy_config_route_v3_Tracing_set_random_sampling(envoy_config_r
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_random_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_random_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_Tracing_set_random_sampling(msg, sub);
   }
   return sub;
@@ -7347,7 +7293,7 @@ UPB_INLINE void envoy_config_route_v3_Tracing_set_overall_sampling(envoy_config_
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_overall_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_overall_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
     if (sub) envoy_config_route_v3_Tracing_set_overall_sampling(msg, sub);
   }
   return sub;
@@ -7373,7 +7319,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_config_route_v3_Tracing
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_tracing_v3_CustomTag* sub = (struct envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_msg_init, arena);
+  struct envoy_type_tracing_v3_CustomTag* sub = (struct envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -7382,12 +7328,12 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_config_route_v3_Tracing
 /* envoy.config.route.v3.VirtualCluster */
 
 UPB_INLINE envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_VirtualCluster_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_VirtualCluster*)_upb_Message_New(&envoy_config_route_v3_VirtualCluster_msg_init, arena);
+  return (envoy_config_route_v3_VirtualCluster*)_upb_Message_New(&envoy__config__route__v3__VirtualCluster_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_VirtualCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_VirtualCluster* ret = envoy_config_route_v3_VirtualCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__VirtualCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7397,7 +7343,7 @@ UPB_INLINE envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_VirtualCl
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_VirtualCluster* ret = envoy_config_route_v3_VirtualCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__VirtualCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7405,13 +7351,13 @@ UPB_INLINE envoy_config_route_v3_VirtualCluster* envoy_config_route_v3_VirtualCl
 }
 UPB_INLINE char* envoy_config_route_v3_VirtualCluster_serialize(const envoy_config_route_v3_VirtualCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_VirtualCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__VirtualCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_VirtualCluster_serialize_ex(const envoy_config_route_v3_VirtualCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_VirtualCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__VirtualCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_VirtualCluster_clear_name(envoy_config_route_v3_VirtualCluster* msg) {
@@ -7488,7 +7434,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Vir
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -7497,12 +7443,12 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Vir
 /* envoy.config.route.v3.RateLimit */
 
 UPB_INLINE envoy_config_route_v3_RateLimit* envoy_config_route_v3_RateLimit_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy_config_route_v3_RateLimit_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit*)_upb_Message_New(&envoy__config__route__v3__RateLimit_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit* envoy_config_route_v3_RateLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit* ret = envoy_config_route_v3_RateLimit_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7512,7 +7458,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit* envoy_config_route_v3_RateLimit_pars
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit* ret = envoy_config_route_v3_RateLimit_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7520,13 +7466,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit* envoy_config_route_v3_RateLimit_pars
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_serialize(const envoy_config_route_v3_RateLimit* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_serialize_ex(const envoy_config_route_v3_RateLimit* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_clear_stage(envoy_config_route_v3_RateLimit* msg) {
@@ -7615,7 +7561,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_set_stage(envoy_config_route_v3_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_mutable_stage(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_stage(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_set_stage(msg, sub);
   }
   return sub;
@@ -7645,7 +7591,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_RateLimit_Action* sub = (struct envoy_config_route_v3_RateLimit_Action*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_msg_init, arena);
+  struct envoy_config_route_v3_RateLimit_Action* sub = (struct envoy_config_route_v3_RateLimit_Action*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -7657,7 +7603,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_set_limit(envoy_config_route_v3_
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateLimit_mutable_limit(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Override* sub = (struct envoy_config_route_v3_RateLimit_Override*)envoy_config_route_v3_RateLimit_limit(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Override*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Override_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Override*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Override_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_set_limit(msg, sub);
   }
   return sub;
@@ -7666,12 +7612,12 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Override* envoy_config_route_v
 /* envoy.config.route.v3.RateLimit.Action */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_RateLimit_Action_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_RateLimit_Action_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action* ret = envoy_config_route_v3_RateLimit_Action_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -7681,7 +7627,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_RateLim
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action* ret = envoy_config_route_v3_RateLimit_Action_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -7689,13 +7635,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_RateLim
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_serialize(const envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_serialize_ex(const envoy_config_route_v3_RateLimit_Action* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -7889,7 +7835,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_source_cluster(envoy_
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_route_v3_RateLimit_Action_mutable_source_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_SourceCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_SourceCluster*)envoy_config_route_v3_RateLimit_Action_source_cluster(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_SourceCluster*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_SourceCluster*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_source_cluster(msg, sub);
   }
   return sub;
@@ -7901,7 +7847,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_destination_cluster(e
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_config_route_v3_RateLimit_Action_mutable_destination_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_DestinationCluster*)envoy_config_route_v3_RateLimit_Action_destination_cluster(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_DestinationCluster*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_DestinationCluster*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_destination_cluster(msg, sub);
   }
   return sub;
@@ -7913,7 +7859,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_request_headers(envoy
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_route_v3_RateLimit_Action_mutable_request_headers(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* sub = (struct envoy_config_route_v3_RateLimit_Action_RequestHeaders*)envoy_config_route_v3_RateLimit_Action_request_headers(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_RequestHeaders*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_RequestHeaders*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_request_headers(msg, sub);
   }
   return sub;
@@ -7925,7 +7871,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_remote_address(envoy_
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_RemoteAddress*)envoy_config_route_v3_RateLimit_Action_remote_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_RemoteAddress*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_RemoteAddress*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_remote_address(msg, sub);
   }
   return sub;
@@ -7937,7 +7883,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_generic_key(envoy_con
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route_v3_RateLimit_Action_mutable_generic_key(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_GenericKey* sub = (struct envoy_config_route_v3_RateLimit_Action_GenericKey*)envoy_config_route_v3_RateLimit_Action_generic_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_GenericKey*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_GenericKey*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_generic_key(msg, sub);
   }
   return sub;
@@ -7949,7 +7895,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_header_value_match(en
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_header_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)envoy_config_route_v3_RateLimit_Action_header_value_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_header_value_match(msg, sub);
   }
   return sub;
@@ -7961,7 +7907,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_dynamic_metadata(envo
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)envoy_config_route_v3_RateLimit_Action_dynamic_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_dynamic_metadata(msg, sub);
   }
   return sub;
@@ -7973,7 +7919,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_metadata(envoy_config
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_mutable_metadata(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_MetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)envoy_config_route_v3_RateLimit_Action_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_metadata(msg, sub);
   }
   return sub;
@@ -7985,7 +7931,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_extension(envoy_confi
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RateLimit_Action_mutable_extension(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RateLimit_Action_extension(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_extension(msg, sub);
   }
   return sub;
@@ -7997,7 +7943,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_masked_remote_address
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_masked_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)envoy_config_route_v3_RateLimit_Action_masked_remote_address(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_masked_remote_address(msg, sub);
   }
   return sub;
@@ -8009,7 +7955,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_query_parameter_value
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_query_parameter_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)envoy_config_route_v3_RateLimit_Action_query_parameter_value_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_set_query_parameter_value_match(msg, sub);
   }
   return sub;
@@ -8018,12 +7964,12 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatc
 /* envoy.config.route.v3.RateLimit.Action.SourceCluster */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_route_v3_RateLimit_Action_SourceCluster_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_SourceCluster*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_SourceCluster*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_route_v3_RateLimit_Action_SourceCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_SourceCluster* ret = envoy_config_route_v3_RateLimit_Action_SourceCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8033,7 +7979,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_ro
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_SourceCluster* ret = envoy_config_route_v3_RateLimit_Action_SourceCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8041,13 +7987,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_ro
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_SourceCluster_serialize(const envoy_config_route_v3_RateLimit_Action_SourceCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_SourceCluster_serialize_ex(const envoy_config_route_v3_RateLimit_Action_SourceCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -8055,12 +8001,12 @@ UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_SourceCluster_serialize_
 /* envoy.config.route.v3.RateLimit.Action.DestinationCluster */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_config_route_v3_RateLimit_Action_DestinationCluster_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_DestinationCluster*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_DestinationCluster*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_config_route_v3_RateLimit_Action_DestinationCluster_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_DestinationCluster* ret = envoy_config_route_v3_RateLimit_Action_DestinationCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8070,7 +8016,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_conf
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_DestinationCluster* ret = envoy_config_route_v3_RateLimit_Action_DestinationCluster_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8078,13 +8024,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_conf
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_DestinationCluster_serialize(const envoy_config_route_v3_RateLimit_Action_DestinationCluster* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_DestinationCluster_serialize_ex(const envoy_config_route_v3_RateLimit_Action_DestinationCluster* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -8092,12 +8038,12 @@ UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_DestinationCluster_seria
 /* envoy.config.route.v3.RateLimit.Action.RequestHeaders */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_route_v3_RateLimit_Action_RequestHeaders_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_RequestHeaders*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_RequestHeaders*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_route_v3_RateLimit_Action_RequestHeaders_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_RequestHeaders* ret = envoy_config_route_v3_RateLimit_Action_RequestHeaders_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8107,7 +8053,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_r
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_RequestHeaders* ret = envoy_config_route_v3_RateLimit_Action_RequestHeaders_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8115,13 +8061,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_r
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_RequestHeaders_serialize(const envoy_config_route_v3_RateLimit_Action_RequestHeaders* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_RequestHeaders_serialize_ex(const envoy_config_route_v3_RateLimit_Action_RequestHeaders* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_clear_header_name(envoy_config_route_v3_RateLimit_Action_RequestHeaders* msg) {
@@ -8174,12 +8120,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_skip_i
 /* envoy.config.route.v3.RateLimit.Action.RemoteAddress */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_route_v3_RateLimit_Action_RemoteAddress_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_RemoteAddress*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_RemoteAddress*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_route_v3_RateLimit_Action_RemoteAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_RemoteAddress* ret = envoy_config_route_v3_RateLimit_Action_RemoteAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8189,7 +8135,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_ro
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_RemoteAddress* ret = envoy_config_route_v3_RateLimit_Action_RemoteAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8197,13 +8143,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_ro
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_RemoteAddress_serialize(const envoy_config_route_v3_RateLimit_Action_RemoteAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_RemoteAddress_serialize_ex(const envoy_config_route_v3_RateLimit_Action_RemoteAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -8211,12 +8157,12 @@ UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_RemoteAddress_serialize_
 /* envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* ret = envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8226,7 +8172,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_con
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* ret = envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8234,13 +8180,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_con
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_serialize(const envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_serialize_ex(const envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_clear_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg) {
@@ -8281,7 +8227,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v4_prefix_mask_len(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v4_prefix_mask_len(msg, sub);
   }
   return sub;
@@ -8293,7 +8239,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v6_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v6_prefix_mask_len(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v6_prefix_mask_len(msg, sub);
   }
   return sub;
@@ -8302,12 +8248,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_A
 /* envoy.config.route.v3.RateLimit.Action.GenericKey */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route_v3_RateLimit_Action_GenericKey_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_GenericKey*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_GenericKey*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route_v3_RateLimit_Action_GenericKey_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_GenericKey* ret = envoy_config_route_v3_RateLimit_Action_GenericKey_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8317,7 +8263,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_GenericKey* ret = envoy_config_route_v3_RateLimit_Action_GenericKey_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8325,13 +8271,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_GenericKey_serialize(const envoy_config_route_v3_RateLimit_Action_GenericKey* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_GenericKey_serialize_ex(const envoy_config_route_v3_RateLimit_Action_GenericKey* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_clear_descriptor_value(envoy_config_route_v3_RateLimit_Action_GenericKey* msg) {
@@ -8369,12 +8315,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_set_descriptor
 /* envoy.config.route.v3.RateLimit.Action.HeaderValueMatch */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* ret = envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8384,7 +8330,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* ret = envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8392,13 +8338,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_serialize(const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_serialize_ex(const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_clear_descriptor_value(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg) {
@@ -8487,7 +8433,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_expe
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_expect_match(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_expect_match(msg, sub);
   }
   return sub;
@@ -8513,7 +8459,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Rat
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -8526,12 +8472,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_desc
 /* envoy.config.route.v3.RateLimit.Action.DynamicMetaData */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_DynamicMetaData* ret = envoy_config_route_v3_RateLimit_Action_DynamicMetaData_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8541,7 +8487,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_DynamicMetaData* ret = envoy_config_route_v3_RateLimit_Action_DynamicMetaData_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8549,13 +8495,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_serialize(const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_serialize_ex(const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_clear_descriptor_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg) {
@@ -8607,7 +8553,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_metad
 UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg, upb_Arena* arena) {
   struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_DynamicMetaData_metadata_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_msg_init, arena);
+    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_metadata_key(msg, sub);
   }
   return sub;
@@ -8620,12 +8566,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_defau
 /* envoy.config.route.v3.RateLimit.Action.MetaData */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_MetaData_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_MetaData*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_MetaData*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_MetaData_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_MetaData* ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8635,7 +8581,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_MetaData* ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8643,13 +8589,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_MetaData_serialize(const envoy_config_route_v3_RateLimit_Action_MetaData* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_MetaData_serialize_ex(const envoy_config_route_v3_RateLimit_Action_MetaData* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_clear_descriptor_key(envoy_config_route_v3_RateLimit_Action_MetaData* msg) {
@@ -8723,7 +8669,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_metadata_key
 UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_MetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_MetaData* msg, upb_Arena* arena) {
   struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_MetaData_metadata_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_msg_init, arena);
+    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_MetaData_set_metadata_key(msg, sub);
   }
   return sub;
@@ -8744,12 +8690,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_skip_if_abse
 /* envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* ret = envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8759,7 +8705,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envo
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* ret = envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8767,13 +8713,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envo
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_serialize(const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_serialize_ex(const envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_clear_descriptor_value(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg) {
@@ -8862,7 +8808,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_expect_match(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_expect_match(msg, sub);
   }
   return sub;
@@ -8888,7 +8834,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_QueryParameterMatcher* sub = (struct envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy_config_route_v3_QueryParameterMatcher_msg_init, arena);
+  struct envoy_config_route_v3_QueryParameterMatcher* sub = (struct envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy__config__route__v3__QueryParameterMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -8901,12 +8847,12 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_
 /* envoy.config.route.v3.RateLimit.Override */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateLimit_Override_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Override*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Override_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Override*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Override_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateLimit_Override_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Override* ret = envoy_config_route_v3_RateLimit_Override_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Override_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8916,7 +8862,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateL
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Override* ret = envoy_config_route_v3_RateLimit_Override_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Override_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8924,13 +8870,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateL
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Override_serialize(const envoy_config_route_v3_RateLimit_Override* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Override_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Override_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Override_serialize_ex(const envoy_config_route_v3_RateLimit_Override* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Override_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Override_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -8964,7 +8910,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Override_set_dynamic_metadata(en
 UPB_INLINE struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_config_route_v3_RateLimit_Override_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Override* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* sub = (struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)envoy_config_route_v3_RateLimit_Override_dynamic_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Override_set_dynamic_metadata(msg, sub);
   }
   return sub;
@@ -8973,12 +8919,12 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envo
 /* envoy.config.route.v3.RateLimit.Override.DynamicMetadata */
 
 UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)_upb_Message_New(&envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, arena);
+  return (envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)_upb_Message_New(&envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Override_DynamicMetadata* ret = envoy_config_route_v3_RateLimit_Override_DynamicMetadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -8988,7 +8934,7 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_confi
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_RateLimit_Override_DynamicMetadata* ret = envoy_config_route_v3_RateLimit_Override_DynamicMetadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -8996,13 +8942,13 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_confi
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_serialize(const envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_serialize_ex(const envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_RateLimit_Override_DynamicMetadata_clear_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg) {
@@ -9028,7 +8974,7 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Override_DynamicMetadata_set_met
 UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_mutable_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg, upb_Arena* arena) {
   struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Override_DynamicMetadata_metadata_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_msg_init, arena);
+    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey_msg_init, arena);
     if (sub) envoy_config_route_v3_RateLimit_Override_DynamicMetadata_set_metadata_key(msg, sub);
   }
   return sub;
@@ -9037,12 +8983,12 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_Rate
 /* envoy.config.route.v3.HeaderMatcher */
 
 UPB_INLINE envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_HeaderMatcher_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  return (envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_HeaderMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_HeaderMatcher* ret = envoy_config_route_v3_HeaderMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__HeaderMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -9052,7 +8998,7 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_HeaderMatc
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_HeaderMatcher* ret = envoy_config_route_v3_HeaderMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__HeaderMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -9060,13 +9006,13 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_HeaderMatc
 }
 UPB_INLINE char* envoy_config_route_v3_HeaderMatcher_serialize(const envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_HeaderMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__HeaderMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_HeaderMatcher_serialize_ex(const envoy_config_route_v3_HeaderMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_HeaderMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__HeaderMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -9253,7 +9199,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_range_match(envoy_config
 UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMatcher_mutable_range_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) {
   struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)envoy_config_route_v3_HeaderMatcher_range_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy_type_v3_Int64Range_msg_init, arena);
+    sub = (struct envoy_type_v3_Int64Range*)_upb_Message_New(&envoy__type__v3__Int64Range_msg_init, arena);
     if (sub) envoy_config_route_v3_HeaderMatcher_set_range_match(msg, sub);
   }
   return sub;
@@ -9281,7 +9227,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_safe_regex_match(envoy_c
 UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_HeaderMatcher_mutable_safe_regex_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_HeaderMatcher_safe_regex_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher_msg_init, arena);
     if (sub) envoy_config_route_v3_HeaderMatcher_set_safe_regex_match(msg, sub);
   }
   return sub;
@@ -9297,7 +9243,7 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_string_match(envoy_confi
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_HeaderMatcher_mutable_string_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_HeaderMatcher_string_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_config_route_v3_HeaderMatcher_set_string_match(msg, sub);
   }
   return sub;
@@ -9310,12 +9256,12 @@ UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_treat_missing_header_as_
 /* envoy.config.route.v3.QueryParameterMatcher */
 
 UPB_INLINE envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_QueryParameterMatcher_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy_config_route_v3_QueryParameterMatcher_msg_init, arena);
+  return (envoy_config_route_v3_QueryParameterMatcher*)_upb_Message_New(&envoy__config__route__v3__QueryParameterMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_QueryParameterMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_QueryParameterMatcher* ret = envoy_config_route_v3_QueryParameterMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__QueryParameterMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -9325,7 +9271,7 @@ UPB_INLINE envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_Qu
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_QueryParameterMatcher* ret = envoy_config_route_v3_QueryParameterMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__QueryParameterMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -9333,13 +9279,13 @@ UPB_INLINE envoy_config_route_v3_QueryParameterMatcher* envoy_config_route_v3_Qu
 }
 UPB_INLINE char* envoy_config_route_v3_QueryParameterMatcher_serialize(const envoy_config_route_v3_QueryParameterMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_QueryParameterMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__QueryParameterMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_QueryParameterMatcher_serialize_ex(const envoy_config_route_v3_QueryParameterMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_QueryParameterMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__QueryParameterMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -9404,7 +9350,7 @@ UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_string_match(env
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_QueryParameterMatcher_mutable_string_match(envoy_config_route_v3_QueryParameterMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_QueryParameterMatcher_string_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_config_route_v3_QueryParameterMatcher_set_string_match(msg, sub);
   }
   return sub;
@@ -9417,12 +9363,12 @@ UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_present_match(en
 /* envoy.config.route.v3.InternalRedirectPolicy */
 
 UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_InternalRedirectPolicy_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_InternalRedirectPolicy*)_upb_Message_New(&envoy_config_route_v3_InternalRedirectPolicy_msg_init, arena);
+  return (envoy_config_route_v3_InternalRedirectPolicy*)_upb_Message_New(&envoy__config__route__v3__InternalRedirectPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_InternalRedirectPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_InternalRedirectPolicy* ret = envoy_config_route_v3_InternalRedirectPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__InternalRedirectPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -9432,7 +9378,7 @@ UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_I
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_InternalRedirectPolicy* ret = envoy_config_route_v3_InternalRedirectPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__InternalRedirectPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -9440,13 +9386,13 @@ UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_I
 }
 UPB_INLINE char* envoy_config_route_v3_InternalRedirectPolicy_serialize(const envoy_config_route_v3_InternalRedirectPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_InternalRedirectPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__InternalRedirectPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_InternalRedirectPolicy_serialize_ex(const envoy_config_route_v3_InternalRedirectPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_InternalRedirectPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__InternalRedirectPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_clear_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy* msg) {
@@ -9557,7 +9503,7 @@ UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_max_internal_re
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_InternalRedirectPolicy_mutable_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_InternalRedirectPolicy_max_internal_redirects(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_route_v3_InternalRedirectPolicy_set_max_internal_redirects(msg, sub);
   }
   return sub;
@@ -9607,7 +9553,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -9620,12 +9566,12 @@ UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_allow_cross_sch
 /* envoy.config.route.v3.FilterConfig */
 
 UPB_INLINE envoy_config_route_v3_FilterConfig* envoy_config_route_v3_FilterConfig_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_FilterConfig*)_upb_Message_New(&envoy_config_route_v3_FilterConfig_msg_init, arena);
+  return (envoy_config_route_v3_FilterConfig*)_upb_Message_New(&envoy__config__route__v3__FilterConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_FilterConfig* envoy_config_route_v3_FilterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_FilterConfig* ret = envoy_config_route_v3_FilterConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__FilterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -9635,7 +9581,7 @@ UPB_INLINE envoy_config_route_v3_FilterConfig* envoy_config_route_v3_FilterConfi
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_FilterConfig* ret = envoy_config_route_v3_FilterConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__FilterConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -9643,13 +9589,13 @@ UPB_INLINE envoy_config_route_v3_FilterConfig* envoy_config_route_v3_FilterConfi
 }
 UPB_INLINE char* envoy_config_route_v3_FilterConfig_serialize(const envoy_config_route_v3_FilterConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_FilterConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__FilterConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_FilterConfig_serialize_ex(const envoy_config_route_v3_FilterConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_FilterConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__FilterConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_FilterConfig_clear_config(envoy_config_route_v3_FilterConfig* msg) {
@@ -9697,7 +9643,7 @@ UPB_INLINE void envoy_config_route_v3_FilterConfig_set_config(envoy_config_route
 UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_mutable_config(envoy_config_route_v3_FilterConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterConfig_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_route_v3_FilterConfig_set_config(msg, sub);
   }
   return sub;
@@ -9711,8 +9657,6 @@ UPB_INLINE void envoy_config_route_v3_FilterConfig_set_disabled(envoy_config_rou
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
new file mode 100644
index 0000000000000..dd249e00f6396
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
@@ -0,0 +1,1667 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/route_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_submsgs[13] = {
+  {.submsg = &envoy__config__route__v3__Route_msg_init},
+  {.submsg = &envoy__config__route__v3__VirtualCluster_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__route__v3__CorsPolicy_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy_msg_init},
+  {.submsg = &envoy__config__route__v3__HedgePolicy_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_VirtualHost__fields[21] = {
+  {1, UPB_SIZE(84, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 80), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(40, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(44, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(48, 104), 0, 6, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(52, 112), 2, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(56, 120), 3, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(60, 128), 4, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(64, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(68, 136), 5, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(72, 144), 6, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(76, 152), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(80, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = {
+  &envoy_config_route_v3_VirtualHost_submsgs[0],
+  &envoy_config_route_v3_VirtualHost__fields[0],
+  UPB_SIZE(96, 160), 21, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x002000003f000012, &upb_prs_1bt},
+    {0x002800003f00001a, &upb_prm_1bt_max192b},
+    {0x000400003f000020, &upb_psv4_1bt},
+    {0x003000003f01002a, &upb_prm_1bt_max64b},
+    {0x003800003f020032, &upb_prm_1bt_max64b},
+    {0x004000003f03003a, &upb_prm_1bt_maxmaxb},
+    {0x0048000001040042, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x005000003f050052, &upb_prm_1bt_maxmaxb},
+    {0x005800003f00005a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x006000003f00006a, &upb_prs_1bt},
+    {0x000800003f000070, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0070000002070182, &upb_psm_2bt_max128b},
+    {0x007800000308018a, &upb_psm_2bt_max64b},
+    {0x0080000004090192, &upb_psm_2bt_maxmaxb},
+    {0x000900003f000198, &upb_psb1_2bt},
+    {0x00880000050a01a2, &upb_psm_2bt_maxmaxb},
+    {0x00900000060b01aa, &upb_psm_2bt_maxmaxb},
+    {0x009800003f0c01b2, &upb_prm_2bt_max64b},
+    {0x000a00003f0001b8, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init = {
+  &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0],
+  &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_FilterAction_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_FilterAction__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = {
+  &envoy_config_route_v3_FilterAction_submsgs[0],
+  &envoy_config_route_v3_FilterAction__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteList_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__Route_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = {
+  &envoy_config_route_v3_RouteList_submsgs[0],
+  &envoy_config_route_v3_RouteList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max192b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_Route_submsgs[13] = {
+  {.submsg = &envoy__config__route__v3__RouteMatch_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction_msg_init},
+  {.submsg = &envoy__config__route__v3__RedirectAction_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__route__v3__Decorator_msg_init},
+  {.submsg = &envoy__config__route__v3__DirectResponseAction_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init},
+  {.submsg = &envoy__config__route__v3__Tracing_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__route__v3__FilterAction_msg_init},
+  {.submsg = &envoy__config__route__v3__NonForwardingAction_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_Route__fields[17] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 16), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 24), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(16, 32), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(20, 40), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(28, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(32, 64), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(52, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(36, 88), 4, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(40, 96), 5, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__Route_msg_init = {
+  &envoy_config_route_v3_Route_submsgs[0],
+  &envoy_config_route_v3_Route__fields[0],
+  UPB_SIZE(72, 128), 17, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x0078000402010012, &upb_pom_1bt_max256b},
+    {0x007800040302001a, &upb_pom_1bt_max128b},
+    {0x0010000002030022, &upb_psm_1bt_maxmaxb},
+    {0x001800000304002a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x007800040705003a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f06004a, &upb_prm_1bt_maxmaxb},
+    {0x002800003f070052, &upb_prm_1bt_maxmaxb},
+    {0x003000003f00005a, &upb_prs_1bt},
+    {0x003800003f000062, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004800003f000072, &upb_pss_1bt},
+    {0x005800000409007a, &upb_psm_1bt_max64b},
+    {0x00600000050a0182, &upb_psm_2bt_maxmaxb},
+    {0x00780004110b018a, &upb_pom_2bt_max64b},
+    {0x00780004120c0192, &upb_pom_2bt_max64b},
+    {0x006800003f00019a, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init = {
+  &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0],
+  &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_submsgs[2] = {
+  {.submsg = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_WeightedCluster__fields[4] = {
+  {1, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 48), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 8), UPB_SIZE(-13, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = {
+  &envoy_config_route_v3_WeightedCluster_submsgs[0],
+  &envoy_config_route_v3_WeightedCluster__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_prm_1bt_max128b},
+    {0x002000003f000012, &upb_pss_1bt},
+    {0x003000000101001a, &upb_psm_1bt_maxmaxb},
+    {0x0008000404000022, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+  {.submsg = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[10] = {
+  {1, UPB_SIZE(44, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(28, 88), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(52, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init = {
+  &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0],
+  &envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0],
+  UPB_SIZE(64, 112), 10, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0028000001000012, &upb_psm_1bt_maxmaxb},
+    {0x003000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x003800003f020022, &upb_prm_1bt_maxmaxb},
+    {0x004000003f03002a, &upb_prm_1bt_maxmaxb},
+    {0x004800003f000032, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x005000003f00004a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040b00005a, &upb_pos_1bt},
+    {0x006000003f000062, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init = {
+  &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0],
+  &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_ClusterSpecifierPlugin__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = {
+  &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0],
+  &envoy_config_route_v3_ClusterSpecifierPlugin__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_submsgs[10] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__QueryParameterMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init},
+  {.submsg = &envoy__type__matcher__v3__RegexMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteMatch__fields[13] = {
+  {1, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 48), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 56), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(24, 64), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(28, 72), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = {
+  &envoy_config_route_v3_RouteMatch_submsgs[0],
+  &envoy_config_route_v3_RouteMatch__fields[0],
+  UPB_SIZE(48, 80), 13, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040100000a, &upb_pos_1bt},
+    {0x0008000402000012, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0018000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f010032, &upb_prm_1bt_max64b},
+    {0x002800003f02003a, &upb_prm_1bt_max64b},
+    {0x0030000002030042, &upb_psm_1bt_max64b},
+    {0x003800000304004a, &upb_psm_1bt_maxmaxb},
+    {0x000800040a050052, &upb_pom_1bt_maxmaxb},
+    {0x004000000406005a, &upb_psm_1bt_max64b},
+    {0x000800040c070062, &upb_pom_1bt_max64b},
+    {0x004800003f08006a, &upb_prm_1bt_maxmaxb},
+    {0x000800040e000072, &upb_pos_1bt},
+    {0x000800040f09007a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init = {
+  &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0],
+  &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[5] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[9] = {
+  {2, UPB_SIZE(28, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(52, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 72), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 104), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(12, 80), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(16, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(20, 96), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = {
+  &envoy_config_route_v3_CorsPolicy_submsgs[0],
+  &envoy_config_route_v3_CorsPolicy__fields[0],
+  UPB_SIZE(64, 112), 9, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x003800003f00002a, &upb_pss_1bt},
+    {0x0048000001000032, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x006800040901004a, &upb_pom_1bt_maxmaxb},
+    {0x0050000002020052, &upb_psm_1bt_maxmaxb},
+    {0x005800003f03005a, &upb_prm_1bt_maxmaxb},
+    {0x0060000003040062, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_submsgs[24] = {
+  {.submsg = &envoy__config__route__v3__WeightedCluster_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init},
+  {.submsg = &envoy__config__route__v3__CorsPolicy_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init},
+  {.submsg = &envoy__config__route__v3__HedgePolicy_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__config__route__v3__InternalRedirectPolicy_msg_init},
+  {.submsg = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init},
+  {.submsg = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction__fields[34] = {
+  {1, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 64), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(124, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(8, 88), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(12, 96), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(20, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(24, 112), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(28, 120), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(32, 128), 5, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(36, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(40, 136), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(44, 144), 7, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(48, 152), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(52, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(56, 160), 8, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(60, 168), 9, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {29, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(64, 176), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(68, 184), 10, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(72, 192), 11, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(76, 200), 12, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(80, 208), 13, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {35, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(88, 216), 14, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {38, UPB_SIZE(92, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(100, 224), 15, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(104, 232), 16, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = {
+  &envoy_config_route_v3_RouteAction_submsgs[0],
+  &envoy_config_route_v3_RouteAction__fields[0],
+  UPB_SIZE(136, 240), 34, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000180100000a, &upb_pos_1bt},
+    {0x0030001802000012, &upb_pos_1bt},
+    {0x003000180300001a, &upb_pom_1bt_max64b},
+    {0x0040000001010022, &upb_psm_1bt_maxmaxb},
+    {0x004800003f00002a, &upb_pss_1bt},
+    {0x0020001006000032, &upb_pos_1bt},
+    {0x002000100702003a, &upb_pom_1bt_maxmaxb},
+    {0x0058000002030042, &upb_psm_1bt_maxmaxb},
+    {0x006000000304004a, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000058, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x006800003f05006a, &upb_prm_1bt_max64b},
+    {0x0070000004060072, &upb_psm_1bt_maxmaxb},
+    {0x007800003f07007a, &upb_prm_1bt_max64b},
+    {0x00c000000b100282, &upb_psm_2bt_maxmaxb},
+    {0x008000000508018a, &upb_psm_2bt_max128b},
+    {0x00d000000d120292, &upb_psm_2bt_max64b},
+    {0x002000102313029a, &upb_pom_2bt_maxmaxb},
+    {0x000800003f0001a0, &upb_psv4_2bt},
+    {0x00300018250002aa, &upb_pos_2bt},
+    {0x001400003f0002b0, &upb_psb1_2bt},
+    {0x00880000060901ba, &upb_psm_2bt_maxmaxb},
+    {0x00900000070a01c2, &upb_psm_2bt_maxmaxb},
+    {0x009800003f0b01ca, &upb_prm_2bt_max64b},
+    {0x000c00003f0001d0, &upb_psv4_2bt},
+    {0x00a00000080c01da, &upb_psm_2bt_max64b},
+    {0x00a80000090d01e2, &upb_psm_2bt_maxmaxb},
+    {0x002000101d0001ea, &upb_pos_2bt},
+    {0x00b000003f0e01f2, &upb_prm_2bt_max64b},
+    {0x00b800000a0f01fa, &upb_psm_2bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init = {
+  &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0],
+  &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
+    {0x002800003f00002a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = {
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy__fields[6] = {
+  {1, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 8, -5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = {
+  &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0],
+  &envoy_config_route_v3_RouteAction_HashPolicy__fields[0],
+  16, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040100000a, &upb_pom_1bt_max64b},
+    {0x0008000402010012, &upb_pom_1bt_max64b},
+    {0x000800040302001a, &upb_pom_1bt_max64b},
+    {0x000000003f000020, &upb_psb1_1bt},
+    {0x000800040503002a, &upb_pom_1bt_max64b},
+    {0x0008000406040032, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init = {
+  &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0],
+  &envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init = {
+  &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0],
+  &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_pss_1bt},
+    {0x003000003f010022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init = {
+  &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0],
+  &envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ProxyProtocolConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init = {
+  &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0],
+  &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init = {
+  &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0],
+  &envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_submsgs[10] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy__fields[13] = {
+  {1, UPB_SIZE(48, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 56, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 64), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 72), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 80), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 88), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 96), 5, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(40, 104), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(44, 112), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = {
+  &envoy_config_route_v3_RetryPolicy_submsgs[0],
+  &envoy_config_route_v3_RetryPolicy__fields[0],
+  UPB_SIZE(64, 120), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x003000003f03002a, &upb_prm_1bt_max64b},
+    {0x003800003f000030, &upb_psv8_1bt},
+    {0x004000003f00003a, &upb_ppv4_1bt},
+    {0x0048000004040042, &upb_psm_1bt_max64b},
+    {0x005000003f05004a, &upb_prm_1bt_max64b},
+    {0x005800003f060052, &upb_prm_1bt_max64b},
+    {0x006000000507005a, &upb_psm_1bt_max64b},
+    {0x006800003f080062, &upb_prm_1bt_maxmaxb},
+    {0x007000000609006a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryPriority__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init = {
+  &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0],
+  &envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init = {
+  &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0],
+  &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init = {
+  &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0],
+  &envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RetryPolicy_ResetHeader__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = {
+  {.submsg = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init = {
+  &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0],
+  &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_HedgePolicy_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_HedgePolicy__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = {
+  &envoy_config_route_v3_HedgePolicy_submsgs[0],
+  &envoy_config_route_v3_HedgePolicy__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RedirectAction_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RedirectAction__fields[9] = {
+  {1, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 40), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(20, 24), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(28, 40), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 24), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 40), -17, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = {
+  &envoy_config_route_v3_RedirectAction_submsgs[0],
+  &envoy_config_route_v3_RedirectAction__fields[0],
+  UPB_SIZE(48, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f00000a, &upb_pss_1bt},
+    {0x0028001002000012, &upb_pos_1bt},
+    {0x000000003f000018, &upb_psv4_1bt},
+    {0x0018000804000020, &upb_pob1_1bt},
+    {0x002800100500002a, &upb_pos_1bt},
+    {0x000400003f000030, &upb_psb1_1bt},
+    {0x001800080700003a, &upb_pos_1bt},
+    {0x000c00003f000040, &upb_psv4_1bt},
+    {0x002800100900004a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_DirectResponseAction_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_DirectResponseAction__fields[2] = {
+  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = {
+  &envoy_config_route_v3_DirectResponseAction_submsgs[0],
+  &envoy_config_route_v3_DirectResponseAction__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_Decorator_submsgs[1] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_Decorator__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = {
+  &envoy_config_route_v3_Decorator_submsgs[0],
+  &envoy_config_route_v3_Decorator__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_Tracing_submsgs[4] = {
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__type__tracing__v3__CustomTag_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_Tracing__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = {
+  &envoy_config_route_v3_Tracing_submsgs[0],
+  &envoy_config_route_v3_Tracing__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x002000003f030022, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_VirtualCluster_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_VirtualCluster__fields[2] = {
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = {
+  &envoy_config_route_v3_VirtualCluster_submsgs[0],
+  &envoy_config_route_v3_VirtualCluster__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f000022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Override_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = {
+  &envoy_config_route_v3_RateLimit_submsgs[0],
+  &envoy_config_route_v3_RateLimit__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f01001a, &upb_prm_1bt_max64b},
+    {0x0028000002020022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_submsgs[11] = {
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init},
+  {.submsg = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action__fields[11] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action__fields[0],
+  UPB_SIZE(8, 16), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x000800000504002a, &upb_pom_1bt_max64b},
+    {0x0008000006050032, &upb_pom_1bt_max64b},
+    {0x000800000706003a, &upb_pom_1bt_max64b},
+    {0x0008000008070042, &upb_pom_1bt_max64b},
+    {0x000800000908004a, &upb_pom_1bt_maxmaxb},
+    {0x000800000a090052, &upb_pom_1bt_max64b},
+    {0x000800000b0a005a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x000000003f000018, &upb_psb1_1bt},
+  })
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_GenericKey__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init = {
+  NULL,
+  &envoy_config_route_v3_RateLimit_Action_GenericKey__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f01001a, &upb_prm_1bt_max64b},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKey_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKey_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MetaData__fields[5] = {
+  {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x0020000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002800003f00001a, &upb_pss_1bt},
+    {0x000400003f000020, &upb_psv4_1bt},
+    {0x000800003f000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__route__v3__QueryParameterMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init = {
+  &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f01001a, &upb_prm_1bt_max64b},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = {
+  &envoy_config_route_v3_RateLimit_Override_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Override__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKey_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init = {
+  &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0],
+  &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_HeaderMatcher_submsgs[3] = {
+  {.submsg = &envoy__type__v3__Int64Range_msg_init},
+  {.submsg = &envoy__type__matcher__v3__RegexMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_HeaderMatcher__fields[11] = {
+  {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 16), -5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(12, 16), -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = {
+  &envoy_config_route_v3_HeaderMatcher_submsgs[0],
+  &envoy_config_route_v3_HeaderMatcher__fields[0],
+  UPB_SIZE(32, 48), 11, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000404000022, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000406000032, &upb_pom_1bt_maxmaxb},
+    {0x0010000407000038, &upb_pob1_1bt},
+    {0x000000003f000040, &upb_psb1_1bt},
+    {0x001000040900004a, &upb_pos_1bt},
+    {0x001000040a000052, &upb_pos_1bt},
+    {0x001000040b01005a, &upb_pom_1bt_maxmaxb},
+    {0x001000040c000062, &upb_pos_1bt},
+    {0x001000040d02006a, &upb_pom_1bt_maxmaxb},
+    {0x000800003f000070, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_QueryParameterMatcher__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 24), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = {
+  &envoy_config_route_v3_QueryParameterMatcher_submsgs[0],
+  &envoy_config_route_v3_QueryParameterMatcher__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000500002a, &upb_pom_1bt_maxmaxb},
+    {0x0018000006000030, &upb_pob1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_InternalRedirectPolicy__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = {
+  &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0],
+  &envoy_config_route_v3_InternalRedirectPolicy__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_ppv4_1bt},
+    {0x001800003f01001a, &upb_prm_1bt_maxmaxb},
+    {0x000100003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_FilterConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_FilterConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = {
+  &envoy_config_route_v3_FilterConfig_submsgs[0],
+  &envoy_config_route_v3_FilterConfig__fields[0],
+  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000200003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[58] = {
+  &envoy__config__route__v3__VirtualHost_msg_init,
+  &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init,
+  &envoy__config__route__v3__FilterAction_msg_init,
+  &envoy__config__route__v3__RouteList_msg_init,
+  &envoy__config__route__v3__Route_msg_init,
+  &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init,
+  &envoy__config__route__v3__WeightedCluster_msg_init,
+  &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init,
+  &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init,
+  &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init,
+  &envoy__config__route__v3__RouteMatch_msg_init,
+  &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init,
+  &envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init,
+  &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init,
+  &envoy__config__route__v3__CorsPolicy_msg_init,
+  &envoy__config__route__v3__RouteAction_msg_init,
+  &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init,
+  &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init,
+  &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init,
+  &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init,
+  &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init,
+  &envoy__config__route__v3__RetryPolicy_msg_init,
+  &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init,
+  &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init,
+  &envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init,
+  &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init,
+  &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init,
+  &envoy__config__route__v3__HedgePolicy_msg_init,
+  &envoy__config__route__v3__RedirectAction_msg_init,
+  &envoy__config__route__v3__DirectResponseAction_msg_init,
+  &envoy__config__route__v3__NonForwardingAction_msg_init,
+  &envoy__config__route__v3__Decorator_msg_init,
+  &envoy__config__route__v3__Tracing_msg_init,
+  &envoy__config__route__v3__VirtualCluster_msg_init,
+  &envoy__config__route__v3__RateLimit_msg_init,
+  &envoy__config__route__v3__RateLimit__Action_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init,
+  &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init,
+  &envoy__config__route__v3__RateLimit__Override_msg_init,
+  &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init,
+  &envoy__config__route__v3__HeaderMatcher_msg_init,
+  &envoy__config__route__v3__QueryParameterMatcher_msg_init,
+  &envoy__config__route__v3__InternalRedirectPolicy_msg_init,
+  &envoy__config__route__v3__FilterConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  58,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
new file mode 100644
index 0000000000000..c11c9c4fb9bc6
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
@@ -0,0 +1,87 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/route_components.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_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__config__route__v3__VirtualHost_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteList_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__Route_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryParameter_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__Decorator_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__Tracing_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h
rename to src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
index 3853f63782b6a..fd225f67132f8 100644
--- a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/scoped_route.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/route/v3/scoped_route.upb_minitable.h"
+
+#include "envoy/config/route/v3/route.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,23 +28,19 @@ extern "C" {
 typedef struct envoy_config_route_v3_ScopedRouteConfiguration envoy_config_route_v3_ScopedRouteConfiguration;
 typedef struct envoy_config_route_v3_ScopedRouteConfiguration_Key envoy_config_route_v3_ScopedRouteConfiguration_Key;
 typedef struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment;
-extern const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init;
 struct envoy_config_route_v3_RouteConfiguration;
-extern const upb_MiniTable envoy_config_route_v3_RouteConfiguration_msg_init;
 
 
 
 /* envoy.config.route.v3.ScopedRouteConfiguration */
 
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration* envoy_config_route_v3_ScopedRouteConfiguration_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_ScopedRouteConfiguration*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_msg_init, arena);
+  return (envoy_config_route_v3_ScopedRouteConfiguration*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration* envoy_config_route_v3_ScopedRouteConfiguration_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration* ret = envoy_config_route_v3_ScopedRouteConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +50,7 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration* envoy_config_route_v3
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration* ret = envoy_config_route_v3_ScopedRouteConfiguration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +58,13 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration* envoy_config_route_v3
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_serialize(const envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_serialize_ex(const envoy_config_route_v3_ScopedRouteConfiguration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_clear_name(envoy_config_route_v3_ScopedRouteConfiguration* msg) {
@@ -142,7 +146,7 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_key(envoy_con
 UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_route_v3_ScopedRouteConfiguration_mutable_key(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_ScopedRouteConfiguration_Key* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key*)envoy_config_route_v3_ScopedRouteConfiguration_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, arena);
+    sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, arena);
     if (sub) envoy_config_route_v3_ScopedRouteConfiguration_set_key(msg, sub);
   }
   return sub;
@@ -158,7 +162,7 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configu
 UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_ScopedRouteConfiguration_mutable_route_configuration(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_config_route_v3_ScopedRouteConfiguration_route_configuration(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy_config_route_v3_RouteConfiguration_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy__config__route__v3__RouteConfiguration_msg_init, arena);
     if (sub) envoy_config_route_v3_ScopedRouteConfiguration_set_route_configuration(msg, sub);
   }
   return sub;
@@ -167,12 +171,12 @@ UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_config_route_v
 /* envoy.config.route.v3.ScopedRouteConfiguration.Key */
 
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_route_v3_ScopedRouteConfiguration_Key_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_ScopedRouteConfiguration_Key*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, arena);
+  return (envoy_config_route_v3_ScopedRouteConfiguration_Key*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_route_v3_ScopedRouteConfiguration_Key_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration_Key* ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -182,7 +186,7 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_rout
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration_Key* ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -190,13 +194,13 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_rout
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_Key_serialize(const envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_Key_serialize_ex(const envoy_config_route_v3_ScopedRouteConfiguration_Key* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_clear_fragments(envoy_config_route_v3_ScopedRouteConfiguration_Key* msg) {
@@ -258,7 +262,7 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, arena);
+  struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -267,12 +271,12 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* e
 /* envoy.config.route.v3.ScopedRouteConfiguration.Key.Fragment */
 
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_new(upb_Arena* arena) {
-  return (envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, arena);
+  return (envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, arena);
 }
 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -282,7 +286,7 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* envoy_co
                            int options, upb_Arena* arena) {
   envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -290,13 +294,13 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* envoy_co
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_serialize(const envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_serialize_ex(const envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -328,8 +332,6 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
new file mode 100644
index 0000000000000..b34cdee43a092
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
@@ -0,0 +1,97 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/scoped_route.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/route/v3/scoped_route.upb_minitable.h"
+#include "envoy/config/route/v3/route.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = {
+  {.submsg = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteConfiguration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__fields[5] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init = {
+  &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0],
+  &envoy_config_route_v3_ScopedRouteConfiguration__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800000100001a, &upb_psm_1bt_max64b},
+    {0x000100003f000020, &upb_psb1_1bt},
+    {0x003000000201002a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init = {
+  &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0],
+  &envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init = {
+  NULL,
+  &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__config__route__v3__ScopedRouteConfiguration_msg_init,
+  &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init,
+  &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
new file mode 100644
index 0000000000000..3d0c5a10f8c62
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/route/v3/scoped_route.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_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__config__route__v3__ScopedRouteConfiguration_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init;
+extern const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init;
+
+extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
new file mode 100644
index 0000000000000..f5e3de7b51478
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
@@ -0,0 +1,1515 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/tap/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_config_tap_v3_TapConfig envoy_config_tap_v3_TapConfig;
+typedef struct envoy_config_tap_v3_MatchPredicate envoy_config_tap_v3_MatchPredicate;
+typedef struct envoy_config_tap_v3_MatchPredicate_MatchSet envoy_config_tap_v3_MatchPredicate_MatchSet;
+typedef struct envoy_config_tap_v3_HttpHeadersMatch envoy_config_tap_v3_HttpHeadersMatch;
+typedef struct envoy_config_tap_v3_HttpGenericBodyMatch envoy_config_tap_v3_HttpGenericBodyMatch;
+typedef struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch;
+typedef struct envoy_config_tap_v3_OutputConfig envoy_config_tap_v3_OutputConfig;
+typedef struct envoy_config_tap_v3_OutputSink envoy_config_tap_v3_OutputSink;
+typedef struct envoy_config_tap_v3_StreamingAdminSink envoy_config_tap_v3_StreamingAdminSink;
+typedef struct envoy_config_tap_v3_BufferedAdminSink envoy_config_tap_v3_BufferedAdminSink;
+typedef struct envoy_config_tap_v3_FilePerTapSink envoy_config_tap_v3_FilePerTapSink;
+typedef struct envoy_config_tap_v3_StreamingGrpcSink envoy_config_tap_v3_StreamingGrpcSink;
+struct envoy_config_common_matcher_v3_MatchPredicate;
+struct envoy_config_core_v3_GrpcService;
+struct envoy_config_core_v3_RuntimeFractionalPercent;
+struct envoy_config_route_v3_HeaderMatcher;
+struct google_protobuf_Duration;
+struct google_protobuf_UInt32Value;
+
+typedef enum {
+  envoy_config_tap_v3_OutputSink_JSON_BODY_AS_BYTES = 0,
+  envoy_config_tap_v3_OutputSink_JSON_BODY_AS_STRING = 1,
+  envoy_config_tap_v3_OutputSink_PROTO_BINARY = 2,
+  envoy_config_tap_v3_OutputSink_PROTO_BINARY_LENGTH_DELIMITED = 3,
+  envoy_config_tap_v3_OutputSink_PROTO_TEXT = 4
+} envoy_config_tap_v3_OutputSink_Format;
+
+
+
+/* envoy.config.tap.v3.TapConfig */
+
+UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy__config__tap__v3__TapConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_TapConfig* ret = envoy_config_tap_v3_TapConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__TapConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_TapConfig* ret = envoy_config_tap_v3_TapConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__TapConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_TapConfig_serialize(const envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__TapConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_TapConfig_serialize_ex(const envoy_config_tap_v3_TapConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__TapConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_match_config(envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_match_config(const envoy_config_tap_v3_TapConfig* msg) {
+  const envoy_config_tap_v3_MatchPredicate* default_val = NULL;
+  const envoy_config_tap_v3_MatchPredicate* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match_config(const envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_output_config(envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_output_config(const envoy_config_tap_v3_TapConfig* msg) {
+  const envoy_config_tap_v3_OutputConfig* default_val = NULL;
+  const envoy_config_tap_v3_OutputConfig* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_output_config(const envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_tap_enabled(envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_tap_enabled(const envoy_config_tap_v3_TapConfig* msg) {
+  const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL;
+  const struct envoy_config_core_v3_RuntimeFractionalPercent* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_tap_enabled(const envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_match(envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_match(const envoy_config_tap_v3_TapConfig* msg) {
+  const struct envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL;
+  const struct envoy_config_common_matcher_v3_MatchPredicate* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match(const envoy_config_tap_v3_TapConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_MatchPredicate* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate_msg_init, arena);
+    if (sub) envoy_config_tap_v3_TapConfig_set_match_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_set_output_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_OutputConfig* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_mutable_output_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_OutputConfig* sub = (struct envoy_config_tap_v3_OutputConfig*)envoy_config_tap_v3_TapConfig_output_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_OutputConfig*)_upb_Message_New(&envoy__config__tap__v3__OutputConfig_msg_init, arena);
+    if (sub) envoy_config_tap_v3_TapConfig_set_output_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_set_tap_enabled(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_mutable_tap_enabled(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_tap_v3_TapConfig_tap_enabled(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy__config__core__v3__RuntimeFractionalPercent_msg_init, arena);
+    if (sub) envoy_config_tap_v3_TapConfig_set_tap_enabled(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_common_matcher_v3_MatchPredicate* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
+  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
+    if (sub) envoy_config_tap_v3_TapConfig_set_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.tap.v3.MatchPredicate */
+
+UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_MatchPredicate* ret = envoy_config_tap_v3_MatchPredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_MatchPredicate* ret = envoy_config_tap_v3_MatchPredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__MatchPredicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_serialize(const envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__MatchPredicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_serialize_ex(const envoy_config_tap_v3_MatchPredicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__MatchPredicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_tap_v3_MatchPredicate_rule_or_match = 1,
+  envoy_config_tap_v3_MatchPredicate_rule_and_match = 2,
+  envoy_config_tap_v3_MatchPredicate_rule_not_match = 3,
+  envoy_config_tap_v3_MatchPredicate_rule_any_match = 4,
+  envoy_config_tap_v3_MatchPredicate_rule_http_request_headers_match = 5,
+  envoy_config_tap_v3_MatchPredicate_rule_http_request_trailers_match = 6,
+  envoy_config_tap_v3_MatchPredicate_rule_http_response_headers_match = 7,
+  envoy_config_tap_v3_MatchPredicate_rule_http_response_trailers_match = 8,
+  envoy_config_tap_v3_MatchPredicate_rule_http_request_generic_body_match = 9,
+  envoy_config_tap_v3_MatchPredicate_rule_http_response_generic_body_match = 10,
+  envoy_config_tap_v3_MatchPredicate_rule_NOT_SET = 0
+} envoy_config_tap_v3_MatchPredicate_rule_oneofcases;
+UPB_INLINE envoy_config_tap_v3_MatchPredicate_rule_oneofcases envoy_config_tap_v3_MatchPredicate_rule_case(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_MatchPredicate_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_or_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_or_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL;
+  const envoy_config_tap_v3_MatchPredicate_MatchSet* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_or_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_and_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_and_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL;
+  const envoy_config_tap_v3_MatchPredicate_MatchSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_and_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_not_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_not_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_MatchPredicate* default_val = NULL;
+  const envoy_config_tap_v3_MatchPredicate* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_not_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_any_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_any_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_any_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_request_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_response_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpHeadersMatch* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpGenericBodyMatch* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL;
+  const envoy_config_tap_v3_HttpGenericBodyMatch* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_or_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_or_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_or_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_or_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_and_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_and_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_and_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_and_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_not_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_mutable_not_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_MatchPredicate_not_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_not_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_any_match(envoy_config_tap_v3_MatchPredicate *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_headers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_headers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpHeadersMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, arena);
+    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.tap.v3.MatchPredicate.MatchSet */
+
+UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_MatchPredicate_MatchSet* ret = envoy_config_tap_v3_MatchPredicate_MatchSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_MatchPredicate_MatchSet* ret = envoy_config_tap_v3_MatchPredicate_MatchSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_MatchSet_serialize(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_MatchSet_serialize_ex(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_MatchPredicate_MatchSet_clear_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_MatchPredicate* const* envoy_config_tap_v3_MatchPredicate_MatchSet_rules(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_tap_v3_MatchPredicate* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_MatchSet_has_rules(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg) {
+  size_t size;
+  envoy_config_tap_v3_MatchPredicate_MatchSet_rules(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_tap_v3_MatchPredicate**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredicate_MatchSet_resize_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_MatchPredicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_MatchSet_add_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy__config__tap__v3__MatchPredicate_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.tap.v3.HttpHeadersMatch */
+
+UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpHeadersMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpHeadersMatch* ret = envoy_config_tap_v3_HttpHeadersMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpHeadersMatch* ret = envoy_config_tap_v3_HttpHeadersMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpHeadersMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpHeadersMatch_serialize(const envoy_config_tap_v3_HttpHeadersMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpHeadersMatch_serialize_ex(const envoy_config_tap_v3_HttpHeadersMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpHeadersMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_HttpHeadersMatch_clear_headers(envoy_config_tap_v3_HttpHeadersMatch* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_tap_v3_HttpHeadersMatch_headers(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_mutable_upb_array(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_tap_v3_HttpHeadersMatch_has_headers(const envoy_config_tap_v3_HttpHeadersMatch* msg) {
+  size_t size;
+  envoy_config_tap_v3_HttpHeadersMatch_headers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_HttpHeadersMatch_mutable_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_HttpHeadersMatch_resize_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_tap_v3_HttpHeadersMatch_add_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.tap.v3.HttpGenericBodyMatch */
+
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpGenericBodyMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpGenericBodyMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_serialize(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_serialize_ex(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_clear_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_config_tap_v3_HttpGenericBodyMatch_bytes_limit(const envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_clear_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_tap_v3_HttpGenericBodyMatch_patterns(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_has_patterns(const envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
+  size_t size;
+  envoy_config_tap_v3_HttpGenericBodyMatch_patterns(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch *msg, uint32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_resize_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_add_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch */
+
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_serialize(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_serialize_ex(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_string_match = 1,
+  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_binary_match = 2,
+  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_NOT_SET = 0
+} envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases;
+UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_case(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_clear_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_string_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_string_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_clear_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_binary_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_binary_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.tap.v3.OutputConfig */
+
+UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_OutputConfig*)_upb_Message_New(&envoy__config__tap__v3__OutputConfig_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_OutputConfig* ret = envoy_config_tap_v3_OutputConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__OutputConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_OutputConfig* ret = envoy_config_tap_v3_OutputConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__OutputConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_OutputConfig_serialize(const envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__OutputConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_OutputConfig_serialize_ex(const envoy_config_tap_v3_OutputConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__OutputConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_sinks(envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_OutputSink* const* envoy_config_tap_v3_OutputConfig_sinks(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_config_tap_v3_OutputSink* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_upb_array(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_mutable_upb_array(const envoy_config_tap_v3_OutputConfig* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_sinks(const envoy_config_tap_v3_OutputConfig* msg) {
+  size_t size;
+  envoy_config_tap_v3_OutputConfig_sinks(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_max_buffered_rx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_max_buffered_tx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_streaming(envoy_config_tap_v3_OutputConfig* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputConfig_streaming(const envoy_config_tap_v3_OutputConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_mutable_sinks(envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_config_tap_v3_OutputSink**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_resize_sinks(envoy_config_tap_v3_OutputConfig* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_OutputSink**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputConfig_add_sinks(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_tap_v3_OutputSink* sub = (struct envoy_config_tap_v3_OutputSink*)_upb_Message_New(&envoy__config__tap__v3__OutputSink_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_streaming(envoy_config_tap_v3_OutputConfig *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.tap.v3.OutputSink */
+
+UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_OutputSink*)_upb_Message_New(&envoy__config__tap__v3__OutputSink_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_OutputSink* ret = envoy_config_tap_v3_OutputSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__OutputSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_OutputSink* ret = envoy_config_tap_v3_OutputSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__OutputSink_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_OutputSink_serialize(const envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__OutputSink_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_OutputSink_serialize_ex(const envoy_config_tap_v3_OutputSink* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__OutputSink_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_config_tap_v3_OutputSink_output_sink_type_streaming_admin = 2,
+  envoy_config_tap_v3_OutputSink_output_sink_type_file_per_tap = 3,
+  envoy_config_tap_v3_OutputSink_output_sink_type_streaming_grpc = 4,
+  envoy_config_tap_v3_OutputSink_output_sink_type_buffered_admin = 5,
+  envoy_config_tap_v3_OutputSink_output_sink_type_NOT_SET = 0
+} envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases;
+UPB_INLINE envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases envoy_config_tap_v3_OutputSink_output_sink_type_case(const envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_format(envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_config_tap_v3_OutputSink_format(const envoy_config_tap_v3_OutputSink* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_streaming_admin(envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_streaming_admin(const envoy_config_tap_v3_OutputSink* msg) {
+  const envoy_config_tap_v3_StreamingAdminSink* default_val = NULL;
+  const envoy_config_tap_v3_StreamingAdminSink* ret;
+  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_streaming_admin(const envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_file_per_tap(envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_file_per_tap(const envoy_config_tap_v3_OutputSink* msg) {
+  const envoy_config_tap_v3_FilePerTapSink* default_val = NULL;
+  const envoy_config_tap_v3_FilePerTapSink* ret;
+  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_file_per_tap(const envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_streaming_grpc(envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_streaming_grpc(const envoy_config_tap_v3_OutputSink* msg) {
+  const envoy_config_tap_v3_StreamingGrpcSink* default_val = NULL;
+  const envoy_config_tap_v3_StreamingGrpcSink* ret;
+  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_streaming_grpc(const envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_buffered_admin(envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_buffered_admin(const envoy_config_tap_v3_OutputSink* msg) {
+  const envoy_config_tap_v3_BufferedAdminSink* default_val = NULL;
+  const envoy_config_tap_v3_BufferedAdminSink* ret;
+  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_buffered_admin(const envoy_config_tap_v3_OutputSink* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_OutputSink_set_format(envoy_config_tap_v3_OutputSink *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingAdminSink* value) {
+  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_mutable_streaming_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_StreamingAdminSink* sub = (struct envoy_config_tap_v3_StreamingAdminSink*)envoy_config_tap_v3_OutputSink_streaming_admin(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_StreamingAdminSink*)_upb_Message_New(&envoy__config__tap__v3__StreamingAdminSink_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputSink_set_streaming_admin(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_set_file_per_tap(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_FilePerTapSink* value) {
+  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_mutable_file_per_tap(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_FilePerTapSink* sub = (struct envoy_config_tap_v3_FilePerTapSink*)envoy_config_tap_v3_OutputSink_file_per_tap(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_FilePerTapSink*)_upb_Message_New(&envoy__config__tap__v3__FilePerTapSink_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputSink_set_file_per_tap(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_grpc(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingGrpcSink* value) {
+  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_mutable_streaming_grpc(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_StreamingGrpcSink* sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)envoy_config_tap_v3_OutputSink_streaming_grpc(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)_upb_Message_New(&envoy__config__tap__v3__StreamingGrpcSink_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputSink_set_streaming_grpc(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_config_tap_v3_OutputSink_set_buffered_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_BufferedAdminSink* value) {
+  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_mutable_buffered_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
+  struct envoy_config_tap_v3_BufferedAdminSink* sub = (struct envoy_config_tap_v3_BufferedAdminSink*)envoy_config_tap_v3_OutputSink_buffered_admin(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_tap_v3_BufferedAdminSink*)_upb_Message_New(&envoy__config__tap__v3__BufferedAdminSink_msg_init, arena);
+    if (sub) envoy_config_tap_v3_OutputSink_set_buffered_admin(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.tap.v3.StreamingAdminSink */
+
+UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_StreamingAdminSink*)_upb_Message_New(&envoy__config__tap__v3__StreamingAdminSink_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_StreamingAdminSink* ret = envoy_config_tap_v3_StreamingAdminSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__StreamingAdminSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_StreamingAdminSink* ret = envoy_config_tap_v3_StreamingAdminSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__StreamingAdminSink_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_StreamingAdminSink_serialize(const envoy_config_tap_v3_StreamingAdminSink* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__StreamingAdminSink_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_StreamingAdminSink_serialize_ex(const envoy_config_tap_v3_StreamingAdminSink* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__StreamingAdminSink_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.config.tap.v3.BufferedAdminSink */
+
+UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_BufferedAdminSink*)_upb_Message_New(&envoy__config__tap__v3__BufferedAdminSink_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_BufferedAdminSink* ret = envoy_config_tap_v3_BufferedAdminSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__BufferedAdminSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_BufferedAdminSink* ret = envoy_config_tap_v3_BufferedAdminSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__BufferedAdminSink_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_BufferedAdminSink_serialize(const envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__BufferedAdminSink_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_BufferedAdminSink_serialize_ex(const envoy_config_tap_v3_BufferedAdminSink* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__BufferedAdminSink_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_clear_max_traces(envoy_config_tap_v3_BufferedAdminSink* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_config_tap_v3_BufferedAdminSink_max_traces(const envoy_config_tap_v3_BufferedAdminSink* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_clear_timeout(envoy_config_tap_v3_BufferedAdminSink* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_timeout(const envoy_config_tap_v3_BufferedAdminSink* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_BufferedAdminSink_has_timeout(const envoy_config_tap_v3_BufferedAdminSink* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_max_traces(envoy_config_tap_v3_BufferedAdminSink *msg, uint64_t value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_timeout(envoy_config_tap_v3_BufferedAdminSink *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_mutable_timeout(envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_tap_v3_BufferedAdminSink_timeout(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_config_tap_v3_BufferedAdminSink_set_timeout(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.config.tap.v3.FilePerTapSink */
+
+UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_FilePerTapSink*)_upb_Message_New(&envoy__config__tap__v3__FilePerTapSink_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_FilePerTapSink* ret = envoy_config_tap_v3_FilePerTapSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__FilePerTapSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_FilePerTapSink* ret = envoy_config_tap_v3_FilePerTapSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__FilePerTapSink_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_FilePerTapSink_serialize(const envoy_config_tap_v3_FilePerTapSink* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__FilePerTapSink_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_FilePerTapSink_serialize_ex(const envoy_config_tap_v3_FilePerTapSink* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__FilePerTapSink_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_clear_path_prefix(envoy_config_tap_v3_FilePerTapSink* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_tap_v3_FilePerTapSink_path_prefix(const envoy_config_tap_v3_FilePerTapSink* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_set_path_prefix(envoy_config_tap_v3_FilePerTapSink *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.config.tap.v3.StreamingGrpcSink */
+
+UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_new(upb_Arena* arena) {
+  return (envoy_config_tap_v3_StreamingGrpcSink*)_upb_Message_New(&envoy__config__tap__v3__StreamingGrpcSink_msg_init, arena);
+}
+UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_config_tap_v3_StreamingGrpcSink* ret = envoy_config_tap_v3_StreamingGrpcSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__StreamingGrpcSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_config_tap_v3_StreamingGrpcSink* ret = envoy_config_tap_v3_StreamingGrpcSink_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__config__tap__v3__StreamingGrpcSink_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_config_tap_v3_StreamingGrpcSink_serialize(const envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__StreamingGrpcSink_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_config_tap_v3_StreamingGrpcSink_serialize_ex(const envoy_config_tap_v3_StreamingGrpcSink* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__config__tap__v3__StreamingGrpcSink_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_clear_tap_id(envoy_config_tap_v3_StreamingGrpcSink* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_config_tap_v3_StreamingGrpcSink_tap_id(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_clear_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_grpc_service(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
+  const struct envoy_config_core_v3_GrpcService* default_val = NULL;
+  const struct envoy_config_core_v3_GrpcService* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_config_tap_v3_StreamingGrpcSink_has_grpc_service(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_tap_id(envoy_config_tap_v3_StreamingGrpcSink *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(envoy_config_tap_v3_StreamingGrpcSink *msg, struct envoy_config_core_v3_GrpcService* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_mutable_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_tap_v3_StreamingGrpcSink_grpc_service(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
+    if (sub) envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
new file mode 100644
index 0000000000000..9ba179c709777
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
@@ -0,0 +1,325 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/tap/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_tap_v3_TapConfig_submsgs[4] = {
+  {.submsg = &envoy__config__tap__v3__MatchPredicate_msg_init},
+  {.submsg = &envoy__config__tap__v3__OutputConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = {
+  &envoy_config_tap_v3_TapConfig_submsgs[0],
+  &envoy_config_tap_v3_TapConfig__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_submsgs[9] = {
+  {.submsg = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__tap__v3__MatchPredicate_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init},
+  {.submsg = &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = {
+  &envoy_config_tap_v3_MatchPredicate_submsgs[0],
+  &envoy_config_tap_v3_MatchPredicate__fields[0],
+  UPB_SIZE(8, 16), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004000020, &upb_pob1_1bt},
+    {0x000800000503002a, &upb_pom_1bt_max64b},
+    {0x0008000006040032, &upb_pom_1bt_max64b},
+    {0x000800000705003a, &upb_pom_1bt_max64b},
+    {0x0008000008060042, &upb_pom_1bt_max64b},
+    {0x000800000907004a, &upb_pom_1bt_max64b},
+    {0x000800000a080052, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = {
+  {.submsg = &envoy__config__tap__v3__MatchPredicate_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = {
+  &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0],
+  &envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = {
+  &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0],
+  &envoy_config_tap_v3_HttpHeadersMatch__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = {
+  {.submsg = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = {
+  &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0],
+  &envoy_config_tap_v3_HttpGenericBodyMatch__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init = {
+  NULL,
+  &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pob_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_OutputConfig_submsgs[3] = {
+  {.submsg = &envoy__config__tap__v3__OutputSink_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = {
+  &envoy_config_tap_v3_OutputConfig_submsgs[0],
+  &envoy_config_tap_v3_OutputConfig__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000202001a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_OutputSink_submsgs[4] = {
+  {.submsg = &envoy__config__tap__v3__StreamingAdminSink_msg_init},
+  {.submsg = &envoy__config__tap__v3__FilePerTapSink_msg_init},
+  {.submsg = &envoy__config__tap__v3__StreamingGrpcSink_msg_init},
+  {.submsg = &envoy__config__tap__v3__BufferedAdminSink_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[5] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = {
+  &envoy_config_tap_v3_OutputSink_submsgs[0],
+  &envoy_config_tap_v3_OutputSink__fields[0],
+  16, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x0008000402000012, &upb_pom_1bt_max64b},
+    {0x000800040301001a, &upb_pom_1bt_max64b},
+    {0x0008000404020022, &upb_pom_1bt_max64b},
+    {0x000800040503002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = {
+  &envoy_config_tap_v3_BufferedAdminSink_submsgs[0],
+  &envoy_config_tap_v3_BufferedAdminSink__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_FilePerTapSink__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = {
+  NULL,
+  &envoy_config_tap_v3_FilePerTapSink__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = {
+  &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0],
+  &envoy_config_tap_v3_StreamingGrpcSink__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[12] = {
+  &envoy__config__tap__v3__TapConfig_msg_init,
+  &envoy__config__tap__v3__MatchPredicate_msg_init,
+  &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init,
+  &envoy__config__tap__v3__HttpHeadersMatch_msg_init,
+  &envoy__config__tap__v3__HttpGenericBodyMatch_msg_init,
+  &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init,
+  &envoy__config__tap__v3__OutputConfig_msg_init,
+  &envoy__config__tap__v3__OutputSink_msg_init,
+  &envoy__config__tap__v3__StreamingAdminSink_msg_init,
+  &envoy__config__tap__v3__BufferedAdminSink_msg_init,
+  &envoy__config__tap__v3__FilePerTapSink_msg_init,
+  &envoy__config__tap__v3__StreamingGrpcSink_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  12,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
new file mode 100644
index 0000000000000..01934e94476d2
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
@@ -0,0 +1,41 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/tap/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_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__config__tap__v3__TapConfig_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init;
+extern const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init;
+
+extern const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
index 8f9b30d03efdc..3dd8d28c26418 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/datadog.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
+
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +25,18 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_DatadogConfig envoy_config_trace_v3_DatadogConfig;
-extern const upb_MiniTable envoy_config_trace_v3_DatadogConfig_msg_init;
 
 
 
 /* envoy.config.trace.v3.DatadogConfig */
 
 UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_DatadogConfig*)_upb_Message_New(&envoy_config_trace_v3_DatadogConfig_msg_init, arena);
+  return (envoy_config_trace_v3_DatadogConfig*)_upb_Message_New(&envoy__config__trace__v3__DatadogConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_DatadogConfig* ret = envoy_config_trace_v3_DatadogConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_DatadogConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__DatadogConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +46,7 @@ UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogCon
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_DatadogConfig* ret = envoy_config_trace_v3_DatadogConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_DatadogConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__DatadogConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +54,13 @@ UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogCon
 }
 UPB_INLINE char* envoy_config_trace_v3_DatadogConfig_serialize(const envoy_config_trace_v3_DatadogConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_DatadogConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__DatadogConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_DatadogConfig_serialize_ex(const envoy_config_trace_v3_DatadogConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_DatadogConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__DatadogConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_collector_cluster(envoy_config_trace_v3_DatadogConfig* msg) {
@@ -104,8 +110,6 @@ UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_hostname(envoy
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
new file mode 100644
index 0000000000000..9bd43d6373913
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/datadog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = {
+  NULL,
+  &envoy_config_trace_v3_DatadogConfig__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__DatadogConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_datadog_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/config/trace/v3/datadog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
new file mode 100644
index 0000000000000..80622a1d9aef4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/datadog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_DATADOG_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__config__trace__v3__DatadogConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
index 5036b4882aa23..dd6af9d915e72 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/dynamic_ot.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
+
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +26,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_DynamicOtConfig envoy_config_trace_v3_DynamicOtConfig;
-extern const upb_MiniTable envoy_config_trace_v3_DynamicOtConfig_msg_init;
 struct google_protobuf_Struct;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
 
 
 
 /* envoy.config.trace.v3.DynamicOtConfig */
 
 UPB_INLINE envoy_config_trace_v3_DynamicOtConfig* envoy_config_trace_v3_DynamicOtConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_DynamicOtConfig*)_upb_Message_New(&envoy_config_trace_v3_DynamicOtConfig_msg_init, arena);
+  return (envoy_config_trace_v3_DynamicOtConfig*)_upb_Message_New(&envoy__config__trace__v3__DynamicOtConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_DynamicOtConfig* envoy_config_trace_v3_DynamicOtConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_DynamicOtConfig* ret = envoy_config_trace_v3_DynamicOtConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_DynamicOtConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__DynamicOtConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +48,7 @@ UPB_INLINE envoy_config_trace_v3_DynamicOtConfig* envoy_config_trace_v3_DynamicO
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_DynamicOtConfig* ret = envoy_config_trace_v3_DynamicOtConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_DynamicOtConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__DynamicOtConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +56,13 @@ UPB_INLINE envoy_config_trace_v3_DynamicOtConfig* envoy_config_trace_v3_DynamicO
 }
 UPB_INLINE char* envoy_config_trace_v3_DynamicOtConfig_serialize(const envoy_config_trace_v3_DynamicOtConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_DynamicOtConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__DynamicOtConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_DynamicOtConfig_serialize_ex(const envoy_config_trace_v3_DynamicOtConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_DynamicOtConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__DynamicOtConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_clear_library(envoy_config_trace_v3_DynamicOtConfig* msg) {
@@ -97,14 +103,12 @@ UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_config(envoy_config_tr
 UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_mutable_config(envoy_config_trace_v3_DynamicOtConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_DynamicOtConfig_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_trace_v3_DynamicOtConfig_set_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
new file mode 100644
index 0000000000000..8ea8ed1ef727d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/dynamic_ot.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = {
+  &envoy_config_trace_v3_DynamicOtConfig_submsgs[0],
+  &envoy_config_trace_v3_DynamicOtConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__DynamicOtConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_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/config/trace/v3/dynamic_ot.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
new file mode 100644
index 0000000000000..b464a2f027511
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/dynamic_ot.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_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__config__trace__v3__DynamicOtConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
index d670b0ece4ff0..68a2eaf057a73 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/http_tracer.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,22 +26,19 @@ extern "C" {
 
 typedef struct envoy_config_trace_v3_Tracing envoy_config_trace_v3_Tracing;
 typedef struct envoy_config_trace_v3_Tracing_Http envoy_config_trace_v3_Tracing_Http;
-extern const upb_MiniTable envoy_config_trace_v3_Tracing_msg_init;
-extern const upb_MiniTable envoy_config_trace_v3_Tracing_Http_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
 
 
 
 /* envoy.config.trace.v3.Tracing */
 
 UPB_INLINE envoy_config_trace_v3_Tracing* envoy_config_trace_v3_Tracing_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_Tracing*)_upb_Message_New(&envoy_config_trace_v3_Tracing_msg_init, arena);
+  return (envoy_config_trace_v3_Tracing*)_upb_Message_New(&envoy__config__trace__v3__Tracing_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_Tracing* envoy_config_trace_v3_Tracing_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_Tracing* ret = envoy_config_trace_v3_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +48,7 @@ UPB_INLINE envoy_config_trace_v3_Tracing* envoy_config_trace_v3_Tracing_parse_ex
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_Tracing* ret = envoy_config_trace_v3_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__Tracing_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +56,13 @@ UPB_INLINE envoy_config_trace_v3_Tracing* envoy_config_trace_v3_Tracing_parse_ex
 }
 UPB_INLINE char* envoy_config_trace_v3_Tracing_serialize(const envoy_config_trace_v3_Tracing* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_Tracing_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__Tracing_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_Tracing_serialize_ex(const envoy_config_trace_v3_Tracing* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_Tracing_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__Tracing_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_Tracing_clear_http(envoy_config_trace_v3_Tracing* msg) {
@@ -84,7 +88,7 @@ UPB_INLINE void envoy_config_trace_v3_Tracing_set_http(envoy_config_trace_v3_Tra
 UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_mutable_http(envoy_config_trace_v3_Tracing* msg, upb_Arena* arena) {
   struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_config_trace_v3_Tracing_http(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy_config_trace_v3_Tracing_Http_msg_init, arena);
+    sub = (struct envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy__config__trace__v3__Tracing__Http_msg_init, arena);
     if (sub) envoy_config_trace_v3_Tracing_set_http(msg, sub);
   }
   return sub;
@@ -93,12 +97,12 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Trac
 /* envoy.config.trace.v3.Tracing.Http */
 
 UPB_INLINE envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_Http_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy_config_trace_v3_Tracing_Http_msg_init, arena);
+  return (envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy__config__trace__v3__Tracing__Http_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_Http_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_Tracing_Http* ret = envoy_config_trace_v3_Tracing_Http_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__Tracing__Http_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -108,7 +112,7 @@ UPB_INLINE envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_Htt
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_Tracing_Http* ret = envoy_config_trace_v3_Tracing_Http_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__Tracing__Http_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -116,13 +120,13 @@ UPB_INLINE envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_Htt
 }
 UPB_INLINE char* envoy_config_trace_v3_Tracing_Http_serialize(const envoy_config_trace_v3_Tracing_Http* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_Tracing_Http_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__Tracing__Http_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_Tracing_Http_serialize_ex(const envoy_config_trace_v3_Tracing_Http* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_Tracing_Http_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__Tracing__Http_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -171,14 +175,12 @@ UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_typed_config(envoy_config
 UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutable_typed_config(envoy_config_trace_v3_Tracing_Http* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_trace_v3_Tracing_Http_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_config_trace_v3_Tracing_Http_set_typed_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
new file mode 100644
index 0000000000000..8246fbda0f0c6
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
@@ -0,0 +1,73 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/http_tracer.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_Tracing_submsgs[1] = {
+  {.submsg = &envoy__config__trace__v3__Tracing__Http_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = {
+  &envoy_config_trace_v3_Tracing_submsgs[0],
+  &envoy_config_trace_v3_Tracing__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_trace_v3_Tracing_Http_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = {
+  &envoy_config_trace_v3_Tracing_Http_submsgs[0],
+  &envoy_config_trace_v3_Tracing_Http__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__trace__v3__Tracing_msg_init,
+  &envoy__config__trace__v3__Tracing__Http_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
new file mode 100644
index 0000000000000..02151eea430ca
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/http_tracer.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_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__config__trace__v3__Tracing_msg_init;
+extern const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
index 2b3ba9ee2096e..119cab5bcc105 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/lightstep.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,9 +27,7 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_LightstepConfig envoy_config_trace_v3_LightstepConfig;
-extern const upb_MiniTable envoy_config_trace_v3_LightstepConfig_msg_init;
 struct envoy_config_core_v3_DataSource;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
 
 typedef enum {
   envoy_config_trace_v3_LightstepConfig_ENVOY = 0,
@@ -34,12 +41,12 @@ typedef enum {
 /* envoy.config.trace.v3.LightstepConfig */
 
 UPB_INLINE envoy_config_trace_v3_LightstepConfig* envoy_config_trace_v3_LightstepConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_LightstepConfig*)_upb_Message_New(&envoy_config_trace_v3_LightstepConfig_msg_init, arena);
+  return (envoy_config_trace_v3_LightstepConfig*)_upb_Message_New(&envoy__config__trace__v3__LightstepConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_LightstepConfig* envoy_config_trace_v3_LightstepConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_LightstepConfig* ret = envoy_config_trace_v3_LightstepConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_LightstepConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__LightstepConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -49,7 +56,7 @@ UPB_INLINE envoy_config_trace_v3_LightstepConfig* envoy_config_trace_v3_Lightste
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_LightstepConfig* ret = envoy_config_trace_v3_LightstepConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_LightstepConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__LightstepConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -57,13 +64,13 @@ UPB_INLINE envoy_config_trace_v3_LightstepConfig* envoy_config_trace_v3_Lightste
 }
 UPB_INLINE char* envoy_config_trace_v3_LightstepConfig_serialize(const envoy_config_trace_v3_LightstepConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_LightstepConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__LightstepConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_LightstepConfig_serialize_ex(const envoy_config_trace_v3_LightstepConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_LightstepConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__LightstepConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_LightstepConfig_clear_collector_cluster(envoy_config_trace_v3_LightstepConfig* msg) {
@@ -180,14 +187,12 @@ UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_access_token(envoy_con
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_LightstepConfig_mutable_access_token(envoy_config_trace_v3_LightstepConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_LightstepConfig_access_token(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_trace_v3_LightstepConfig_set_access_token(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
new file mode 100644
index 0000000000000..bc97351766031
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
@@ -0,0 +1,62 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/lightstep.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_LightstepConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = {
+  &envoy_config_trace_v3_LightstepConfig_submsgs[0],
+  &envoy_config_trace_v3_LightstepConfig__fields[0],
+  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_ppv4_1bt},
+    {0x0030000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__LightstepConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_lightstep_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/config/trace/v3/lightstep.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
new file mode 100644
index 0000000000000..74d423825e908
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/lightstep.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_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__config__trace__v3__LightstepConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
similarity index 95%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
index bf3ca77b79305..cf0d9bda6e5e4 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opencensus.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,11 +27,8 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_OpenCensusConfig envoy_config_trace_v3_OpenCensusConfig;
-extern const upb_MiniTable envoy_config_trace_v3_OpenCensusConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
 struct opencensus_proto_trace_v1_TraceConfig;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable opencensus_proto_trace_v1_TraceConfig_msg_init;
 
 typedef enum {
   envoy_config_trace_v3_OpenCensusConfig_NONE = 0,
@@ -37,12 +43,12 @@ typedef enum {
 /* envoy.config.trace.v3.OpenCensusConfig */
 
 UPB_INLINE envoy_config_trace_v3_OpenCensusConfig* envoy_config_trace_v3_OpenCensusConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_OpenCensusConfig*)_upb_Message_New(&envoy_config_trace_v3_OpenCensusConfig_msg_init, arena);
+  return (envoy_config_trace_v3_OpenCensusConfig*)_upb_Message_New(&envoy__config__trace__v3__OpenCensusConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_OpenCensusConfig* envoy_config_trace_v3_OpenCensusConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_OpenCensusConfig* ret = envoy_config_trace_v3_OpenCensusConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_OpenCensusConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__OpenCensusConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -52,7 +58,7 @@ UPB_INLINE envoy_config_trace_v3_OpenCensusConfig* envoy_config_trace_v3_OpenCen
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_OpenCensusConfig* ret = envoy_config_trace_v3_OpenCensusConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_OpenCensusConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__OpenCensusConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -60,13 +66,13 @@ UPB_INLINE envoy_config_trace_v3_OpenCensusConfig* envoy_config_trace_v3_OpenCen
 }
 UPB_INLINE char* envoy_config_trace_v3_OpenCensusConfig_serialize(const envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_OpenCensusConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__OpenCensusConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_OpenCensusConfig_serialize_ex(const envoy_config_trace_v3_OpenCensusConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_OpenCensusConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__OpenCensusConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_clear_trace_config(envoy_config_trace_v3_OpenCensusConfig* msg) {
@@ -284,7 +290,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_trace_config(envoy_co
 UPB_INLINE struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trace_v3_OpenCensusConfig_mutable_trace_config(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) {
   struct opencensus_proto_trace_v1_TraceConfig* sub = (struct opencensus_proto_trace_v1_TraceConfig*)envoy_config_trace_v3_OpenCensusConfig_trace_config(msg);
   if (sub == NULL) {
-    sub = (struct opencensus_proto_trace_v1_TraceConfig*)_upb_Message_New(&opencensus_proto_trace_v1_TraceConfig_msg_init, arena);
+    sub = (struct opencensus_proto_trace_v1_TraceConfig*)_upb_Message_New(&opencensus__proto__trace__v1__TraceConfig_msg_init, arena);
     if (sub) envoy_config_trace_v3_OpenCensusConfig_set_trace_config(msg, sub);
   }
   return sub;
@@ -376,7 +382,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_grpc_serv
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_stackdriver_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_stackdriver_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_grpc_service(msg, sub);
   }
   return sub;
@@ -388,14 +394,12 @@ UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_grpc_service(
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_ocagent_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_ocagent_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_trace_v3_OpenCensusConfig_set_ocagent_grpc_service(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
new file mode 100644
index 0000000000000..48b35ddd952e4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
@@ -0,0 +1,81 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/opencensus.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = {
+  {.submsg = &opencensus__proto__trace__v1__TraceConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[13] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(10, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(40, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 48), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(16, 56), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(20, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(56, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(24, 96), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(28, 104), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = {
+  &envoy_config_trace_v3_OpenCensusConfig_submsgs[0],
+  &envoy_config_trace_v3_OpenCensusConfig__fields[0],
+  UPB_SIZE(64, 112), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000200003f000018, &upb_psb1_1bt},
+    {0x001000003f000022, &upb_pss_1bt},
+    {0x000300003f000028, &upb_psb1_1bt},
+    {0x002000003f000032, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000003f000042, &upb_ppv4_1bt},
+    {0x003800003f00004a, &upb_ppv4_1bt},
+    {0x004000003f000052, &upb_pss_1bt},
+    {0x000400003f000058, &upb_psb1_1bt},
+    {0x005000003f000062, &upb_pss_1bt},
+    {0x006000000201006a, &upb_psm_1bt_maxmaxb},
+    {0x0068000003020072, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__OpenCensusConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_opencensus_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/config/trace/v3/opencensus.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
new file mode 100644
index 0000000000000..ec74950812d57
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/opencensus.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_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__config__trace__v3__OpenCensusConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
index 27312f85ada0d..da629c38908fb 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opentelemetry.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +23,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_OpenTelemetryConfig envoy_config_trace_v3_OpenTelemetryConfig;
-extern const upb_MiniTable envoy_config_trace_v3_OpenTelemetryConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
 
 
 
 /* envoy.config.trace.v3.OpenTelemetryConfig */
 
 UPB_INLINE envoy_config_trace_v3_OpenTelemetryConfig* envoy_config_trace_v3_OpenTelemetryConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_OpenTelemetryConfig*)_upb_Message_New(&envoy_config_trace_v3_OpenTelemetryConfig_msg_init, arena);
+  return (envoy_config_trace_v3_OpenTelemetryConfig*)_upb_Message_New(&envoy__config__trace__v3__OpenTelemetryConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_OpenTelemetryConfig* envoy_config_trace_v3_OpenTelemetryConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_OpenTelemetryConfig* ret = envoy_config_trace_v3_OpenTelemetryConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_OpenTelemetryConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__OpenTelemetryConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +45,7 @@ UPB_INLINE envoy_config_trace_v3_OpenTelemetryConfig* envoy_config_trace_v3_Open
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_OpenTelemetryConfig* ret = envoy_config_trace_v3_OpenTelemetryConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_OpenTelemetryConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__OpenTelemetryConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +53,13 @@ UPB_INLINE envoy_config_trace_v3_OpenTelemetryConfig* envoy_config_trace_v3_Open
 }
 UPB_INLINE char* envoy_config_trace_v3_OpenTelemetryConfig_serialize(const envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_OpenTelemetryConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__OpenTelemetryConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_OpenTelemetryConfig_serialize_ex(const envoy_config_trace_v3_OpenTelemetryConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_OpenTelemetryConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__OpenTelemetryConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_clear_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig* msg) {
@@ -93,7 +96,7 @@ UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_grpc_service(envoy
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenTelemetryConfig_mutable_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenTelemetryConfig_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_trace_v3_OpenTelemetryConfig_set_grpc_service(msg, sub);
   }
   return sub;
@@ -103,8 +106,6 @@ UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_service_name(envoy
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
new file mode 100644
index 0000000000000..31e54083a6f63
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/opentelemetry.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_OpenTelemetryConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = {
+  &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0],
+  &envoy_config_trace_v3_OpenTelemetryConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__OpenTelemetryConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_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/config/trace/v3/opentelemetry.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
new file mode 100644
index 0000000000000..b3887bb385aa4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/opentelemetry.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_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__config__trace__v3__OpenTelemetryConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
similarity index 81%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
index 47074d585873b..865e53c83cae2 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/service.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/service.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_TraceServiceConfig envoy_config_trace_v3_TraceServiceConfig;
-extern const upb_MiniTable envoy_config_trace_v3_TraceServiceConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
 
 
 
 /* envoy.config.trace.v3.TraceServiceConfig */
 
 UPB_INLINE envoy_config_trace_v3_TraceServiceConfig* envoy_config_trace_v3_TraceServiceConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_TraceServiceConfig*)_upb_Message_New(&envoy_config_trace_v3_TraceServiceConfig_msg_init, arena);
+  return (envoy_config_trace_v3_TraceServiceConfig*)_upb_Message_New(&envoy__config__trace__v3__TraceServiceConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_TraceServiceConfig* envoy_config_trace_v3_TraceServiceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_TraceServiceConfig* ret = envoy_config_trace_v3_TraceServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_TraceServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__TraceServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_config_trace_v3_TraceServiceConfig* envoy_config_trace_v3_Trace
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_TraceServiceConfig* ret = envoy_config_trace_v3_TraceServiceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_TraceServiceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__TraceServiceConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_config_trace_v3_TraceServiceConfig* envoy_config_trace_v3_Trace
 }
 UPB_INLINE char* envoy_config_trace_v3_TraceServiceConfig_serialize(const envoy_config_trace_v3_TraceServiceConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_TraceServiceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__TraceServiceConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_TraceServiceConfig_serialize_ex(const envoy_config_trace_v3_TraceServiceConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_TraceServiceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__TraceServiceConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_TraceServiceConfig_clear_grpc_service(envoy_config_trace_v3_TraceServiceConfig* msg) {
@@ -82,14 +87,12 @@ UPB_INLINE void envoy_config_trace_v3_TraceServiceConfig_set_grpc_service(envoy_
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_TraceServiceConfig_mutable_grpc_service(envoy_config_trace_v3_TraceServiceConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_TraceServiceConfig_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_trace_v3_TraceServiceConfig_set_grpc_service(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
new file mode 100644
index 0000000000000..caf578c757e71
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/service.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_TraceServiceConfig__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = {
+  &envoy_config_trace_v3_TraceServiceConfig_submsgs[0],
+  &envoy_config_trace_v3_TraceServiceConfig__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__TraceServiceConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_service_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/config/trace/v3/service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
new file mode 100644
index 0000000000000..d11957f4b3fc0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/service.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_SERVICE_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__config__trace__v3__TraceServiceConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
index 8072a7855d2f1..c8621b37a2f91 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/skywalking.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/skywalking.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/sensitive.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
@@ -19,24 +28,20 @@ extern "C" {
 
 typedef struct envoy_config_trace_v3_SkyWalkingConfig envoy_config_trace_v3_SkyWalkingConfig;
 typedef struct envoy_config_trace_v3_ClientConfig envoy_config_trace_v3_ClientConfig;
-extern const upb_MiniTable envoy_config_trace_v3_SkyWalkingConfig_msg_init;
-extern const upb_MiniTable envoy_config_trace_v3_ClientConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.config.trace.v3.SkyWalkingConfig */
 
 UPB_INLINE envoy_config_trace_v3_SkyWalkingConfig* envoy_config_trace_v3_SkyWalkingConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_SkyWalkingConfig*)_upb_Message_New(&envoy_config_trace_v3_SkyWalkingConfig_msg_init, arena);
+  return (envoy_config_trace_v3_SkyWalkingConfig*)_upb_Message_New(&envoy__config__trace__v3__SkyWalkingConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_SkyWalkingConfig* envoy_config_trace_v3_SkyWalkingConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_SkyWalkingConfig* ret = envoy_config_trace_v3_SkyWalkingConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_SkyWalkingConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__SkyWalkingConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +51,7 @@ UPB_INLINE envoy_config_trace_v3_SkyWalkingConfig* envoy_config_trace_v3_SkyWalk
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_SkyWalkingConfig* ret = envoy_config_trace_v3_SkyWalkingConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_SkyWalkingConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__SkyWalkingConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +59,13 @@ UPB_INLINE envoy_config_trace_v3_SkyWalkingConfig* envoy_config_trace_v3_SkyWalk
 }
 UPB_INLINE char* envoy_config_trace_v3_SkyWalkingConfig_serialize(const envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_SkyWalkingConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__SkyWalkingConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_SkyWalkingConfig_serialize_ex(const envoy_config_trace_v3_SkyWalkingConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_SkyWalkingConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__SkyWalkingConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_clear_grpc_service(envoy_config_trace_v3_SkyWalkingConfig* msg) {
@@ -101,7 +106,7 @@ UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_grpc_service(envoy_co
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_SkyWalkingConfig_mutable_grpc_service(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_SkyWalkingConfig_grpc_service(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
     if (sub) envoy_config_trace_v3_SkyWalkingConfig_set_grpc_service(msg, sub);
   }
   return sub;
@@ -113,7 +118,7 @@ UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_client_config(envoy_c
 UPB_INLINE struct envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_SkyWalkingConfig_mutable_client_config(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) {
   struct envoy_config_trace_v3_ClientConfig* sub = (struct envoy_config_trace_v3_ClientConfig*)envoy_config_trace_v3_SkyWalkingConfig_client_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_trace_v3_ClientConfig*)_upb_Message_New(&envoy_config_trace_v3_ClientConfig_msg_init, arena);
+    sub = (struct envoy_config_trace_v3_ClientConfig*)_upb_Message_New(&envoy__config__trace__v3__ClientConfig_msg_init, arena);
     if (sub) envoy_config_trace_v3_SkyWalkingConfig_set_client_config(msg, sub);
   }
   return sub;
@@ -122,12 +127,12 @@ UPB_INLINE struct envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_SkyW
 /* envoy.config.trace.v3.ClientConfig */
 
 UPB_INLINE envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_ClientConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_ClientConfig*)_upb_Message_New(&envoy_config_trace_v3_ClientConfig_msg_init, arena);
+  return (envoy_config_trace_v3_ClientConfig*)_upb_Message_New(&envoy__config__trace__v3__ClientConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_ClientConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_ClientConfig* ret = envoy_config_trace_v3_ClientConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_ClientConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__ClientConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -137,7 +142,7 @@ UPB_INLINE envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_ClientConfi
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_ClientConfig* ret = envoy_config_trace_v3_ClientConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_ClientConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__ClientConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -145,13 +150,13 @@ UPB_INLINE envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_ClientConfi
 }
 UPB_INLINE char* envoy_config_trace_v3_ClientConfig_serialize(const envoy_config_trace_v3_ClientConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_ClientConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__ClientConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_ClientConfig_serialize_ex(const envoy_config_trace_v3_ClientConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_ClientConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__ClientConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -234,14 +239,12 @@ UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_max_cache_size(envoy_conf
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_trace_v3_ClientConfig_mutable_max_cache_size(envoy_config_trace_v3_ClientConfig* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_trace_v3_ClientConfig_max_cache_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_config_trace_v3_ClientConfig_set_max_cache_size(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
new file mode 100644
index 0000000000000..18570b3ccf878
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
@@ -0,0 +1,85 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/skywalking.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/skywalking.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+  {.submsg = &envoy__config__trace__v3__ClientConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_SkyWalkingConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = {
+  &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0],
+  &envoy_config_trace_v3_SkyWalkingConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_trace_v3_ClientConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_ClientConfig__fields[4] = {
+  {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = {
+  &envoy_config_trace_v3_ClientConfig_submsgs[0],
+  &envoy_config_trace_v3_ClientConfig__fields[0],
+  UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x002800003f000012, &upb_pss_1bt},
+    {0x000800040300001a, &upb_pos_1bt},
+    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__trace__v3__SkyWalkingConfig_msg_init,
+  &envoy__config__trace__v3__ClientConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
new file mode 100644
index 0000000000000..08ef598dd641b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/skywalking.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_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__config__trace__v3__SkyWalkingConfig_msg_init;
+extern const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
new file mode 100644
index 0000000000000..dd8ad387d121b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/trace.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+/* Public Imports. */
+#include "envoy/config/trace/v3/datadog.upb.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb.h"
+#include "envoy/config/trace/v3/http_tracer.upb.h"
+#include "envoy/config/trace/v3/lightstep.upb.h"
+#include "envoy/config/trace/v3/opencensus.upb.h"
+#include "envoy/config/trace/v3/opentelemetry.upb.h"
+#include "envoy/config/trace/v3/service.upb.h"
+#include "envoy/config/trace/v3/zipkin.upb.h"
+
+#include "envoy/config/trace/v3/trace.upb_minitable.h"
+
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
+#include "envoy/config/trace/v3/service.upb_minitable.h"
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c
new file mode 100644
index 0000000000000..eb396c3b2d5bf
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/trace.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/trace.upb_minitable.h"
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
+#include "envoy/config/trace/v3/service.upb_minitable.h"
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  NULL,
+  0,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
new file mode 100644
index 0000000000000..772847047f64f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/trace.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+/* Public Imports. */
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
+#include "envoy/config/trace/v3/service.upb_minitable.h"
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
+
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
index 21c4353bcdfb4..dd236caa7924e 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/xray.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/xray.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,26 +29,21 @@ extern "C" {
 
 typedef struct envoy_config_trace_v3_XRayConfig envoy_config_trace_v3_XRayConfig;
 typedef struct envoy_config_trace_v3_XRayConfig_SegmentFields envoy_config_trace_v3_XRayConfig_SegmentFields;
-extern const upb_MiniTable envoy_config_trace_v3_XRayConfig_msg_init;
-extern const upb_MiniTable envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init;
 struct envoy_config_core_v3_DataSource;
 struct envoy_config_core_v3_SocketAddress;
 struct google_protobuf_Struct;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
 
 
 
 /* envoy.config.trace.v3.XRayConfig */
 
 UPB_INLINE envoy_config_trace_v3_XRayConfig* envoy_config_trace_v3_XRayConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_XRayConfig*)_upb_Message_New(&envoy_config_trace_v3_XRayConfig_msg_init, arena);
+  return (envoy_config_trace_v3_XRayConfig*)_upb_Message_New(&envoy__config__trace__v3__XRayConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_XRayConfig* envoy_config_trace_v3_XRayConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_XRayConfig* ret = envoy_config_trace_v3_XRayConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_XRayConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__XRayConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +53,7 @@ UPB_INLINE envoy_config_trace_v3_XRayConfig* envoy_config_trace_v3_XRayConfig_pa
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_XRayConfig* ret = envoy_config_trace_v3_XRayConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_XRayConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__XRayConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +61,13 @@ UPB_INLINE envoy_config_trace_v3_XRayConfig* envoy_config_trace_v3_XRayConfig_pa
 }
 UPB_INLINE char* envoy_config_trace_v3_XRayConfig_serialize(const envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_XRayConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__XRayConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_XRayConfig_serialize_ex(const envoy_config_trace_v3_XRayConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_XRayConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__XRayConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_XRayConfig_clear_daemon_endpoint(envoy_config_trace_v3_XRayConfig* msg) {
@@ -129,7 +134,7 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_daemon_endpoint(envoy_confi
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v3_XRayConfig_mutable_daemon_endpoint(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_trace_v3_XRayConfig_daemon_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
     if (sub) envoy_config_trace_v3_XRayConfig_set_daemon_endpoint(msg, sub);
   }
   return sub;
@@ -145,7 +150,7 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_sampling_rule_manifest(envo
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_XRayConfig_mutable_sampling_rule_manifest(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_XRayConfig_sampling_rule_manifest(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_config_trace_v3_XRayConfig_set_sampling_rule_manifest(msg, sub);
   }
   return sub;
@@ -157,7 +162,7 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_fields(envoy_config
 UPB_INLINE struct envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3_XRayConfig_mutable_segment_fields(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) {
   struct envoy_config_trace_v3_XRayConfig_SegmentFields* sub = (struct envoy_config_trace_v3_XRayConfig_SegmentFields*)envoy_config_trace_v3_XRayConfig_segment_fields(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_trace_v3_XRayConfig_SegmentFields*)_upb_Message_New(&envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, arena);
+    sub = (struct envoy_config_trace_v3_XRayConfig_SegmentFields*)_upb_Message_New(&envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, arena);
     if (sub) envoy_config_trace_v3_XRayConfig_set_segment_fields(msg, sub);
   }
   return sub;
@@ -166,12 +171,12 @@ UPB_INLINE struct envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_t
 /* envoy.config.trace.v3.XRayConfig.SegmentFields */
 
 UPB_INLINE envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3_XRayConfig_SegmentFields_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_XRayConfig_SegmentFields*)_upb_Message_New(&envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, arena);
+  return (envoy_config_trace_v3_XRayConfig_SegmentFields*)_upb_Message_New(&envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3_XRayConfig_SegmentFields_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_XRayConfig_SegmentFields* ret = envoy_config_trace_v3_XRayConfig_SegmentFields_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -181,7 +186,7 @@ UPB_INLINE envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_XRayConfig_SegmentFields* ret = envoy_config_trace_v3_XRayConfig_SegmentFields_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -189,13 +194,13 @@ UPB_INLINE envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3
 }
 UPB_INLINE char* envoy_config_trace_v3_XRayConfig_SegmentFields_serialize(const envoy_config_trace_v3_XRayConfig_SegmentFields* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_XRayConfig_SegmentFields_serialize_ex(const envoy_config_trace_v3_XRayConfig_SegmentFields* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_clear_origin(envoy_config_trace_v3_XRayConfig_SegmentFields* msg) {
@@ -236,14 +241,12 @@ UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_aws(envoy_con
 UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig_SegmentFields_mutable_aws(envoy_config_trace_v3_XRayConfig_SegmentFields* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_XRayConfig_SegmentFields_aws(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) envoy_config_trace_v3_XRayConfig_SegmentFields_set_aws(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
new file mode 100644
index 0000000000000..fa111a65101be
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
@@ -0,0 +1,87 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/xray.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/xray.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_XRayConfig__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = {
+  &envoy_config_trace_v3_XRayConfig_submsgs[0],
+  &envoy_config_trace_v3_XRayConfig__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_XRayConfig_SegmentFields__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init = {
+  &envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[0],
+  &envoy_config_trace_v3_XRayConfig_SegmentFields__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__config__trace__v3__XRayConfig_msg_init,
+  &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
new file mode 100644
index 0000000000000..39da1cd5267c2
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/xray.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_XRAY_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__config__trace__v3__XRayConfig_msg_init;
+extern const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h
rename to src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
index c354cf8f7a44c..906c257969dd4 100644
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/zipkin.proto
  *
@@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
+
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,9 +27,7 @@ extern "C" {
 #endif
 
 typedef struct envoy_config_trace_v3_ZipkinConfig envoy_config_trace_v3_ZipkinConfig;
-extern const upb_MiniTable envoy_config_trace_v3_ZipkinConfig_msg_init;
 struct google_protobuf_BoolValue;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
 
 typedef enum {
   envoy_config_trace_v3_ZipkinConfig_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE = 0,
@@ -34,12 +41,12 @@ typedef enum {
 /* envoy.config.trace.v3.ZipkinConfig */
 
 UPB_INLINE envoy_config_trace_v3_ZipkinConfig* envoy_config_trace_v3_ZipkinConfig_new(upb_Arena* arena) {
-  return (envoy_config_trace_v3_ZipkinConfig*)_upb_Message_New(&envoy_config_trace_v3_ZipkinConfig_msg_init, arena);
+  return (envoy_config_trace_v3_ZipkinConfig*)_upb_Message_New(&envoy__config__trace__v3__ZipkinConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_trace_v3_ZipkinConfig* envoy_config_trace_v3_ZipkinConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_config_trace_v3_ZipkinConfig* ret = envoy_config_trace_v3_ZipkinConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_ZipkinConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__ZipkinConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -49,7 +56,7 @@ UPB_INLINE envoy_config_trace_v3_ZipkinConfig* envoy_config_trace_v3_ZipkinConfi
                            int options, upb_Arena* arena) {
   envoy_config_trace_v3_ZipkinConfig* ret = envoy_config_trace_v3_ZipkinConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_trace_v3_ZipkinConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__trace__v3__ZipkinConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -57,13 +64,13 @@ UPB_INLINE envoy_config_trace_v3_ZipkinConfig* envoy_config_trace_v3_ZipkinConfi
 }
 UPB_INLINE char* envoy_config_trace_v3_ZipkinConfig_serialize(const envoy_config_trace_v3_ZipkinConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_ZipkinConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__ZipkinConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_config_trace_v3_ZipkinConfig_serialize_ex(const envoy_config_trace_v3_ZipkinConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_config_trace_v3_ZipkinConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__trace__v3__ZipkinConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_clear_collector_cluster(envoy_config_trace_v3_ZipkinConfig* msg) {
@@ -167,7 +174,7 @@ UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_shared_span_context(envoy
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinConfig_mutable_shared_span_context(envoy_config_trace_v3_ZipkinConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_trace_v3_ZipkinConfig_shared_span_context(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_config_trace_v3_ZipkinConfig_set_shared_span_context(msg, sub);
   }
   return sub;
@@ -185,8 +192,6 @@ UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_split_spans_for_request(e
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
new file mode 100644
index 0000000000000..6e131df2086cb
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
@@ -0,0 +1,65 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/zipkin.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_config_trace_v3_ZipkinConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_config_trace_v3_ZipkinConfig__fields[7] = {
+  {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = {
+  &envoy_config_trace_v3_ZipkinConfig_submsgs[0],
+  &envoy_config_trace_v3_ZipkinConfig__fields[0],
+  UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x002000003f000012, &upb_pss_1bt},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x0030000001000022, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000028, &upb_psv4_1bt},
+    {0x003800003f000032, &upb_pss_1bt},
+    {0x000800003f000038, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__config__trace__v3__ZipkinConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_config_trace_v3_zipkin_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/config/trace/v3/zipkin.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
new file mode 100644
index 0000000000000..7acdf3ec9065d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/trace/v3/zipkin.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_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__config__trace__v3__ZipkinConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
new file mode 100644
index 0000000000000..b6ac687b69216
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
@@ -0,0 +1,2691 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/data/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_data_accesslog_v3_TCPAccessLogEntry envoy_data_accesslog_v3_TCPAccessLogEntry;
+typedef struct envoy_data_accesslog_v3_HTTPAccessLogEntry envoy_data_accesslog_v3_HTTPAccessLogEntry;
+typedef struct envoy_data_accesslog_v3_ConnectionProperties envoy_data_accesslog_v3_ConnectionProperties;
+typedef struct envoy_data_accesslog_v3_AccessLogCommon envoy_data_accesslog_v3_AccessLogCommon;
+typedef struct envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry;
+typedef struct envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry;
+typedef struct envoy_data_accesslog_v3_ResponseFlags envoy_data_accesslog_v3_ResponseFlags;
+typedef struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized envoy_data_accesslog_v3_ResponseFlags_Unauthorized;
+typedef struct envoy_data_accesslog_v3_TLSProperties envoy_data_accesslog_v3_TLSProperties;
+typedef struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties envoy_data_accesslog_v3_TLSProperties_CertificateProperties;
+typedef struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName;
+typedef struct envoy_data_accesslog_v3_HTTPRequestProperties envoy_data_accesslog_v3_HTTPRequestProperties;
+typedef struct envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry;
+typedef struct envoy_data_accesslog_v3_HTTPResponseProperties envoy_data_accesslog_v3_HTTPResponseProperties;
+typedef struct envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry;
+typedef struct envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry;
+struct envoy_config_core_v3_Address;
+struct envoy_config_core_v3_Metadata;
+struct google_protobuf_Any;
+struct google_protobuf_Duration;
+struct google_protobuf_Timestamp;
+struct google_protobuf_UInt32Value;
+
+typedef enum {
+  envoy_data_accesslog_v3_NotSet = 0,
+  envoy_data_accesslog_v3_TcpUpstreamConnected = 1,
+  envoy_data_accesslog_v3_TcpPeriodic = 2,
+  envoy_data_accesslog_v3_TcpConnectionEnd = 3,
+  envoy_data_accesslog_v3_DownstreamStart = 4,
+  envoy_data_accesslog_v3_DownstreamPeriodic = 5,
+  envoy_data_accesslog_v3_DownstreamEnd = 6,
+  envoy_data_accesslog_v3_UpstreamPoolReady = 7,
+  envoy_data_accesslog_v3_UpstreamPeriodic = 8,
+  envoy_data_accesslog_v3_UpstreamEnd = 9,
+  envoy_data_accesslog_v3_DownstreamTunnelSuccessfullyEstablished = 10
+} envoy_data_accesslog_v3_AccessLogType;
+
+typedef enum {
+  envoy_data_accesslog_v3_HTTPAccessLogEntry_PROTOCOL_UNSPECIFIED = 0,
+  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP10 = 1,
+  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP11 = 2,
+  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP2 = 3,
+  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP3 = 4
+} envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion;
+
+typedef enum {
+  envoy_data_accesslog_v3_ResponseFlags_Unauthorized_REASON_UNSPECIFIED = 0,
+  envoy_data_accesslog_v3_ResponseFlags_Unauthorized_EXTERNAL_SERVICE = 1
+} envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason;
+
+typedef enum {
+  envoy_data_accesslog_v3_TLSProperties_VERSION_UNSPECIFIED = 0,
+  envoy_data_accesslog_v3_TLSProperties_TLSv1 = 1,
+  envoy_data_accesslog_v3_TLSProperties_TLSv1_1 = 2,
+  envoy_data_accesslog_v3_TLSProperties_TLSv1_2 = 3,
+  envoy_data_accesslog_v3_TLSProperties_TLSv1_3 = 4
+} envoy_data_accesslog_v3_TLSProperties_TLSVersion;
+
+
+
+/* envoy.data.accesslog.v3.TCPAccessLogEntry */
+
+UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_TCPAccessLogEntry*)_upb_Message_New(&envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TCPAccessLogEntry* ret = envoy_data_accesslog_v3_TCPAccessLogEntry_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TCPAccessLogEntry* ret = envoy_data_accesslog_v3_TCPAccessLogEntry_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TCPAccessLogEntry_serialize(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TCPAccessLogEntry_serialize_ex(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_clear_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL;
+  const envoy_data_accesslog_v3_AccessLogCommon* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_common_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_clear_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const envoy_data_accesslog_v3_ConnectionProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_ConnectionProperties* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_connection_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy__data__accesslog__v3__AccessLogCommon_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_ConnectionProperties* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_ConnectionProperties* sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)_upb_Message_New(&envoy__data__accesslog__v3__ConnectionProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.data.accesslog.v3.HTTPAccessLogEntry */
+
+UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_HTTPAccessLogEntry*)_upb_Message_New(&envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPAccessLogEntry* ret = envoy_data_accesslog_v3_HTTPAccessLogEntry_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPAccessLogEntry* ret = envoy_data_accesslog_v3_HTTPAccessLogEntry_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPAccessLogEntry_serialize(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPAccessLogEntry_serialize_ex(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL;
+  const envoy_data_accesslog_v3_AccessLogCommon* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_common_properties(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_data_accesslog_v3_HTTPAccessLogEntry_protocol_version(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_request(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const envoy_data_accesslog_v3_HTTPRequestProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_HTTPRequestProperties* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_request(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_response(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const envoy_data_accesslog_v3_HTTPResponseProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_HTTPResponseProperties* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_response(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy__data__accesslog__v3__AccessLogCommon_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, int32_t value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPRequestProperties* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_HTTPRequestProperties* sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_request(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)_upb_Message_New(&envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPResponseProperties* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_HTTPResponseProperties* sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_response(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)_upb_Message_New(&envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.data.accesslog.v3.ConnectionProperties */
+
+UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_ConnectionProperties*)_upb_Message_New(&envoy__data__accesslog__v3__ConnectionProperties_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ConnectionProperties* ret = envoy_data_accesslog_v3_ConnectionProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ConnectionProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ConnectionProperties* ret = envoy_data_accesslog_v3_ConnectionProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ConnectionProperties_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ConnectionProperties_serialize(const envoy_data_accesslog_v3_ConnectionProperties* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ConnectionProperties_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ConnectionProperties_serialize_ex(const envoy_data_accesslog_v3_ConnectionProperties* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ConnectionProperties_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_clear_received_bytes(envoy_data_accesslog_v3_ConnectionProperties* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_received_bytes(const envoy_data_accesslog_v3_ConnectionProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_clear_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_sent_bytes(const envoy_data_accesslog_v3_ConnectionProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_received_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.AccessLogCommon */
+
+UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy__data__accesslog__v3__AccessLogCommon_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_AccessLogCommon* ret = envoy_data_accesslog_v3_AccessLogCommon_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__AccessLogCommon_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_AccessLogCommon* ret = envoy_data_accesslog_v3_AccessLogCommon_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__AccessLogCommon_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_AccessLogCommon_serialize(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__AccessLogCommon_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_AccessLogCommon_serialize_ex(const envoy_data_accesslog_v3_AccessLogCommon* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__AccessLogCommon_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_sample_rate(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double envoy_data_accesslog_v3_AccessLogCommon_sample_rate(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Address* default_val = NULL;
+  const struct envoy_config_core_v3_Address* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Address* default_val = NULL;
+  const struct envoy_config_core_v3_Address* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_tls_properties(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const envoy_data_accesslog_v3_TLSProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_TLSProperties* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_tls_properties(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_start_time(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Timestamp* default_val = NULL;
+  const struct google_protobuf_Timestamp* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_start_time(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Address* default_val = NULL;
+  const struct envoy_config_core_v3_Address* ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_upstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Address* default_val = NULL;
+  const struct envoy_config_core_v3_Address* ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_upstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_upstream_cluster(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_response_flags(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const envoy_data_accesslog_v3_ResponseFlags* default_val = NULL;
+  const envoy_data_accesslog_v3_ResponseFlags* ret;
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_response_flags(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_metadata(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Metadata* default_val = NULL;
+  const struct envoy_config_core_v3_Metadata* ret;
+  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_metadata(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_upstream_transport_failure_reason(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_route_name(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_route_name(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct envoy_config_core_v3_Address* default_val = NULL;
+  const struct envoy_config_core_v3_Address* ret;
+  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_direct_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_filter_state_objects(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_size(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any** val) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_custom_tags(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_custom_tags_size(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView* val) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, 0);
+}
+UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_duration(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_duration(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_duration(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_data_accesslog_v3_AccessLogCommon_upstream_request_attempt_count(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_connection_termination_details(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_stream_id(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_stream_id(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_intermediate_log_entry(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_downstream_transport_failure_reason(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_downstream_wire_bytes_sent(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_downstream_wire_bytes_received(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_upstream_wire_bytes_sent(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_upstream_wire_bytes_received(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_access_log_type(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_data_accesslog_v3_AccessLogCommon_access_log_type(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_sample_rate(envoy_data_accesslog_v3_AccessLogCommon *msg, double value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_TLSProperties* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_mutable_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_TLSProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties*)envoy_data_accesslog_v3_AccessLogCommon_tls_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_TLSProperties*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_start_time(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Timestamp* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_mutable_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_data_accesslog_v3_AccessLogCommon_start_time(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_start_time(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_ResponseFlags* value) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_mutable_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_ResponseFlags* sub = (struct envoy_data_accesslog_v3_ResponseFlags*)envoy_data_accesslog_v3_AccessLogCommon_response_flags(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_ResponseFlags*)_upb_Message_New(&envoy__data__accesslog__v3__ResponseFlags_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_metadata(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Metadata* value) {
+  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_mutable_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_data_accesslog_v3_AccessLogCommon_metadata(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_metadata(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_route_name(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
+  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_clear(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_delete(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
+  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_custom_tags_clear(envoy_data_accesslog_v3_AccessLogCommon* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
+  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_delete(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
+  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_duration(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_duration(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_duration(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_duration(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon *msg, uint32_t value) {
+  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_stream_id(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon *msg, bool value) {
+  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
+  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
+  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
+  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
+  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
+  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_access_log_type(envoy_data_accesslog_v3_AccessLogCommon *msg, int32_t value) {
+  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry */
+
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_key(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_value(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
+  struct google_protobuf_Any* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_has_value(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_set_value(envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry *msg, struct google_protobuf_Any* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(struct google_protobuf_Any*));
+}
+
+/* envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry */
+
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_key(const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_value(const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_value(msg, &ret, 0);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_set_value(envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry *msg, upb_StringView value) {
+  _upb_msg_map_set_value(msg, &value, 0);
+}
+
+/* envoy.data.accesslog.v3.ResponseFlags */
+
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_ResponseFlags*)_upb_Message_New(&envoy__data__accesslog__v3__ResponseFlags_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ResponseFlags* ret = envoy_data_accesslog_v3_ResponseFlags_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ResponseFlags_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ResponseFlags* ret = envoy_data_accesslog_v3_ResponseFlags_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ResponseFlags_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_serialize(const envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ResponseFlags_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_serialize_ex(const envoy_data_accesslog_v3_ResponseFlags* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ResponseFlags_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_failed_local_healthcheck(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_healthy_upstream(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_request_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_local_reset(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_local_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_remote_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_connection_failure(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_connection_termination(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_overflow(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_route_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_route_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_delay_injected(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_delay_injected(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_fault_injected(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_fault_injected(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_rate_limited(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_rate_limited(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* default_val = NULL;
+  const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_has_unauthorized_details(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_rate_limit_service_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_connection_termination(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_retry_limit_exceeded(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_stream_idle_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_invalid_envoy_request_headers(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_protocol_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_max_stream_duration_reached(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_response_from_cache_filter(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_filter_config_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_duration_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_duration_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_protocol_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_cluster_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_overload_manager(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_overload_manager(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags* msg) {
+  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_dns_resolution_failure(const envoy_data_accesslog_v3_ResponseFlags* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_local_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_route_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_delay_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_fault_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limited(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags *msg, envoy_data_accesslog_v3_ResponseFlags_Unauthorized* value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_mutable_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)_upb_Message_New(&envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_duration_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_overload_manager(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
+  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.ResponseFlags.Unauthorized */
+
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)_upb_Message_New(&envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret = envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret = envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_serialize(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_serialize_ex(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_clear_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_data_accesslog_v3_ResponseFlags_Unauthorized_reason(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_set_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.TLSProperties */
+
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_TLSProperties*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties* ret = envoy_data_accesslog_v3_TLSProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties* ret = envoy_data_accesslog_v3_TLSProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_serialize(const envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_serialize_ex(const envoy_data_accesslog_v3_TLSProperties* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_version(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_data_accesslog_v3_TLSProperties_tls_version(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_tls_cipher_suite(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_tls_sni_hostname(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_local_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL;
+  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_peer_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_session_id(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_tls_session_id(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_ja3_fingerprint(const envoy_data_accesslog_v3_TLSProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_version(envoy_data_accesslog_v3_TLSProperties *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_mutable_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
+  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_session_id(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.TLSProperties.CertificateProperties */
+
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_serialize(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_serialize_ex(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_clear_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* const* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_upb_array(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_mutable_upb_array(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_has_subject_alt_name(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
+  size_t size;
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_clear_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName** envoy_data_accesslog_v3_TLSProperties_CertificateProperties_mutable_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName** envoy_data_accesslog_v3_TLSProperties_CertificateProperties_resize_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_add_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName */
+
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName*)_upb_Message_New(&envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_serialize(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_serialize_ex(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_uri = 1,
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_dns = 2,
+  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_NOT_SET = 0
+} envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases;
+UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_case(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_clear_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_uri(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_has_uri(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_clear_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_dns(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_has_dns(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.HTTPRequestProperties */
+
+UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_HTTPRequestProperties*)_upb_Message_New(&envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPRequestProperties* ret = envoy_data_accesslog_v3_HTTPRequestProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPRequestProperties* ret = envoy_data_accesslog_v3_HTTPRequestProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPRequestProperties_serialize(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPRequestProperties_serialize_ex(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_method(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_data_accesslog_v3_HTTPRequestProperties_request_method(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_scheme(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_scheme(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_authority(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_authority(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_port(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_has_port(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_path(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_path(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_user_agent(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_referer(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_referer(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_forwarded_for(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_id(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_request_id(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_original_path(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_original_path(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_bytes(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_request_body_bytes(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_headers(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_size(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_get(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView* val) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, 0);
+}
+UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_next(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_upstream_header_bytes_sent(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_downstream_header_bytes_received(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_method(envoy_data_accesslog_v3_HTTPRequestProperties *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_scheme(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_authority(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_port(envoy_data_accesslog_v3_HTTPRequestProperties *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_mutable_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPRequestProperties_port(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_HTTPRequestProperties_set_port(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_referer(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_id(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_original_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_clear(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_set(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
+  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_delete(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_nextmutable(envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry */
+
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_key(const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_value(const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_value(msg, &ret, 0);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_set_value(envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry *msg, upb_StringView value) {
+  _upb_msg_map_set_value(msg, &value, 0);
+}
+
+/* envoy.data.accesslog.v3.HTTPResponseProperties */
+
+UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_new(upb_Arena* arena) {
+  return (envoy_data_accesslog_v3_HTTPResponseProperties*)_upb_Message_New(&envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, arena);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPResponseProperties* ret = envoy_data_accesslog_v3_HTTPResponseProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_data_accesslog_v3_HTTPResponseProperties* ret = envoy_data_accesslog_v3_HTTPResponseProperties_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPResponseProperties_serialize(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_data_accesslog_v3_HTTPResponseProperties_serialize_ex(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_response_code(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_has_response_code(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_bytes(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_response_body_bytes(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_headers(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_size(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, 0);
+}
+UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_trailers(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_size(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, 0);
+}
+UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_response_code_details(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_upstream_header_bytes_received(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_downstream_header_bytes_sent(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(envoy_data_accesslog_v3_HTTPResponseProperties *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_mutable_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPResponseProperties_response_code(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
+  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_delete(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
+  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_delete(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry */
+
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_key(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_value(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_value(msg, &ret, 0);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_set_value(envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry *msg, upb_StringView value) {
+  _upb_msg_map_set_value(msg, &value, 0);
+}
+
+/* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry */
+
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_key(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_value(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_value(msg, &ret, 0);
+  return ret;
+}
+
+UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_set_value(envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry *msg, upb_StringView value) {
+  _upb_msg_map_set_value(msg, &value, 0);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
new file mode 100644
index 0000000000000..8351c8f6a6b78
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
@@ -0,0 +1,555 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/data/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = {
+  {.submsg = &envoy__data__accesslog__v3__AccessLogCommon_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__ConnectionProperties_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_TCPAccessLogEntry__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = {
+  &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0],
+  &envoy_data_accesslog_v3_TCPAccessLogEntry__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = {
+  {.submsg = &envoy__data__accesslog__v3__AccessLogCommon_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = {
+  &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0],
+  &envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x001000000201001a, &upb_psm_1bt_max192b},
+    {0x0018000003020022, &upb_psm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_ConnectionProperties__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_ConnectionProperties__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = {
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__TLSProperties_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__ResponseFlags_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon__fields[33] = {
+  {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = {
+  &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0],
+  &envoy_data_accesslog_v3_AccessLogCommon__fields[0],
+  UPB_SIZE(184, 304), 33, kUpb_ExtMode_NonExtendable, 33, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f000009, &upb_psf8_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000003020022, &upb_psm_1bt_max128b},
+    {0x003000000403002a, &upb_psm_1bt_maxmaxb},
+    {0x0038000005040032, &upb_psm_1bt_maxmaxb},
+    {0x004000000605003a, &upb_psm_1bt_maxmaxb},
+    {0x0048000007060042, &upb_psm_1bt_maxmaxb},
+    {0x005000000807004a, &upb_psm_1bt_maxmaxb},
+    {0x0058000009080052, &upb_psm_1bt_maxmaxb},
+    {0x006000000a09005a, &upb_psm_1bt_maxmaxb},
+    {0x006800000b0a0062, &upb_psm_1bt_maxmaxb},
+    {0x007000000c0b006a, &upb_psm_1bt_maxmaxb},
+    {0x007800000d0c0072, &upb_psm_1bt_maxmaxb},
+    {0x008000003f00007a, &upb_pss_1bt},
+    {0x009000000e0d0182, &upb_psm_2bt_max64b},
+    {0x009800000f0e018a, &upb_psm_2bt_maxmaxb},
+    {0x00a000003f000192, &upb_pss_2bt},
+    {0x00b000003f00019a, &upb_pss_2bt},
+    {0x00c00000100f01a2, &upb_psm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00d80000111201ba, &upb_psm_2bt_maxmaxb},
+    {0x000400003f0001c0, &upb_psv4_2bt},
+    {0x00e000003f0001ca, &upb_pss_2bt},
+    {0x00f000003f0001d2, &upb_pss_2bt},
+    {0x000800003f0001d8, &upb_psb1_2bt},
+    {0x010000003f0001e2, &upb_pss_2bt},
+    {0x011000003f0001e8, &upb_psv8_2bt},
+    {0x011800003f0001f0, &upb_psv8_2bt},
+    {0x012000003f0001f8, &upb_psv8_2bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init = {
+  &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0],
+  &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = {
+  {.submsg = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27] = {
+  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = {
+  &envoy_data_accesslog_v3_ResponseFlags_submsgs[0],
+  &envoy_data_accesslog_v3_ResponseFlags__fields[0],
+  40, 27, kUpb_ExtMode_NonExtendable, 27, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000008, &upb_psb1_1bt},
+    {0x000200003f000010, &upb_psb1_1bt},
+    {0x000300003f000018, &upb_psb1_1bt},
+    {0x000400003f000020, &upb_psb1_1bt},
+    {0x000500003f000028, &upb_psb1_1bt},
+    {0x000600003f000030, &upb_psb1_1bt},
+    {0x000700003f000038, &upb_psb1_1bt},
+    {0x000800003f000040, &upb_psb1_1bt},
+    {0x000900003f000048, &upb_psb1_1bt},
+    {0x000a00003f000050, &upb_psb1_1bt},
+    {0x000b00003f000058, &upb_psb1_1bt},
+    {0x000c00003f000060, &upb_psb1_1bt},
+    {0x002000000100006a, &upb_psm_1bt_max64b},
+    {0x000d00003f000070, &upb_psb1_1bt},
+    {0x000e00003f000078, &upb_psb1_1bt},
+    {0x000f00003f000180, &upb_psb1_2bt},
+    {0x001000003f000188, &upb_psb1_2bt},
+    {0x001100003f000190, &upb_psb1_2bt},
+    {0x001200003f000198, &upb_psb1_2bt},
+    {0x001300003f0001a0, &upb_psb1_2bt},
+    {0x001400003f0001a8, &upb_psb1_2bt},
+    {0x001500003f0001b0, &upb_psb1_2bt},
+    {0x001600003f0001b8, &upb_psb1_2bt},
+    {0x001700003f0001c0, &upb_psb1_2bt},
+    {0x001800003f0001c8, &upb_psb1_2bt},
+    {0x001900003f0001d0, &upb_psb1_2bt},
+    {0x001a00003f0001d8, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties__fields[7] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = {
+  &envoy_data_accesslog_v3_TLSProperties_submsgs[0],
+  &envoy_data_accesslog_v3_TLSProperties__fields[0],
+  UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x001000003f00001a, &upb_pss_1bt},
+    {0x0020000002010022, &upb_psm_1bt_max64b},
+    {0x002800000302002a, &upb_psm_1bt_max64b},
+    {0x003000003f000032, &upb_pss_1bt},
+    {0x004000003f00003a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = {
+  {.submsg = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[2] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init = {
+  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0],
+  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties__fields[15] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = {
+  &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0],
+  &envoy_data_accesslog_v3_HTTPRequestProperties__fields[0],
+  UPB_SIZE(112, 184), 15, kUpb_ExtMode_NonExtendable, 15, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x0028000001000022, &upb_psm_1bt_maxmaxb},
+    {0x003000003f00002a, &upb_pss_1bt},
+    {0x004000003f000032, &upb_pss_1bt},
+    {0x005000003f00003a, &upb_pss_1bt},
+    {0x006000003f000042, &upb_pss_1bt},
+    {0x007000003f00004a, &upb_pss_1bt},
+    {0x008000003f000052, &upb_pss_1bt},
+    {0x009000003f000058, &upb_psv8_1bt},
+    {0x009800003f000060, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x00a800003f000070, &upb_psv8_1bt},
+    {0x00b000003f000078, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init},
+  {.submsg = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties__fields[8] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init = {
+  &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0],
+  &envoy_data_accesslog_v3_HTTPResponseProperties__fields[0],
+  UPB_SIZE(56, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x001800003f000018, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000003f000032, &upb_pss_1bt},
+    {0x004000003f000038, &upb_psv8_1bt},
+    {0x004800003f000040, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init = {
+  NULL,
+  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[16] = {
+  &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init,
+  &envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init,
+  &envoy__data__accesslog__v3__ConnectionProperties_msg_init,
+  &envoy__data__accesslog__v3__AccessLogCommon_msg_init,
+  &envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init,
+  &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init,
+  &envoy__data__accesslog__v3__ResponseFlags_msg_init,
+  &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init,
+  &envoy__data__accesslog__v3__TLSProperties_msg_init,
+  &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init,
+  &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init,
+  &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init,
+  &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init,
+  &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init,
+  &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init,
+  &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init,
+};
+
+const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  16,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
new file mode 100644
index 0000000000000..53d7d0196ed6d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/data/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_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__data__accesslog__v3__TCPAccessLogEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init;
+extern const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init;
+
+extern const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
new file mode 100644
index 0000000000000..3133bacbbaf1a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
@@ -0,0 +1,134 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/clusters/aggregate/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_clusters_aggregate_v3_ClusterConfig envoy_extensions_clusters_aggregate_v3_ClusterConfig;
+
+
+
+/* envoy.extensions.clusters.aggregate.v3.ClusterConfig */
+
+UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_clusters_aggregate_v3_ClusterConfig*)_upb_Message_New(&envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_clusters_aggregate_v3_ClusterConfig* ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_clusters_aggregate_v3_ClusterConfig* ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize_ex(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_clusters_aggregate_v3_ClusterConfig_clear_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters_upb_array(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters_mutable_upb_array(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_has_clusters(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg) {
+  size_t size;
+  envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE upb_StringView* envoy_extensions_clusters_aggregate_v3_ClusterConfig_mutable_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_clusters_aggregate_v3_ClusterConfig_resize_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_add_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c
new file mode 100644
index 0000000000000..8de32fc2b9c1e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/clusters/aggregate/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init = {
+  NULL,
+  &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prs_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__clusters__aggregate__v3__ClusterConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_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/clusters/aggregate/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
new file mode 100644
index 0000000000000..7a18de08b595b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/clusters/aggregate/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_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__clusters__aggregate__v3__ClusterConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
new file mode 100644
index 0000000000000..710357f4aab08
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
@@ -0,0 +1,428 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/common/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h"
+
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_filters_common_fault_v3_FaultDelay envoy_extensions_filters_common_fault_v3_FaultDelay;
+typedef struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay;
+typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit;
+typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit;
+typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit;
+struct envoy_type_v3_FractionalPercent;
+struct google_protobuf_Duration;
+
+typedef enum {
+  envoy_extensions_filters_common_fault_v3_FaultDelay_FIXED = 0
+} envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType;
+
+
+
+/* envoy.extensions.filters.common.fault.v3.FaultDelay */
+
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_common_fault_v3_FaultDelay*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_fixed_delay = 3,
+  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_header_delay = 5,
+  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_NOT_SET = 0
+} envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases;
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_case(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
+  const struct envoy_type_v3_FractionalPercent* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* default_val = NULL;
+  const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct envoy_type_v3_FractionalPercent* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
+  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay */
+
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.extensions.filters.common.fault.v3.FaultRateLimit */
+
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_fixed_limit = 1,
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_header_limit = 3,
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_NOT_SET = 0
+} envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases;
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_case(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* default_val = NULL;
+  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
+  const struct envoy_type_v3_FractionalPercent* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* default_val = NULL;
+  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, struct envoy_type_v3_FractionalPercent* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
+  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, arena);
+    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit */
+
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_clear_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_limit_kbps(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_set_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, uint64_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit */
+
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
new file mode 100644
index 0000000000000..f529824b170bb
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
@@ -0,0 +1,116 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/common/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultDelay__fields[3] = {
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init = {
+  &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0],
+  &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040300001a, &upb_pom_1bt_maxmaxb},
+    {0x0008000001010022, &upb_psm_1bt_maxmaxb},
+    {0x001000040502002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = {
+  {.submsg = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[3] = {
+  {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init = {
+  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0],
+  &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040100000a, &upb_pom_1bt_max64b},
+    {0x0008000001010012, &upb_psm_1bt_maxmaxb},
+    {0x001000040302001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init = {
+  NULL,
+  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+  })
+};
+
+const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init,
+  &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init,
+  &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init,
+  &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init,
+  &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
new file mode 100644
index 0000000000000..b5f4270c40ebb
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/common/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_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__filters__common__fault__v3__FaultDelay_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
new file mode 100644
index 0000000000000..bec25cd7dd869
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
@@ -0,0 +1,656 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h"
+
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_filters_http_fault_v3_FaultAbort envoy_extensions_filters_http_fault_v3_FaultAbort;
+typedef struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort;
+typedef struct envoy_extensions_filters_http_fault_v3_HTTPFault envoy_extensions_filters_http_fault_v3_HTTPFault;
+struct envoy_config_route_v3_HeaderMatcher;
+struct envoy_extensions_filters_common_fault_v3_FaultDelay;
+struct envoy_extensions_filters_common_fault_v3_FaultRateLimit;
+struct envoy_type_v3_FractionalPercent;
+struct google_protobuf_Struct;
+struct google_protobuf_UInt32Value;
+
+
+
+/* envoy.extensions.filters.http.fault.v3.FaultAbort */
+
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_http_fault_v3_FaultAbort*)_upb_Message_New(&envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_FaultAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_FaultAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_serialize_ex(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_http_status = 2,
+  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_grpc_status = 5,
+  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_header_abort = 4,
+  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_NOT_SET = 0
+} envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases;
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_case(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
+  const struct envoy_type_v3_FractionalPercent* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* default_val = NULL;
+  const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  uint32_t default_val = (uint32_t)0u;
+  uint32_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, struct envoy_type_v3_FractionalPercent* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) {
+  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)_upb_Message_New(&envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort */
+
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)_upb_Message_New(&envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize_ex(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.extensions.filters.http.fault.v3.HTTPFault */
+
+UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_http_fault_v3_HTTPFault*)_upb_Message_New(&envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_HTTPFault* ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_http_fault_v3_HTTPFault* ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_HTTPFault_serialize(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_http_fault_v3_HTTPFault_serialize_ex(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const struct envoy_extensions_filters_common_fault_v3_FaultDelay* default_val = NULL;
+  const struct envoy_extensions_filters_common_fault_v3_FaultDelay* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const envoy_extensions_filters_http_fault_v3_FaultAbort* default_val = NULL;
+  const envoy_extensions_filters_http_fault_v3_FaultAbort* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_upstream_cluster(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_extensions_filters_http_fault_v3_HTTPFault_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_mutable_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  size_t size;
+  envoy_extensions_filters_http_fault_v3_HTTPFault_headers(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes_mutable_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_downstream_nodes(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  size_t size;
+  envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* default_val = NULL;
+  const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_delay_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_delay_duration_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_http_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_grpc_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_disable_downstream_cluster_stats(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const struct google_protobuf_Struct* default_val = NULL;
+  const struct google_protobuf_Struct* ret;
+  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_filter_metadata(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultDelay* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_delay(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_common_fault_v3_FaultDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)envoy_extensions_filters_http_fault_v3_HTTPFault_delay(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, envoy_extensions_filters_http_fault_v3_FaultAbort* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_abort(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_http_fault_v3_FaultAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)envoy_extensions_filters_http_fault_v3_HTTPFault_abort(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)_upb_Message_New(&envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_resize_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_extensions_filters_http_fault_v3_HTTPFault_add_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE upb_StringView* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_filters_http_fault_v3_HTTPFault_resize_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_add_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)_upb_Message_New(&envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, bool value) {
+  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_Struct* value) {
+  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
+  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
new file mode 100644
index 0000000000000..dba34760827d3
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
@@ -0,0 +1,141 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = {
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
+  {.submsg = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_FaultAbort__fields[4] = {
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init = {
+  &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0],
+  &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000402000010, &upb_pov4_1bt},
+    {0x000800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0010000404010022, &upb_pom_1bt_max64b},
+    {0x0010000405000028, &upb_pov4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = {
+  {.submsg = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init},
+  {.submsg = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_HTTPFault__fields[16] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init = {
+  &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0],
+  &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0],
+  UPB_SIZE(104, 192), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x002800003f020022, &upb_prm_1bt_maxmaxb},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x0038000003030032, &upb_psm_1bt_maxmaxb},
+    {0x004000000404003a, &upb_psm_1bt_maxmaxb},
+    {0x004800003f000042, &upb_pss_1bt},
+    {0x005800003f00004a, &upb_pss_1bt},
+    {0x006800003f000052, &upb_pss_1bt},
+    {0x007800003f00005a, &upb_pss_1bt},
+    {0x008800003f000062, &upb_pss_1bt},
+    {0x009800003f00006a, &upb_pss_1bt},
+    {0x00a800003f000072, &upb_pss_1bt},
+    {0x000100003f000078, &upb_psb1_1bt},
+    {0x00b8000005050182, &upb_psm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init,
+  &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init,
+  &envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
new file mode 100644
index 0000000000000..02fef1103f75c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_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__filters__http__fault__v3__FaultAbort_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
new file mode 100644
index 0000000000000..8a21e2ec944cc
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
@@ -0,0 +1,266 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h"
+
+#include "envoy/config/rbac/v3/rbac.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_extensions_filters_http_rbac_v3_RBAC envoy_extensions_filters_http_rbac_v3_RBAC;
+typedef struct envoy_extensions_filters_http_rbac_v3_RBACPerRoute envoy_extensions_filters_http_rbac_v3_RBACPerRoute;
+struct envoy_config_rbac_v3_RBAC;
+struct xds_type_matcher_v3_Matcher;
+
+
+
+/* envoy.extensions.filters.http.rbac.v3.RBAC */
+
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_http_rbac_v3_RBAC*)_upb_Message_New(&envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_http_rbac_v3_RBAC* ret = envoy_extensions_filters_http_rbac_v3_RBAC_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_http_rbac_v3_RBAC* ret = envoy_extensions_filters_http_rbac_v3_RBAC_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBAC_serialize(const envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBAC_serialize_ex(const envoy_extensions_filters_http_rbac_v3_RBAC* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const struct envoy_config_rbac_v3_RBAC* default_val = NULL;
+  const struct envoy_config_rbac_v3_RBAC* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const struct envoy_config_rbac_v3_RBAC* default_val = NULL;
+  const struct envoy_config_rbac_v3_RBAC* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const struct xds_type_matcher_v3_Matcher* default_val = NULL;
+  const struct xds_type_matcher_v3_Matcher* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const struct xds_type_matcher_v3_Matcher* default_val = NULL;
+  const struct xds_type_matcher_v3_Matcher* ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_rules(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy__config__rbac__v3__RBAC_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
+  struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy__config__rbac__v3__RBAC_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.filters.http.rbac.v3.RBACPerRoute */
+
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(upb_Arena* arena) {
+  return (envoy_extensions_filters_http_rbac_v3_RBACPerRoute*)_upb_Message_New(&envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_filters_http_rbac_v3_RBACPerRoute* ret = envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_filters_http_rbac_v3_RBACPerRoute* ret = envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_serialize(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_serialize_ex(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_clear_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
+  const envoy_extensions_filters_http_rbac_v3_RBAC* default_val = NULL;
+  const envoy_extensions_filters_http_rbac_v3_RBAC* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBACPerRoute_has_rbac(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute *msg, envoy_extensions_filters_http_rbac_v3_RBAC* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_mutable_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena) {
+  struct envoy_extensions_filters_http_rbac_v3_RBAC* sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)_upb_Message_New(&envoy__extensions__filters__http__rbac__v3__RBAC_msg_init, arena);
+    if (sub) envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
new file mode 100644
index 0000000000000..b24122632dde4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
@@ -0,0 +1,87 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h"
+#include "envoy/config/rbac/v3/rbac.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = {
+  {.submsg = &envoy__config__rbac__v3__RBAC_msg_init},
+  {.submsg = &envoy__config__rbac__v3__RBAC_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = {
+  &envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[0],
+  &envoy_extensions_filters_http_rbac_v3_RBAC__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x0028000003020022, &upb_psm_1bt_maxmaxb},
+    {0x003000000403002a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[1] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init = {
+  &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0],
+  &envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init,
+  &envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
new file mode 100644
index 0000000000000..3a6671638c3de
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_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__filters__http__rbac__v3__RBAC_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
index 71a79635f38d0..5c54cf8afa792 100644
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/router/v3/router.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/filters/http/router/v3/router.upb_minitable.h"
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,28 +29,22 @@ extern "C" {
 
 typedef struct envoy_extensions_filters_http_router_v3_Router envoy_extensions_filters_http_router_v3_Router;
 typedef struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions;
-extern const upb_MiniTable envoy_extensions_filters_http_router_v3_Router_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init;
 struct envoy_config_accesslog_v3_AccessLog;
 struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* envoy.extensions.filters.http.router.v3.Router */
 
 UPB_INLINE envoy_extensions_filters_http_router_v3_Router* envoy_extensions_filters_http_router_v3_Router_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_router_v3_Router*)_upb_Message_New(&envoy_extensions_filters_http_router_v3_Router_msg_init, arena);
+  return (envoy_extensions_filters_http_router_v3_Router*)_upb_Message_New(&envoy__extensions__filters__http__router__v3__Router_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_http_router_v3_Router* envoy_extensions_filters_http_router_v3_Router_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_http_router_v3_Router* ret = envoy_extensions_filters_http_router_v3_Router_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__router__v3__Router_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +54,7 @@ UPB_INLINE envoy_extensions_filters_http_router_v3_Router* envoy_extensions_filt
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_http_router_v3_Router* ret = envoy_extensions_filters_http_router_v3_Router_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__router__v3__Router_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +62,13 @@ UPB_INLINE envoy_extensions_filters_http_router_v3_Router* envoy_extensions_filt
 }
 UPB_INLINE char* envoy_extensions_filters_http_router_v3_Router_serialize(const envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_router_v3_Router_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__router__v3__Router_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_http_router_v3_Router_serialize_ex(const envoy_extensions_filters_http_router_v3_Router* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_router_v3_Router_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__router__v3__Router_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_clear_dynamic_stats(envoy_extensions_filters_http_router_v3_Router* msg) {
@@ -260,7 +264,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_dynamic_stats
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_http_router_v3_Router_mutable_dynamic_stats(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_http_router_v3_Router_dynamic_stats(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_http_router_v3_Router_set_dynamic_stats(msg, sub);
   }
   return sub;
@@ -290,7 +294,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -352,7 +356,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -364,7 +368,7 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_upstream_log_
 UPB_INLINE struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* envoy_extensions_filters_http_router_v3_Router_mutable_upstream_log_options(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* sub = (struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)envoy_extensions_filters_http_router_v3_Router_upstream_log_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)_upb_Message_New(&envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, arena);
+    sub = (struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)_upb_Message_New(&envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_http_router_v3_Router_set_upstream_log_options(msg, sub);
   }
   return sub;
@@ -373,12 +377,12 @@ UPB_INLINE struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessL
 /* envoy.extensions.filters.http.router.v3.Router.UpstreamAccessLogOptions */
 
 UPB_INLINE envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)_upb_Message_New(&envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, arena);
+  return (envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)_upb_Message_New(&envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* ret = envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -388,7 +392,7 @@ UPB_INLINE envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptio
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* ret = envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -396,13 +400,13 @@ UPB_INLINE envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptio
 }
 UPB_INLINE char* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_serialize(const envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_serialize_ex(const envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_clear_flush_upstream_log_on_upstream_stream(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg) {
@@ -443,14 +447,12 @@ UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLog
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_mutable_upstream_log_flush_interval(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_upstream_log_flush_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_set_upstream_log_flush_interval(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
new file mode 100644
index 0000000000000..85d1b2584d3e7
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
@@ -0,0 +1,101 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/router/v3/router.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/http/router/v3/router.upb_minitable.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_submsgs[4] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLog_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init},
+  {.submsg = &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router__fields[9] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(25, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 40), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_init = {
+  &envoy_extensions_filters_http_router_v3_Router_submsgs[0],
+  &envoy_extensions_filters_http_router_v3_Router__fields[0],
+  UPB_SIZE(40, 48), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x001000003f01001a, &upb_prm_1bt_maxmaxb},
+    {0x000200003f000020, &upb_psb1_1bt},
+    {0x001800003f00002a, &upb_prs_1bt},
+    {0x000300003f000030, &upb_psb1_1bt},
+    {0x000400003f000038, &upb_psb1_1bt},
+    {0x002000003f020042, &upb_prm_1bt_maxmaxb},
+    {0x002800000203004a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[2] = {
+  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init = {
+  &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0],
+  &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000008, &upb_psb1_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__extensions__filters__http__router__v3__Router_msg_init,
+  &envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
new file mode 100644
index 0000000000000..d58fb3cac394a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/router/v3/router.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_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__filters__http__router__v3__Router_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
index b41498205eb78..0bff2f21dab7e 100644
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h"
+
+#include "envoy/config/core/v3/extension.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
@@ -19,22 +25,19 @@ extern "C" {
 
 typedef struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession envoy_extensions_filters_http_stateful_session_v3_StatefulSession;
 typedef struct envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute;
-extern const upb_MiniTable envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init;
 struct envoy_config_core_v3_TypedExtensionConfig;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
 
 
 
 /* envoy.extensions.filters.http.stateful_session.v3.StatefulSession */
 
 UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSession* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)_upb_Message_New(&envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, arena);
+  return (envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)_upb_Message_New(&envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSession* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_http_stateful_session_v3_StatefulSession* ret = envoy_extensions_filters_http_stateful_session_v3_StatefulSession_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSession* en
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_http_stateful_session_v3_StatefulSession* ret = envoy_extensions_filters_http_stateful_session_v3_StatefulSession_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSession* en
 }
 UPB_INLINE char* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_serialize(const envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_serialize_ex(const envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSession_clear_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg) {
@@ -84,7 +87,7 @@ UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessio
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_mutable_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_http_stateful_session_v3_StatefulSession_session_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_extensions_filters_http_stateful_session_v3_StatefulSession_set_session_state(msg, sub);
   }
   return sub;
@@ -93,12 +96,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi
 /* envoy.extensions.filters.http.stateful_session.v3.StatefulSessionPerRoute */
 
 UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute*)_upb_Message_New(&envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init, arena);
+  return (envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute*)_upb_Message_New(&envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* ret = envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -108,7 +111,7 @@ UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerR
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* ret = envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -116,13 +119,13 @@ UPB_INLINE envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerR
 }
 UPB_INLINE char* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_serialize(const envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_serialize_ex(const envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -176,14 +179,12 @@ UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessio
 UPB_INLINE struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_mutable_stateful_session(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* sub = (struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_stateful_session(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)_upb_Message_New(&envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init, arena);
+    sub = (struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)_upb_Message_New(&envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init, arena);
     if (sub) envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_set_stateful_session(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3_stateful_session_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
new file mode 100644
index 0000000000000..86653c3349248
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
@@ -0,0 +1,72 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init = {
+  &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0],
+  &envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init = {
+  &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0],
+  &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_pob1_1bt},
+    {0x0008000002000012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init,
+  &envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3_stateful_session_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
new file mode 100644
index 0000000000000..7e79af26bc113
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_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__filters__http__stateful_0session__v3__StatefulSession_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3_stateful_session_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
index a8de1b51b4d6b..827a1f7705bf5 100644
--- a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
  *
@@ -10,7 +9,33 @@
 #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h"
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/substitution_format_string.upb_minitable.h"
+#include "envoy/config/route/v3/route.upb_minitable.h"
+#include "envoy/config/route/v3/scoped_route.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/type/http/v3/path_transformation.upb_minitable.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -38,27 +63,6 @@ typedef struct envoy_extensions_filters_network_http_connection_manager_v3_Scope
 typedef struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter;
 typedef struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension;
 typedef struct envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init;
 struct envoy_config_accesslog_v3_AccessLog;
 struct envoy_config_accesslog_v3_AccessLogFilter;
 struct envoy_config_core_v3_CidrRange;
@@ -83,30 +87,6 @@ struct google_protobuf_Any;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http3ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HttpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SchemeHeaderTransformation_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SubstitutionFormatString_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_RouteConfiguration_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_msg_init;
-extern const upb_MiniTable envoy_config_trace_v3_Tracing_Http_msg_init;
-extern const upb_MiniTable envoy_type_http_v3_PathTransformation_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 typedef enum {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_AUTO = 0,
@@ -147,12 +127,12 @@ typedef enum {
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -162,7 +142,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -170,13 +150,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1061,7 +1041,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_Rds*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_Rds*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_Rds*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_rds(msg, sub);
   }
   return sub;
@@ -1073,7 +1053,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy_config_route_v3_RouteConfiguration_msg_init, arena);
+    sub = (struct envoy_config_route_v3_RouteConfiguration*)_upb_Message_New(&envoy__config__route__v3__RouteConfiguration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_route_config(msg, sub);
   }
   return sub;
@@ -1099,7 +1079,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1111,7 +1091,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_user_agent(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_user_agent(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_user_agent(msg, sub);
   }
   return sub;
@@ -1123,7 +1103,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_tracing(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_tracing(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_tracing(msg, sub);
   }
   return sub;
@@ -1135,7 +1115,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http1ProtocolOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http_protocol_options(msg, sub);
   }
   return sub;
@@ -1147,7 +1127,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http2_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http2_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http2ProtocolOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http2_protocol_options(msg, sub);
   }
   return sub;
@@ -1163,7 +1143,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_drain_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_drain_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_drain_timeout(msg, sub);
   }
   return sub;
@@ -1189,7 +1169,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1201,7 +1181,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_use_remote_address(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_use_remote_address(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_use_remote_address(msg, sub);
   }
   return sub;
@@ -1213,7 +1193,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_generate_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_generate_request_id(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_generate_request_id(msg, sub);
   }
   return sub;
@@ -1229,7 +1209,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_set_current_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_current_client_cert_details(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_set_current_client_cert_details(msg, sub);
   }
   return sub;
@@ -1275,7 +1255,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1287,7 +1267,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_idle_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_idle_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_idle_timeout(msg, sub);
   }
   return sub;
@@ -1299,7 +1279,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_internal_address_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_internal_address_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_internal_address_config(msg, sub);
   }
   return sub;
@@ -1311,7 +1291,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_delayed_close_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_delayed_close_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_delayed_close_timeout(msg, sub);
   }
   return sub;
@@ -1323,7 +1303,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_timeout(msg, sub);
   }
   return sub;
@@ -1335,7 +1315,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_max_request_headers_kb(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_max_request_headers_kb(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_max_request_headers_kb(msg, sub);
   }
   return sub;
@@ -1347,7 +1327,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_normalize_path(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_normalize_path(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_normalize_path(msg, sub);
   }
   return sub;
@@ -1359,7 +1339,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scoped_routes(msg, sub);
   }
   return sub;
@@ -1383,7 +1363,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_common_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_common_http_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_HttpProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__HttpProtocolOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_common_http_protocol_options(msg, sub);
   }
   return sub;
@@ -1395,7 +1375,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_id_extension(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_id_extension(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_id_extension(msg, sub);
   }
   return sub;
@@ -1411,7 +1391,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_local_reply_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_local_reply_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_local_reply_config(msg, sub);
   }
   return sub;
@@ -1427,7 +1407,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_error_on_invalid_http_message(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_error_on_invalid_http_message(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_error_on_invalid_http_message(msg, sub);
   }
   return sub;
@@ -1439,7 +1419,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_headers_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_headers_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_headers_timeout(msg, sub);
   }
   return sub;
@@ -1455,7 +1435,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_path_normalization_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_path_normalization_options(msg, sub);
   }
   return sub;
@@ -1467,7 +1447,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http3_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http3_protocol_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http3ProtocolOptions_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)_upb_Message_New(&envoy__config__core__v3__Http3ProtocolOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http3_protocol_options(msg, sub);
   }
   return sub;
@@ -1497,7 +1477,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1513,7 +1493,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scheme_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SchemeHeaderTransformation* sub = (struct envoy_config_core_v3_SchemeHeaderTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scheme_header_transformation(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SchemeHeaderTransformation*)_upb_Message_New(&envoy_config_core_v3_SchemeHeaderTransformation_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SchemeHeaderTransformation*)_upb_Message_New(&envoy__config__core__v3__SchemeHeaderTransformation_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scheme_header_transformation(msg, sub);
   }
   return sub;
@@ -1525,7 +1505,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_proxy_status_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_proxy_status_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_proxy_status_config(msg, sub);
   }
   return sub;
@@ -1537,7 +1517,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_typed_header_validation_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_typed_header_validation_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_typed_header_validation_config(msg, sub);
   }
   return sub;
@@ -1567,7 +1547,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1579,7 +1559,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_proxy_protocol_connection_state(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_proxy_protocol_connection_state(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_proxy_protocol_connection_state(msg, sub);
   }
   return sub;
@@ -1591,7 +1571,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_flush_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_flush_interval(msg, sub);
   }
   return sub;
@@ -1607,7 +1587,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_options(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_options(msg, sub);
   }
   return sub;
@@ -1616,12 +1596,12 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1631,7 +1611,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1639,13 +1619,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_clear_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg) {
@@ -1779,7 +1759,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_client_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_client_sampling(msg, sub);
   }
   return sub;
@@ -1791,7 +1771,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_random_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_random_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_random_sampling(msg, sub);
   }
   return sub;
@@ -1803,7 +1783,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_overall_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) {
   struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_overall_sampling(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_overall_sampling(msg, sub);
   }
   return sub;
@@ -1819,7 +1799,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_max_path_tag_length(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_max_path_tag_length(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_max_path_tag_length(msg, sub);
   }
   return sub;
@@ -1845,7 +1825,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_extensions_filters_netw
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_tracing_v3_CustomTag* sub = (struct envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_msg_init, arena);
+  struct envoy_type_tracing_v3_CustomTag* sub = (struct envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1857,7 +1837,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_provider(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) {
   struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_provider(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy_config_trace_v3_Tracing_Http_msg_init, arena);
+    sub = (struct envoy_config_trace_v3_Tracing_Http*)_upb_Message_New(&envoy__config__trace__v3__Tracing__Http_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_provider(msg, sub);
   }
   return sub;
@@ -1866,12 +1846,12 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_n
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.InternalAddressConfig */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1881,7 +1861,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1889,13 +1869,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_clear_unix_sockets(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg) {
@@ -1972,7 +1952,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_filters_netwo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1981,12 +1961,12 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_filters_netwo
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.SetCurrentClientCertDetails */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1996,7 +1976,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2004,13 +1984,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_clear_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg) {
@@ -2080,7 +2060,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_mutable_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_subject(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_subject(msg, sub);
   }
   return sub;
@@ -2105,12 +2085,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2120,7 +2100,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2128,13 +2108,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_clear_upgrade_type(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg) {
@@ -2226,7 +2206,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2238,7 +2218,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_mutable_enabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_enabled(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_set_enabled(msg, sub);
   }
   return sub;
@@ -2247,12 +2227,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2262,7 +2242,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2270,13 +2250,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_clear_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg) {
@@ -2317,7 +2297,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) {
   struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_forwarding_transformation(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_msg_init, arena);
+    sub = (struct envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy__type__http__v3__PathTransformation_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_forwarding_transformation(msg, sub);
   }
   return sub;
@@ -2329,7 +2309,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_http_filter_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) {
   struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_http_filter_transformation(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_msg_init, arena);
+    sub = (struct envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy__type__http__v3__PathTransformation_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_http_filter_transformation(msg, sub);
   }
   return sub;
@@ -2338,12 +2318,12 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filter
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.ProxyStatusConfig */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2353,7 +2333,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2361,13 +2341,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -2482,12 +2462,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2497,7 +2477,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2505,13 +2485,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_clear_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg) {
@@ -2559,7 +2539,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_mutable_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_access_log_flush_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_access_log_flush_interval(msg, sub);
   }
   return sub;
@@ -2576,12 +2556,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 /* envoy.extensions.filters.network.http_connection_manager.v3.LocalReplyConfig */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2591,7 +2571,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalRepl
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* ret = envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2599,13 +2579,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalRepl
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_clear_mappers(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg) {
@@ -2682,7 +2662,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Re
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2694,7 +2674,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Loca
 UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mutable_body_format(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_body_format(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy_config_core_v3_SubstitutionFormatString_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy__config__core__v3__SubstitutionFormatString_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_set_body_format(msg, sub);
   }
   return sub;
@@ -2703,12 +2683,12 @@ UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extension
 /* envoy.extensions.filters.network.http_connection_manager.v3.ResponseMapper */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* ret = envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2718,7 +2698,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseM
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* ret = envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2726,13 +2706,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseM
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_clear_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg) {
@@ -2840,7 +2820,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Resp
 UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) {
   struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_filter(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_filter(msg, sub);
   }
   return sub;
@@ -2852,7 +2832,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Resp
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_status_code(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_status_code(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_status_code(msg, sub);
   }
   return sub;
@@ -2864,7 +2844,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Resp
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body(msg, sub);
   }
   return sub;
@@ -2876,7 +2856,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Resp
 UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body_format_override(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body_format_override(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy_config_core_v3_SubstitutionFormatString_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SubstitutionFormatString*)_upb_Message_New(&envoy__config__core__v3__SubstitutionFormatString_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body_format_override(msg, sub);
   }
   return sub;
@@ -2902,7 +2882,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_extensions_filte
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy_config_core_v3_HeaderValueOption_msg_init, arena);
+  struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_Message_New(&envoy__config__core__v3__HeaderValueOption_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2911,12 +2891,12 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_extensions_filte
 /* envoy.extensions.filters.network.http_connection_manager.v3.Rds */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_Rds_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_Rds*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_Rds*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_Rds_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_Rds* ret = envoy_extensions_filters_network_http_connection_manager_v3_Rds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2926,7 +2906,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds* envo
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_Rds* ret = envoy_extensions_filters_network_http_connection_manager_v3_Rds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2934,13 +2914,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds* envo
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_Rds_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_Rds_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_clear_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg) {
@@ -2977,7 +2957,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_Rds_mutable_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_config_source(msg, sub);
   }
   return sub;
@@ -2990,12 +2970,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3005,7 +2985,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3013,13 +2993,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_clear_scoped_route_configurations(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* msg) {
@@ -3081,7 +3061,7 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration* envoy_extensio
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_route_v3_ScopedRouteConfiguration* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration*)_upb_Message_New(&envoy_config_route_v3_ScopedRouteConfiguration_msg_init, arena);
+  struct envoy_config_route_v3_ScopedRouteConfiguration* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration*)_upb_Message_New(&envoy__config__route__v3__ScopedRouteConfiguration_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3090,12 +3070,12 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration* envoy_extensio
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3105,7 +3085,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3113,13 +3093,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3214,7 +3194,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scope_key_builder(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scope_key_builder(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scope_key_builder(msg, sub);
   }
   return sub;
@@ -3226,7 +3206,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_rds_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_rds_config_source(msg, sub);
   }
   return sub;
@@ -3238,7 +3218,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_route_configurations_list(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_route_configurations_list(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_route_configurations_list(msg, sub);
   }
   return sub;
@@ -3250,7 +3230,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_rds(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_rds(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_rds(msg, sub);
   }
   return sub;
@@ -3259,12 +3239,12 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3274,7 +3254,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3282,13 +3262,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_clear_fragments(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* msg) {
@@ -3350,7 +3330,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, arena);
+  struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3359,12 +3339,12 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3374,7 +3354,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3382,13 +3362,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3422,7 +3402,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_mutable_header_value_extractor(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_header_value_extractor(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_set_header_value_extractor(msg, sub);
   }
   return sub;
@@ -3431,12 +3411,12 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3446,7 +3426,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3454,13 +3434,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3544,7 +3524,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_mutable_element(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_element(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_element(msg, sub);
   }
   return sub;
@@ -3553,12 +3533,12 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3568,7 +3548,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3576,13 +3556,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_clear_separator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* msg) {
@@ -3620,12 +3600,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRds */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3635,7 +3615,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3643,13 +3623,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_clear_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg) {
@@ -3686,7 +3666,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_mutable_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_scoped_rds_config_source(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_set_scoped_rds_config_source(msg, sub);
   }
   return sub;
@@ -3699,12 +3679,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Scop
 /* envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3714,7 +3694,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilte
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3722,13 +3702,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilte
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -3804,7 +3784,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_typed_config(msg, sub);
   }
   return sub;
@@ -3816,7 +3796,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_config_discovery(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_discovery(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy_config_core_v3_ExtensionConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy__config__core__v3__ExtensionConfigSource_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_config_discovery(msg, sub);
   }
   return sub;
@@ -3829,12 +3809,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http
 /* envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* ret = envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3844,7 +3824,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestID
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* ret = envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3852,13 +3832,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestID
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_clear_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg) {
@@ -3884,7 +3864,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Requ
 UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_set_typed_config(msg, sub);
   }
   return sub;
@@ -3893,12 +3873,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_con
 /* envoy.extensions.filters.network.http_connection_manager.v3.EnvoyMobileHttpConnectionManager */
 
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init, arena);
+  return (envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* ret = envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3908,7 +3888,7 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobi
                            int options, upb_Arena* arena) {
   envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* ret = envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3916,13 +3896,13 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobi
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_serialize_ex(const envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_clear_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg) {
@@ -3948,14 +3928,12 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Envo
 UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_mutable_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg, upb_Arena* arena) {
   struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)_upb_Message_New(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init, arena);
+    sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)_upb_Message_New(&envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init, arena);
     if (sub) envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_set_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
new file mode 100644
index 0000000000000..63e370cb2d4f7
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
@@ -0,0 +1,679 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/substitution_format_string.upb_minitable.h"
+#include "envoy/config/route/v3/route.upb_minitable.h"
+#include "envoy/config/route/v3/scoped_route.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/type/http/v3/path_transformation.upb_minitable.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init},
+  {.submsg = &envoy__config__route__v3__RouteConfiguration_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init},
+  {.submsg = &envoy__config__core__v3__Http1ProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Http2ProtocolOptions_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLog_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init},
+  {.submsg = &envoy__config__core__v3__HttpProtocolOptions_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Http3ProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__SchemeHeaderTransformation_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[54] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(200, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 80), 1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 88), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 96), 3, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 104), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(208, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(28, 128), 5, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(32, 136), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(36, 144), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(40, 152), 7, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(48, 160), 8, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(52, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(56, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(60, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(61, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(216, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(64, 184), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(68, 192), 9, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(72, 200), 10, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(76, 208), 11, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {28, UPB_SIZE(80, 216), 12, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {29, UPB_SIZE(84, 224), 13, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {30, UPB_SIZE(88, 232), 14, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {31, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {32, UPB_SIZE(96, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {33, UPB_SIZE(97, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(100, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {35, UPB_SIZE(104, 240), 15, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(108, 248), 16, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(112, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {38, UPB_SIZE(116, 256), 17, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(120, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(124, 264), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(128, 272), 19, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {42, UPB_SIZE(196, 368), UPB_SIZE(-133, -41), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {43, UPB_SIZE(136, 280), 20, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {44, UPB_SIZE(140, 288), 21, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {45, UPB_SIZE(144, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {46, UPB_SIZE(148, 296), 0, 27, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {47, UPB_SIZE(152, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {48, UPB_SIZE(156, 304), 22, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {49, UPB_SIZE(160, 312), 23, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(164, 320), 24, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {51, UPB_SIZE(168, 49), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {52, UPB_SIZE(172, 328), 0, 31, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {53, UPB_SIZE(176, 336), 25, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {54, UPB_SIZE(180, 344), 26, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {55, UPB_SIZE(184, 50), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {56, UPB_SIZE(188, 352), 27, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0],
+  UPB_SIZE(224, 376), 54, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x003800003f000012, &upb_pss_1bt},
+    {0x016800180300001a, &upb_pom_1bt_max64b},
+    {0x0168001804010022, &upb_pom_1bt_maxmaxb},
+    {0x004800003f02002a, &upb_prm_1bt_max64b},
+    {0x0050000001030032, &upb_psm_1bt_maxmaxb},
+    {0x005800000204003a, &upb_psm_1bt_max64b},
+    {0x0060000003050042, &upb_psm_1bt_maxmaxb},
+    {0x006800000406004a, &upb_psm_1bt_maxmaxb},
+    {0x007000003f000052, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0080000005070062, &upb_psm_1bt_maxmaxb},
+    {0x008800003f08006a, &upb_prm_1bt_maxmaxb},
+    {0x0090000006090072, &upb_psm_1bt_maxmaxb},
+    {0x00980000070a007a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000180, &upb_psv4_2bt},
+    {0x00a00000080b018a, &upb_psm_2bt_max64b},
+    {0x000c00003f000190, &upb_psb1_2bt},
+    {0x001000003f000198, &upb_psv4_2bt},
+    {0x001400003f0001a0, &upb_psb1_2bt},
+    {0x001500003f0001a8, &upb_psb1_2bt},
+    {0x00a800003f0001b2, &upb_pss_2bt},
+    {0x00b800003f0c01ba, &upb_prm_2bt_max64b},
+    {0x00c00000090d01c2, &upb_psm_2bt_maxmaxb},
+    {0x00c800000a0e01ca, &upb_psm_2bt_max64b},
+    {0x00d000000b0f01d2, &upb_psm_2bt_maxmaxb},
+    {0x01180000141902da, &upb_psm_2bt_max64b},
+    {0x00d800000c1001e2, &upb_psm_2bt_maxmaxb},
+    {0x00e000000d1101ea, &upb_psm_2bt_maxmaxb},
+    {0x00e800000e1201f2, &upb_psm_2bt_maxmaxb},
+    {0x016800181f1301fa, &upb_pom_2bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[6] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__type__tracing__v3__CustomTag_msg_init},
+  {.submsg = &envoy__config__trace__v3__Tracing__Http_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[7] = {
+  {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[0],
+  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100001a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010022, &upb_psm_1bt_maxmaxb},
+    {0x001800000302002a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000030, &upb_psb1_1bt},
+    {0x002000000403003a, &upb_psm_1bt_maxmaxb},
+    {0x002800003f040042, &upb_prm_1bt_maxmaxb},
+    {0x003000000505004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000800003f000012, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(10, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(11, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0],
+  16, 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x000200003f000020, &upb_psb1_1bt},
+    {0x000300003f000028, &upb_psb1_1bt},
+    {0x000400003f000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = {
+  {.submsg = &envoy__type__http__v3__PathTransformation_msg_init},
+  {.submsg = &envoy__type__http__v3__PathTransformation_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[6] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 8, -5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init = {
+  NULL,
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[0],
+  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000200003f000018, &upb_psb1_1bt},
+    {0x000300003f000020, &upb_psb1_1bt},
+    {0x0008000405000028, &upb_pob1_1bt},
+    {0x0008000406000032, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[0],
+  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x000200003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init},
+  {.submsg = &envoy__config__core__v3__SubstitutionFormatString_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = {
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__SubstitutionFormatString_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValueOption_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0],
+  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800003f04002a, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = {
+  {.submsg = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init},
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[5] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 40), UPB_SIZE(-13, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 40), UPB_SIZE(-13, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+    {0x0028000404020022, &upb_pom_1bt_max64b},
+    {0x002800040503002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[4] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 40), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0028000003000018, &upb_pov4_1bt},
+    {0x0028000004000022, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init = {
+  NULL,
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__config__core__v3__ExtensionConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[4] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0018000004000022, &upb_pom_1bt_maxmaxb},
+    {0x001800000501002a, &upb_pom_1bt_maxmaxb},
+    {0x000400003f000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = {
+  {.submsg = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init = {
+  &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0],
+  &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[21] = {
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init,
+  &envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  21,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
new file mode 100644
index 0000000000000..0f559e8cfb8b3
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_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__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init;
+extern const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
new file mode 100644
index 0000000000000..68e7eca0430d4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
@@ -0,0 +1,101 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h"
+
+#include "envoy/type/http/v3/cookie.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_http_stateful_session_cookie_v3_CookieBasedSessionState envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState;
+struct envoy_type_http_v3_Cookie;
+
+
+
+/* envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState */
+
+UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(upb_Arena* arena) {
+  return (envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState*)_upb_Message_New(&envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* ret = envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* ret = envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_serialize(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_serialize_ex(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_clear_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
+  const struct envoy_type_http_v3_Cookie* default_val = NULL;
+  const struct envoy_type_http_v3_Cookie* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_has_cookie(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState *msg, struct envoy_type_http_v3_Cookie* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_mutable_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena) {
+  struct envoy_type_http_v3_Cookie* sub = (struct envoy_type_http_v3_Cookie*)envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_http_v3_Cookie*)_upb_Message_New(&envoy__type__http__v3__Cookie_msg_init, arena);
+    if (sub) envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
new file mode 100644
index 0000000000000..e9e376ff09a19
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h"
+#include "envoy/type/http/v3/cookie.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = {
+  {.submsg = &envoy__type__http__v3__Cookie_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init = {
+  &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0],
+  &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_cookie_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/http/stateful_session/cookie/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
new file mode 100644
index 0000000000000..b553761f2a524
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_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__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
index bf143f17dfe9b..f384447bc1931 100644
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.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
@@ -18,25 +25,21 @@ extern "C" {
 #endif
 
 typedef struct envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_FloatValue;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_FloatValue_msg_init;
 
 
 
 /* envoy.extensions.load_balancing_policies.client_side_weighted_round_robin.v3.ClientSideWeightedRoundRobin */
 
 UPB_INLINE envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin*)_upb_Message_New(&envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init, arena);
+  return (envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* ret = envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +49,7 @@ UPB_INLINE envoy_extensions_load_balancing_policies_client_side_weighted_round_r
                            int options, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* ret = envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +57,13 @@ UPB_INLINE envoy_extensions_load_balancing_policies_client_side_weighted_round_r
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_serialize(const envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_serialize_ex(const envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_clear_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg) {
@@ -161,7 +164,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_enable_oob_load_report(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_enable_oob_load_report(msg, sub);
   }
   return sub;
@@ -173,7 +176,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_oob_reporting_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_oob_reporting_period(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_oob_reporting_period(msg, sub);
   }
   return sub;
@@ -185,7 +188,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_blackout_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_blackout_period(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_blackout_period(msg, sub);
   }
   return sub;
@@ -197,7 +200,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_expiration_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_expiration_period(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_expiration_period(msg, sub);
   }
   return sub;
@@ -209,7 +212,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_update_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_update_period(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_update_period(msg, sub);
   }
   return sub;
@@ -221,14 +224,12 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_ro
 UPB_INLINE struct google_protobuf_FloatValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_error_utilization_penalty(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) {
   struct google_protobuf_FloatValue* sub = (struct google_protobuf_FloatValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_error_utilization_penalty(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_FloatValue*)_upb_Message_New(&google_protobuf_FloatValue_msg_init, arena);
+    sub = (struct google_protobuf_FloatValue*)_upb_Message_New(&google__protobuf__FloatValue_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_error_utilization_penalty(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
new file mode 100644
index 0000000000000..754542ad47168
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
@@ -0,0 +1,67 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = {
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__FloatValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[6] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init = {
+  &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[0],
+  &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[0],
+  UPB_SIZE(32, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
+    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_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/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
new file mode 100644
index 0000000000000..f053fb9cfe921
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_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__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
new file mode 100644
index 0000000000000..0135c5d02d8e9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
@@ -0,0 +1,488 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/common/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.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_load_balancing_policies_common_v3_LocalityLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig;
+typedef struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig;
+typedef struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig;
+typedef struct envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig;
+typedef struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig;
+struct envoy_config_core_v3_RuntimeDouble;
+struct envoy_type_v3_Percent;
+struct google_protobuf_Duration;
+struct google_protobuf_UInt32Value;
+struct google_protobuf_UInt64Value;
+
+
+
+/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig */
+
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_zone_aware_lb_config = 1,
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_locality_weighted_lb_config = 2,
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_NOT_SET = 0
+} envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases;
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_case(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_clear_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* default_val = NULL;
+  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_has_zone_aware_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_clear_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* default_val = NULL;
+  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_has_locality_weighted_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) {
+  struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) {
+  struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig */
+
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const struct envoy_type_v3_Percent* default_val = NULL;
+  const struct envoy_type_v3_Percent* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_has_routing_enabled(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const struct google_protobuf_UInt64Value* default_val = NULL;
+  const struct google_protobuf_UInt64Value* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_has_min_cluster_size(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_fail_traffic_on_panic(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig */
+
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig */
+
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* ret = envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* ret = envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_slow_start_window(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
+  const struct envoy_config_core_v3_RuntimeDouble* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_aggression(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const struct envoy_type_v3_Percent* default_val = NULL;
+  const struct envoy_type_v3_Percent* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_min_weight_percent(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy__config__core__v3__RuntimeDouble_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
+  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig */
+
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(upb_Arena* arena) {
+  return (envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_clear_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_use_hostname_for_hashing(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_clear_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_has_hash_balance_factor(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
new file mode 100644
index 0000000000000..78ec6dea2084a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
@@ -0,0 +1,135 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/common/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = {
+  {.submsg = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init},
+  {.submsg = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init = {
+  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0],
+  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = {
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init = {
+  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0],
+  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeDouble_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init = {
+  &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0],
+  &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[2] = {
+  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init = {
+  &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0],
+  &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000100003f000008, &upb_psb1_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init,
+  &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init,
+  &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init,
+  &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init,
+  &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v3_common_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
new file mode 100644
index 0000000000000..844a1aa8094b7
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/common/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_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__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v3_common_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
similarity index 79%
rename from src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
index 32bc916e61476..82254b68ffcea 100644
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
  *
@@ -10,7 +9,12 @@
 #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +22,18 @@ extern "C" {
 #endif
 
 typedef struct envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init;
 
 
 
 /* envoy.extensions.load_balancing_policies.pick_first.v3.PickFirst */
 
 UPB_INLINE envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst*)_upb_Message_New(&envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init, arena);
+  return (envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* ret = envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +43,7 @@ UPB_INLINE envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* env
                            int options, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* ret = envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +51,13 @@ UPB_INLINE envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* env
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_serialize(const envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_serialize_ex(const envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_clear_shuffle_address_list(envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst* msg) {
@@ -74,8 +77,6 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c
new file mode 100644
index 0000000000000..986957f8ff0ed
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c
@@ -0,0 +1,44 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init = {
+  NULL,
+  &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_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/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
new file mode 100644
index 0000000000000..8e91a419f4f9a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_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__load_0balancing_0policies__pick_0first__v3__PickFirst_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
index 50e676bb6922b..a383901bbef1c 100644
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h"
+
+#include "envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.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
@@ -18,15 +26,10 @@ extern "C" {
 #endif
 
 typedef struct envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init;
 struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig;
 struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig;
 struct google_protobuf_UInt32Value;
 struct google_protobuf_UInt64Value;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
 
 typedef enum {
   envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_DEFAULT_HASH = 0,
@@ -39,12 +42,12 @@ typedef enum {
 /* envoy.extensions.load_balancing_policies.ring_hash.v3.RingHash */
 
 UPB_INLINE envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash*)_upb_Message_New(&envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init, arena);
+  return (envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* ret = envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -54,7 +57,7 @@ UPB_INLINE envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* envoy
                            int options, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* ret = envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -62,13 +65,13 @@ UPB_INLINE envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* envoy
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_serialize(const envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_serialize_ex(const envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_clear_hash_function(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg) {
@@ -180,7 +183,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_minimum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_minimum_ring_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_minimum_ring_size(msg, sub);
   }
   return sub;
@@ -192,7 +195,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s
 UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_maximum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) {
   struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_maximum_ring_size(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_maximum_ring_size(msg, sub);
   }
   return sub;
@@ -208,7 +211,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_hash_balance_factor(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_hash_balance_factor(msg, sub);
   }
   return sub;
@@ -220,7 +223,7 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s
 UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_consistent_hashing_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) {
   struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_consistent_hashing_lb_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, arena);
+    sub = (struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_consistent_hashing_lb_config(msg, sub);
   }
   return sub;
@@ -232,14 +235,12 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_s
 UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) {
   struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_locality_weighted_lb_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, arena);
+    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_locality_weighted_lb_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
new file mode 100644
index 0000000000000..5b858a205bbd3
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
@@ -0,0 +1,68 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h"
+#include "envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = {
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init},
+  {.submsg = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[7] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init = {
+  &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0],
+  &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[0],
+  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x001800000201001a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000020, &upb_psb1_1bt},
+    {0x002000000302002a, &upb_psm_1bt_maxmaxb},
+    {0x0028000004030032, &upb_psm_1bt_maxmaxb},
+    {0x003000000504003a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_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/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
new file mode 100644
index 0000000000000..5cca88629df44
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_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__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
similarity index 82%
rename from src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
index 974b5499f183f..e6b4ebcfc7059 100644
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h"
+
+#include "envoy/config/cluster/v3/cluster.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
@@ -18,21 +24,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init;
 struct envoy_config_cluster_v3_LoadBalancingPolicy;
-extern const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_msg_init;
 
 
 
 /* envoy.extensions.load_balancing_policies.wrr_locality.v3.WrrLocality */
 
 UPB_INLINE envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality*)_upb_Message_New(&envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init, arena);
+  return (envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality*)_upb_Message_New(&envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* ret = envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality*
                            int options, upb_Arena* arena) {
   envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* ret = envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality*
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_serialize(const envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_serialize_ex(const envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_clear_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg) {
@@ -82,14 +86,12 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLoca
 UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_mutable_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg, upb_Arena* arena) {
   struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_endpoint_picking_policy(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, arena);
+    sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, arena);
     if (sub) envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_set_endpoint_picking_policy(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
new file mode 100644
index 0000000000000..155497dcf6686
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = {
+  {.submsg = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init = {
+  &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0],
+  &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_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/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
new file mode 100644
index 0000000000000..dfb0608636a51
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_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__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
new file mode 100644
index 0000000000000..406cf0ff06859
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/cert.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+/* Public Imports. */
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+
+#include "envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h"
+
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c
new file mode 100644
index 0000000000000..3d9870943cebb
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c
@@ -0,0 +1,28 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/cert.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  NULL,
+  0,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
new file mode 100644
index 0000000000000..60fbbc8e2dbbb
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/cert.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+/* Public Imports. */
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
+
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
new file mode 100644
index 0000000000000..d9ad9b33ba3c8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
@@ -0,0 +1,1469 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_tls_v3_TlsParameters envoy_extensions_transport_sockets_tls_v3_TlsParameters;
+typedef struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider;
+typedef struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate envoy_extensions_transport_sockets_tls_v3_TlsCertificate;
+typedef struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys;
+typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance;
+typedef struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher;
+typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext;
+struct envoy_config_core_v3_DataSource;
+struct envoy_config_core_v3_TypedExtensionConfig;
+struct envoy_config_core_v3_WatchedDirectory;
+struct envoy_type_matcher_v3_StringMatcher;
+struct google_protobuf_Any;
+struct google_protobuf_BoolValue;
+struct google_protobuf_UInt32Value;
+
+typedef enum {
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_VERIFY_TRUST_CHAIN = 0,
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ACCEPT_UNTRUSTED = 1
+} envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification;
+
+typedef enum {
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SAN_TYPE_UNSPECIFIED = 0,
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_EMAIL = 1,
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_DNS = 2,
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_URI = 3,
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4
+} envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SanType;
+
+typedef enum {
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLS_AUTO = 0,
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_0 = 1,
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_1 = 2,
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_2 = 3,
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_3 = 4
+} envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol;
+
+
+
+/* envoy.extensions.transport_sockets.tls.v3.TlsParameters */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_TlsParameters*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters* ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters* ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsParameters_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsParameters_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_TlsParameters_tls_minimum_protocol_version(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_TlsParameters_tls_maximum_protocol_version(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_cipher_suites(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_ecdh_curves(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_signature_algorithms(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_serialize(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_typed_config = 3,
+  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_NOT_SET = 0
+} envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases;
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_case(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_clear_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_provider_name(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_clear_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_has_typed_config(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.TlsCertificate */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsCertificate* ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsCertificate* ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_certificate_chain(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_private_key(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_password(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* default_val = NULL;
+  const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL;
+  const struct envoy_config_core_v3_WatchedDirectory* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_pkcs12(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_core_v3_DataSource**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_resize_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_core_v3_DataSource**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_add_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_WatchedDirectory* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_clear_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_has_keys(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_mutable_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_config_core_v3_DataSource**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_resize_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_config_core_v3_DataSource**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_add_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret = envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret = envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_clear_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_instance_name(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_clear_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_certificate_name(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* ret = envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* ret = envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_serialize(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_san_type(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
+  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_StringMatcher* ret;
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_has_matcher(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_mutable_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext */
+
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct google_protobuf_BoolValue* default_val = NULL;
+  const struct google_protobuf_BoolValue* ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct envoy_config_core_v3_DataSource* default_val = NULL;
+  const struct envoy_config_core_v3_DataSource* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_allow_expired_certificate(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct envoy_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trust_chain_verification(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL;
+  const struct envoy_config_core_v3_WatchedDirectory* ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_custom_validator_config(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* default_val = NULL;
+  const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret;
+  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_ca_certificate_provider_instance(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_only_verify_leaf_cert_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_typed_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  size_t size;
+  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_max_verify_depth(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_BoolValue* value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct envoy_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, int32_t value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_WatchedDirectory* value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) {
+  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
+  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* sub = (struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
new file mode 100644
index 0000000000000..8aeb08f30b815
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
@@ -0,0 +1,262 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[5] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init = {
+  NULL,
+  &envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[0],
+  UPB_SIZE(24, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x000800003f00001a, &upb_prs_1bt},
+    {0x001000003f000022, &upb_prs_1bt},
+    {0x001800003f00002a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 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__tls__v3__PrivateKeyProvider_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init},
+  {.submsg = &envoy__config__core__v3__WatchedDirectory_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[8] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0],
+  UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
+    {0x002800003f04002a, &upb_prm_1bt_maxmaxb},
+    {0x0030000005050032, &upb_psm_1bt_max64b},
+    {0x003800000606003a, &upb_psm_1bt_maxmaxb},
+    {0x0040000007070042, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init = {
+  NULL,
+  &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[2] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 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__tls__v3__SubjectAltNameMatcher_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[9] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__WatchedDirectory_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[14] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0],
+  UPB_SIZE(64, 104), 14, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001800003f000012, &upb_prs_1bt},
+    {0x002000003f00001a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0028000002010032, &upb_psm_1bt_maxmaxb},
+    {0x003000000302003a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000040, &upb_psb1_1bt},
+    {0x003800003f03004a, &upb_prm_1bt_maxmaxb},
+    {0x000400003f000050, &upb_psv4_1bt},
+    {0x004000000404005a, &upb_psm_1bt_maxmaxb},
+    {0x0048000005050062, &upb_psm_1bt_maxmaxb},
+    {0x005000000606006a, &upb_psm_1bt_max64b},
+    {0x000800003f000070, &upb_psb1_1bt},
+    {0x005800003f07007a, &upb_prm_1bt_max64b},
+    {0x0060000007080182, &upb_psm_2bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
new file mode 100644
index 0000000000000..7ff235725804a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_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__tls__v3__TlsParameters_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
index 8829dddbec504..b96e6d9d9f0e2 100644
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/secret.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,31 +30,23 @@ extern "C" {
 typedef struct envoy_extensions_transport_sockets_tls_v3_GenericSecret envoy_extensions_transport_sockets_tls_v3_GenericSecret;
 typedef struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig;
 typedef struct envoy_extensions_transport_sockets_tls_v3_Secret envoy_extensions_transport_sockets_tls_v3_Secret;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_Secret_msg_init;
 struct envoy_config_core_v3_ConfigSource;
 struct envoy_config_core_v3_DataSource;
 struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext;
 struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate;
 struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init;
 
 
 
 /* envoy.extensions.transport_sockets.tls.v3.GenericSecret */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extensions_transport_sockets_tls_v3_GenericSecret_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_GenericSecret*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_GenericSecret*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extensions_transport_sockets_tls_v3_GenericSecret_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_GenericSecret* ret = envoy_extensions_transport_sockets_tls_v3_GenericSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -54,7 +56,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extens
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_GenericSecret* ret = envoy_extensions_transport_sockets_tls_v3_GenericSecret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -62,13 +64,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extens
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_GenericSecret_serialize(const envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_GenericSecret_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_GenericSecret_clear_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg) {
@@ -94,7 +96,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_GenericSecret_set_secr
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_GenericSecret_mutable_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_GenericSecret_secret(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_GenericSecret_set_secret(msg, sub);
   }
   return sub;
@@ -103,12 +105,12 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so
 /* envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* ret = envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -118,7 +120,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_exte
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* ret = envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -126,13 +128,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_exte
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_serialize(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_clear_name(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg) {
@@ -173,7 +175,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sd
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_mutable_sds_config(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sds_config(msg, sub);
   }
   return sub;
@@ -182,12 +184,12 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_
 /* envoy.extensions.transport_sockets.tls.v3.Secret */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret* envoy_extensions_transport_sockets_tls_v3_Secret_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_Secret*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_Secret*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret* envoy_extensions_transport_sockets_tls_v3_Secret_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_Secret* ret = envoy_extensions_transport_sockets_tls_v3_Secret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -197,7 +199,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret* envoy_extensions_tr
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_Secret* ret = envoy_extensions_transport_sockets_tls_v3_Secret_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -205,13 +207,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret* envoy_extensions_tr
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_Secret_serialize(const envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_Secret_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_Secret* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -308,7 +310,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_tls_certifi
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_tls_certificate(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)envoy_extensions_transport_sockets_tls_v3_Secret_tls_certificate(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_Secret_set_tls_certificate(msg, sub);
   }
   return sub;
@@ -320,7 +322,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_session_tic
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_Secret_session_ticket_keys(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_Secret_set_session_ticket_keys(msg, sub);
   }
   return sub;
@@ -332,7 +334,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_validation_
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_Secret_validation_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_Secret_set_validation_context(msg, sub);
   }
   return sub;
@@ -344,14 +346,12 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_generic_sec
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_generic_secret(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* sub = (struct envoy_extensions_transport_sockets_tls_v3_GenericSecret*)envoy_extensions_transport_sockets_tls_v3_Secret_generic_secret(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_GenericSecret*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_GenericSecret*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_Secret_set_generic_secret(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
new file mode 100644
index 0000000000000..2e831e59137e0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
@@ -0,0 +1,108 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/secret.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 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__tls__v3__GenericSecret_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 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__tls__v3__SdsSecretConfig_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Secret__fields[5] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_Secret__fields[0],
+  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
+    {0x001800000301001a, &upb_pom_1bt_maxmaxb},
+    {0x0018000004020022, &upb_pom_1bt_maxmaxb},
+    {0x001800000503002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
new file mode 100644
index 0000000000000..26b06398a2d7b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/secret.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_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__tls__v3__GenericSecret_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
index e87fcdf5ea08c..8074297fb469b 100644
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls.proto
  *
@@ -10,7 +9,21 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -24,13 +37,6 @@ typedef struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext envoy_
 typedef struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider;
 typedef struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance;
 typedef struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init;
 struct envoy_config_core_v3_CidrRange;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance;
@@ -42,17 +48,6 @@ struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys;
 struct google_protobuf_BoolValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 typedef enum {
   envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_LENIENT_STAPLING = 0,
@@ -65,12 +60,12 @@ typedef enum {
 /* envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -80,7 +75,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* envoy_e
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -88,13 +83,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* envoy_e
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_clear_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg) {
@@ -157,7 +152,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_common_tls_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_common_tls_context(msg, sub);
   }
   return sub;
@@ -177,7 +172,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_max_session_keys(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_max_session_keys(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_max_session_keys(msg, sub);
   }
   return sub;
@@ -186,12 +181,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket
 /* envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -201,7 +196,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* envoy
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -209,13 +204,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* envoy
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -367,7 +362,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_common_tls_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_common_tls_context(msg, sub);
   }
   return sub;
@@ -379,7 +374,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_client_certificate(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_client_certificate(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_client_certificate(msg, sub);
   }
   return sub;
@@ -391,7 +386,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_sni(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_sni(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_sni(msg, sub);
   }
   return sub;
@@ -403,7 +398,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys(msg, sub);
   }
   return sub;
@@ -415,7 +410,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys_sds_secret_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys_sds_secret_config(msg, sub);
   }
   return sub;
@@ -427,7 +422,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct google_protobuf_Duration* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_timeout(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_timeout(msg, sub);
   }
   return sub;
@@ -447,7 +442,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_s
 UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_full_scan_certs_on_sni_mismatch(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) {
   struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_full_scan_certs_on_sni_mismatch(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_full_scan_certs_on_sni_mismatch(msg, sub);
   }
   return sub;
@@ -456,12 +451,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_
 /* envoy.extensions.transport_sockets.tls.v3.TlsKeyLog */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* ret = envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -471,7 +466,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* ret = envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -479,13 +474,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_clear_path(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg) {
@@ -599,7 +594,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_soc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -625,7 +620,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_soc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -634,12 +629,12 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_extensions_transport_soc
 /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -649,7 +644,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_ext
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -657,13 +652,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_ext
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -962,7 +957,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_t
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_params(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsParameters*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_params(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsParameters*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsParameters*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_params(msg, sub);
   }
   return sub;
@@ -988,7 +983,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, arena);
+  struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1000,7 +995,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_v
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context(msg, sub);
   }
   return sub;
@@ -1050,7 +1045,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, arena);
+  struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1062,7 +1057,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_v
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_sds_secret_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_sds_secret_config(msg, sub);
   }
   return sub;
@@ -1074,7 +1069,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_c
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_combined_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_combined_validation_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_combined_validation_context(msg, sub);
   }
   return sub;
@@ -1086,7 +1081,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_t
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider(msg, sub);
   }
   return sub;
@@ -1098,7 +1093,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_v
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider(msg, sub);
   }
   return sub;
@@ -1110,7 +1105,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_t
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider_instance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider_instance(msg, sub);
   }
   return sub;
@@ -1122,7 +1117,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_v
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider_instance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider_instance(msg, sub);
   }
   return sub;
@@ -1134,7 +1129,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_c
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_custom_handshaker(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_custom_handshaker(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_custom_handshaker(msg, sub);
   }
   return sub;
@@ -1146,7 +1141,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_t
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_provider_instance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_provider_instance(msg, sub);
   }
   return sub;
@@ -1158,7 +1153,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_k
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_key_log(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_key_log(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_key_log(msg, sub);
   }
   return sub;
@@ -1167,12 +1162,12 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_ext
 /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1182,7 +1177,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1190,13 +1185,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1245,7 +1240,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certi
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_typed_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_set_typed_config(msg, sub);
   }
   return sub;
@@ -1254,12 +1249,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_tr
 /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1269,7 +1264,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1277,13 +1272,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_clear_instance_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* msg) {
@@ -1321,12 +1316,12 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certi
 /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1336,7 +1331,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCe
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1344,13 +1339,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCe
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_clear_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg) {
@@ -1421,7 +1416,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_default_validation_context(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_default_validation_context(msg, sub);
   }
   return sub;
@@ -1433,7 +1428,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_sds_secret_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_sds_secret_config(msg, sub);
   }
   return sub;
@@ -1445,7 +1440,7 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider(msg, sub);
   }
   return sub;
@@ -1457,14 +1452,12 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi
 UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) {
   struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider_instance(msg);
   if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init, arena);
+    sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider_instance(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
new file mode 100644
index 0000000000000..5b8f79500b0d8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
@@ -0,0 +1,267 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/tls.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[2] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[9] = {
+  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 48), 5, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0],
+  UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psm_1bt_max128b},
+    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
+    {0x002000000302001a, &upb_psm_1bt_maxmaxb},
+    {0x0038000404030022, &upb_pom_1bt_maxmaxb},
+    {0x003800040504002a, &upb_pom_1bt_maxmaxb},
+    {0x0028000004050032, &upb_psm_1bt_maxmaxb},
+    {0x0038000407000038, &upb_pob1_1bt},
+    {0x000800003f000040, &upb_psv4_1bt},
+    {0x003000000506004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+  {.submsg = &envoy__config__core__v3__CidrRange_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[3] = {
+  {1, UPB_SIZE(8, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_maxmaxb},
+    {0x001800003f01001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[14] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 40), 2, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(24, 48), 3, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(32, 56), 4, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(36, 64), 5, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(40, 72), 6, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0],
+  UPB_SIZE(48, 88), 14, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
+    {0x005000040302001a, &upb_pom_1bt_maxmaxb},
+    {0x001800003f000022, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f030032, &upb_prm_1bt_maxmaxb},
+    {0x005000040704003a, &upb_pom_1bt_maxmaxb},
+    {0x0050000408050042, &upb_pom_1bt_max64b},
+    {0x002800000206004a, &upb_psm_1bt_max64b},
+    {0x005000040a070052, &upb_pom_1bt_max64b},
+    {0x003000000308005a, &upb_psm_1bt_max64b},
+    {0x005000040c090062, &upb_pom_1bt_max64b},
+    {0x00380000040a006a, &upb_psm_1bt_maxmaxb},
+    {0x00400000050b0072, &upb_psm_1bt_maxmaxb},
+    {0x00480000060c007a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 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__tls__v3__CommonTlsContext__CertificateProvider_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init = {
+  NULL,
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800000302001a, &upb_psm_1bt_max64b},
+    {0x0020000004030022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
new file mode 100644
index 0000000000000..da98df5e9a0e4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/tls.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_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__tls__v3__UpstreamTlsContext_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
rename to src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
index c82e7a1ab3dd1..db2d60a7f7205 100644
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.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
@@ -19,22 +25,19 @@ extern "C" {
 
 typedef struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig;
 typedef struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init;
 struct envoy_config_core_v3_DataSource;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
 
 
 
 /* envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* ret = envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig*
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* ret = envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig*
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_serialize(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_clear_trust_domains(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig* msg) {
@@ -120,7 +123,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorC
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* sub = (struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, arena);
+  struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* sub = (struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -129,12 +132,12 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorC
 /* envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig.TrustDomain */
 
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, arena);
+  return (envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, arena);
 }
 UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* ret = envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -144,7 +147,7 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_T
                            int options, upb_Arena* arena) {
   envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* ret = envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -152,13 +155,13 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_T
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_serialize(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_clear_name(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg) {
@@ -199,14 +202,12 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCon
 UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_mutable_trust_bundle(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_trust_bundle(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy__config__core__v3__DataSource_msg_init, arena);
     if (sub) envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_set_trust_bundle(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
new file mode 100644
index 0000000000000..6316adc68b9c4
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
@@ -0,0 +1,72 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.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"
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = {
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = {
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 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__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init = {
+  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0],
+  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init,
+  &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
new file mode 100644
index 0000000000000..64c7400853a33
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_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__tls__v3__SPIFFECertValidatorConfig_msg_init;
+extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init;
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
new file mode 100644
index 0000000000000..5d95aa21e645e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
@@ -0,0 +1,73 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/discovery/v3/ads.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/service/discovery/v3/ads.upb_minitable.h"
+
+#include "envoy/service/discovery/v3/discovery.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_service_discovery_v3_AdsDummy envoy_service_discovery_v3_AdsDummy;
+
+
+
+/* envoy.service.discovery.v3.AdsDummy */
+
+UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_new(upb_Arena* arena) {
+  return (envoy_service_discovery_v3_AdsDummy*)_upb_Message_New(&envoy__service__discovery__v3__AdsDummy_msg_init, arena);
+}
+UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_service_discovery_v3_AdsDummy* ret = envoy_service_discovery_v3_AdsDummy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__AdsDummy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_service_discovery_v3_AdsDummy* ret = envoy_service_discovery_v3_AdsDummy_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__AdsDummy_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize(const envoy_service_discovery_v3_AdsDummy* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__AdsDummy_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize_ex(const envoy_service_discovery_v3_AdsDummy* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__AdsDummy_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c
new file mode 100644
index 0000000000000..a65e32dfc231d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/discovery/v3/ads.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/service/discovery/v3/ads.upb_minitable.h"
+#include "envoy/service/discovery/v3/discovery.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__service__discovery__v3__AdsDummy_msg_init,
+};
+
+const upb_MiniTableFile envoy_service_discovery_v3_ads_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/service/discovery/v3/ads.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
new file mode 100644
index 0000000000000..5724b024b795e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/discovery/v3/ads.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_ADS_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__service__discovery__v3__AdsDummy_msg_init;
+
+extern const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h
rename to src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
index 3eb9fc857d344..5b9edddbcb0e3 100644
--- a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/discovery/v3/discovery.proto
  *
@@ -10,7 +9,18 @@
 #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/service/discovery/v3/discovery.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/rpc/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -31,44 +41,24 @@ typedef struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleCons
 typedef struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList;
 typedef struct envoy_service_discovery_v3_Resource envoy_service_discovery_v3_Resource;
 typedef struct envoy_service_discovery_v3_Resource_CacheControl envoy_service_discovery_v3_Resource_CacheControl;
-extern const upb_MiniTable envoy_service_discovery_v3_ResourceLocator_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_ResourceName_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DiscoveryRequest_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DiscoveryResponse_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_Resource_msg_init;
-extern const upb_MiniTable envoy_service_discovery_v3_Resource_CacheControl_msg_init;
 struct envoy_config_core_v3_ControlPlane;
 struct envoy_config_core_v3_Metadata;
 struct envoy_config_core_v3_Node;
 struct google_protobuf_Any;
 struct google_protobuf_Duration;
 struct google_rpc_Status;
-extern const upb_MiniTable envoy_config_core_v3_ControlPlane_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_rpc_Status_msg_init;
 
 
 
 /* envoy.service.discovery.v3.ResourceLocator */
 
 UPB_INLINE envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v3_ResourceLocator_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy_service_discovery_v3_ResourceLocator_msg_init, arena);
+  return (envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy__service__discovery__v3__ResourceLocator_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v3_ResourceLocator_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_ResourceLocator* ret = envoy_service_discovery_v3_ResourceLocator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_ResourceLocator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__ResourceLocator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -78,7 +68,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_ResourceLocator* ret = envoy_service_discovery_v3_ResourceLocator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_ResourceLocator_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__ResourceLocator_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -86,13 +76,13 @@ UPB_INLINE envoy_service_discovery_v3_ResourceLocator* envoy_service_discovery_v
 }
 UPB_INLINE char* envoy_service_discovery_v3_ResourceLocator_serialize(const envoy_service_discovery_v3_ResourceLocator* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_ResourceLocator_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__ResourceLocator_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_ResourceLocator_serialize_ex(const envoy_service_discovery_v3_ResourceLocator* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_ResourceLocator_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__ResourceLocator_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_clear_name(envoy_service_discovery_v3_ResourceLocator* msg) {
@@ -177,12 +167,12 @@ UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntr
 /* envoy.service.discovery.v3.ResourceName */
 
 UPB_INLINE envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_ResourceName_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy_service_discovery_v3_ResourceName_msg_init, arena);
+  return (envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy__service__discovery__v3__ResourceName_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_ResourceName_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_ResourceName* ret = envoy_service_discovery_v3_ResourceName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_ResourceName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__ResourceName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -192,7 +182,7 @@ UPB_INLINE envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_R
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_ResourceName* ret = envoy_service_discovery_v3_ResourceName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_ResourceName_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__ResourceName_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -200,13 +190,13 @@ UPB_INLINE envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_R
 }
 UPB_INLINE char* envoy_service_discovery_v3_ResourceName_serialize(const envoy_service_discovery_v3_ResourceName* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_ResourceName_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__ResourceName_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_ResourceName_serialize_ex(const envoy_service_discovery_v3_ResourceName* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_ResourceName_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__ResourceName_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_ResourceName_clear_name(envoy_service_discovery_v3_ResourceName* msg) {
@@ -247,7 +237,7 @@ UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_dynamic_parameter_co
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_ResourceName_mutable_dynamic_parameter_constraints(envoy_service_discovery_v3_ResourceName* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_ResourceName_dynamic_parameter_constraints(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, arena);
     if (sub) envoy_service_discovery_v3_ResourceName_set_dynamic_parameter_constraints(msg, sub);
   }
   return sub;
@@ -256,12 +246,12 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_
 /* envoy.service.discovery.v3.DiscoveryRequest */
 
 UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest* envoy_service_discovery_v3_DiscoveryRequest_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DiscoveryRequest*)_upb_Message_New(&envoy_service_discovery_v3_DiscoveryRequest_msg_init, arena);
+  return (envoy_service_discovery_v3_DiscoveryRequest*)_upb_Message_New(&envoy__service__discovery__v3__DiscoveryRequest_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest* envoy_service_discovery_v3_DiscoveryRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DiscoveryRequest* ret = envoy_service_discovery_v3_DiscoveryRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DiscoveryRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -271,7 +261,7 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest* envoy_service_discovery_
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DiscoveryRequest* ret = envoy_service_discovery_v3_DiscoveryRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DiscoveryRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -279,13 +269,13 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest* envoy_service_discovery_
 }
 UPB_INLINE char* envoy_service_discovery_v3_DiscoveryRequest_serialize(const envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DiscoveryRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DiscoveryRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DiscoveryRequest_serialize_ex(const envoy_service_discovery_v3_DiscoveryRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DiscoveryRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DiscoveryRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_clear_version_info(envoy_service_discovery_v3_DiscoveryRequest* msg) {
@@ -437,7 +427,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_node(envoy_servi
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DiscoveryRequest_mutable_node(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DiscoveryRequest_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DiscoveryRequest_set_node(msg, sub);
   }
   return sub;
@@ -481,7 +471,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_error_detail(env
 UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) {
   struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DiscoveryRequest_error_detail(msg);
   if (sub == NULL) {
-    sub = (struct google_rpc_Status*)_upb_Message_New(&google_rpc_Status_msg_init, arena);
+    sub = (struct google_rpc_Status*)_upb_Message_New(&google__rpc__Status_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DiscoveryRequest_set_error_detail(msg, sub);
   }
   return sub;
@@ -507,7 +497,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_disc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy_service_discovery_v3_ResourceLocator_msg_init, arena);
+  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy__service__discovery__v3__ResourceLocator_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -516,12 +506,12 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_disc
 /* envoy.service.discovery.v3.DiscoveryResponse */
 
 UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse* envoy_service_discovery_v3_DiscoveryResponse_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DiscoveryResponse*)_upb_Message_New(&envoy_service_discovery_v3_DiscoveryResponse_msg_init, arena);
+  return (envoy_service_discovery_v3_DiscoveryResponse*)_upb_Message_New(&envoy__service__discovery__v3__DiscoveryResponse_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse* envoy_service_discovery_v3_DiscoveryResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DiscoveryResponse* ret = envoy_service_discovery_v3_DiscoveryResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DiscoveryResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -531,7 +521,7 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse* envoy_service_discovery
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DiscoveryResponse* ret = envoy_service_discovery_v3_DiscoveryResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DiscoveryResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -539,13 +529,13 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse* envoy_service_discovery
 }
 UPB_INLINE char* envoy_service_discovery_v3_DiscoveryResponse_serialize(const envoy_service_discovery_v3_DiscoveryResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DiscoveryResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DiscoveryResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DiscoveryResponse_serialize_ex(const envoy_service_discovery_v3_DiscoveryResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DiscoveryResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DiscoveryResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_clear_version_info(envoy_service_discovery_v3_DiscoveryResponse* msg) {
@@ -670,7 +660,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_DiscoveryRespo
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -694,7 +684,7 @@ UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_control_plane(e
 UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DiscoveryResponse* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DiscoveryResponse_control_plane(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy_config_core_v3_ControlPlane_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy__config__core__v3__ControlPlane_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DiscoveryResponse_set_control_plane(msg, sub);
   }
   return sub;
@@ -703,12 +693,12 @@ UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_
 /* envoy.service.discovery.v3.DeltaDiscoveryRequest */
 
 UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest* envoy_service_discovery_v3_DeltaDiscoveryRequest_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DeltaDiscoveryRequest*)_upb_Message_New(&envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init, arena);
+  return (envoy_service_discovery_v3_DeltaDiscoveryRequest*)_upb_Message_New(&envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest* envoy_service_discovery_v3_DeltaDiscoveryRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DeltaDiscoveryRequest* ret = envoy_service_discovery_v3_DeltaDiscoveryRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -718,7 +708,7 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest* envoy_service_disco
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DeltaDiscoveryRequest* ret = envoy_service_discovery_v3_DeltaDiscoveryRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -726,13 +716,13 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest* envoy_service_disco
 }
 UPB_INLINE char* envoy_service_discovery_v3_DeltaDiscoveryRequest_serialize(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DeltaDiscoveryRequest_serialize_ex(const envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_clear_node(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg) {
@@ -964,7 +954,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_node(envoy_
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_node(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DeltaDiscoveryRequest_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DeltaDiscoveryRequest_set_node(msg, sub);
   }
   return sub;
@@ -1056,7 +1046,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_error_detai
 UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) {
   struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DeltaDiscoveryRequest_error_detail(msg);
   if (sub == NULL) {
-    sub = (struct google_rpc_Status*)_upb_Message_New(&google_rpc_Status_msg_init, arena);
+    sub = (struct google_rpc_Status*)_upb_Message_New(&google__rpc__Status_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DeltaDiscoveryRequest_set_error_detail(msg, sub);
   }
   return sub;
@@ -1082,7 +1072,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_disc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy_service_discovery_v3_ResourceLocator_msg_init, arena);
+  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy__service__discovery__v3__ResourceLocator_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1108,7 +1098,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceLocator* envoy_service_disc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy_service_discovery_v3_ResourceLocator_msg_init, arena);
+  struct envoy_service_discovery_v3_ResourceLocator* sub = (struct envoy_service_discovery_v3_ResourceLocator*)_upb_Message_New(&envoy__service__discovery__v3__ResourceLocator_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1134,12 +1124,12 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResource
 /* envoy.service.discovery.v3.DeltaDiscoveryResponse */
 
 UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse* envoy_service_discovery_v3_DeltaDiscoveryResponse_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DeltaDiscoveryResponse*)_upb_Message_New(&envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init, arena);
+  return (envoy_service_discovery_v3_DeltaDiscoveryResponse*)_upb_Message_New(&envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse* envoy_service_discovery_v3_DeltaDiscoveryResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DeltaDiscoveryResponse* ret = envoy_service_discovery_v3_DeltaDiscoveryResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1149,7 +1139,7 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse* envoy_service_disc
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DeltaDiscoveryResponse* ret = envoy_service_discovery_v3_DeltaDiscoveryResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1157,13 +1147,13 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse* envoy_service_disc
 }
 UPB_INLINE char* envoy_service_discovery_v3_DeltaDiscoveryResponse_serialize(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DeltaDiscoveryResponse_serialize_ex(const envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_clear_system_version_info(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg) {
@@ -1351,7 +1341,7 @@ UPB_INLINE struct envoy_service_discovery_v3_Resource* envoy_service_discovery_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_Resource* sub = (struct envoy_service_discovery_v3_Resource*)_upb_Message_New(&envoy_service_discovery_v3_Resource_msg_init, arena);
+  struct envoy_service_discovery_v3_Resource* sub = (struct envoy_service_discovery_v3_Resource*)_upb_Message_New(&envoy__service__discovery__v3__Resource_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1395,7 +1385,7 @@ UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_pl
 UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DeltaDiscoveryResponse_control_plane(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy_config_core_v3_ControlPlane_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ControlPlane*)_upb_Message_New(&envoy__config__core__v3__ControlPlane_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_plane(msg, sub);
   }
   return sub;
@@ -1421,7 +1411,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discove
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_ResourceName* sub = (struct envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy_service_discovery_v3_ResourceName_msg_init, arena);
+  struct envoy_service_discovery_v3_ResourceName* sub = (struct envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy__service__discovery__v3__ResourceName_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1430,12 +1420,12 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discove
 /* envoy.service.discovery.v3.DynamicParameterConstraints */
 
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, arena);
+  return (envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints* ret = envoy_service_discovery_v3_DynamicParameterConstraints_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1445,7 +1435,7 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints* ret = envoy_service_discovery_v3_DynamicParameterConstraints_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1453,13 +1443,13 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_serialize(const envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_serialize_ex(const envoy_service_discovery_v3_DynamicParameterConstraints* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1541,7 +1531,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_const
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_constraint(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)envoy_service_discovery_v3_DynamicParameterConstraints_constraint(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DynamicParameterConstraints_set_constraint(msg, sub);
   }
   return sub;
@@ -1553,7 +1543,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_or_co
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_or_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_or_constraints(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DynamicParameterConstraints_set_or_constraints(msg, sub);
   }
   return sub;
@@ -1565,7 +1555,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_and_c
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_and_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_and_constraints(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DynamicParameterConstraints_set_and_constraints(msg, sub);
   }
   return sub;
@@ -1577,7 +1567,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_not_c
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_not_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_DynamicParameterConstraints_not_constraints(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DynamicParameterConstraints_set_not_constraints(msg, sub);
   }
   return sub;
@@ -1586,12 +1576,12 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_
 /* envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint */
 
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, arena);
+  return (envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* ret = envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1601,7 +1591,7 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstrai
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* ret = envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1609,13 +1599,13 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstrai
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_serialize(const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_serialize_ex(const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1684,7 +1674,7 @@ UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleCon
 UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_mutable_exists(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_exists(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, arena);
     if (sub) envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_exists(msg, sub);
   }
   return sub;
@@ -1693,12 +1683,12 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleC
 /* envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint.Exists */
 
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, arena);
+  return (envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* ret = envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1708,7 +1698,7 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstrai
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* ret = envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1716,13 +1706,13 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstrai
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_serialize(const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_serialize_ex(const envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -1730,12 +1720,12 @@ UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_SingleCo
 /* envoy.service.discovery.v3.DynamicParameterConstraints.ConstraintList */
 
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, arena);
+  return (envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* ret = envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1745,7 +1735,7 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* ret = envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1753,13 +1743,13 @@ UPB_INLINE envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_serialize(const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_serialize_ex(const envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_clear_constraints(envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* msg) {
@@ -1821,7 +1811,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy_service_discovery_v3_DynamicParameterConstraints_msg_init, arena);
+  struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)_upb_Message_New(&envoy__service__discovery__v3__DynamicParameterConstraints_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1830,12 +1820,12 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_
 /* envoy.service.discovery.v3.Resource */
 
 UPB_INLINE envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_Resource_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_Resource*)_upb_Message_New(&envoy_service_discovery_v3_Resource_msg_init, arena);
+  return (envoy_service_discovery_v3_Resource*)_upb_Message_New(&envoy__service__discovery__v3__Resource_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_Resource_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_Resource* ret = envoy_service_discovery_v3_Resource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__Resource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1845,7 +1835,7 @@ UPB_INLINE envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_Resou
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_Resource* ret = envoy_service_discovery_v3_Resource_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__Resource_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1853,13 +1843,13 @@ UPB_INLINE envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_Resou
 }
 UPB_INLINE char* envoy_service_discovery_v3_Resource_serialize(const envoy_service_discovery_v3_Resource* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_Resource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__Resource_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_Resource_serialize_ex(const envoy_service_discovery_v3_Resource* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_Resource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__Resource_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_Resource_clear_version(envoy_service_discovery_v3_Resource* msg) {
@@ -2008,7 +1998,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource(envoy_service_d
 UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_Resource_mutable_resource(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_discovery_v3_Resource_resource(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_service_discovery_v3_Resource_set_resource(msg, sub);
   }
   return sub;
@@ -2048,7 +2038,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_ttl(envoy_service_discov
 UPB_INLINE struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_mutable_ttl(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_discovery_v3_Resource_ttl(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_service_discovery_v3_Resource_set_ttl(msg, sub);
   }
   return sub;
@@ -2060,7 +2050,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_cache_control(envoy_serv
 UPB_INLINE struct envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_mutable_cache_control(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_Resource_CacheControl* sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)envoy_service_discovery_v3_Resource_cache_control(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)_upb_Message_New(&envoy_service_discovery_v3_Resource_CacheControl_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)_upb_Message_New(&envoy__service__discovery__v3__Resource__CacheControl_msg_init, arena);
     if (sub) envoy_service_discovery_v3_Resource_set_cache_control(msg, sub);
   }
   return sub;
@@ -2072,7 +2062,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource_name(envoy_serv
 UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_Resource_mutable_resource_name(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) {
   struct envoy_service_discovery_v3_ResourceName* sub = (struct envoy_service_discovery_v3_ResourceName*)envoy_service_discovery_v3_Resource_resource_name(msg);
   if (sub == NULL) {
-    sub = (struct envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy_service_discovery_v3_ResourceName_msg_init, arena);
+    sub = (struct envoy_service_discovery_v3_ResourceName*)_upb_Message_New(&envoy__service__discovery__v3__ResourceName_msg_init, arena);
     if (sub) envoy_service_discovery_v3_Resource_set_resource_name(msg, sub);
   }
   return sub;
@@ -2084,7 +2074,7 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_metadata(envoy_service_d
 UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_service_discovery_v3_Resource_mutable_metadata(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_service_discovery_v3_Resource_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena);
     if (sub) envoy_service_discovery_v3_Resource_set_metadata(msg, sub);
   }
   return sub;
@@ -2093,12 +2083,12 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_service_discovery_v3_Reso
 /* envoy.service.discovery.v3.Resource.CacheControl */
 
 UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_CacheControl_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_Resource_CacheControl*)_upb_Message_New(&envoy_service_discovery_v3_Resource_CacheControl_msg_init, arena);
+  return (envoy_service_discovery_v3_Resource_CacheControl*)_upb_Message_New(&envoy__service__discovery__v3__Resource__CacheControl_msg_init, arena);
 }
 UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_CacheControl_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_discovery_v3_Resource_CacheControl* ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__Resource__CacheControl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2108,7 +2098,7 @@ UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl* envoy_service_disco
                            int options, upb_Arena* arena) {
   envoy_service_discovery_v3_Resource_CacheControl* ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__discovery__v3__Resource__CacheControl_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2116,13 +2106,13 @@ UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl* envoy_service_disco
 }
 UPB_INLINE char* envoy_service_discovery_v3_Resource_CacheControl_serialize(const envoy_service_discovery_v3_Resource_CacheControl* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_Resource_CacheControl_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__Resource__CacheControl_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_discovery_v3_Resource_CacheControl_serialize_ex(const envoy_service_discovery_v3_Resource_CacheControl* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_Resource_CacheControl_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__discovery__v3__Resource__CacheControl_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_clear_do_not_cache(envoy_service_discovery_v3_Resource_CacheControl* msg) {
@@ -2142,8 +2132,6 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cach
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
new file mode 100644
index 0000000000000..7480452d08c79
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
@@ -0,0 +1,402 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/discovery/v3/discovery.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/service/discovery/v3/discovery.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/rpc/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_service_discovery_v3_ResourceLocator_submsgs[1] = {
+  {.submsg = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = {
+  &envoy_service_discovery_v3_ResourceLocator_submsgs[0],
+  &envoy_service_discovery_v3_ResourceLocator__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init = {
+  NULL,
+  &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_ResourceName_submsgs[1] = {
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_ResourceName__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = {
+  &envoy_service_discovery_v3_ResourceName_submsgs[0],
+  &envoy_service_discovery_v3_ResourceName__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &google__rpc__Status_msg_init},
+  {.submsg = &envoy__service__discovery__v3__ResourceLocator_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryRequest__fields[7] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 72), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = {
+  &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0],
+  &envoy_service_discovery_v3_DiscoveryRequest__fields[0],
+  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_prs_1bt},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x003800003f00002a, &upb_pss_1bt},
+    {0x0048000002010032, &upb_psm_1bt_maxmaxb},
+    {0x005000003f02003a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__config__core__v3__ControlPlane_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryResponse__fields[6] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 64), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = {
+  &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0],
+  &envoy_service_discovery_v3_DiscoveryResponse__fields[0],
+  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x002000003f000022, &upb_pss_1bt},
+    {0x003000003f00002a, &upb_pss_1bt},
+    {0x0040000001010032, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = {
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init},
+  {.submsg = &google__rpc__Status_msg_init},
+  {.submsg = &envoy__service__discovery__v3__ResourceLocator_msg_init},
+  {.submsg = &envoy__service__discovery__v3__ResourceLocator_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[9] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 72), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 88), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init = {
+  &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0],
+  &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0],
+  UPB_SIZE(48, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_prs_1bt},
+    {0x002800003f000022, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f000032, &upb_pss_1bt},
+    {0x004800000202003a, &upb_psm_1bt_maxmaxb},
+    {0x005000003f030042, &upb_prm_1bt_max64b},
+    {0x005800003f04004a, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init = {
+  NULL,
+  &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = {
+  {.submsg = &envoy__service__discovery__v3__Resource_msg_init},
+  {.submsg = &envoy__config__core__v3__ControlPlane_msg_init},
+  {.submsg = &envoy__service__discovery__v3__ResourceName_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[7] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(8, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 72), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init = {
+  &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0],
+  &envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0],
+  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f000022, &upb_pss_1bt},
+    {0x003000003f00002a, &upb_pss_1bt},
+    {0x004000003f000032, &upb_prs_1bt},
+    {0x004800000101003a, &upb_psm_1bt_maxmaxb},
+    {0x005000003f020042, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = {
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init},
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init},
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init},
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints__fields[4] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_msg_init = {
+  &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0],
+  &envoy_service_discovery_v3_DynamicParameterConstraints__fields[0],
+  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = {
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[3] = {
+  {1, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init = {
+  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0],
+  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x000800000300001a, &upb_pom_1bt_max64b},
+  })
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = {
+  {.submsg = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init = {
+  &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0],
+  &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_discovery_v3_Resource_submsgs[5] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__service__discovery__v3__Resource__CacheControl_msg_init},
+  {.submsg = &envoy__service__discovery__v3__ResourceName_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_Resource__fields[8] = {
+  {1, UPB_SIZE(28, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 72), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 80), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = {
+  &envoy_service_discovery_v3_Resource_submsgs[0],
+  &envoy_service_discovery_v3_Resource__fields[0],
+  UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_pss_1bt},
+    {0x003000003f000022, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0038000002010032, &upb_psm_1bt_maxmaxb},
+    {0x004000000302003a, &upb_psm_1bt_max64b},
+    {0x0048000004030042, &upb_psm_1bt_max64b},
+    {0x005000000504004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_service_discovery_v3_Resource_CacheControl__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_init = {
+  NULL,
+  &envoy_service_discovery_v3_Resource_CacheControl__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[14] = {
+  &envoy__service__discovery__v3__ResourceLocator_msg_init,
+  &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init,
+  &envoy__service__discovery__v3__ResourceName_msg_init,
+  &envoy__service__discovery__v3__DiscoveryRequest_msg_init,
+  &envoy__service__discovery__v3__DiscoveryResponse_msg_init,
+  &envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init,
+  &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init,
+  &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init,
+  &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init,
+  &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init,
+  &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init,
+  &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init,
+  &envoy__service__discovery__v3__Resource_msg_init,
+  &envoy__service__discovery__v3__Resource__CacheControl_msg_init,
+};
+
+const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  14,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
new file mode 100644
index 0000000000000..225a402041a8c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
@@ -0,0 +1,43 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/discovery/v3/discovery.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_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__service__discovery__v3__ResourceLocator_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init;
+extern const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_init;
+
+extern const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
similarity index 91%
rename from src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h
rename to src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
index bcc33d6eda5c7..b005cd2ed3148 100644
--- a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/load_stats/v3/lrs.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/service/load_stats/v3/lrs.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/endpoint/v3/load_report.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,26 +27,21 @@ extern "C" {
 
 typedef struct envoy_service_load_stats_v3_LoadStatsRequest envoy_service_load_stats_v3_LoadStatsRequest;
 typedef struct envoy_service_load_stats_v3_LoadStatsResponse envoy_service_load_stats_v3_LoadStatsResponse;
-extern const upb_MiniTable envoy_service_load_stats_v3_LoadStatsRequest_msg_init;
-extern const upb_MiniTable envoy_service_load_stats_v3_LoadStatsResponse_msg_init;
 struct envoy_config_core_v3_Node;
 struct envoy_config_endpoint_v3_ClusterStats;
 struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterStats_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* envoy.service.load_stats.v3.LoadStatsRequest */
 
 UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest* envoy_service_load_stats_v3_LoadStatsRequest_new(upb_Arena* arena) {
-  return (envoy_service_load_stats_v3_LoadStatsRequest*)_upb_Message_New(&envoy_service_load_stats_v3_LoadStatsRequest_msg_init, arena);
+  return (envoy_service_load_stats_v3_LoadStatsRequest*)_upb_Message_New(&envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, arena);
 }
 UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest* envoy_service_load_stats_v3_LoadStatsRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_load_stats_v3_LoadStatsRequest* ret = envoy_service_load_stats_v3_LoadStatsRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +51,7 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest* envoy_service_load_stat
                            int options, upb_Arena* arena) {
   envoy_service_load_stats_v3_LoadStatsRequest* ret = envoy_service_load_stats_v3_LoadStatsRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +59,13 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest* envoy_service_load_stat
 }
 UPB_INLINE char* envoy_service_load_stats_v3_LoadStatsRequest_serialize(const envoy_service_load_stats_v3_LoadStatsRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_load_stats_v3_LoadStatsRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_load_stats_v3_LoadStatsRequest_serialize_ex(const envoy_service_load_stats_v3_LoadStatsRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_load_stats_v3_LoadStatsRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_load_stats_v3_LoadStatsRequest_clear_node(envoy_service_load_stats_v3_LoadStatsRequest* msg) {
@@ -125,7 +128,7 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsRequest_set_node(envoy_serv
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(envoy_service_load_stats_v3_LoadStatsRequest* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_load_stats_v3_LoadStatsRequest_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_service_load_stats_v3_LoadStatsRequest_set_node(msg, sub);
   }
   return sub;
@@ -151,7 +154,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats* envoy_service_load_stat
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_config_endpoint_v3_ClusterStats* sub = (struct envoy_config_endpoint_v3_ClusterStats*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterStats_msg_init, arena);
+  struct envoy_config_endpoint_v3_ClusterStats* sub = (struct envoy_config_endpoint_v3_ClusterStats*)_upb_Message_New(&envoy__config__endpoint__v3__ClusterStats_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -160,12 +163,12 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats* envoy_service_load_stat
 /* envoy.service.load_stats.v3.LoadStatsResponse */
 
 UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse* envoy_service_load_stats_v3_LoadStatsResponse_new(upb_Arena* arena) {
-  return (envoy_service_load_stats_v3_LoadStatsResponse*)_upb_Message_New(&envoy_service_load_stats_v3_LoadStatsResponse_msg_init, arena);
+  return (envoy_service_load_stats_v3_LoadStatsResponse*)_upb_Message_New(&envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, arena);
 }
 UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse* envoy_service_load_stats_v3_LoadStatsResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_load_stats_v3_LoadStatsResponse* ret = envoy_service_load_stats_v3_LoadStatsResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -175,7 +178,7 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse* envoy_service_load_sta
                            int options, upb_Arena* arena) {
   envoy_service_load_stats_v3_LoadStatsResponse* ret = envoy_service_load_stats_v3_LoadStatsResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -183,13 +186,13 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse* envoy_service_load_sta
 }
 UPB_INLINE char* envoy_service_load_stats_v3_LoadStatsResponse_serialize(const envoy_service_load_stats_v3_LoadStatsResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_load_stats_v3_LoadStatsResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_load_stats_v3_LoadStatsResponse_serialize_ex(const envoy_service_load_stats_v3_LoadStatsResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_load_stats_v3_LoadStatsResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_clear_clusters(envoy_service_load_stats_v3_LoadStatsResponse* msg) {
@@ -298,7 +301,7 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_load_reporting
 UPB_INLINE struct google_protobuf_Duration* envoy_service_load_stats_v3_LoadStatsResponse_mutable_load_reporting_interval(envoy_service_load_stats_v3_LoadStatsResponse* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_load_stats_v3_LoadStatsResponse_load_reporting_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_service_load_stats_v3_LoadStatsResponse_set_load_reporting_interval(msg, sub);
   }
   return sub;
@@ -312,8 +315,6 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_send_all_clust
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
new file mode 100644
index 0000000000000..a9d8ff9c45d8a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
@@ -0,0 +1,84 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/load_stats/v3/lrs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/service/load_stats/v3/lrs.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/endpoint/v3/load_report.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = {
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterStats_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsRequest__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = {
+  &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0],
+  &envoy_service_load_stats_v3_LoadStatsRequest__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsResponse__fields[4] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(13, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init = {
+  &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0],
+  &envoy_service_load_stats_v3_LoadStatsResponse__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prs_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+    {0x000200003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init,
+  &envoy__service__load_0stats__v3__LoadStatsResponse_msg_init,
+};
+
+const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
new file mode 100644
index 0000000000000..b5248c8ae8318
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/load_stats/v3/lrs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_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__service__load_0stats__v3__LoadStatsRequest_msg_init;
+extern const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init;
+
+extern const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h
rename to src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
index d4160ced2c0ff..eee684215d7fb 100644
--- a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/status/v3/csds.proto
  *
@@ -10,7 +9,20 @@
 #define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/service/status/v3/csds.upb_minitable.h"
+
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/matcher/v3/node.upb_minitable.h"
+#include "google/api/annotations.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -22,11 +34,6 @@ typedef struct envoy_service_status_v3_PerXdsConfig envoy_service_status_v3_PerX
 typedef struct envoy_service_status_v3_ClientConfig envoy_service_status_v3_ClientConfig;
 typedef struct envoy_service_status_v3_ClientConfig_GenericXdsConfig envoy_service_status_v3_ClientConfig_GenericXdsConfig;
 typedef struct envoy_service_status_v3_ClientStatusResponse envoy_service_status_v3_ClientStatusResponse;
-extern const upb_MiniTable envoy_service_status_v3_ClientStatusRequest_msg_init;
-extern const upb_MiniTable envoy_service_status_v3_PerXdsConfig_msg_init;
-extern const upb_MiniTable envoy_service_status_v3_ClientConfig_msg_init;
-extern const upb_MiniTable envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init;
-extern const upb_MiniTable envoy_service_status_v3_ClientStatusResponse_msg_init;
 struct envoy_admin_v3_ClustersConfigDump;
 struct envoy_admin_v3_EndpointsConfigDump;
 struct envoy_admin_v3_ListenersConfigDump;
@@ -37,16 +44,6 @@ struct envoy_config_core_v3_Node;
 struct envoy_type_matcher_v3_NodeMatcher;
 struct google_protobuf_Any;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable envoy_admin_v3_ClustersConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenersConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_RoutesConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_NodeMatcher_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 typedef enum {
   envoy_service_status_v3_CLIENT_UNKNOWN = 0,
@@ -68,12 +65,12 @@ typedef enum {
 /* envoy.service.status.v3.ClientStatusRequest */
 
 UPB_INLINE envoy_service_status_v3_ClientStatusRequest* envoy_service_status_v3_ClientStatusRequest_new(upb_Arena* arena) {
-  return (envoy_service_status_v3_ClientStatusRequest*)_upb_Message_New(&envoy_service_status_v3_ClientStatusRequest_msg_init, arena);
+  return (envoy_service_status_v3_ClientStatusRequest*)_upb_Message_New(&envoy__service__status__v3__ClientStatusRequest_msg_init, arena);
 }
 UPB_INLINE envoy_service_status_v3_ClientStatusRequest* envoy_service_status_v3_ClientStatusRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_status_v3_ClientStatusRequest* ret = envoy_service_status_v3_ClientStatusRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientStatusRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -83,7 +80,7 @@ UPB_INLINE envoy_service_status_v3_ClientStatusRequest* envoy_service_status_v3_
                            int options, upb_Arena* arena) {
   envoy_service_status_v3_ClientStatusRequest* ret = envoy_service_status_v3_ClientStatusRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientStatusRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -91,13 +88,13 @@ UPB_INLINE envoy_service_status_v3_ClientStatusRequest* envoy_service_status_v3_
 }
 UPB_INLINE char* envoy_service_status_v3_ClientStatusRequest_serialize(const envoy_service_status_v3_ClientStatusRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientStatusRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientStatusRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_status_v3_ClientStatusRequest_serialize_ex(const envoy_service_status_v3_ClientStatusRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientStatusRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientStatusRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_clear_node_matchers(envoy_service_status_v3_ClientStatusRequest* msg) {
@@ -185,7 +182,7 @@ UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher* envoy_service_status_v3_Cli
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_matcher_v3_NodeMatcher* sub = (struct envoy_type_matcher_v3_NodeMatcher*)_upb_Message_New(&envoy_type_matcher_v3_NodeMatcher_msg_init, arena);
+  struct envoy_type_matcher_v3_NodeMatcher* sub = (struct envoy_type_matcher_v3_NodeMatcher*)_upb_Message_New(&envoy__type__matcher__v3__NodeMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -197,7 +194,7 @@ UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_node(envoy_servi
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatusRequest_mutable_node(envoy_service_status_v3_ClientStatusRequest* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientStatusRequest_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_service_status_v3_ClientStatusRequest_set_node(msg, sub);
   }
   return sub;
@@ -210,12 +207,12 @@ UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_exclude_resource
 /* envoy.service.status.v3.PerXdsConfig */
 
 UPB_INLINE envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_PerXdsConfig_new(upb_Arena* arena) {
-  return (envoy_service_status_v3_PerXdsConfig*)_upb_Message_New(&envoy_service_status_v3_PerXdsConfig_msg_init, arena);
+  return (envoy_service_status_v3_PerXdsConfig*)_upb_Message_New(&envoy__service__status__v3__PerXdsConfig_msg_init, arena);
 }
 UPB_INLINE envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_PerXdsConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_status_v3_PerXdsConfig* ret = envoy_service_status_v3_PerXdsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__PerXdsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -225,7 +222,7 @@ UPB_INLINE envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_PerXdsC
                            int options, upb_Arena* arena) {
   envoy_service_status_v3_PerXdsConfig* ret = envoy_service_status_v3_PerXdsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__PerXdsConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -233,13 +230,13 @@ UPB_INLINE envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_PerXdsC
 }
 UPB_INLINE char* envoy_service_status_v3_PerXdsConfig_serialize(const envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_PerXdsConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__PerXdsConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_status_v3_PerXdsConfig_serialize_ex(const envoy_service_status_v3_PerXdsConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_PerXdsConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__PerXdsConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -363,7 +360,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_listener_config(envoy_s
 UPB_INLINE struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_listener_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ListenersConfigDump* sub = (struct envoy_admin_v3_ListenersConfigDump*)envoy_service_status_v3_PerXdsConfig_listener_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ListenersConfigDump*)_upb_Message_New(&envoy_admin_v3_ListenersConfigDump_msg_init, arena);
+    sub = (struct envoy_admin_v3_ListenersConfigDump*)_upb_Message_New(&envoy__admin__v3__ListenersConfigDump_msg_init, arena);
     if (sub) envoy_service_status_v3_PerXdsConfig_set_listener_config(msg, sub);
   }
   return sub;
@@ -375,7 +372,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_cluster_config(envoy_se
 UPB_INLINE struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_cluster_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ClustersConfigDump* sub = (struct envoy_admin_v3_ClustersConfigDump*)envoy_service_status_v3_PerXdsConfig_cluster_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ClustersConfigDump*)_upb_Message_New(&envoy_admin_v3_ClustersConfigDump_msg_init, arena);
+    sub = (struct envoy_admin_v3_ClustersConfigDump*)_upb_Message_New(&envoy__admin__v3__ClustersConfigDump_msg_init, arena);
     if (sub) envoy_service_status_v3_PerXdsConfig_set_cluster_config(msg, sub);
   }
   return sub;
@@ -387,7 +384,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_route_config(envoy_serv
 UPB_INLINE struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_route_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_RoutesConfigDump* sub = (struct envoy_admin_v3_RoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_route_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_RoutesConfigDump*)_upb_Message_New(&envoy_admin_v3_RoutesConfigDump_msg_init, arena);
+    sub = (struct envoy_admin_v3_RoutesConfigDump*)_upb_Message_New(&envoy__admin__v3__RoutesConfigDump_msg_init, arena);
     if (sub) envoy_service_status_v3_PerXdsConfig_set_route_config(msg, sub);
   }
   return sub;
@@ -399,7 +396,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(env
 UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_scoped_route_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_ScopedRoutesConfigDump* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_scoped_route_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)_upb_Message_New(&envoy_admin_v3_ScopedRoutesConfigDump_msg_init, arena);
+    sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)_upb_Message_New(&envoy__admin__v3__ScopedRoutesConfigDump_msg_init, arena);
     if (sub) envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(msg, sub);
   }
   return sub;
@@ -411,7 +408,7 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_endpoint_config(envoy_s
 UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_endpoint_config(envoy_service_status_v3_PerXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_EndpointsConfigDump* sub = (struct envoy_admin_v3_EndpointsConfigDump*)envoy_service_status_v3_PerXdsConfig_endpoint_config(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_EndpointsConfigDump*)_upb_Message_New(&envoy_admin_v3_EndpointsConfigDump_msg_init, arena);
+    sub = (struct envoy_admin_v3_EndpointsConfigDump*)_upb_Message_New(&envoy__admin__v3__EndpointsConfigDump_msg_init, arena);
     if (sub) envoy_service_status_v3_PerXdsConfig_set_endpoint_config(msg, sub);
   }
   return sub;
@@ -424,12 +421,12 @@ UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_client_status(envoy_ser
 /* envoy.service.status.v3.ClientConfig */
 
 UPB_INLINE envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientConfig_new(upb_Arena* arena) {
-  return (envoy_service_status_v3_ClientConfig*)_upb_Message_New(&envoy_service_status_v3_ClientConfig_msg_init, arena);
+  return (envoy_service_status_v3_ClientConfig*)_upb_Message_New(&envoy__service__status__v3__ClientConfig_msg_init, arena);
 }
 UPB_INLINE envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_status_v3_ClientConfig* ret = envoy_service_status_v3_ClientConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -439,7 +436,7 @@ UPB_INLINE envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientC
                            int options, upb_Arena* arena) {
   envoy_service_status_v3_ClientConfig* ret = envoy_service_status_v3_ClientConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -447,13 +444,13 @@ UPB_INLINE envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientC
 }
 UPB_INLINE char* envoy_service_status_v3_ClientConfig_serialize(const envoy_service_status_v3_ClientConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_status_v3_ClientConfig_serialize_ex(const envoy_service_status_v3_ClientConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_status_v3_ClientConfig_clear_node(envoy_service_status_v3_ClientConfig* msg) {
@@ -553,7 +550,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_set_node(envoy_service_stat
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientConfig_mutable_node(envoy_service_status_v3_ClientConfig* msg, upb_Arena* arena) {
   struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientConfig_node(msg);
   if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
     if (sub) envoy_service_status_v3_ClientConfig_set_node(msg, sub);
   }
   return sub;
@@ -579,7 +576,7 @@ UPB_INLINE struct envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_status_v3_PerXdsConfig* sub = (struct envoy_service_status_v3_PerXdsConfig*)_upb_Message_New(&envoy_service_status_v3_PerXdsConfig_msg_init, arena);
+  struct envoy_service_status_v3_PerXdsConfig* sub = (struct envoy_service_status_v3_PerXdsConfig*)_upb_Message_New(&envoy__service__status__v3__PerXdsConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -605,7 +602,7 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_s
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* sub = (struct envoy_service_status_v3_ClientConfig_GenericXdsConfig*)_upb_Message_New(&envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, arena);
+  struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* sub = (struct envoy_service_status_v3_ClientConfig_GenericXdsConfig*)_upb_Message_New(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -614,12 +611,12 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_s
 /* envoy.service.status.v3.ClientConfig.GenericXdsConfig */
 
 UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_service_status_v3_ClientConfig_GenericXdsConfig_new(upb_Arena* arena) {
-  return (envoy_service_status_v3_ClientConfig_GenericXdsConfig*)_upb_Message_New(&envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, arena);
+  return (envoy_service_status_v3_ClientConfig_GenericXdsConfig*)_upb_Message_New(&envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, arena);
 }
 UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_service_status_v3_ClientConfig_GenericXdsConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_status_v3_ClientConfig_GenericXdsConfig* ret = envoy_service_status_v3_ClientConfig_GenericXdsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -629,7 +626,7 @@ UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_service_
                            int options, upb_Arena* arena) {
   envoy_service_status_v3_ClientConfig_GenericXdsConfig* ret = envoy_service_status_v3_ClientConfig_GenericXdsConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -637,13 +634,13 @@ UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_service_
 }
 UPB_INLINE char* envoy_service_status_v3_ClientConfig_GenericXdsConfig_serialize(const envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_status_v3_ClientConfig_GenericXdsConfig_serialize_ex(const envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_clear_type_url(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg) {
@@ -777,7 +774,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_xds_co
 UPB_INLINE struct google_protobuf_Any* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_xds_config(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_xds_config(msg, sub);
   }
   return sub;
@@ -789,7 +786,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_u
 UPB_INLINE struct google_protobuf_Timestamp* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_last_updated(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_last_updated(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(msg, sub);
   }
   return sub;
@@ -809,7 +806,7 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_error_state(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) {
   struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_error_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
     if (sub) envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(msg, sub);
   }
   return sub;
@@ -822,12 +819,12 @@ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_is_sta
 /* envoy.service.status.v3.ClientStatusResponse */
 
 UPB_INLINE envoy_service_status_v3_ClientStatusResponse* envoy_service_status_v3_ClientStatusResponse_new(upb_Arena* arena) {
-  return (envoy_service_status_v3_ClientStatusResponse*)_upb_Message_New(&envoy_service_status_v3_ClientStatusResponse_msg_init, arena);
+  return (envoy_service_status_v3_ClientStatusResponse*)_upb_Message_New(&envoy__service__status__v3__ClientStatusResponse_msg_init, arena);
 }
 UPB_INLINE envoy_service_status_v3_ClientStatusResponse* envoy_service_status_v3_ClientStatusResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_service_status_v3_ClientStatusResponse* ret = envoy_service_status_v3_ClientStatusResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientStatusResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -837,7 +834,7 @@ UPB_INLINE envoy_service_status_v3_ClientStatusResponse* envoy_service_status_v3
                            int options, upb_Arena* arena) {
   envoy_service_status_v3_ClientStatusResponse* ret = envoy_service_status_v3_ClientStatusResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__service__status__v3__ClientStatusResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -845,13 +842,13 @@ UPB_INLINE envoy_service_status_v3_ClientStatusResponse* envoy_service_status_v3
 }
 UPB_INLINE char* envoy_service_status_v3_ClientStatusResponse_serialize(const envoy_service_status_v3_ClientStatusResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientStatusResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientStatusResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_service_status_v3_ClientStatusResponse_serialize_ex(const envoy_service_status_v3_ClientStatusResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_service_status_v3_ClientStatusResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__service__status__v3__ClientStatusResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_service_status_v3_ClientStatusResponse_clear_config(envoy_service_status_v3_ClientStatusResponse* msg) {
@@ -913,14 +910,12 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig* envoy_service_status_v3_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_service_status_v3_ClientConfig* sub = (struct envoy_service_status_v3_ClientConfig*)_upb_Message_New(&envoy_service_status_v3_ClientConfig_msg_init, arena);
+  struct envoy_service_status_v3_ClientConfig* sub = (struct envoy_service_status_v3_ClientConfig*)_upb_Message_New(&envoy__service__status__v3__ClientConfig_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
new file mode 100644
index 0000000000000..883c27a0d6861
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
@@ -0,0 +1,183 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/status/v3/csds.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/service/status/v3/csds.upb_minitable.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/matcher/v3/node.upb_minitable.h"
+#include "google/api/annotations.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_service_status_v3_ClientStatusRequest_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__NodeMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_status_v3_ClientStatusRequest__fields[3] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = {
+  &envoy_service_status_v3_ClientStatusRequest_submsgs[0],
+  &envoy_service_status_v3_ClientStatusRequest__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_status_v3_PerXdsConfig_submsgs[5] = {
+  {.submsg = &envoy__admin__v3__ListenersConfigDump_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump_msg_init},
+  {.submsg = &envoy__admin__v3__RoutesConfigDump_msg_init},
+  {.submsg = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init},
+  {.submsg = &envoy__admin__v3__EndpointsConfigDump_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_status_v3_PerXdsConfig__fields[7] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 16), -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 16), -5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = {
+  &envoy_service_status_v3_PerXdsConfig_submsgs[0],
+  &envoy_service_status_v3_PerXdsConfig__fields[0],
+  UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x0010000402000012, &upb_pom_1bt_maxmaxb},
+    {0x001000040301001a, &upb_pom_1bt_maxmaxb},
+    {0x0010000404020022, &upb_pom_1bt_maxmaxb},
+    {0x001000040503002a, &upb_pom_1bt_maxmaxb},
+    {0x0010000406040032, &upb_pom_1bt_maxmaxb},
+    {0x000800003f000038, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_submsgs[3] = {
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &envoy__service__status__v3__PerXdsConfig_msg_init},
+  {.submsg = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_status_v3_ClientConfig__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = {
+  &envoy_service_status_v3_ClientConfig_submsgs[0],
+  &envoy_service_status_v3_ClientConfig__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x001800003f02001a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[9] = {
+  {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(44, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 64), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 72), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 80), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(24, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init = {
+  &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0],
+  &envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0],
+  UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x002000003f000012, &upb_pss_1bt},
+    {0x003000003f00001a, &upb_pss_1bt},
+    {0x0040000001000022, &upb_psm_1bt_maxmaxb},
+    {0x004800000201002a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000030, &upb_psv4_1bt},
+    {0x000800003f000038, &upb_psv4_1bt},
+    {0x0050000003020042, &upb_psm_1bt_maxmaxb},
+    {0x000c00003f000048, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_service_status_v3_ClientStatusResponse_submsgs[1] = {
+  {.submsg = &envoy__service__status__v3__ClientConfig_msg_init},
+};
+
+static const upb_MiniTableField envoy_service_status_v3_ClientStatusResponse__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = {
+  &envoy_service_status_v3_ClientStatusResponse_submsgs[0],
+  &envoy_service_status_v3_ClientStatusResponse__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__service__status__v3__ClientStatusRequest_msg_init,
+  &envoy__service__status__v3__PerXdsConfig_msg_init,
+  &envoy__service__status__v3__ClientConfig_msg_init,
+  &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init,
+  &envoy__service__status__v3__ClientStatusResponse_msg_init,
+};
+
+const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
new file mode 100644
index 0000000000000..0deeb2762d91e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/service/status/v3/csds.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_SERVICE_STATUS_V3_CSDS_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__service__status__v3__ClientStatusRequest_msg_init;
+extern const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init;
+extern const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init;
+extern const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init;
+extern const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init;
+
+extern const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
new file mode 100644
index 0000000000000..fcc84cbfe6376
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
@@ -0,0 +1,131 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/http/v3/cookie.upb_minitable.h"
+
+#include "google/protobuf/duration.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_type_http_v3_Cookie envoy_type_http_v3_Cookie;
+struct google_protobuf_Duration;
+
+
+
+/* envoy.type.http.v3.Cookie */
+
+UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_new(upb_Arena* arena) {
+  return (envoy_type_http_v3_Cookie*)_upb_Message_New(&envoy__type__http__v3__Cookie_msg_init, arena);
+}
+UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_http_v3_Cookie* ret = envoy_type_http_v3_Cookie_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__Cookie_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_http_v3_Cookie* ret = envoy_type_http_v3_Cookie_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__Cookie_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_http_v3_Cookie_serialize(const envoy_type_http_v3_Cookie* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__http__v3__Cookie_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_http_v3_Cookie_serialize_ex(const envoy_type_http_v3_Cookie* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__http__v3__Cookie_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_http_v3_Cookie_clear_name(envoy_type_http_v3_Cookie* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_name(const envoy_type_http_v3_Cookie* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_http_v3_Cookie_clear_ttl(envoy_type_http_v3_Cookie* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Duration* envoy_type_http_v3_Cookie_ttl(const envoy_type_http_v3_Cookie* msg) {
+  const struct google_protobuf_Duration* default_val = NULL;
+  const struct google_protobuf_Duration* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_http_v3_Cookie_has_ttl(const envoy_type_http_v3_Cookie* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_http_v3_Cookie_clear_path(envoy_type_http_v3_Cookie* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_path(const envoy_type_http_v3_Cookie* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_http_v3_Cookie_set_name(envoy_type_http_v3_Cookie *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_http_v3_Cookie_set_ttl(envoy_type_http_v3_Cookie *msg, struct google_protobuf_Duration* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_ttl(envoy_type_http_v3_Cookie* msg, upb_Arena* arena) {
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_http_v3_Cookie_ttl(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
+    if (sub) envoy_type_http_v3_Cookie_set_ttl(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
new file mode 100644
index 0000000000000..cc317ceec474e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/http/v3/cookie.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_http_v3_Cookie_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_http_v3_Cookie__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = {
+  &envoy_type_http_v3_Cookie_submsgs[0],
+  &envoy_type_http_v3_Cookie__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x002000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__http__v3__Cookie_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_http_v3_cookie_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/type/http/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
new file mode 100644
index 0000000000000..6f345ce31a14d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_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__type__http__v3__Cookie_msg_init;
+
+extern const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h
rename to src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
index 09806ae9e5b23..1b22deccae64b 100644
--- a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/http/v3/path_transformation.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/http/v3/path_transformation.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
@@ -21,22 +26,18 @@ typedef struct envoy_type_http_v3_PathTransformation envoy_type_http_v3_PathTran
 typedef struct envoy_type_http_v3_PathTransformation_Operation envoy_type_http_v3_PathTransformation_Operation;
 typedef struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986;
 typedef struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes envoy_type_http_v3_PathTransformation_Operation_MergeSlashes;
-extern const upb_MiniTable envoy_type_http_v3_PathTransformation_msg_init;
-extern const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_msg_init;
-extern const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init;
-extern const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init;
 
 
 
 /* envoy.type.http.v3.PathTransformation */
 
 UPB_INLINE envoy_type_http_v3_PathTransformation* envoy_type_http_v3_PathTransformation_new(upb_Arena* arena) {
-  return (envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_msg_init, arena);
+  return (envoy_type_http_v3_PathTransformation*)_upb_Message_New(&envoy__type__http__v3__PathTransformation_msg_init, arena);
 }
 UPB_INLINE envoy_type_http_v3_PathTransformation* envoy_type_http_v3_PathTransformation_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation* ret = envoy_type_http_v3_PathTransformation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +47,7 @@ UPB_INLINE envoy_type_http_v3_PathTransformation* envoy_type_http_v3_PathTransfo
                            int options, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation* ret = envoy_type_http_v3_PathTransformation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +55,13 @@ UPB_INLINE envoy_type_http_v3_PathTransformation* envoy_type_http_v3_PathTransfo
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_serialize(const envoy_type_http_v3_PathTransformation* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_serialize_ex(const envoy_type_http_v3_PathTransformation* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_http_v3_PathTransformation_clear_operations(envoy_type_http_v3_PathTransformation* msg) {
@@ -122,7 +123,7 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation* envoy_type_ht
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_http_v3_PathTransformation_Operation* sub = (struct envoy_type_http_v3_PathTransformation_Operation*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_msg_init, arena);
+  struct envoy_type_http_v3_PathTransformation_Operation* sub = (struct envoy_type_http_v3_PathTransformation_Operation*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -131,12 +132,12 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation* envoy_type_ht
 /* envoy.type.http.v3.PathTransformation.Operation */
 
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation* envoy_type_http_v3_PathTransformation_Operation_new(upb_Arena* arena) {
-  return (envoy_type_http_v3_PathTransformation_Operation*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_msg_init, arena);
+  return (envoy_type_http_v3_PathTransformation_Operation*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation_msg_init, arena);
 }
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation* envoy_type_http_v3_PathTransformation_Operation_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation* ret = envoy_type_http_v3_PathTransformation_Operation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -146,7 +147,7 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation* envoy_type_http_v3_P
                            int options, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation* ret = envoy_type_http_v3_PathTransformation_Operation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -154,13 +155,13 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation* envoy_type_http_v3_P
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_serialize(const envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_serialize_ex(const envoy_type_http_v3_PathTransformation_Operation* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -210,7 +211,7 @@ UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_normalize_pa
 UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* envoy_type_http_v3_PathTransformation_Operation_mutable_normalize_path_rfc_3986(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) {
   struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* sub = (struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)envoy_type_http_v3_PathTransformation_Operation_normalize_path_rfc_3986(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, arena);
+    sub = (struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, arena);
     if (sub) envoy_type_http_v3_PathTransformation_Operation_set_normalize_path_rfc_3986(msg, sub);
   }
   return sub;
@@ -222,7 +223,7 @@ UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_merge_slashe
 UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_type_http_v3_PathTransformation_Operation_mutable_merge_slashes(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) {
   struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* sub = (struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)envoy_type_http_v3_PathTransformation_Operation_merge_slashes(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, arena);
+    sub = (struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, arena);
     if (sub) envoy_type_http_v3_PathTransformation_Operation_set_merge_slashes(msg, sub);
   }
   return sub;
@@ -231,12 +232,12 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*
 /* envoy.type.http.v3.PathTransformation.Operation.NormalizePathRFC3986 */
 
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_new(upb_Arena* arena) {
-  return (envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, arena);
+  return (envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, arena);
 }
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* ret = envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -246,7 +247,7 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*
                            int options, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* ret = envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -254,13 +255,13 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_serialize(const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_serialize_ex(const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -268,12 +269,12 @@ UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_NormalizePathRF
 /* envoy.type.http.v3.PathTransformation.Operation.MergeSlashes */
 
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_new(upb_Arena* arena) {
-  return (envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)_upb_Message_New(&envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, arena);
+  return (envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)_upb_Message_New(&envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, arena);
 }
 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* ret = envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -283,7 +284,7 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_t
                            int options, upb_Arena* arena) {
   envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* ret = envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -291,19 +292,17 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_t
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_serialize(const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_serialize_ex(const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
 
-extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
new file mode 100644
index 0000000000000..f1aa5786412b8
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
@@ -0,0 +1,86 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/path_transformation.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/http/v3/path_transformation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_submsgs[1] = {
+  {.submsg = &envoy__type__http__v3__PathTransformation__Operation_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_http_v3_PathTransformation__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = {
+  &envoy_type_http_v3_PathTransformation_submsgs[0],
+  &envoy_type_http_v3_PathTransformation__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = {
+  {.submsg = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init},
+  {.submsg = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_http_v3_PathTransformation_Operation__fields[2] = {
+  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init = {
+  &envoy_type_http_v3_PathTransformation_Operation_submsgs[0],
+  &envoy_type_http_v3_PathTransformation_Operation__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000002000012, &upb_pom_1bt_max64b},
+    {0x000800000301001a, &upb_pom_1bt_max64b},
+  })
+};
+
+const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &envoy__type__http__v3__PathTransformation_msg_init,
+  &envoy__type__http__v3__PathTransformation__Operation_msg_init,
+  &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init,
+  &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
new file mode 100644
index 0000000000000..8ff8f254827ce
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/path_transformation.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_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__type__http__v3__PathTransformation_msg_init;
+extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init;
+extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init;
+extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init;
+
+extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
similarity index 87%
rename from src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h
rename to src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
index 4d58928e1e277..c0ca5ff9c27bc 100644
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/filter_state.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/string.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
@@ -18,21 +24,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_matcher_v3_FilterStateMatcher envoy_type_matcher_v3_FilterStateMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_FilterStateMatcher_msg_init;
 struct envoy_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
 
 
 
 /* envoy.type.matcher.v3.FilterStateMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_FilterStateMatcher*)_upb_Message_New(&envoy_type_matcher_v3_FilterStateMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_FilterStateMatcher*)_upb_Message_New(&envoy__type__matcher__v3__FilterStateMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_FilterStateMatcher* ret = envoy_type_matcher_v3_FilterStateMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_FilterStateMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__FilterStateMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_Filte
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_FilterStateMatcher* ret = envoy_type_matcher_v3_FilterStateMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_FilterStateMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__FilterStateMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_Filte
 }
 UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize(const envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_FilterStateMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__FilterStateMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize_ex(const envoy_type_matcher_v3_FilterStateMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_FilterStateMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__FilterStateMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -105,14 +109,12 @@ UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_string_match(envoy_
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_FilterStateMatcher_string_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_FilterStateMatcher_set_string_match(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
new file mode 100644
index 0000000000000..13e5e5998524c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/filter_state.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = {
+  &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0],
+  &envoy_type_matcher_v3_FilterStateMatcher__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__matcher__v3__FilterStateMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_filter_state_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/type/matcher/v3/filter_state.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
new file mode 100644
index 0000000000000..95ded9842f508
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/filter_state.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_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__type__matcher__v3__FilterStateMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
new file mode 100644
index 0000000000000..7674ebe1d94ea
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
@@ -0,0 +1,299 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/http_inputs.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_type_matcher_v3_HttpRequestHeaderMatchInput envoy_type_matcher_v3_HttpRequestHeaderMatchInput;
+typedef struct envoy_type_matcher_v3_HttpRequestTrailerMatchInput envoy_type_matcher_v3_HttpRequestTrailerMatchInput;
+typedef struct envoy_type_matcher_v3_HttpResponseHeaderMatchInput envoy_type_matcher_v3_HttpResponseHeaderMatchInput;
+typedef struct envoy_type_matcher_v3_HttpResponseTrailerMatchInput envoy_type_matcher_v3_HttpResponseTrailerMatchInput;
+typedef struct envoy_type_matcher_v3_HttpRequestQueryParamMatchInput envoy_type_matcher_v3_HttpRequestQueryParamMatchInput;
+
+
+
+/* envoy.type.matcher.v3.HttpRequestHeaderMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpRequestHeaderMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestHeaderMatchInput* ret = envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestHeaderMatchInput* ret = envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_clear_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestHeaderMatchInput_header_name(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.HttpRequestTrailerMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpRequestTrailerMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestTrailerMatchInput* ret = envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestTrailerMatchInput* ret = envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_clear_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestTrailerMatchInput_header_name(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.HttpResponseHeaderMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpResponseHeaderMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseHeaderMatchInput* ret = envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseHeaderMatchInput* ret = envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_clear_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseHeaderMatchInput_header_name(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.HttpResponseTrailerMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpResponseTrailerMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseTrailerMatchInput* ret = envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseTrailerMatchInput* ret = envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_clear_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseTrailerMatchInput_header_name(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.HttpRequestQueryParamMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpRequestQueryParamMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* ret = envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* ret = envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_clear_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_query_param(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
new file mode 100644
index 0000000000000..3edc656507140
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c
@@ -0,0 +1,105 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/http_inputs.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init,
+  &envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init,
+  &envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init,
+  &envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init,
+  &envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
new file mode 100644
index 0000000000000..8df39ff34fe35
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_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__type__matcher__v3__HttpRequestHeaderMatchInput_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
new file mode 100644
index 0000000000000..f6a48143c2845
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
@@ -0,0 +1,260 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_type_matcher_v3_MetadataMatcher envoy_type_matcher_v3_MetadataMatcher;
+typedef struct envoy_type_matcher_v3_MetadataMatcher_PathSegment envoy_type_matcher_v3_MetadataMatcher_PathSegment;
+struct envoy_type_matcher_v3_ValueMatcher;
+
+
+
+/* envoy.type.matcher.v3.MetadataMatcher */
+
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_MetadataMatcher* ret = envoy_type_matcher_v3_MetadataMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__MetadataMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_MetadataMatcher* ret = envoy_type_matcher_v3_MetadataMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__MetadataMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_serialize(const envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__MetadataMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_serialize_ex(const envoy_type_matcher_v3_MetadataMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__MetadataMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_filter(envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_MetadataMatcher_filter(const envoy_type_matcher_v3_MetadataMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_path(envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const* envoy_type_matcher_v3_MetadataMatcher_path(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_upb_array(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_mutable_upb_array(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_has_path(const envoy_type_matcher_v3_MetadataMatcher* msg) {
+  size_t size;
+  envoy_type_matcher_v3_MetadataMatcher_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_value(envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_value(const envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_ValueMatcher* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_has_value(const envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_invert(envoy_type_matcher_v3_MetadataMatcher* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_invert(const envoy_type_matcher_v3_MetadataMatcher* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_filter(envoy_type_matcher_v3_MetadataMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_mutable_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_type_matcher_v3_MetadataMatcher_PathSegment**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_resize_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_add_path(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* sub = (struct envoy_type_matcher_v3_MetadataMatcher_PathSegment*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_value(envoy_type_matcher_v3_MetadataMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_mutable_value(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_MetadataMatcher_value(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_MetadataMatcher_set_value(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_invert(envoy_type_matcher_v3_MetadataMatcher *msg, bool value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.MetadataMatcher.PathSegment */
+
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_MetadataMatcher_PathSegment* ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_MetadataMatcher_PathSegment* ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_PathSegment_serialize(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_PathSegment_serialize_ex(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_key = 1,
+  envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_NOT_SET = 0
+} envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases;
+UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_case(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_clear_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_MetadataMatcher_PathSegment_key(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_PathSegment_has_key(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
new file mode 100644
index 0000000000000..64d26c2bf9acc
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
@@ -0,0 +1,76 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init},
+  {.submsg = &envoy__type__matcher__v3__ValueMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher__fields[4] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = {
+  &envoy_type_matcher_v3_MetadataMatcher_submsgs[0],
+  &envoy_type_matcher_v3_MetadataMatcher__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__matcher__v3__MetadataMatcher_msg_init,
+  &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
new file mode 100644
index 0000000000000..b2803e332e3de
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_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__type__matcher__v3__MetadataMatcher_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h
rename to src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
index 2b4290013e919..afa5df98b36bf 100644
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/node.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/matcher/v3/node.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/matcher/v3/struct.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,23 +25,20 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_matcher_v3_NodeMatcher envoy_type_matcher_v3_NodeMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_NodeMatcher_msg_init;
 struct envoy_type_matcher_v3_StringMatcher;
 struct envoy_type_matcher_v3_StructMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StructMatcher_msg_init;
 
 
 
 /* envoy.type.matcher.v3.NodeMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_NodeMatcher* envoy_type_matcher_v3_NodeMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_NodeMatcher*)_upb_Message_New(&envoy_type_matcher_v3_NodeMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_NodeMatcher*)_upb_Message_New(&envoy__type__matcher__v3__NodeMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_NodeMatcher* envoy_type_matcher_v3_NodeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_NodeMatcher* ret = envoy_type_matcher_v3_NodeMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__NodeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +48,7 @@ UPB_INLINE envoy_type_matcher_v3_NodeMatcher* envoy_type_matcher_v3_NodeMatcher_
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_NodeMatcher* ret = envoy_type_matcher_v3_NodeMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__NodeMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +56,13 @@ UPB_INLINE envoy_type_matcher_v3_NodeMatcher* envoy_type_matcher_v3_NodeMatcher_
 }
 UPB_INLINE char* envoy_type_matcher_v3_NodeMatcher_serialize(const envoy_type_matcher_v3_NodeMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_NodeMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__NodeMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_NodeMatcher_serialize_ex(const envoy_type_matcher_v3_NodeMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_NodeMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__NodeMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_clear_node_id(envoy_type_matcher_v3_NodeMatcher* msg) {
@@ -121,7 +125,7 @@ UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_set_node_id(envoy_type_matcher
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_NodeMatcher_mutable_node_id(envoy_type_matcher_v3_NodeMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_NodeMatcher_node_id(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_NodeMatcher_set_node_id(msg, sub);
   }
   return sub;
@@ -147,14 +151,12 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_Nod
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct envoy_type_matcher_v3_StructMatcher* sub = (struct envoy_type_matcher_v3_StructMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StructMatcher_msg_init, arena);
+  struct envoy_type_matcher_v3_StructMatcher* sub = (struct envoy_type_matcher_v3_StructMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StructMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
new file mode 100644
index 0000000000000..7aeb8e7941c68
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/node.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/node.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/matcher/v3/struct.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_NodeMatcher_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StructMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_NodeMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = {
+  &envoy_type_matcher_v3_NodeMatcher_submsgs[0],
+  &envoy_type_matcher_v3_NodeMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__matcher__v3__NodeMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_node_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/type/matcher/v3/node.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
new file mode 100644
index 0000000000000..65c8e3cf6fd54
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/node.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_NODE_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__type__matcher__v3__NodeMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
similarity index 87%
rename from src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h
rename to src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
index 8bd83eec381bb..5ee017d2874cd 100644
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/number.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/matcher/v3/number.upb_minitable.h"
+
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_matcher_v3_DoubleMatcher envoy_type_matcher_v3_DoubleMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_DoubleMatcher_msg_init;
 struct envoy_type_v3_DoubleRange;
-extern const upb_MiniTable envoy_type_v3_DoubleRange_msg_init;
 
 
 
 /* envoy.type.matcher.v3.DoubleMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_DoubleMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_DoubleMatcher*)_upb_Message_New(&envoy_type_matcher_v3_DoubleMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_DoubleMatcher*)_upb_Message_New(&envoy__type__matcher__v3__DoubleMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_DoubleMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_DoubleMatcher* ret = envoy_type_matcher_v3_DoubleMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__DoubleMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_DoubleMatc
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_DoubleMatcher* ret = envoy_type_matcher_v3_DoubleMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__DoubleMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_DoubleMatc
 }
 UPB_INLINE char* envoy_type_matcher_v3_DoubleMatcher_serialize(const envoy_type_matcher_v3_DoubleMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_DoubleMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__DoubleMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_DoubleMatcher_serialize_ex(const envoy_type_matcher_v3_DoubleMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_DoubleMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__DoubleMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -106,7 +111,7 @@ UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_range(envoy_type_matcher
 UPB_INLINE struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleMatcher_mutable_range(envoy_type_matcher_v3_DoubleMatcher* msg, upb_Arena* arena) {
   struct envoy_type_v3_DoubleRange* sub = (struct envoy_type_v3_DoubleRange*)envoy_type_matcher_v3_DoubleMatcher_range(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_DoubleRange*)_upb_Message_New(&envoy_type_v3_DoubleRange_msg_init, arena);
+    sub = (struct envoy_type_v3_DoubleRange*)_upb_Message_New(&envoy__type__v3__DoubleRange_msg_init, arena);
     if (sub) envoy_type_matcher_v3_DoubleMatcher_set_range(msg, sub);
   }
   return sub;
@@ -116,8 +121,6 @@ UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_exact(envoy_type_matcher
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
new file mode 100644
index 0000000000000..519736b11fe8e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/number.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/number.upb_minitable.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__v3__DoubleRange_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_DoubleMatcher__fields[2] = {
+  {1, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = {
+  &envoy_type_matcher_v3_DoubleMatcher_submsgs[0],
+  &envoy_type_matcher_v3_DoubleMatcher__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002000011, &upb_pof8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__matcher__v3__DoubleMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_number_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/type/matcher/v3/number.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
new file mode 100644
index 0000000000000..ecc48762e847b
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/number.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_NUMBER_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__type__matcher__v3__DoubleMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
similarity index 83%
rename from src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h
rename to src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
index 249cefe29efe1..b8369ea98e5a2 100644
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/path.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/matcher/v3/path.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +25,19 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_matcher_v3_PathMatcher envoy_type_matcher_v3_PathMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_PathMatcher_msg_init;
 struct envoy_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
 
 
 
 /* envoy.type.matcher.v3.PathMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_PathMatcher* envoy_type_matcher_v3_PathMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy_type_matcher_v3_PathMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy__type__matcher__v3__PathMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_PathMatcher* envoy_type_matcher_v3_PathMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_PathMatcher* ret = envoy_type_matcher_v3_PathMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__PathMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +47,7 @@ UPB_INLINE envoy_type_matcher_v3_PathMatcher* envoy_type_matcher_v3_PathMatcher_
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_PathMatcher* ret = envoy_type_matcher_v3_PathMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__PathMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +55,13 @@ UPB_INLINE envoy_type_matcher_v3_PathMatcher* envoy_type_matcher_v3_PathMatcher_
 }
 UPB_INLINE char* envoy_type_matcher_v3_PathMatcher_serialize(const envoy_type_matcher_v3_PathMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_PathMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__PathMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_PathMatcher_serialize_ex(const envoy_type_matcher_v3_PathMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_PathMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__PathMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -90,14 +95,12 @@ UPB_INLINE void envoy_type_matcher_v3_PathMatcher_set_path(envoy_type_matcher_v3
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_PathMatcher_mutable_path(envoy_type_matcher_v3_PathMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_PathMatcher_path(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_PathMatcher_set_path(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
new file mode 100644
index 0000000000000..d3fac774e3a50
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/path.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/path.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_PathMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_PathMatcher__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = {
+  &envoy_type_matcher_v3_PathMatcher_submsgs[0],
+  &envoy_type_matcher_v3_PathMatcher__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__matcher__v3__PathMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_path_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/type/matcher/v3/path.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
new file mode 100644
index 0000000000000..64280def1303f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/path.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_PATH_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__type__matcher__v3__PathMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
new file mode 100644
index 0000000000000..61a5bf08ee91d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
@@ -0,0 +1,271 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_type_matcher_v3_RegexMatcher envoy_type_matcher_v3_RegexMatcher;
+typedef struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2 envoy_type_matcher_v3_RegexMatcher_GoogleRE2;
+typedef struct envoy_type_matcher_v3_RegexMatchAndSubstitute envoy_type_matcher_v3_RegexMatchAndSubstitute;
+struct google_protobuf_UInt32Value;
+
+
+
+/* envoy.type.matcher.v3.RegexMatcher */
+
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatcher* ret = envoy_type_matcher_v3_RegexMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatcher* ret = envoy_type_matcher_v3_RegexMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_serialize(const envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_serialize_ex(const envoy_type_matcher_v3_RegexMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_matcher_v3_RegexMatcher_engine_type_google_re2 = 1,
+  envoy_type_matcher_v3_RegexMatcher_engine_type_NOT_SET = 0
+} envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases;
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases envoy_type_matcher_v3_RegexMatcher_engine_type_case(const envoy_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_clear_google_re2(envoy_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_google_re2(const envoy_type_matcher_v3_RegexMatcher* msg) {
+  const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL;
+  const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_has_google_re2(const envoy_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_clear_regex(envoy_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatcher_regex(const envoy_type_matcher_v3_RegexMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_google_re2(envoy_type_matcher_v3_RegexMatcher *msg, envoy_type_matcher_v3_RegexMatcher_GoogleRE2* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_mutable_google_re2(envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)envoy_type_matcher_v3_RegexMatcher_google_re2(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_RegexMatcher_set_google_re2(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_regex(envoy_type_matcher_v3_RegexMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.RegexMatcher.GoogleRE2 */
+
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_serialize(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_clear_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
+  const struct google_protobuf_UInt32Value* default_val = NULL;
+  const struct google_protobuf_UInt32Value* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_GoogleRE2_has_max_program_size(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *msg, struct google_protobuf_UInt32Value* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_mutable_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena) {
+  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.type.matcher.v3.RegexMatchAndSubstitute */
+
+UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatchAndSubstitute* ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_RegexMatchAndSubstitute* ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatchAndSubstitute_serialize(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_RegexMatchAndSubstitute_serialize_ex(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_clear_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
+  const envoy_type_matcher_v3_RegexMatcher* default_val = NULL;
+  const envoy_type_matcher_v3_RegexMatcher* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_RegexMatchAndSubstitute_has_pattern(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_clear_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatchAndSubstitute_substitution(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, envoy_type_matcher_v3_RegexMatcher* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_mutable_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
new file mode 100644
index 0000000000000..9d81dc33d73e9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
@@ -0,0 +1,96 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = {
+  &envoy_type_matcher_v3_RegexMatcher_submsgs[0],
+  &envoy_type_matcher_v3_RegexMatcher__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pom_1bt_max64b},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = {
+  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0],
+  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__RegexMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = {
+  &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0],
+  &envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__type__matcher__v3__RegexMatcher_msg_init,
+  &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init,
+  &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
new file mode 100644
index 0000000000000..70cb6c6c74ec7
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_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__type__matcher__v3__RegexMatcher_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
new file mode 100644
index 0000000000000..b269d2293d864
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
@@ -0,0 +1,109 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/status_code_input.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/status_code_input.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput;
+typedef struct envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput;
+
+
+
+/* envoy.type.matcher.v3.HttpResponseStatusCodeMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.type.matcher.v3.HttpResponseStatusCodeClassMatchInput */
+
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput*)_upb_Message_New(&envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
new file mode 100644
index 0000000000000..0d8e4c40dc46f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c
@@ -0,0 +1,43 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/status_code_input.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/status_code_input.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init,
+  &envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
new file mode 100644
index 0000000000000..a6bf81448f182
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/status_code_input.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_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__type__matcher__v3__HttpResponseStatusCodeMatchInput_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
new file mode 100644
index 0000000000000..512aebe5b2b26
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
@@ -0,0 +1,306 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_type_matcher_v3_StringMatcher envoy_type_matcher_v3_StringMatcher;
+typedef struct envoy_type_matcher_v3_ListStringMatcher envoy_type_matcher_v3_ListStringMatcher;
+struct envoy_type_matcher_v3_RegexMatcher;
+
+
+
+/* envoy.type.matcher.v3.StringMatcher */
+
+UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_StringMatcher* ret = envoy_type_matcher_v3_StringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_StringMatcher* ret = envoy_type_matcher_v3_StringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StringMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StringMatcher_serialize(const envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StringMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StringMatcher_serialize_ex(const envoy_type_matcher_v3_StringMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StringMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_matcher_v3_StringMatcher_match_pattern_exact = 1,
+  envoy_type_matcher_v3_StringMatcher_match_pattern_prefix = 2,
+  envoy_type_matcher_v3_StringMatcher_match_pattern_suffix = 3,
+  envoy_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5,
+  envoy_type_matcher_v3_StringMatcher_match_pattern_contains = 7,
+  envoy_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0
+} envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases;
+UPB_INLINE envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases envoy_type_matcher_v3_StringMatcher_match_pattern_case(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_exact(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_exact(const envoy_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_exact(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_prefix(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_prefix(const envoy_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_prefix(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_suffix(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_suffix(const envoy_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_suffix(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_safe_regex(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_safe_regex(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const struct envoy_type_matcher_v3_RegexMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_RegexMatcher* ret;
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_safe_regex(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_ignore_case(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_ignore_case(const envoy_type_matcher_v3_StringMatcher* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_contains(envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_contains(const envoy_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_contains(const envoy_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_exact(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_prefix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_suffix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_safe_regex(envoy_type_matcher_v3_StringMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_mutable_safe_regex(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_StringMatcher_safe_regex(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy__type__matcher__v3__RegexMatcher_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_StringMatcher_set_safe_regex(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_ignore_case(envoy_type_matcher_v3_StringMatcher *msg, bool value) {
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_contains(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.matcher.v3.ListStringMatcher */
+
+UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ListStringMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_ListStringMatcher* ret = envoy_type_matcher_v3_ListStringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ListStringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_ListStringMatcher* ret = envoy_type_matcher_v3_ListStringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ListStringMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_ListStringMatcher_serialize(const envoy_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ListStringMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_ListStringMatcher_serialize_ex(const envoy_type_matcher_v3_ListStringMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ListStringMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_ListStringMatcher_clear_patterns(envoy_type_matcher_v3_ListStringMatcher* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_matcher_v3_StringMatcher* const* envoy_type_matcher_v3_ListStringMatcher_patterns(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_upb_array(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_type_matcher_v3_ListStringMatcher_has_patterns(const envoy_type_matcher_v3_ListStringMatcher* msg) {
+  size_t size;
+  envoy_type_matcher_v3_ListStringMatcher_patterns(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStringMatcher_mutable_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStringMatcher_resize_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ListStringMatcher_add_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
new file mode 100644
index 0000000000000..6570c1e242a04
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
@@ -0,0 +1,81 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__RegexMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[6] = {
+  {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = {
+  &envoy_type_matcher_v3_StringMatcher_submsgs[0],
+  &envoy_type_matcher_v3_StringMatcher__fields[0],
+  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040100000a, &upb_pos_1bt},
+    {0x0008000402000012, &upb_pos_1bt},
+    {0x000800040300001a, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040500002a, &upb_pom_1bt_maxmaxb},
+    {0x000000003f000030, &upb_psb1_1bt},
+    {0x000800040700003a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_ListStringMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = {
+  &envoy_type_matcher_v3_ListStringMatcher_submsgs[0],
+  &envoy_type_matcher_v3_ListStringMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__matcher__v3__StringMatcher_msg_init,
+  &envoy__type__matcher__v3__ListStringMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
new file mode 100644
index 0000000000000..961f4c6c26c15
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_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__type__matcher__v3__StringMatcher_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
new file mode 100644
index 0000000000000..011484425f11a
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
@@ -0,0 +1,230 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/matcher/v3/struct.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_type_matcher_v3_StructMatcher envoy_type_matcher_v3_StructMatcher;
+typedef struct envoy_type_matcher_v3_StructMatcher_PathSegment envoy_type_matcher_v3_StructMatcher_PathSegment;
+struct envoy_type_matcher_v3_ValueMatcher;
+
+
+
+/* envoy.type.matcher.v3.StructMatcher */
+
+UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_StructMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StructMatcher_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_StructMatcher* ret = envoy_type_matcher_v3_StructMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StructMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_StructMatcher* ret = envoy_type_matcher_v3_StructMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StructMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_serialize(const envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StructMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_serialize_ex(const envoy_type_matcher_v3_StructMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StructMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_matcher_v3_StructMatcher_clear_path(envoy_type_matcher_v3_StructMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_matcher_v3_StructMatcher_PathSegment* const* envoy_type_matcher_v3_StructMatcher_path(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_type_matcher_v3_StructMatcher_PathSegment* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_type_matcher_v3_StructMatcher_path_upb_array(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_type_matcher_v3_StructMatcher_path_mutable_upb_array(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_path(const envoy_type_matcher_v3_StructMatcher* msg) {
+  size_t size;
+  envoy_type_matcher_v3_StructMatcher_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void envoy_type_matcher_v3_StructMatcher_clear_value(envoy_type_matcher_v3_StructMatcher* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_value(const envoy_type_matcher_v3_StructMatcher* msg) {
+  const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL;
+  const struct envoy_type_matcher_v3_ValueMatcher* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_value(const envoy_type_matcher_v3_StructMatcher* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_mutable_path(envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_type_matcher_v3_StructMatcher_PathSegment**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_resize_path(envoy_type_matcher_v3_StructMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_StructMatcher_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_add_path(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_type_matcher_v3_StructMatcher_PathSegment* sub = (struct envoy_type_matcher_v3_StructMatcher_PathSegment*)_upb_Message_New(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void envoy_type_matcher_v3_StructMatcher_set_value(envoy_type_matcher_v3_StructMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_mutable_value(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) {
+  struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_StructMatcher_value(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher_msg_init, arena);
+    if (sub) envoy_type_matcher_v3_StructMatcher_set_value(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.type.matcher.v3.StructMatcher.PathSegment */
+
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_new(upb_Arena* arena) {
+  return (envoy_type_matcher_v3_StructMatcher_PathSegment*)_upb_Message_New(&envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, arena);
+}
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_matcher_v3_StructMatcher_PathSegment* ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_matcher_v3_StructMatcher_PathSegment* ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_PathSegment_serialize(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_PathSegment_serialize_ex(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_matcher_v3_StructMatcher_PathSegment_segment_key = 1,
+  envoy_type_matcher_v3_StructMatcher_PathSegment_segment_NOT_SET = 0
+} envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases;
+UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases envoy_type_matcher_v3_StructMatcher_PathSegment_segment_case(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_clear_key(envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_matcher_v3_StructMatcher_PathSegment_key(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_PathSegment_has_key(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
new file mode 100644
index 0000000000000..8cc769bb04462
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
@@ -0,0 +1,70 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/struct.upb_minitable.h"
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_StructMatcher_submsgs[2] = {
+  {.submsg = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init},
+  {.submsg = &envoy__type__matcher__v3__ValueMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher__fields[2] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = {
+  &envoy_type_matcher_v3_StructMatcher_submsgs[0],
+  &envoy_type_matcher_v3_StructMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x001000000101001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher_PathSegment__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init = {
+  NULL,
+  &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__matcher__v3__StructMatcher_msg_init,
+  &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
new file mode 100644
index 0000000000000..fdc1e736f6aa9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_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__type__matcher__v3__StructMatcher_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h
rename to src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
index 88564e9d55905..823d306423df9 100644
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/value.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+
+#include "envoy/type/matcher/v3/number.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,25 +28,20 @@ extern "C" {
 typedef struct envoy_type_matcher_v3_ValueMatcher envoy_type_matcher_v3_ValueMatcher;
 typedef struct envoy_type_matcher_v3_ValueMatcher_NullMatch envoy_type_matcher_v3_ValueMatcher_NullMatch;
 typedef struct envoy_type_matcher_v3_ListMatcher envoy_type_matcher_v3_ListMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_ListMatcher_msg_init;
 struct envoy_type_matcher_v3_DoubleMatcher;
 struct envoy_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_DoubleMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
 
 
 
 /* envoy.type.matcher.v3.ValueMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ValueMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ValueMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_ValueMatcher* ret = envoy_type_matcher_v3_ValueMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ValueMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +51,7 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ValueMatche
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_ValueMatcher* ret = envoy_type_matcher_v3_ValueMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ValueMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +59,13 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ValueMatche
 }
 UPB_INLINE char* envoy_type_matcher_v3_ValueMatcher_serialize(const envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ValueMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ValueMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_ValueMatcher_serialize_ex(const envoy_type_matcher_v3_ValueMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ValueMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ValueMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -176,7 +179,7 @@ UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_null_match(envoy_type_mat
 UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_ValueMatcher_mutable_null_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_ValueMatcher_NullMatch* sub = (struct envoy_type_matcher_v3_ValueMatcher_NullMatch*)envoy_type_matcher_v3_ValueMatcher_null_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ValueMatcher_NullMatch*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_ValueMatcher_NullMatch*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, arena);
     if (sub) envoy_type_matcher_v3_ValueMatcher_set_null_match(msg, sub);
   }
   return sub;
@@ -188,7 +191,7 @@ UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_double_match(envoy_type_m
 UPB_INLINE struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_double_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_DoubleMatcher* sub = (struct envoy_type_matcher_v3_DoubleMatcher*)envoy_type_matcher_v3_ValueMatcher_double_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_DoubleMatcher*)_upb_Message_New(&envoy_type_matcher_v3_DoubleMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_DoubleMatcher*)_upb_Message_New(&envoy__type__matcher__v3__DoubleMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_ValueMatcher_set_double_match(msg, sub);
   }
   return sub;
@@ -200,7 +203,7 @@ UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_string_match(envoy_type_m
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_string_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_ValueMatcher_string_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_ValueMatcher_set_string_match(msg, sub);
   }
   return sub;
@@ -220,7 +223,7 @@ UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_list_match(envoy_type_mat
 UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_list_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_ListMatcher* sub = (struct envoy_type_matcher_v3_ListMatcher*)envoy_type_matcher_v3_ValueMatcher_list_match(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ListMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ListMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_ListMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ListMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_ValueMatcher_set_list_match(msg, sub);
   }
   return sub;
@@ -229,12 +232,12 @@ UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_Value
 /* envoy.type.matcher.v3.ValueMatcher.NullMatch */
 
 UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_ValueMatcher_NullMatch_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_ValueMatcher_NullMatch*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, arena);
+  return (envoy_type_matcher_v3_ValueMatcher_NullMatch*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_ValueMatcher_NullMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_ValueMatcher_NullMatch* ret = envoy_type_matcher_v3_ValueMatcher_NullMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -244,7 +247,7 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_V
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_ValueMatcher_NullMatch* ret = envoy_type_matcher_v3_ValueMatcher_NullMatch_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -252,13 +255,13 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_V
 }
 UPB_INLINE char* envoy_type_matcher_v3_ValueMatcher_NullMatch_serialize(const envoy_type_matcher_v3_ValueMatcher_NullMatch* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_ValueMatcher_NullMatch_serialize_ex(const envoy_type_matcher_v3_ValueMatcher_NullMatch* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -266,12 +269,12 @@ UPB_INLINE char* envoy_type_matcher_v3_ValueMatcher_NullMatch_serialize_ex(const
 /* envoy.type.matcher.v3.ListMatcher */
 
 UPB_INLINE envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ListMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_ListMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ListMatcher_msg_init, arena);
+  return (envoy_type_matcher_v3_ListMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ListMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ListMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_matcher_v3_ListMatcher* ret = envoy_type_matcher_v3_ListMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ListMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -281,7 +284,7 @@ UPB_INLINE envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ListMatcher_
                            int options, upb_Arena* arena) {
   envoy_type_matcher_v3_ListMatcher* ret = envoy_type_matcher_v3_ListMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__matcher__v3__ListMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -289,13 +292,13 @@ UPB_INLINE envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ListMatcher_
 }
 UPB_INLINE char* envoy_type_matcher_v3_ListMatcher_serialize(const envoy_type_matcher_v3_ListMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ListMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ListMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_matcher_v3_ListMatcher_serialize_ex(const envoy_type_matcher_v3_ListMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ListMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__matcher__v3__ListMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -329,14 +332,12 @@ UPB_INLINE void envoy_type_matcher_v3_ListMatcher_set_one_of(envoy_type_matcher_
 UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ListMatcher_mutable_one_of(envoy_type_matcher_v3_ListMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_ListMatcher_one_of(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy__type__matcher__v3__ValueMatcher_msg_init, arena);
     if (sub) envoy_type_matcher_v3_ListMatcher_set_one_of(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
new file mode 100644
index 0000000000000..a2739979896c9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
@@ -0,0 +1,92 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/value.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
+#include "envoy/type/matcher/v3/number.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_matcher_v3_ValueMatcher_submsgs[4] = {
+  {.submsg = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init},
+  {.submsg = &envoy__type__matcher__v3__DoubleMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__type__matcher__v3__ListMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_ValueMatcher__fields[6] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = {
+  &envoy_type_matcher_v3_ValueMatcher_submsgs[0],
+  &envoy_type_matcher_v3_ValueMatcher__fields[0],
+  UPB_SIZE(8, 16), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x000800000302001a, &upb_pom_1bt_maxmaxb},
+    {0x0008000004000020, &upb_pob1_1bt},
+    {0x0008000005000028, &upb_pob1_1bt},
+    {0x0008000006030032, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub envoy_type_matcher_v3_ListMatcher_submsgs[1] = {
+  {.submsg = &envoy__type__matcher__v3__ValueMatcher_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_matcher_v3_ListMatcher__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = {
+  &envoy_type_matcher_v3_ListMatcher_submsgs[0],
+  &envoy_type_matcher_v3_ListMatcher__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__type__matcher__v3__ValueMatcher_msg_init,
+  &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init,
+  &envoy__type__matcher__v3__ListMatcher_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
new file mode 100644
index 0000000000000..f953406ca1eb6
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/value.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_VALUE_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__type__matcher__v3__ValueMatcher_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init;
+extern const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init;
+
+extern const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
new file mode 100644
index 0000000000000..76161e933baa0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
@@ -0,0 +1,525 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/metadata/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.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_type_metadata_v3_MetadataKey envoy_type_metadata_v3_MetadataKey;
+typedef struct envoy_type_metadata_v3_MetadataKey_PathSegment envoy_type_metadata_v3_MetadataKey_PathSegment;
+typedef struct envoy_type_metadata_v3_MetadataKind envoy_type_metadata_v3_MetadataKind;
+typedef struct envoy_type_metadata_v3_MetadataKind_Request envoy_type_metadata_v3_MetadataKind_Request;
+typedef struct envoy_type_metadata_v3_MetadataKind_Route envoy_type_metadata_v3_MetadataKind_Route;
+typedef struct envoy_type_metadata_v3_MetadataKind_Cluster envoy_type_metadata_v3_MetadataKind_Cluster;
+typedef struct envoy_type_metadata_v3_MetadataKind_Host envoy_type_metadata_v3_MetadataKind_Host;
+
+
+
+/* envoy.type.metadata.v3.MetadataKey */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKey* ret = envoy_type_metadata_v3_MetadataKey_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKey_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKey* ret = envoy_type_metadata_v3_MetadataKey_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKey_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_serialize(const envoy_type_metadata_v3_MetadataKey* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKey_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_serialize_ex(const envoy_type_metadata_v3_MetadataKey* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKey_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKey_clear_key(envoy_type_metadata_v3_MetadataKey* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_metadata_v3_MetadataKey_key(const envoy_type_metadata_v3_MetadataKey* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKey_clear_path(envoy_type_metadata_v3_MetadataKey* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_metadata_v3_MetadataKey_PathSegment* const* envoy_type_metadata_v3_MetadataKey_path(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const envoy_type_metadata_v3_MetadataKey_PathSegment* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _envoy_type_metadata_v3_MetadataKey_path_upb_array(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _envoy_type_metadata_v3_MetadataKey_path_mutable_upb_array(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_has_path(const envoy_type_metadata_v3_MetadataKey* msg) {
+  size_t size;
+  envoy_type_metadata_v3_MetadataKey_path(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void envoy_type_metadata_v3_MetadataKey_set_key(envoy_type_metadata_v3_MetadataKey *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_mutable_path(envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (envoy_type_metadata_v3_MetadataKey_PathSegment**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_resize_path(envoy_type_metadata_v3_MetadataKey* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_metadata_v3_MetadataKey_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_add_path(envoy_type_metadata_v3_MetadataKey* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct envoy_type_metadata_v3_MetadataKey_PathSegment* sub = (struct envoy_type_metadata_v3_MetadataKey_PathSegment*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* envoy.type.metadata.v3.MetadataKey.PathSegment */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKey_PathSegment*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKey_PathSegment* ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKey_PathSegment* ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_PathSegment_serialize(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_PathSegment_serialize_ex(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_metadata_v3_MetadataKey_PathSegment_segment_key = 1,
+  envoy_type_metadata_v3_MetadataKey_PathSegment_segment_NOT_SET = 0
+} envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases;
+UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases envoy_type_metadata_v3_MetadataKey_PathSegment_segment_case(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_clear_key(envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView envoy_type_metadata_v3_MetadataKey_PathSegment_key(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_PathSegment_has_key(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_set_key(envoy_type_metadata_v3_MetadataKey_PathSegment *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.metadata.v3.MetadataKind */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKind*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind* ret = envoy_type_metadata_v3_MetadataKind_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind* ret = envoy_type_metadata_v3_MetadataKind_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_serialize(const envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_serialize_ex(const envoy_type_metadata_v3_MetadataKind* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  envoy_type_metadata_v3_MetadataKind_kind_request = 1,
+  envoy_type_metadata_v3_MetadataKind_kind_route = 2,
+  envoy_type_metadata_v3_MetadataKind_kind_cluster = 3,
+  envoy_type_metadata_v3_MetadataKind_kind_host = 4,
+  envoy_type_metadata_v3_MetadataKind_kind_NOT_SET = 0
+} envoy_type_metadata_v3_MetadataKind_kind_oneofcases;
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_kind_oneofcases envoy_type_metadata_v3_MetadataKind_kind_case(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (envoy_type_metadata_v3_MetadataKind_kind_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_request(envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_request(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const envoy_type_metadata_v3_MetadataKind_Request* default_val = NULL;
+  const envoy_type_metadata_v3_MetadataKind_Request* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_request(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_route(envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_route(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const envoy_type_metadata_v3_MetadataKind_Route* default_val = NULL;
+  const envoy_type_metadata_v3_MetadataKind_Route* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_route(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_cluster(envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_cluster(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const envoy_type_metadata_v3_MetadataKind_Cluster* default_val = NULL;
+  const envoy_type_metadata_v3_MetadataKind_Cluster* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_cluster(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_host(envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_host(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const envoy_type_metadata_v3_MetadataKind_Host* default_val = NULL;
+  const envoy_type_metadata_v3_MetadataKind_Host* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_host(const envoy_type_metadata_v3_MetadataKind* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_request(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Request* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_mutable_request(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
+  struct envoy_type_metadata_v3_MetadataKind_Request* sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)envoy_type_metadata_v3_MetadataKind_request(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Request_msg_init, arena);
+    if (sub) envoy_type_metadata_v3_MetadataKind_set_request(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_route(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Route* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_mutable_route(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
+  struct envoy_type_metadata_v3_MetadataKind_Route* sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)envoy_type_metadata_v3_MetadataKind_route(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Route_msg_init, arena);
+    if (sub) envoy_type_metadata_v3_MetadataKind_set_route(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_cluster(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Cluster* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_mutable_cluster(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
+  struct envoy_type_metadata_v3_MetadataKind_Cluster* sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)envoy_type_metadata_v3_MetadataKind_cluster(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, arena);
+    if (sub) envoy_type_metadata_v3_MetadataKind_set_cluster(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_host(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Host* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_mutable_host(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
+  struct envoy_type_metadata_v3_MetadataKind_Host* sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)envoy_type_metadata_v3_MetadataKind_host(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Host_msg_init, arena);
+    if (sub) envoy_type_metadata_v3_MetadataKind_set_host(msg, sub);
+  }
+  return sub;
+}
+
+/* envoy.type.metadata.v3.MetadataKind.Request */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKind_Request*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Request_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Request* ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Request_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Request* ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Request_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Request_serialize(const envoy_type_metadata_v3_MetadataKind_Request* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Request_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Request_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Request* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Request_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.type.metadata.v3.MetadataKind.Route */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKind_Route*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Route_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Route* ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Route_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Route* ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Route_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Route_serialize(const envoy_type_metadata_v3_MetadataKind_Route* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Route_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Route_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Route* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Route_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.type.metadata.v3.MetadataKind.Cluster */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKind_Cluster*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Cluster* ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Cluster* ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Cluster_serialize(const envoy_type_metadata_v3_MetadataKind_Cluster* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Cluster_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Cluster* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+/* envoy.type.metadata.v3.MetadataKind.Host */
+
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_new(upb_Arena* arena) {
+  return (envoy_type_metadata_v3_MetadataKind_Host*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind__Host_msg_init, arena);
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Host* ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Host_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_metadata_v3_MetadataKind_Host* ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__metadata__v3__MetadataKind__Host_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize(const envoy_type_metadata_v3_MetadataKind_Host* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Host_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Host* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__metadata__v3__MetadataKind__Host_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
new file mode 100644
index 0000000000000..f658a7ac0d126
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
@@ -0,0 +1,127 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/metadata/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKey_submsgs[1] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = {
+  &envoy_type_metadata_v3_MetadataKey_submsgs[0],
+  &envoy_type_metadata_v3_MetadataKey__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey_PathSegment__fields[1] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init = {
+  NULL,
+  &envoy_type_metadata_v3_MetadataKey_PathSegment__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKind_submsgs[4] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKind__Request_msg_init},
+  {.submsg = &envoy__type__metadata__v3__MetadataKind__Route_msg_init},
+  {.submsg = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init},
+  {.submsg = &envoy__type__metadata__v3__MetadataKind__Host_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_metadata_v3_MetadataKind__fields[4] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = {
+  &envoy_type_metadata_v3_MetadataKind_submsgs[0],
+  &envoy_type_metadata_v3_MetadataKind__fields[0],
+  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[7] = {
+  &envoy__type__metadata__v3__MetadataKey_msg_init,
+  &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init,
+  &envoy__type__metadata__v3__MetadataKind_msg_init,
+  &envoy__type__metadata__v3__MetadataKind__Request_msg_init,
+  &envoy__type__metadata__v3__MetadataKind__Route_msg_init,
+  &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init,
+  &envoy__type__metadata__v3__MetadataKind__Host_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  7,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
new file mode 100644
index 0000000000000..a88e86243ac25
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/metadata/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_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__type__metadata__v3__MetadataKey_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init;
+extern const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init;
+
+extern const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h
rename to src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
index 9c8f05b3bd0a5..b05adecba7ff4 100644
--- a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/tracing/v3/custom_tag.proto
  *
@@ -10,7 +9,15 @@
 #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -22,27 +29,20 @@ typedef struct envoy_type_tracing_v3_CustomTag_Literal envoy_type_tracing_v3_Cus
 typedef struct envoy_type_tracing_v3_CustomTag_Environment envoy_type_tracing_v3_CustomTag_Environment;
 typedef struct envoy_type_tracing_v3_CustomTag_Header envoy_type_tracing_v3_CustomTag_Header;
 typedef struct envoy_type_tracing_v3_CustomTag_Metadata envoy_type_tracing_v3_CustomTag_Metadata;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_Literal_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_Environment_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_Header_msg_init;
-extern const upb_MiniTable envoy_type_tracing_v3_CustomTag_Metadata_msg_init;
 struct envoy_type_metadata_v3_MetadataKey;
 struct envoy_type_metadata_v3_MetadataKind;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKey_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_msg_init;
 
 
 
 /* envoy.type.tracing.v3.CustomTag */
 
 UPB_INLINE envoy_type_tracing_v3_CustomTag* envoy_type_tracing_v3_CustomTag_new(upb_Arena* arena) {
-  return (envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_msg_init, arena);
+  return (envoy_type_tracing_v3_CustomTag*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag_msg_init, arena);
 }
 UPB_INLINE envoy_type_tracing_v3_CustomTag* envoy_type_tracing_v3_CustomTag_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag* ret = envoy_type_tracing_v3_CustomTag_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -52,7 +52,7 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag* envoy_type_tracing_v3_CustomTag_pars
                            int options, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag* ret = envoy_type_tracing_v3_CustomTag_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -60,13 +60,13 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag* envoy_type_tracing_v3_CustomTag_pars
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_serialize(const envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_serialize_ex(const envoy_type_tracing_v3_CustomTag* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -163,7 +163,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_literal(envoy_type_tracing_v
 UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_CustomTag_mutable_literal(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) {
   struct envoy_type_tracing_v3_CustomTag_Literal* sub = (struct envoy_type_tracing_v3_CustomTag_Literal*)envoy_type_tracing_v3_CustomTag_literal(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_tracing_v3_CustomTag_Literal*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Literal_msg_init, arena);
+    sub = (struct envoy_type_tracing_v3_CustomTag_Literal*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Literal_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_set_literal(msg, sub);
   }
   return sub;
@@ -175,7 +175,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_environment(envoy_type_traci
 UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_CustomTag_mutable_environment(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) {
   struct envoy_type_tracing_v3_CustomTag_Environment* sub = (struct envoy_type_tracing_v3_CustomTag_Environment*)envoy_type_tracing_v3_CustomTag_environment(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_tracing_v3_CustomTag_Environment*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Environment_msg_init, arena);
+    sub = (struct envoy_type_tracing_v3_CustomTag_Environment*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Environment_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_set_environment(msg, sub);
   }
   return sub;
@@ -187,7 +187,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_request_header(envoy_type_tr
 UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomTag_mutable_request_header(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) {
   struct envoy_type_tracing_v3_CustomTag_Header* sub = (struct envoy_type_tracing_v3_CustomTag_Header*)envoy_type_tracing_v3_CustomTag_request_header(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_tracing_v3_CustomTag_Header*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Header_msg_init, arena);
+    sub = (struct envoy_type_tracing_v3_CustomTag_Header*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Header_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_set_request_header(msg, sub);
   }
   return sub;
@@ -199,7 +199,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_metadata(envoy_type_tracing_
 UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_CustomTag_mutable_metadata(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) {
   struct envoy_type_tracing_v3_CustomTag_Metadata* sub = (struct envoy_type_tracing_v3_CustomTag_Metadata*)envoy_type_tracing_v3_CustomTag_metadata(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_tracing_v3_CustomTag_Metadata*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Metadata_msg_init, arena);
+    sub = (struct envoy_type_tracing_v3_CustomTag_Metadata*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Metadata_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_set_metadata(msg, sub);
   }
   return sub;
@@ -208,12 +208,12 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v
 /* envoy.type.tracing.v3.CustomTag.Literal */
 
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_CustomTag_Literal_new(upb_Arena* arena) {
-  return (envoy_type_tracing_v3_CustomTag_Literal*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Literal_msg_init, arena);
+  return (envoy_type_tracing_v3_CustomTag_Literal*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Literal_msg_init, arena);
 }
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_CustomTag_Literal_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Literal* ret = envoy_type_tracing_v3_CustomTag_Literal_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Literal_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -223,7 +223,7 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_Custom
                            int options, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Literal* ret = envoy_type_tracing_v3_CustomTag_Literal_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Literal_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -231,13 +231,13 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_Custom
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Literal_serialize(const envoy_type_tracing_v3_CustomTag_Literal* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Literal_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Literal_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Literal_serialize_ex(const envoy_type_tracing_v3_CustomTag_Literal* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Literal_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Literal_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_tracing_v3_CustomTag_Literal_clear_value(envoy_type_tracing_v3_CustomTag_Literal* msg) {
@@ -260,12 +260,12 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Literal_set_value(envoy_type_tra
 /* envoy.type.tracing.v3.CustomTag.Environment */
 
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_CustomTag_Environment_new(upb_Arena* arena) {
-  return (envoy_type_tracing_v3_CustomTag_Environment*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Environment_msg_init, arena);
+  return (envoy_type_tracing_v3_CustomTag_Environment*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Environment_msg_init, arena);
 }
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_CustomTag_Environment_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Environment* ret = envoy_type_tracing_v3_CustomTag_Environment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Environment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -275,7 +275,7 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_Cu
                            int options, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Environment* ret = envoy_type_tracing_v3_CustomTag_Environment_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Environment_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -283,13 +283,13 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_Cu
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Environment_serialize(const envoy_type_tracing_v3_CustomTag_Environment* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Environment_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Environment_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Environment_serialize_ex(const envoy_type_tracing_v3_CustomTag_Environment* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Environment_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Environment_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_clear_name(envoy_type_tracing_v3_CustomTag_Environment* msg) {
@@ -327,12 +327,12 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_set_default_value(en
 /* envoy.type.tracing.v3.CustomTag.Header */
 
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomTag_Header_new(upb_Arena* arena) {
-  return (envoy_type_tracing_v3_CustomTag_Header*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Header_msg_init, arena);
+  return (envoy_type_tracing_v3_CustomTag_Header*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Header_msg_init, arena);
 }
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomTag_Header_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Header* ret = envoy_type_tracing_v3_CustomTag_Header_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Header_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -342,7 +342,7 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomT
                            int options, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Header* ret = envoy_type_tracing_v3_CustomTag_Header_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Header_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -350,13 +350,13 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomT
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Header_serialize(const envoy_type_tracing_v3_CustomTag_Header* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Header_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Header_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Header_serialize_ex(const envoy_type_tracing_v3_CustomTag_Header* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Header_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Header_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_clear_name(envoy_type_tracing_v3_CustomTag_Header* msg) {
@@ -394,12 +394,12 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_set_default_value(envoy_t
 /* envoy.type.tracing.v3.CustomTag.Metadata */
 
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_CustomTag_Metadata_new(upb_Arena* arena) {
-  return (envoy_type_tracing_v3_CustomTag_Metadata*)_upb_Message_New(&envoy_type_tracing_v3_CustomTag_Metadata_msg_init, arena);
+  return (envoy_type_tracing_v3_CustomTag_Metadata*)_upb_Message_New(&envoy__type__tracing__v3__CustomTag__Metadata_msg_init, arena);
 }
 UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_CustomTag_Metadata_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Metadata* ret = envoy_type_tracing_v3_CustomTag_Metadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Metadata_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -409,7 +409,7 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_Custo
                            int options, upb_Arena* arena) {
   envoy_type_tracing_v3_CustomTag_Metadata* ret = envoy_type_tracing_v3_CustomTag_Metadata_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__tracing__v3__CustomTag__Metadata_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -417,13 +417,13 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_Custo
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Metadata_serialize(const envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Metadata_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Metadata_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_tracing_v3_CustomTag_Metadata_serialize_ex(const envoy_type_tracing_v3_CustomTag_Metadata* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_tracing_v3_CustomTag_Metadata_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__tracing__v3__CustomTag__Metadata_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_clear_kind(envoy_type_tracing_v3_CustomTag_Metadata* msg) {
@@ -475,7 +475,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_kind(envoy_type_tra
 UPB_INLINE struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_v3_CustomTag_Metadata_mutable_kind(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) {
   struct envoy_type_metadata_v3_MetadataKind* sub = (struct envoy_type_metadata_v3_MetadataKind*)envoy_type_tracing_v3_CustomTag_Metadata_kind(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKind*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_msg_init, arena);
+    sub = (struct envoy_type_metadata_v3_MetadataKind*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKind_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_Metadata_set_kind(msg, sub);
   }
   return sub;
@@ -487,7 +487,7 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_metadata_key(envoy_
 UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v3_CustomTag_Metadata_mutable_metadata_key(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) {
   struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_type_tracing_v3_CustomTag_Metadata_metadata_key(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_msg_init, arena);
+    sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy__type__metadata__v3__MetadataKey_msg_init, arena);
     if (sub) envoy_type_tracing_v3_CustomTag_Metadata_set_metadata_key(msg, sub);
   }
   return sub;
@@ -497,8 +497,6 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_default_value(envoy
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
new file mode 100644
index 0000000000000..ad696905daeae
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
@@ -0,0 +1,139 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/tracing/v3/custom_tag.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_submsgs[4] = {
+  {.submsg = &envoy__type__tracing__v3__CustomTag__Literal_msg_init},
+  {.submsg = &envoy__type__tracing__v3__CustomTag__Environment_msg_init},
+  {.submsg = &envoy__type__tracing__v3__CustomTag__Header_msg_init},
+  {.submsg = &envoy__type__tracing__v3__CustomTag__Metadata_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_tracing_v3_CustomTag__fields[5] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = {
+  &envoy_type_tracing_v3_CustomTag_submsgs[0],
+  &envoy_type_tracing_v3_CustomTag__fields[0],
+  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_max64b},
+    {0x001800000301001a, &upb_pom_1bt_max64b},
+    {0x0018000004020022, &upb_pom_1bt_max64b},
+    {0x001800000503002a, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Literal__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init = {
+  NULL,
+  &envoy_type_tracing_v3_CustomTag_Literal__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Environment__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init = {
+  NULL,
+  &envoy_type_tracing_v3_CustomTag_Environment__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Header__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = {
+  NULL,
+  &envoy_type_tracing_v3_CustomTag_Header__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = {
+  {.submsg = &envoy__type__metadata__v3__MetadataKind_msg_init},
+  {.submsg = &envoy__type__metadata__v3__MetadataKey_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Metadata__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init = {
+  &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0],
+  &envoy_type_tracing_v3_CustomTag_Metadata__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[5] = {
+  &envoy__type__tracing__v3__CustomTag_msg_init,
+  &envoy__type__tracing__v3__CustomTag__Literal_msg_init,
+  &envoy__type__tracing__v3__CustomTag__Environment_msg_init,
+  &envoy__type__tracing__v3__CustomTag__Header_msg_init,
+  &envoy__type__tracing__v3__CustomTag__Metadata_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  5,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
new file mode 100644
index 0000000000000..df52ab8ae3af9
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/tracing/v3/custom_tag.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_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__type__tracing__v3__CustomTag_msg_init;
+extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init;
+extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init;
+extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init;
+extern const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init;
+
+extern const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
index f8813bfe69622..bcba13a63ab92 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/hash_policy.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/hash_policy.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,21 +26,18 @@ extern "C" {
 typedef struct envoy_type_v3_HashPolicy envoy_type_v3_HashPolicy;
 typedef struct envoy_type_v3_HashPolicy_SourceIp envoy_type_v3_HashPolicy_SourceIp;
 typedef struct envoy_type_v3_HashPolicy_FilterState envoy_type_v3_HashPolicy_FilterState;
-extern const upb_MiniTable envoy_type_v3_HashPolicy_msg_init;
-extern const upb_MiniTable envoy_type_v3_HashPolicy_SourceIp_msg_init;
-extern const upb_MiniTable envoy_type_v3_HashPolicy_FilterState_msg_init;
 
 
 
 /* envoy.type.v3.HashPolicy */
 
 UPB_INLINE envoy_type_v3_HashPolicy* envoy_type_v3_HashPolicy_new(upb_Arena* arena) {
-  return (envoy_type_v3_HashPolicy*)_upb_Message_New(&envoy_type_v3_HashPolicy_msg_init, arena);
+  return (envoy_type_v3_HashPolicy*)_upb_Message_New(&envoy__type__v3__HashPolicy_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_HashPolicy* envoy_type_v3_HashPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_HashPolicy* ret = envoy_type_v3_HashPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE envoy_type_v3_HashPolicy* envoy_type_v3_HashPolicy_parse_ex(const cha
                            int options, upb_Arena* arena) {
   envoy_type_v3_HashPolicy* ret = envoy_type_v3_HashPolicy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE envoy_type_v3_HashPolicy* envoy_type_v3_HashPolicy_parse_ex(const cha
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_serialize(const envoy_type_v3_HashPolicy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_serialize_ex(const envoy_type_v3_HashPolicy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -108,7 +111,7 @@ UPB_INLINE void envoy_type_v3_HashPolicy_set_source_ip(envoy_type_v3_HashPolicy
 UPB_INLINE struct envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_mutable_source_ip(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_type_v3_HashPolicy_SourceIp* sub = (struct envoy_type_v3_HashPolicy_SourceIp*)envoy_type_v3_HashPolicy_source_ip(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_HashPolicy_SourceIp*)_upb_Message_New(&envoy_type_v3_HashPolicy_SourceIp_msg_init, arena);
+    sub = (struct envoy_type_v3_HashPolicy_SourceIp*)_upb_Message_New(&envoy__type__v3__HashPolicy__SourceIp_msg_init, arena);
     if (sub) envoy_type_v3_HashPolicy_set_source_ip(msg, sub);
   }
   return sub;
@@ -120,7 +123,7 @@ UPB_INLINE void envoy_type_v3_HashPolicy_set_filter_state(envoy_type_v3_HashPoli
 UPB_INLINE struct envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_mutable_filter_state(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) {
   struct envoy_type_v3_HashPolicy_FilterState* sub = (struct envoy_type_v3_HashPolicy_FilterState*)envoy_type_v3_HashPolicy_filter_state(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_HashPolicy_FilterState*)_upb_Message_New(&envoy_type_v3_HashPolicy_FilterState_msg_init, arena);
+    sub = (struct envoy_type_v3_HashPolicy_FilterState*)_upb_Message_New(&envoy__type__v3__HashPolicy__FilterState_msg_init, arena);
     if (sub) envoy_type_v3_HashPolicy_set_filter_state(msg, sub);
   }
   return sub;
@@ -129,12 +132,12 @@ UPB_INLINE struct envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy
 /* envoy.type.v3.HashPolicy.SourceIp */
 
 UPB_INLINE envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_SourceIp_new(upb_Arena* arena) {
-  return (envoy_type_v3_HashPolicy_SourceIp*)_upb_Message_New(&envoy_type_v3_HashPolicy_SourceIp_msg_init, arena);
+  return (envoy_type_v3_HashPolicy_SourceIp*)_upb_Message_New(&envoy__type__v3__HashPolicy__SourceIp_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_SourceIp_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_HashPolicy_SourceIp* ret = envoy_type_v3_HashPolicy_SourceIp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_SourceIp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy__SourceIp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -144,7 +147,7 @@ UPB_INLINE envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_SourceIp_
                            int options, upb_Arena* arena) {
   envoy_type_v3_HashPolicy_SourceIp* ret = envoy_type_v3_HashPolicy_SourceIp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_SourceIp_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy__SourceIp_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -152,13 +155,13 @@ UPB_INLINE envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_SourceIp_
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_SourceIp_serialize(const envoy_type_v3_HashPolicy_SourceIp* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_SourceIp_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy__SourceIp_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_SourceIp_serialize_ex(const envoy_type_v3_HashPolicy_SourceIp* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_SourceIp_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy__SourceIp_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -166,12 +169,12 @@ UPB_INLINE char* envoy_type_v3_HashPolicy_SourceIp_serialize_ex(const envoy_type
 /* envoy.type.v3.HashPolicy.FilterState */
 
 UPB_INLINE envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_FilterState_new(upb_Arena* arena) {
-  return (envoy_type_v3_HashPolicy_FilterState*)_upb_Message_New(&envoy_type_v3_HashPolicy_FilterState_msg_init, arena);
+  return (envoy_type_v3_HashPolicy_FilterState*)_upb_Message_New(&envoy__type__v3__HashPolicy__FilterState_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_FilterState_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_HashPolicy_FilterState* ret = envoy_type_v3_HashPolicy_FilterState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_FilterState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy__FilterState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -181,7 +184,7 @@ UPB_INLINE envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_Filter
                            int options, upb_Arena* arena) {
   envoy_type_v3_HashPolicy_FilterState* ret = envoy_type_v3_HashPolicy_FilterState_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HashPolicy_FilterState_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HashPolicy__FilterState_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -189,13 +192,13 @@ UPB_INLINE envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_Filter
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_FilterState_serialize(const envoy_type_v3_HashPolicy_FilterState* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_FilterState_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy__FilterState_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_HashPolicy_FilterState_serialize_ex(const envoy_type_v3_HashPolicy_FilterState* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HashPolicy_FilterState_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HashPolicy__FilterState_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_clear_key(envoy_type_v3_HashPolicy_FilterState* msg) {
@@ -215,8 +218,6 @@ UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_set_key(envoy_type_v3_HashP
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
new file mode 100644
index 0000000000000..1828916a368ae
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
@@ -0,0 +1,76 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/hash_policy.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/hash_policy.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_v3_HashPolicy_submsgs[2] = {
+  {.submsg = &envoy__type__v3__HashPolicy__SourceIp_msg_init},
+  {.submsg = &envoy__type__v3__HashPolicy__FilterState_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_v3_HashPolicy__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = {
+  &envoy_type_v3_HashPolicy_submsgs[0],
+  &envoy_type_v3_HashPolicy__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableField envoy_type_v3_HashPolicy_FilterState__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init = {
+  NULL,
+  &envoy_type_v3_HashPolicy_FilterState__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__type__v3__HashPolicy_msg_init,
+  &envoy__type__v3__HashPolicy__SourceIp_msg_init,
+  &envoy__type__v3__HashPolicy__FilterState_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
new file mode 100644
index 0000000000000..f54a830895f0e
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/hash_policy.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HASH_POLICY_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__type__v3__HashPolicy_msg_init;
+extern const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init;
+extern const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h
new file mode 100644
index 0000000000000..ff12940bdcfaa
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
+#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/v3/http.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+  envoy_type_v3_HTTP1 = 0,
+  envoy_type_v3_HTTP2 = 1,
+  envoy_type_v3_HTTP3 = 2
+} envoy_type_v3_CodecClientType;
+
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
new file mode 100644
index 0000000000000..c54e11f451f12
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c
@@ -0,0 +1,26 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/http.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  NULL,
+  0,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
new file mode 100644
index 0000000000000..499d347a67a44
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
@@ -0,0 +1,29 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HTTP_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_MiniTableFile envoy_type_v3_http_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
index d3bd26d3ce7d8..6cd784dc89de3 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/http_status.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/http_status.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,7 +24,6 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_v3_HttpStatus envoy_type_v3_HttpStatus;
-extern const upb_MiniTable envoy_type_v3_HttpStatus_msg_init;
 
 typedef enum {
   envoy_type_v3_Empty = 0,
@@ -85,12 +90,12 @@ typedef enum {
 /* envoy.type.v3.HttpStatus */
 
 UPB_INLINE envoy_type_v3_HttpStatus* envoy_type_v3_HttpStatus_new(upb_Arena* arena) {
-  return (envoy_type_v3_HttpStatus*)_upb_Message_New(&envoy_type_v3_HttpStatus_msg_init, arena);
+  return (envoy_type_v3_HttpStatus*)_upb_Message_New(&envoy__type__v3__HttpStatus_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_HttpStatus* envoy_type_v3_HttpStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_HttpStatus* ret = envoy_type_v3_HttpStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HttpStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HttpStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -100,7 +105,7 @@ UPB_INLINE envoy_type_v3_HttpStatus* envoy_type_v3_HttpStatus_parse_ex(const cha
                            int options, upb_Arena* arena) {
   envoy_type_v3_HttpStatus* ret = envoy_type_v3_HttpStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_HttpStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__HttpStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -108,13 +113,13 @@ UPB_INLINE envoy_type_v3_HttpStatus* envoy_type_v3_HttpStatus_parse_ex(const cha
 }
 UPB_INLINE char* envoy_type_v3_HttpStatus_serialize(const envoy_type_v3_HttpStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HttpStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HttpStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_HttpStatus_serialize_ex(const envoy_type_v3_HttpStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_HttpStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__HttpStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_HttpStatus_clear_code(envoy_type_v3_HttpStatus* msg) {
@@ -134,8 +139,6 @@ UPB_INLINE void envoy_type_v3_HttpStatus_set_code(envoy_type_v3_HttpStatus *msg,
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
new file mode 100644
index 0000000000000..6ecadb83b0ad3
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http_status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/http_status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_type_v3_HttpStatus__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__HttpStatus_msg_init = {
+  NULL,
+  &envoy_type_v3_HttpStatus__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__v3__HttpStatus_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_http_status_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/type/v3/http_status.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
new file mode 100644
index 0000000000000..1deb302d3757c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http_status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HTTP_STATUS_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__type__v3__HttpStatus_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
similarity index 83%
rename from src/core/ext/upb-generated/envoy/type/v3/percent.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
index 4a3796b73a5a9..277abbe0da65d 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/percent.proto
  *
@@ -10,7 +9,14 @@
 #define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/percent.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,8 +25,6 @@ extern "C" {
 
 typedef struct envoy_type_v3_Percent envoy_type_v3_Percent;
 typedef struct envoy_type_v3_FractionalPercent envoy_type_v3_FractionalPercent;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
 
 typedef enum {
   envoy_type_v3_FractionalPercent_HUNDRED = 0,
@@ -33,12 +37,12 @@ typedef enum {
 /* envoy.type.v3.Percent */
 
 UPB_INLINE envoy_type_v3_Percent* envoy_type_v3_Percent_new(upb_Arena* arena) {
-  return (envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+  return (envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_Percent* envoy_type_v3_Percent_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_Percent* ret = envoy_type_v3_Percent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Percent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Percent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +52,7 @@ UPB_INLINE envoy_type_v3_Percent* envoy_type_v3_Percent_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   envoy_type_v3_Percent* ret = envoy_type_v3_Percent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Percent_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Percent_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +60,13 @@ UPB_INLINE envoy_type_v3_Percent* envoy_type_v3_Percent_parse_ex(const char* buf
 }
 UPB_INLINE char* envoy_type_v3_Percent_serialize(const envoy_type_v3_Percent* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Percent_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__Percent_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_Percent_serialize_ex(const envoy_type_v3_Percent* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Percent_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__Percent_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_Percent_clear_value(envoy_type_v3_Percent* msg) {
@@ -85,12 +89,12 @@ UPB_INLINE void envoy_type_v3_Percent_set_value(envoy_type_v3_Percent *msg, doub
 /* envoy.type.v3.FractionalPercent */
 
 UPB_INLINE envoy_type_v3_FractionalPercent* envoy_type_v3_FractionalPercent_new(upb_Arena* arena) {
-  return (envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+  return (envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_FractionalPercent* envoy_type_v3_FractionalPercent_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_FractionalPercent* ret = envoy_type_v3_FractionalPercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__FractionalPercent_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -100,7 +104,7 @@ UPB_INLINE envoy_type_v3_FractionalPercent* envoy_type_v3_FractionalPercent_pars
                            int options, upb_Arena* arena) {
   envoy_type_v3_FractionalPercent* ret = envoy_type_v3_FractionalPercent_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__FractionalPercent_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -108,13 +112,13 @@ UPB_INLINE envoy_type_v3_FractionalPercent* envoy_type_v3_FractionalPercent_pars
 }
 UPB_INLINE char* envoy_type_v3_FractionalPercent_serialize(const envoy_type_v3_FractionalPercent* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_FractionalPercent_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__FractionalPercent_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_FractionalPercent_serialize_ex(const envoy_type_v3_FractionalPercent* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_FractionalPercent_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__FractionalPercent_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_FractionalPercent_clear_numerator(envoy_type_v3_FractionalPercent* msg) {
@@ -149,8 +153,6 @@ UPB_INLINE void envoy_type_v3_FractionalPercent_set_denominator(envoy_type_v3_Fr
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
new file mode 100644
index 0000000000000..0c62048a89d6f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c
@@ -0,0 +1,64 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/percent.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_type_v3_Percent__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__Percent_msg_init = {
+  NULL,
+  &envoy_type_v3_Percent__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+  })
+};
+
+static const upb_MiniTableField envoy_type_v3_FractionalPercent__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init = {
+  NULL,
+  &envoy_type_v3_FractionalPercent__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__v3__Percent_msg_init,
+  &envoy__type__v3__FractionalPercent_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
new file mode 100644
index 0000000000000..de5d7c88e12ee
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/percent.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_PERCENT_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__type__v3__Percent_msg_init;
+extern const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h
new file mode 100644
index 0000000000000..ac841a0ce0cfc
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h
@@ -0,0 +1,238 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
+#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/type/v3/range.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_type_v3_Int64Range envoy_type_v3_Int64Range;
+typedef struct envoy_type_v3_Int32Range envoy_type_v3_Int32Range;
+typedef struct envoy_type_v3_DoubleRange envoy_type_v3_DoubleRange;
+
+
+
+/* envoy.type.v3.Int64Range */
+
+UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_new(upb_Arena* arena) {
+  return (envoy_type_v3_Int64Range*)_upb_Message_New(&envoy__type__v3__Int64Range_msg_init, arena);
+}
+UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_v3_Int64Range* ret = envoy_type_v3_Int64Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Int64Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_v3_Int64Range* ret = envoy_type_v3_Int64Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Int64Range_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_v3_Int64Range_serialize(const envoy_type_v3_Int64Range* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__Int64Range_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_v3_Int64Range_serialize_ex(const envoy_type_v3_Int64Range* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__Int64Range_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_v3_Int64Range_clear_start(envoy_type_v3_Int64Range* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t envoy_type_v3_Int64Range_start(const envoy_type_v3_Int64Range* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_v3_Int64Range_clear_end(envoy_type_v3_Int64Range* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t envoy_type_v3_Int64Range_end(const envoy_type_v3_Int64Range* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_v3_Int64Range_set_start(envoy_type_v3_Int64Range *msg, int64_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_v3_Int64Range_set_end(envoy_type_v3_Int64Range *msg, int64_t value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.v3.Int32Range */
+
+UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_new(upb_Arena* arena) {
+  return (envoy_type_v3_Int32Range*)_upb_Message_New(&envoy__type__v3__Int32Range_msg_init, arena);
+}
+UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_v3_Int32Range* ret = envoy_type_v3_Int32Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Int32Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_v3_Int32Range* ret = envoy_type_v3_Int32Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__Int32Range_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_v3_Int32Range_serialize(const envoy_type_v3_Int32Range* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__Int32Range_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_v3_Int32Range_serialize_ex(const envoy_type_v3_Int32Range* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__Int32Range_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_v3_Int32Range_clear_start(envoy_type_v3_Int32Range* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_type_v3_Int32Range_start(const envoy_type_v3_Int32Range* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_v3_Int32Range_clear_end(envoy_type_v3_Int32Range* msg) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t envoy_type_v3_Int32Range_end(const envoy_type_v3_Int32Range* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_v3_Int32Range_set_start(envoy_type_v3_Int32Range *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_v3_Int32Range_set_end(envoy_type_v3_Int32Range *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* envoy.type.v3.DoubleRange */
+
+UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_new(upb_Arena* arena) {
+  return (envoy_type_v3_DoubleRange*)_upb_Message_New(&envoy__type__v3__DoubleRange_msg_init, arena);
+}
+UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_type_v3_DoubleRange* ret = envoy_type_v3_DoubleRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__DoubleRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_type_v3_DoubleRange* ret = envoy_type_v3_DoubleRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__DoubleRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_type_v3_DoubleRange_serialize(const envoy_type_v3_DoubleRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__DoubleRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_type_v3_DoubleRange_serialize_ex(const envoy_type_v3_DoubleRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &envoy__type__v3__DoubleRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_type_v3_DoubleRange_clear_start(envoy_type_v3_DoubleRange* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double envoy_type_v3_DoubleRange_start(const envoy_type_v3_DoubleRange* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void envoy_type_v3_DoubleRange_clear_end(envoy_type_v3_DoubleRange* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double envoy_type_v3_DoubleRange_end(const envoy_type_v3_DoubleRange* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void envoy_type_v3_DoubleRange_set_start(envoy_type_v3_DoubleRange *msg, double value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg, double value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
new file mode 100644
index 0000000000000..d16e792c3a7f0
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c
@@ -0,0 +1,84 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_type_v3_Int64Range__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__Int64Range_msg_init = {
+  NULL,
+  &envoy_type_v3_Int64Range__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_v3_Int32Range__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__Int32Range_msg_init = {
+  NULL,
+  &envoy_type_v3_Int32Range__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField envoy_type_v3_DoubleRange__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__DoubleRange_msg_init = {
+  NULL,
+  &envoy_type_v3_DoubleRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+    {0x000800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &envoy__type__v3__Int64Range_msg_init,
+  &envoy__type__v3__Int32Range_msg_init,
+  &envoy__type__v3__DoubleRange_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
new file mode 100644
index 0000000000000..3e8c29434b599
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RANGE_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__type__v3__Int64Range_msg_init;
+extern const upb_MiniTable envoy__type__v3__Int32Range_msg_init;
+extern const upb_MiniTable envoy__type__v3__DoubleRange_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
index ddd9562d65f20..5b1668b4712ed 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_strategy.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/ratelimit_strategy.upb_minitable.h"
+
+#include "envoy/type/v3/ratelimit_unit.upb_minitable.h"
+#include "envoy/type/v3/token_bucket.upb_minitable.h"
+#include "xds/annotations/v3/status.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
@@ -19,10 +27,7 @@ extern "C" {
 
 typedef struct envoy_type_v3_RateLimitStrategy envoy_type_v3_RateLimitStrategy;
 typedef struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit;
-extern const upb_MiniTable envoy_type_v3_RateLimitStrategy_msg_init;
-extern const upb_MiniTable envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init;
 struct envoy_type_v3_TokenBucket;
-extern const upb_MiniTable envoy_type_v3_TokenBucket_msg_init;
 
 typedef enum {
   envoy_type_v3_RateLimitStrategy_ALLOW_ALL = 0,
@@ -34,12 +39,12 @@ typedef enum {
 /* envoy.type.v3.RateLimitStrategy */
 
 UPB_INLINE envoy_type_v3_RateLimitStrategy* envoy_type_v3_RateLimitStrategy_new(upb_Arena* arena) {
-  return (envoy_type_v3_RateLimitStrategy*)_upb_Message_New(&envoy_type_v3_RateLimitStrategy_msg_init, arena);
+  return (envoy_type_v3_RateLimitStrategy*)_upb_Message_New(&envoy__type__v3__RateLimitStrategy_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_RateLimitStrategy* envoy_type_v3_RateLimitStrategy_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_RateLimitStrategy* ret = envoy_type_v3_RateLimitStrategy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_RateLimitStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__RateLimitStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -49,7 +54,7 @@ UPB_INLINE envoy_type_v3_RateLimitStrategy* envoy_type_v3_RateLimitStrategy_pars
                            int options, upb_Arena* arena) {
   envoy_type_v3_RateLimitStrategy* ret = envoy_type_v3_RateLimitStrategy_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_RateLimitStrategy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__RateLimitStrategy_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -57,13 +62,13 @@ UPB_INLINE envoy_type_v3_RateLimitStrategy* envoy_type_v3_RateLimitStrategy_pars
 }
 UPB_INLINE char* envoy_type_v3_RateLimitStrategy_serialize(const envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_RateLimitStrategy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__RateLimitStrategy_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_RateLimitStrategy_serialize_ex(const envoy_type_v3_RateLimitStrategy* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_RateLimitStrategy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__RateLimitStrategy_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -133,7 +138,7 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_requests_per_time_unit(envoy
 UPB_INLINE struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_RateLimitStrategy_mutable_requests_per_time_unit(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) {
   struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* sub = (struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)envoy_type_v3_RateLimitStrategy_requests_per_time_unit(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)_upb_Message_New(&envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, arena);
+    sub = (struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)_upb_Message_New(&envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, arena);
     if (sub) envoy_type_v3_RateLimitStrategy_set_requests_per_time_unit(msg, sub);
   }
   return sub;
@@ -145,7 +150,7 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_token_bucket(envoy_type_v3_R
 UPB_INLINE struct envoy_type_v3_TokenBucket* envoy_type_v3_RateLimitStrategy_mutable_token_bucket(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) {
   struct envoy_type_v3_TokenBucket* sub = (struct envoy_type_v3_TokenBucket*)envoy_type_v3_RateLimitStrategy_token_bucket(msg);
   if (sub == NULL) {
-    sub = (struct envoy_type_v3_TokenBucket*)_upb_Message_New(&envoy_type_v3_TokenBucket_msg_init, arena);
+    sub = (struct envoy_type_v3_TokenBucket*)_upb_Message_New(&envoy__type__v3__TokenBucket_msg_init, arena);
     if (sub) envoy_type_v3_RateLimitStrategy_set_token_bucket(msg, sub);
   }
   return sub;
@@ -154,12 +159,12 @@ UPB_INLINE struct envoy_type_v3_TokenBucket* envoy_type_v3_RateLimitStrategy_mut
 /* envoy.type.v3.RateLimitStrategy.RequestsPerTimeUnit */
 
 UPB_INLINE envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_new(upb_Arena* arena) {
-  return (envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)_upb_Message_New(&envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, arena);
+  return (envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)_upb_Message_New(&envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* ret = envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -169,7 +174,7 @@ UPB_INLINE envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_Ra
                            int options, upb_Arena* arena) {
   envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* ret = envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -177,13 +182,13 @@ UPB_INLINE envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_Ra
 }
 UPB_INLINE char* envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_serialize(const envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_serialize_ex(const envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_clear_requests_per_time_unit(envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* msg) {
@@ -218,8 +223,6 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_time_uni
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
new file mode 100644
index 0000000000000..2fd8cccb5c985
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
@@ -0,0 +1,75 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/ratelimit_strategy.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/ratelimit_strategy.upb_minitable.h"
+#include "envoy/type/v3/ratelimit_unit.upb_minitable.h"
+#include "envoy/type/v3/token_bucket.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_v3_RateLimitStrategy_submsgs[2] = {
+  {.submsg = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init},
+  {.submsg = &envoy__type__v3__TokenBucket_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_v3_RateLimitStrategy__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = {
+  &envoy_type_v3_RateLimitStrategy_submsgs[0],
+  &envoy_type_v3_RateLimitStrategy__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_pov4_1bt},
+    {0x0008000002000012, &upb_pom_1bt_max64b},
+    {0x000800000301001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableField envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init = {
+  NULL,
+  &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &envoy__type__v3__RateLimitStrategy_msg_init,
+  &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
new file mode 100644
index 0000000000000..6b3623bb9f454
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/ratelimit_strategy.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_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__type__v3__RateLimitStrategy_msg_init;
+extern const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
similarity index 78%
rename from src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
index 0e5ed4b5768c4..b1b9a9ebc1b79 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_unit.proto
  *
@@ -10,7 +9,12 @@
 #define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/ratelimit_unit.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -29,8 +33,6 @@ typedef enum {
 
 
 
-extern const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
new file mode 100644
index 0000000000000..e6731c1ffa5d2
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c
@@ -0,0 +1,26 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/ratelimit_unit.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/ratelimit_unit.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  NULL,
+  0,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
new file mode 100644
index 0000000000000..a20e7d368cd4c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
@@ -0,0 +1,29 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/ratelimit_unit.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RATELIMIT_UNIT_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_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
similarity index 87%
rename from src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
index 9b5d66f922b2d..5604cd6c06e5d 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/semantic_version.proto
  *
@@ -10,7 +9,13 @@
 #define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +23,18 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_v3_SemanticVersion envoy_type_v3_SemanticVersion;
-extern const upb_MiniTable envoy_type_v3_SemanticVersion_msg_init;
 
 
 
 /* envoy.type.v3.SemanticVersion */
 
 UPB_INLINE envoy_type_v3_SemanticVersion* envoy_type_v3_SemanticVersion_new(upb_Arena* arena) {
-  return (envoy_type_v3_SemanticVersion*)_upb_Message_New(&envoy_type_v3_SemanticVersion_msg_init, arena);
+  return (envoy_type_v3_SemanticVersion*)_upb_Message_New(&envoy__type__v3__SemanticVersion_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_SemanticVersion* envoy_type_v3_SemanticVersion_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_SemanticVersion* ret = envoy_type_v3_SemanticVersion_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__SemanticVersion_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +44,7 @@ UPB_INLINE envoy_type_v3_SemanticVersion* envoy_type_v3_SemanticVersion_parse_ex
                            int options, upb_Arena* arena) {
   envoy_type_v3_SemanticVersion* ret = envoy_type_v3_SemanticVersion_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__SemanticVersion_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +52,13 @@ UPB_INLINE envoy_type_v3_SemanticVersion* envoy_type_v3_SemanticVersion_parse_ex
 }
 UPB_INLINE char* envoy_type_v3_SemanticVersion_serialize(const envoy_type_v3_SemanticVersion* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_SemanticVersion_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__SemanticVersion_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_SemanticVersion_serialize_ex(const envoy_type_v3_SemanticVersion* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_SemanticVersion_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__SemanticVersion_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_SemanticVersion_clear_major_number(envoy_type_v3_SemanticVersion* msg) {
@@ -104,8 +108,6 @@ UPB_INLINE void envoy_type_v3_SemanticVersion_set_patch(envoy_type_v3_SemanticVe
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
new file mode 100644
index 0000000000000..b4c4c7ac7edf2
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/semantic_version.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField envoy_type_v3_SemanticVersion__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__SemanticVersion_msg_init = {
+  NULL,
+  &envoy_type_v3_SemanticVersion__fields[0],
+  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x000800003f000018, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__v3__SemanticVersion_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_semantic_version_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/type/v3/semantic_version.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
new file mode 100644
index 0000000000000..183a79a94f0b5
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/semantic_version.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_SEMANTIC_VERSION_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__type__v3__SemanticVersion_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
similarity index 87%
rename from src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h
rename to src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
index 492f2b4ed19d5..5f1866f0ca343 100644
--- a/src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/token_bucket.proto
  *
@@ -10,7 +9,16 @@
 #define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/type/v3/token_bucket.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,23 +26,20 @@ extern "C" {
 #endif
 
 typedef struct envoy_type_v3_TokenBucket envoy_type_v3_TokenBucket;
-extern const upb_MiniTable envoy_type_v3_TokenBucket_msg_init;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* envoy.type.v3.TokenBucket */
 
 UPB_INLINE envoy_type_v3_TokenBucket* envoy_type_v3_TokenBucket_new(upb_Arena* arena) {
-  return (envoy_type_v3_TokenBucket*)_upb_Message_New(&envoy_type_v3_TokenBucket_msg_init, arena);
+  return (envoy_type_v3_TokenBucket*)_upb_Message_New(&envoy__type__v3__TokenBucket_msg_init, arena);
 }
 UPB_INLINE envoy_type_v3_TokenBucket* envoy_type_v3_TokenBucket_parse(const char* buf, size_t size, upb_Arena* arena) {
   envoy_type_v3_TokenBucket* ret = envoy_type_v3_TokenBucket_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_TokenBucket_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__TokenBucket_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +49,7 @@ UPB_INLINE envoy_type_v3_TokenBucket* envoy_type_v3_TokenBucket_parse_ex(const c
                            int options, upb_Arena* arena) {
   envoy_type_v3_TokenBucket* ret = envoy_type_v3_TokenBucket_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_TokenBucket_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__type__v3__TokenBucket_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +57,13 @@ UPB_INLINE envoy_type_v3_TokenBucket* envoy_type_v3_TokenBucket_parse_ex(const c
 }
 UPB_INLINE char* envoy_type_v3_TokenBucket_serialize(const envoy_type_v3_TokenBucket* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_TokenBucket_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__TokenBucket_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* envoy_type_v3_TokenBucket_serialize_ex(const envoy_type_v3_TokenBucket* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_TokenBucket_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__type__v3__TokenBucket_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_v3_TokenBucket_clear_max_tokens(envoy_type_v3_TokenBucket* msg) {
@@ -114,7 +119,7 @@ UPB_INLINE void envoy_type_v3_TokenBucket_set_tokens_per_fill(envoy_type_v3_Toke
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_mutable_tokens_per_fill(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_v3_TokenBucket_tokens_per_fill(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) envoy_type_v3_TokenBucket_set_tokens_per_fill(msg, sub);
   }
   return sub;
@@ -126,14 +131,12 @@ UPB_INLINE void envoy_type_v3_TokenBucket_set_fill_interval(envoy_type_v3_TokenB
 UPB_INLINE struct google_protobuf_Duration* envoy_type_v3_TokenBucket_mutable_fill_interval(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_v3_TokenBucket_fill_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) envoy_type_v3_TokenBucket_set_fill_interval(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
new file mode 100644
index 0000000000000..ddc3b6beb672f
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
@@ -0,0 +1,57 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/token_bucket.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/type/v3/token_bucket.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub envoy_type_v3_TokenBucket_submsgs[2] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField envoy_type_v3_TokenBucket__fields[3] = {
+  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = {
+  &envoy_type_v3_TokenBucket_submsgs[0],
+  &envoy_type_v3_TokenBucket__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x001000000201001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__type__v3__TokenBucket_msg_init,
+};
+
+const upb_MiniTableFile envoy_type_v3_token_bucket_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/type/v3/token_bucket.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
new file mode 100644
index 0000000000000..d9aaac68ba594
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/token_bucket.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_TOKEN_BUCKET_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__type__v3__TokenBucket_msg_init;
+
+extern const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/api/annotations.upb.h b/src/core/ext/upb-gen/google/api/annotations.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/google/api/annotations.upb.h
rename to src/core/ext/upb-gen/google/api/annotations.upb.h
index a08085870d3a8..2a07e8a88d37d 100644
--- a/src/core/ext/upb-generated/google/api/annotations.upb.h
+++ b/src/core/ext/upb-gen/google/api/annotations.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/annotations.proto
  *
@@ -10,16 +9,20 @@
 #define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/api/annotations.upb_minitable.h"
+
+#include "google/api/http.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern const upb_MiniTableExtension google_api_http_ext;
 struct google_protobuf_MethodOptions;
-extern const upb_MiniTable google_protobuf_MethodOptions_msg_init;
 
 
 UPB_INLINE bool google_api_has_http(const struct google_protobuf_MethodOptions* msg) {
@@ -44,8 +47,6 @@ UPB_INLINE void google_api_set_http(struct google_protobuf_MethodOptions* msg, c
   bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
-extern const upb_MiniTableFile google_api_annotations_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
new file mode 100644
index 0000000000000..118590edad4cb
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/annotations.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/api/annotations.upb_minitable.h"
+#include "google/api/http.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableExtension google_api_http_ext = {
+  {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MethodOptions_msg_init,
+  {.submsg = &google__api__HttpRule_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &google_api_http_ext,
+};
+
+const upb_MiniTableFile google_api_annotations_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  extensions_layout,
+  0,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
new file mode 100644
index 0000000000000..d98f0dacddae8
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/annotations.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_API_ANNOTATIONS_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_MiniTableExtension google_api_http_ext;
+
+extern const upb_MiniTableFile google_api_annotations_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h
rename to src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
index 1305238a147eb..e85a6aed895ee 100644
--- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/checked.proto
  *
@@ -10,7 +9,14 @@
 #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "google/protobuf/empty.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -30,27 +36,10 @@ typedef struct google_api_expr_v1alpha1_Decl_IdentDecl google_api_expr_v1alpha1_
 typedef struct google_api_expr_v1alpha1_Decl_FunctionDecl google_api_expr_v1alpha1_Decl_FunctionDecl;
 typedef struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload google_api_expr_v1alpha1_Decl_FunctionDecl_Overload;
 typedef struct google_api_expr_v1alpha1_Reference google_api_expr_v1alpha1_Reference;
-extern const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Type_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Type_ListType_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Type_MapType_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Type_FunctionType_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Type_AbstractType_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Decl_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Decl_IdentDecl_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Reference_msg_init;
 struct google_api_expr_v1alpha1_Constant;
 struct google_api_expr_v1alpha1_Expr;
 struct google_api_expr_v1alpha1_SourceInfo;
 struct google_protobuf_Empty;
-extern const upb_MiniTable google_api_expr_v1alpha1_Constant_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_msg_init;
-extern const upb_MiniTable google_protobuf_Empty_msg_init;
 
 typedef enum {
   google_api_expr_v1alpha1_Type_PRIMITIVE_TYPE_UNSPECIFIED = 0,
@@ -74,12 +63,12 @@ typedef enum {
 /* google.api.expr.v1alpha1.CheckedExpr */
 
 UPB_INLINE google_api_expr_v1alpha1_CheckedExpr* google_api_expr_v1alpha1_CheckedExpr_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google_api_expr_v1alpha1_CheckedExpr_msg_init, arena);
+  return (google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google__api__expr__v1alpha1__CheckedExpr_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_CheckedExpr* google_api_expr_v1alpha1_CheckedExpr_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_CheckedExpr* ret = google_api_expr_v1alpha1_CheckedExpr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__CheckedExpr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -89,7 +78,7 @@ UPB_INLINE google_api_expr_v1alpha1_CheckedExpr* google_api_expr_v1alpha1_Checke
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_CheckedExpr* ret = google_api_expr_v1alpha1_CheckedExpr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__CheckedExpr_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -97,13 +86,13 @@ UPB_INLINE google_api_expr_v1alpha1_CheckedExpr* google_api_expr_v1alpha1_Checke
 }
 UPB_INLINE char* google_api_expr_v1alpha1_CheckedExpr_serialize(const google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_CheckedExpr_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__CheckedExpr_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_CheckedExpr_serialize_ex(const google_api_expr_v1alpha1_CheckedExpr* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_CheckedExpr_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__CheckedExpr_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_clear_reference_map(google_api_expr_v1alpha1_CheckedExpr* msg) {
@@ -234,7 +223,7 @@ UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_expr(google_api_expr_v1
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_CheckedExpr_mutable_expr(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_CheckedExpr_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_CheckedExpr_set_expr(msg, sub);
   }
   return sub;
@@ -246,7 +235,7 @@ UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_source_info(google_api_
 UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_CheckedExpr_mutable_source_info(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_CheckedExpr_source_info(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google_api_expr_v1alpha1_SourceInfo_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_CheckedExpr_set_source_info(msg, sub);
   }
   return sub;
@@ -297,12 +286,12 @@ UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_set_value(goog
 /* google.api.expr.v1alpha1.Type */
 
 UPB_INLINE google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+  return (google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type* ret = google_api_expr_v1alpha1_Type_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -312,7 +301,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_parse_ex
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type* ret = google_api_expr_v1alpha1_Type_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -320,13 +309,13 @@ UPB_INLINE google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_parse_ex
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_serialize(const google_api_expr_v1alpha1_Type* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_serialize_ex(const google_api_expr_v1alpha1_Type* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -552,7 +541,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_dyn(google_api_expr_v1alpha1_T
 UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_dyn(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_dyn(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google_protobuf_Empty_msg_init, arena);
+    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google__protobuf__Empty_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_dyn(msg, sub);
   }
   return sub;
@@ -580,7 +569,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_list_type(google_api_expr_v1al
 UPB_INLINE struct google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type_mutable_list_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type_ListType* sub = (struct google_api_expr_v1alpha1_Type_ListType*)google_api_expr_v1alpha1_Type_list_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type_ListType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_ListType_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type_ListType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__ListType_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_list_type(msg, sub);
   }
   return sub;
@@ -592,7 +581,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_map_type(google_api_expr_v1alp
 UPB_INLINE struct google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_mutable_map_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type_MapType* sub = (struct google_api_expr_v1alpha1_Type_MapType*)google_api_expr_v1alpha1_Type_map_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type_MapType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_MapType_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type_MapType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__MapType_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_map_type(msg, sub);
   }
   return sub;
@@ -604,7 +593,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_function(google_api_expr_v1alp
 UPB_INLINE struct google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_Type_mutable_function(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type_FunctionType* sub = (struct google_api_expr_v1alpha1_Type_FunctionType*)google_api_expr_v1alpha1_Type_function(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type_FunctionType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_FunctionType_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type_FunctionType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__FunctionType_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_function(msg, sub);
   }
   return sub;
@@ -624,7 +613,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_type(google_api_expr_v1alpha1_
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_mutable_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_type(msg, sub);
   }
   return sub;
@@ -636,7 +625,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_error(google_api_expr_v1alpha1
 UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_error(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_error(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google_protobuf_Empty_msg_init, arena);
+    sub = (struct google_protobuf_Empty*)_upb_Message_New(&google__protobuf__Empty_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_error(msg, sub);
   }
   return sub;
@@ -648,7 +637,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_set_abstract_type(google_api_expr_
 UPB_INLINE struct google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_Type_mutable_abstract_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type_AbstractType* sub = (struct google_api_expr_v1alpha1_Type_AbstractType*)google_api_expr_v1alpha1_Type_abstract_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type_AbstractType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_AbstractType_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type_AbstractType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__AbstractType_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_set_abstract_type(msg, sub);
   }
   return sub;
@@ -657,12 +646,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1
 /* google.api.expr.v1alpha1.Type.ListType */
 
 UPB_INLINE google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type_ListType_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Type_ListType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_ListType_msg_init, arena);
+  return (google_api_expr_v1alpha1_Type_ListType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__ListType_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type_ListType_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_ListType* ret = google_api_expr_v1alpha1_Type_ListType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__ListType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -672,7 +661,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_ListType* ret = google_api_expr_v1alpha1_Type_ListType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__ListType_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -680,13 +669,13 @@ UPB_INLINE google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_ListType_serialize(const google_api_expr_v1alpha1_Type_ListType* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_ListType_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__ListType_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_ListType_serialize_ex(const google_api_expr_v1alpha1_Type_ListType* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_ListType_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__ListType_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Type_ListType_clear_elem_type(google_api_expr_v1alpha1_Type_ListType* msg) {
@@ -712,7 +701,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_ListType_set_elem_type(google_api_
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_ListType_mutable_elem_type(google_api_expr_v1alpha1_Type_ListType* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_ListType_elem_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_ListType_set_elem_type(msg, sub);
   }
   return sub;
@@ -721,12 +710,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_L
 /* google.api.expr.v1alpha1.Type.MapType */
 
 UPB_INLINE google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_MapType_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Type_MapType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_MapType_msg_init, arena);
+  return (google_api_expr_v1alpha1_Type_MapType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__MapType_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_MapType_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_MapType* ret = google_api_expr_v1alpha1_Type_MapType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__MapType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -736,7 +725,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_MapType* ret = google_api_expr_v1alpha1_Type_MapType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__MapType_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -744,13 +733,13 @@ UPB_INLINE google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_MapType_serialize(const google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_MapType_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__MapType_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_MapType_serialize_ex(const google_api_expr_v1alpha1_Type_MapType* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_MapType_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__MapType_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_clear_key_type(google_api_expr_v1alpha1_Type_MapType* msg) {
@@ -791,7 +780,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_key_type(google_api_ex
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_key_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_key_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_MapType_set_key_type(msg, sub);
   }
   return sub;
@@ -803,7 +792,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_value_type(google_api_
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_value_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_value_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_MapType_set_value_type(msg, sub);
   }
   return sub;
@@ -812,12 +801,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_M
 /* google.api.expr.v1alpha1.Type.FunctionType */
 
 UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_Type_FunctionType_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Type_FunctionType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_FunctionType_msg_init, arena);
+  return (google_api_expr_v1alpha1_Type_FunctionType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__FunctionType_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_Type_FunctionType_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_FunctionType* ret = google_api_expr_v1alpha1_Type_FunctionType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__FunctionType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -827,7 +816,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_FunctionType* ret = google_api_expr_v1alpha1_Type_FunctionType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__FunctionType_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -835,13 +824,13 @@ UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_FunctionType_serialize(const google_api_expr_v1alpha1_Type_FunctionType* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_FunctionType_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__FunctionType_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_FunctionType_serialize_ex(const google_api_expr_v1alpha1_Type_FunctionType* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_FunctionType_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__FunctionType_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Type_FunctionType_clear_result_type(google_api_expr_v1alpha1_Type_FunctionType* msg) {
@@ -904,7 +893,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Type_FunctionType_set_result_type(googl
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_FunctionType_mutable_result_type(google_api_expr_v1alpha1_Type_FunctionType* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_FunctionType_result_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Type_FunctionType_set_result_type(msg, sub);
   }
   return sub;
@@ -930,7 +919,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_F
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -939,12 +928,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_F
 /* google.api.expr.v1alpha1.Type.AbstractType */
 
 UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_Type_AbstractType_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Type_AbstractType*)_upb_Message_New(&google_api_expr_v1alpha1_Type_AbstractType_msg_init, arena);
+  return (google_api_expr_v1alpha1_Type_AbstractType*)_upb_Message_New(&google__api__expr__v1alpha1__Type__AbstractType_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_Type_AbstractType_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_AbstractType* ret = google_api_expr_v1alpha1_Type_AbstractType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__AbstractType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -954,7 +943,7 @@ UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Type_AbstractType* ret = google_api_expr_v1alpha1_Type_AbstractType_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Type__AbstractType_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -962,13 +951,13 @@ UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_AbstractType_serialize(const google_api_expr_v1alpha1_Type_AbstractType* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_AbstractType_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__AbstractType_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Type_AbstractType_serialize_ex(const google_api_expr_v1alpha1_Type_AbstractType* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Type_AbstractType_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Type__AbstractType_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Type_AbstractType_clear_name(google_api_expr_v1alpha1_Type_AbstractType* msg) {
@@ -1045,7 +1034,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_A
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1054,12 +1043,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_A
 /* google.api.expr.v1alpha1.Decl */
 
 UPB_INLINE google_api_expr_v1alpha1_Decl* google_api_expr_v1alpha1_Decl_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Decl*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_msg_init, arena);
+  return (google_api_expr_v1alpha1_Decl*)_upb_Message_New(&google__api__expr__v1alpha1__Decl_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Decl* google_api_expr_v1alpha1_Decl_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl* ret = google_api_expr_v1alpha1_Decl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1069,7 +1058,7 @@ UPB_INLINE google_api_expr_v1alpha1_Decl* google_api_expr_v1alpha1_Decl_parse_ex
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl* ret = google_api_expr_v1alpha1_Decl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1077,13 +1066,13 @@ UPB_INLINE google_api_expr_v1alpha1_Decl* google_api_expr_v1alpha1_Decl_parse_ex
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_serialize(const google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_serialize_ex(const google_api_expr_v1alpha1_Decl* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1148,7 +1137,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_set_ident(google_api_expr_v1alpha1
 UPB_INLINE struct google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Decl_mutable_ident(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Decl_IdentDecl* sub = (struct google_api_expr_v1alpha1_Decl_IdentDecl*)google_api_expr_v1alpha1_Decl_ident(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Decl_IdentDecl*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Decl_IdentDecl*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Decl_set_ident(msg, sub);
   }
   return sub;
@@ -1160,7 +1149,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_set_function(google_api_expr_v1alp
 UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_Decl_mutable_function(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Decl_FunctionDecl* sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl*)google_api_expr_v1alpha1_Decl_function(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Decl_set_function(msg, sub);
   }
   return sub;
@@ -1169,12 +1158,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1
 /* google.api.expr.v1alpha1.Decl.IdentDecl */
 
 UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Decl_IdentDecl_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Decl_IdentDecl*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, arena);
+  return (google_api_expr_v1alpha1_Decl_IdentDecl*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Decl_IdentDecl_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_IdentDecl* ret = google_api_expr_v1alpha1_Decl_IdentDecl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1184,7 +1173,7 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Dec
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_IdentDecl* ret = google_api_expr_v1alpha1_Decl_IdentDecl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1192,13 +1181,13 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Dec
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_IdentDecl_serialize(const google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_IdentDecl_serialize_ex(const google_api_expr_v1alpha1_Decl_IdentDecl* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_clear_type(google_api_expr_v1alpha1_Decl_IdentDecl* msg) {
@@ -1250,7 +1239,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_type(google_api_expr
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_type(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_IdentDecl_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Decl_IdentDecl_set_type(msg, sub);
   }
   return sub;
@@ -1262,7 +1251,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_value(google_api_exp
 UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_value(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Decl_IdentDecl_value(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google_api_expr_v1alpha1_Constant_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google__api__expr__v1alpha1__Constant_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Decl_IdentDecl_set_value(msg, sub);
   }
   return sub;
@@ -1275,12 +1264,12 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_doc(google_api_expr_
 /* google.api.expr.v1alpha1.Decl.FunctionDecl */
 
 UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_Decl_FunctionDecl_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Decl_FunctionDecl*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, arena);
+  return (google_api_expr_v1alpha1_Decl_FunctionDecl*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_Decl_FunctionDecl_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_FunctionDecl* ret = google_api_expr_v1alpha1_Decl_FunctionDecl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1290,7 +1279,7 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_FunctionDecl* ret = google_api_expr_v1alpha1_Decl_FunctionDecl_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1298,13 +1287,13 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_FunctionDecl_serialize(const google_api_expr_v1alpha1_Decl_FunctionDecl* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_FunctionDecl_serialize_ex(const google_api_expr_v1alpha1_Decl_FunctionDecl* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_clear_overloads(google_api_expr_v1alpha1_Decl_FunctionDecl* msg) {
@@ -1366,7 +1355,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_ap
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, arena);
+  struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1375,12 +1364,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_ap
 /* google.api.expr.v1alpha1.Decl.FunctionDecl.Overload */
 
 UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Decl_FunctionDecl_Overload*)_upb_Message_New(&google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, arena);
+  return (google_api_expr_v1alpha1_Decl_FunctionDecl_Overload*)_upb_Message_New(&google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* ret = google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1390,7 +1379,7 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_api_expr_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* ret = google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1398,13 +1387,13 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* google_api_expr_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_serialize(const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_serialize_ex(const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_clear_overload_id(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg) {
@@ -1555,7 +1544,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_F
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+  struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1591,7 +1580,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_result_t
 UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_mutable_result_type(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_result_type(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google_api_expr_v1alpha1_Type_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Type*)_upb_Message_New(&google__api__expr__v1alpha1__Type_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_result_type(msg, sub);
   }
   return sub;
@@ -1608,12 +1597,12 @@ UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_doc(goog
 /* google.api.expr.v1alpha1.Reference */
 
 UPB_INLINE google_api_expr_v1alpha1_Reference* google_api_expr_v1alpha1_Reference_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Reference*)_upb_Message_New(&google_api_expr_v1alpha1_Reference_msg_init, arena);
+  return (google_api_expr_v1alpha1_Reference*)_upb_Message_New(&google__api__expr__v1alpha1__Reference_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Reference* google_api_expr_v1alpha1_Reference_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Reference* ret = google_api_expr_v1alpha1_Reference_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Reference_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1623,7 +1612,7 @@ UPB_INLINE google_api_expr_v1alpha1_Reference* google_api_expr_v1alpha1_Referenc
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Reference* ret = google_api_expr_v1alpha1_Reference_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Reference_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1631,13 +1620,13 @@ UPB_INLINE google_api_expr_v1alpha1_Reference* google_api_expr_v1alpha1_Referenc
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Reference_serialize(const google_api_expr_v1alpha1_Reference* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Reference_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Reference_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Reference_serialize_ex(const google_api_expr_v1alpha1_Reference* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Reference_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Reference_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Reference_clear_name(google_api_expr_v1alpha1_Reference* msg) {
@@ -1739,14 +1728,12 @@ UPB_INLINE void google_api_expr_v1alpha1_Reference_set_value(google_api_expr_v1a
 UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Reference_mutable_value(google_api_expr_v1alpha1_Reference* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Reference_value(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google_api_expr_v1alpha1_Constant_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google__api__expr__v1alpha1__Constant_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Reference_set_value(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
new file mode 100644
index 0000000000000..1acedc72e66d9
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
@@ -0,0 +1,369 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/expr/v1alpha1/checked.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "google/protobuf/empty.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = {
+  {.submsg = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__SourceInfo_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[4] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = {
+  &google_api_expr_v1alpha1_CheckedExpr_submsgs[0],
+  &google_api_expr_v1alpha1_CheckedExpr__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0018000001020022, &upb_psm_1bt_maxmaxb},
+    {0x002000000203002a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Reference_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init = {
+  &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0],
+  &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init = {
+  &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0],
+  &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Type_submsgs[7] = {
+  {.submsg = &google__protobuf__Empty_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type__ListType_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type__MapType_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type__FunctionType_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+  {.submsg = &google__protobuf__Empty_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type__AbstractType_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Type__fields[13] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = {
+  &google_api_expr_v1alpha1_Type_submsgs[0],
+  &google_api_expr_v1alpha1_Type__fields[0],
+  UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002000010, &upb_pov4_1bt},
+    {0x0008000003000018, &upb_pov4_1bt},
+    {0x0008000004000020, &upb_pov4_1bt},
+    {0x0008000005000028, &upb_pov4_1bt},
+    {0x0008000006010032, &upb_pom_1bt_max64b},
+    {0x000800000702003a, &upb_pom_1bt_max64b},
+    {0x0008000008030042, &upb_pom_1bt_max64b},
+    {0x000800000900004a, &upb_pos_1bt},
+    {0x000800000a000052, &upb_pos_1bt},
+    {0x000800000b04005a, &upb_pom_1bt_max64b},
+    {0x000800000c050062, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000e060072, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Type_ListType_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Type_ListType__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = {
+  &google_api_expr_v1alpha1_Type_ListType_submsgs[0],
+  &google_api_expr_v1alpha1_Type_ListType__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Type_MapType_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Type_MapType__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = {
+  &google_api_expr_v1alpha1_Type_MapType_submsgs[0],
+  &google_api_expr_v1alpha1_Type_MapType__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Type_FunctionType__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = {
+  &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0],
+  &google_api_expr_v1alpha1_Type_FunctionType__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Type_AbstractType__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = {
+  &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0],
+  &google_api_expr_v1alpha1_Type_AbstractType__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Decl__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = {
+  &google_api_expr_v1alpha1_Decl_submsgs[0],
+  &google_api_expr_v1alpha1_Decl__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pom_1bt_max64b},
+    {0x001800000301001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Constant_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Decl_IdentDecl__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = {
+  &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0],
+  &google_api_expr_v1alpha1_Decl_IdentDecl__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x001800003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = {
+  &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0],
+  &google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Type_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[6] = {
+  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init = {
+  &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0],
+  &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000003f00001a, &upb_prs_1bt},
+    {0x0028000001010022, &upb_psm_1bt_max64b},
+    {0x000100003f000028, &upb_psb1_1bt},
+    {0x003000003f000032, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Reference_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Constant_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Reference__fields[3] = {
+  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = {
+  &google_api_expr_v1alpha1_Reference_submsgs[0],
+  &google_api_expr_v1alpha1_Reference__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00001a, &upb_prs_1bt},
+    {0x0020000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[13] = {
+  &google__api__expr__v1alpha1__CheckedExpr_msg_init,
+  &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init,
+  &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init,
+  &google__api__expr__v1alpha1__Type_msg_init,
+  &google__api__expr__v1alpha1__Type__ListType_msg_init,
+  &google__api__expr__v1alpha1__Type__MapType_msg_init,
+  &google__api__expr__v1alpha1__Type__FunctionType_msg_init,
+  &google__api__expr__v1alpha1__Type__AbstractType_msg_init,
+  &google__api__expr__v1alpha1__Decl_msg_init,
+  &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init,
+  &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init,
+  &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init,
+  &google__api__expr__v1alpha1__Reference_msg_init,
+};
+
+const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  13,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
new file mode 100644
index 0000000000000..2dca15da5fbc9
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
@@ -0,0 +1,42 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/expr/v1alpha1/checked.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_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 google__api__expr__v1alpha1__CheckedExpr_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init;
+
+extern const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h
rename to src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
index 56aaca8dd4ca0..0fdce4db970c4 100644
--- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/syntax.proto
  *
@@ -10,7 +9,14 @@
 #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -31,36 +37,20 @@ typedef struct google_api_expr_v1alpha1_SourceInfo google_api_expr_v1alpha1_Sour
 typedef struct google_api_expr_v1alpha1_SourceInfo_PositionsEntry google_api_expr_v1alpha1_SourceInfo_PositionsEntry;
 typedef struct google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry;
 typedef struct google_api_expr_v1alpha1_SourcePosition google_api_expr_v1alpha1_SourcePosition;
-extern const upb_MiniTable google_api_expr_v1alpha1_ParsedExpr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_Ident_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_Select_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_Call_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateList_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateStruct_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_Comprehension_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Constant_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_SourcePosition_msg_init;
 struct google_protobuf_Duration;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 
 
 /* google.api.expr.v1alpha1.ParsedExpr */
 
 UPB_INLINE google_api_expr_v1alpha1_ParsedExpr* google_api_expr_v1alpha1_ParsedExpr_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_ParsedExpr*)_upb_Message_New(&google_api_expr_v1alpha1_ParsedExpr_msg_init, arena);
+  return (google_api_expr_v1alpha1_ParsedExpr*)_upb_Message_New(&google__api__expr__v1alpha1__ParsedExpr_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_ParsedExpr* google_api_expr_v1alpha1_ParsedExpr_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_ParsedExpr* ret = google_api_expr_v1alpha1_ParsedExpr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__ParsedExpr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -70,7 +60,7 @@ UPB_INLINE google_api_expr_v1alpha1_ParsedExpr* google_api_expr_v1alpha1_ParsedE
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_ParsedExpr* ret = google_api_expr_v1alpha1_ParsedExpr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__ParsedExpr_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -78,13 +68,13 @@ UPB_INLINE google_api_expr_v1alpha1_ParsedExpr* google_api_expr_v1alpha1_ParsedE
 }
 UPB_INLINE char* google_api_expr_v1alpha1_ParsedExpr_serialize(const google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_ParsedExpr_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__ParsedExpr_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_ParsedExpr_serialize_ex(const google_api_expr_v1alpha1_ParsedExpr* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_ParsedExpr_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__ParsedExpr_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_clear_expr(google_api_expr_v1alpha1_ParsedExpr* msg) {
@@ -125,7 +115,7 @@ UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_expr(google_api_expr_v1a
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_ParsedExpr_mutable_expr(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_ParsedExpr_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_ParsedExpr_set_expr(msg, sub);
   }
   return sub;
@@ -137,7 +127,7 @@ UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_source_info(google_api_e
 UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_ParsedExpr_mutable_source_info(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_ParsedExpr_source_info(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google_api_expr_v1alpha1_SourceInfo_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_ParsedExpr_set_source_info(msg, sub);
   }
   return sub;
@@ -146,12 +136,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_
 /* google.api.expr.v1alpha1.Expr */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr* ret = google_api_expr_v1alpha1_Expr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -161,7 +151,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_parse_ex
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr* ret = google_api_expr_v1alpha1_Expr_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -169,13 +159,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_parse_ex
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_serialize(const google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_serialize_ex(const google_api_expr_v1alpha1_Expr* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -320,7 +310,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_const_expr(google_api_expr_v1a
 UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Expr_mutable_const_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Expr_const_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google_api_expr_v1alpha1_Constant_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google__api__expr__v1alpha1__Constant_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_const_expr(msg, sub);
   }
   return sub;
@@ -332,7 +322,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_ident_expr(google_api_expr_v1a
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_mutable_ident_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_Ident* sub = (struct google_api_expr_v1alpha1_Expr_Ident*)google_api_expr_v1alpha1_Expr_ident_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_Ident*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Ident_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_Ident*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Ident_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_ident_expr(msg, sub);
   }
   return sub;
@@ -344,7 +334,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_select_expr(google_api_expr_v1
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_mutable_select_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_Select* sub = (struct google_api_expr_v1alpha1_Expr_Select*)google_api_expr_v1alpha1_Expr_select_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_Select*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Select_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_Select*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Select_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_select_expr(msg, sub);
   }
   return sub;
@@ -356,7 +346,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_call_expr(google_api_expr_v1al
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_mutable_call_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_Call* sub = (struct google_api_expr_v1alpha1_Expr_Call*)google_api_expr_v1alpha1_Expr_call_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_Call*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Call_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_Call*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Call_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_call_expr(msg, sub);
   }
   return sub;
@@ -368,7 +358,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_list_expr(google_api_expr_v1al
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Expr_mutable_list_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_CreateList* sub = (struct google_api_expr_v1alpha1_Expr_CreateList*)google_api_expr_v1alpha1_Expr_list_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_CreateList*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateList_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_CreateList*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateList_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_list_expr(msg, sub);
   }
   return sub;
@@ -380,7 +370,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_struct_expr(google_api_expr_v1
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_Expr_mutable_struct_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_CreateStruct* sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct*)google_api_expr_v1alpha1_Expr_struct_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_struct_expr(msg, sub);
   }
   return sub;
@@ -392,7 +382,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_set_comprehension_expr(google_api_
 UPB_INLINE struct google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1_Expr_mutable_comprehension_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr_Comprehension* sub = (struct google_api_expr_v1alpha1_Expr_Comprehension*)google_api_expr_v1alpha1_Expr_comprehension_expr(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr_Comprehension*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Comprehension_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr_Comprehension*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Comprehension_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_set_comprehension_expr(msg, sub);
   }
   return sub;
@@ -401,12 +391,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v
 /* google.api.expr.v1alpha1.Expr.Ident */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_Ident_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_Ident*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Ident_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_Ident*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Ident_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_Ident_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Ident* ret = google_api_expr_v1alpha1_Expr_Ident_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Ident_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -416,7 +406,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_Id
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Ident* ret = google_api_expr_v1alpha1_Expr_Ident_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Ident_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -424,13 +414,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_Id
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Ident_serialize(const google_api_expr_v1alpha1_Expr_Ident* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Ident_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Ident_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Ident_serialize_ex(const google_api_expr_v1alpha1_Expr_Ident* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Ident_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Ident_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_Ident_clear_name(google_api_expr_v1alpha1_Expr_Ident* msg) {
@@ -453,12 +443,12 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Ident_set_name(google_api_expr_v1a
 /* google.api.expr.v1alpha1.Expr.Select */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_Select_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_Select*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Select_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_Select*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Select_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_Select_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Select* ret = google_api_expr_v1alpha1_Expr_Select_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Select_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -468,7 +458,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_S
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Select* ret = google_api_expr_v1alpha1_Expr_Select_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Select_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -476,13 +466,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_S
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Select_serialize(const google_api_expr_v1alpha1_Expr_Select* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Select_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Select_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Select_serialize_ex(const google_api_expr_v1alpha1_Expr_Select* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Select_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Select_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_clear_operand(google_api_expr_v1alpha1_Expr_Select* msg) {
@@ -530,7 +520,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_operand(google_api_expr
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Select_mutable_operand(google_api_expr_v1alpha1_Expr_Select* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Select_operand(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Select_set_operand(msg, sub);
   }
   return sub;
@@ -547,12 +537,12 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_test_only(google_api_ex
 /* google.api.expr.v1alpha1.Expr.Call */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_Call_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_Call*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Call_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_Call*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Call_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_Call_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Call* ret = google_api_expr_v1alpha1_Expr_Call_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Call_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -562,7 +552,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_Cal
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Call* ret = google_api_expr_v1alpha1_Expr_Call_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Call_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -570,13 +560,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_Cal
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Call_serialize(const google_api_expr_v1alpha1_Expr_Call* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Call_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Call_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Call_serialize_ex(const google_api_expr_v1alpha1_Expr_Call* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Call_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Call_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_clear_target(google_api_expr_v1alpha1_Expr_Call* msg) {
@@ -650,7 +640,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_target(google_api_expr_v1
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Call_mutable_target(google_api_expr_v1alpha1_Expr_Call* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Call_target(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Call_set_target(msg, sub);
   }
   return sub;
@@ -680,7 +670,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -689,12 +679,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
 /* google.api.expr.v1alpha1.Expr.CreateList */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Expr_CreateList_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_CreateList*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateList_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_CreateList*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateList_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Expr_CreateList_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateList* ret = google_api_expr_v1alpha1_Expr_CreateList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -704,7 +694,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Ex
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateList* ret = google_api_expr_v1alpha1_Expr_CreateList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -712,13 +702,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Ex
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateList_serialize(const google_api_expr_v1alpha1_Expr_CreateList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateList_serialize_ex(const google_api_expr_v1alpha1_Expr_CreateList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateList_clear_elements(google_api_expr_v1alpha1_Expr_CreateList* msg) {
@@ -780,7 +770,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -789,12 +779,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
 /* google.api.expr.v1alpha1.Expr.CreateStruct */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_Expr_CreateStruct_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_CreateStruct*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_CreateStruct*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_Expr_CreateStruct_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateStruct* ret = google_api_expr_v1alpha1_Expr_CreateStruct_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -804,7 +794,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateStruct* ret = google_api_expr_v1alpha1_Expr_CreateStruct_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -812,13 +802,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateStruct_serialize(const google_api_expr_v1alpha1_Expr_CreateStruct* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateStruct_serialize_ex(const google_api_expr_v1alpha1_Expr_CreateStruct* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_clear_message_name(google_api_expr_v1alpha1_Expr_CreateStruct* msg) {
@@ -895,7 +885,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_e
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry* sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, arena);
+  struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry* sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -904,12 +894,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_e
 /* google.api.expr.v1alpha1.Expr.CreateStruct.Entry */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_CreateStruct_Entry*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_CreateStruct_Entry*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateStruct_Entry* ret = google_api_expr_v1alpha1_Expr_CreateStruct_Entry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -919,7 +909,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_expr_v1a
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_CreateStruct_Entry* ret = google_api_expr_v1alpha1_Expr_CreateStruct_Entry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -927,13 +917,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry* google_api_expr_v1a
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_serialize(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_serialize_ex(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1017,7 +1007,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_map_key(goo
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_map_key(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_map_key(msg, sub);
   }
   return sub;
@@ -1029,7 +1019,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_value(googl
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_value(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_value(msg, sub);
   }
   return sub;
@@ -1038,12 +1028,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
 /* google.api.expr.v1alpha1.Expr.Comprehension */
 
 UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1_Expr_Comprehension_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Expr_Comprehension*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_Comprehension_msg_init, arena);
+  return (google_api_expr_v1alpha1_Expr_Comprehension*)_upb_Message_New(&google__api__expr__v1alpha1__Expr__Comprehension_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1_Expr_Comprehension_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Comprehension* ret = google_api_expr_v1alpha1_Expr_Comprehension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Comprehension_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1053,7 +1043,7 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Expr_Comprehension* ret = google_api_expr_v1alpha1_Expr_Comprehension_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Expr__Comprehension_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1061,13 +1051,13 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Comprehension_serialize(const google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Comprehension_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Comprehension_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Expr_Comprehension_serialize_ex(const google_api_expr_v1alpha1_Expr_Comprehension* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Expr_Comprehension_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Expr__Comprehension_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_clear_iter_var(google_api_expr_v1alpha1_Expr_Comprehension* msg) {
@@ -1179,7 +1169,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_range(googl
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_iter_range(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_iter_range(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Comprehension_set_iter_range(msg, sub);
   }
   return sub;
@@ -1195,7 +1185,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_init(google
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_accu_init(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_accu_init(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Comprehension_set_accu_init(msg, sub);
   }
   return sub;
@@ -1207,7 +1197,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_condition(g
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_condition(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_condition(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Comprehension_set_loop_condition(msg, sub);
   }
   return sub;
@@ -1219,7 +1209,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_step(google
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_step(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_step(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Comprehension_set_loop_step(msg, sub);
   }
   return sub;
@@ -1231,7 +1221,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_result(google_ap
 UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_result(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) {
   struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_result(msg);
   if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
+    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google__api__expr__v1alpha1__Expr_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Expr_Comprehension_set_result(msg, sub);
   }
   return sub;
@@ -1240,12 +1230,12 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C
 /* google.api.expr.v1alpha1.Constant */
 
 UPB_INLINE google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Constant_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google_api_expr_v1alpha1_Constant_msg_init, arena);
+  return (google_api_expr_v1alpha1_Constant*)_upb_Message_New(&google__api__expr__v1alpha1__Constant_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Constant_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_Constant* ret = google_api_expr_v1alpha1_Constant_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Constant_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1255,7 +1245,7 @@ UPB_INLINE google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Constant_
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_Constant* ret = google_api_expr_v1alpha1_Constant_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__Constant_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1263,13 +1253,13 @@ UPB_INLINE google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Constant_
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Constant_serialize(const google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Constant_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Constant_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_Constant_serialize_ex(const google_api_expr_v1alpha1_Constant* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_Constant_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__Constant_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1459,7 +1449,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Constant_set_duration_value(google_api_
 UPB_INLINE struct google_protobuf_Duration* google_api_expr_v1alpha1_Constant_mutable_duration_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)google_api_expr_v1alpha1_Constant_duration_value(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Constant_set_duration_value(msg, sub);
   }
   return sub;
@@ -1471,7 +1461,7 @@ UPB_INLINE void google_api_expr_v1alpha1_Constant_set_timestamp_value(google_api
 UPB_INLINE struct google_protobuf_Timestamp* google_api_expr_v1alpha1_Constant_mutable_timestamp_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)google_api_expr_v1alpha1_Constant_timestamp_value(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) google_api_expr_v1alpha1_Constant_set_timestamp_value(msg, sub);
   }
   return sub;
@@ -1480,12 +1470,12 @@ UPB_INLINE struct google_protobuf_Timestamp* google_api_expr_v1alpha1_Constant_m
 /* google.api.expr.v1alpha1.SourceInfo */
 
 UPB_INLINE google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_SourceInfo_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google_api_expr_v1alpha1_SourceInfo_msg_init, arena);
+  return (google_api_expr_v1alpha1_SourceInfo*)_upb_Message_New(&google__api__expr__v1alpha1__SourceInfo_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_SourceInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_SourceInfo* ret = google_api_expr_v1alpha1_SourceInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__SourceInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1495,7 +1485,7 @@ UPB_INLINE google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_SourceI
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_SourceInfo* ret = google_api_expr_v1alpha1_SourceInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__SourceInfo_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1503,13 +1493,13 @@ UPB_INLINE google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_SourceI
 }
 UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_serialize(const google_api_expr_v1alpha1_SourceInfo* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_SourceInfo_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__SourceInfo_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_SourceInfo_serialize_ex(const google_api_expr_v1alpha1_SourceInfo* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_SourceInfo_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__SourceInfo_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_clear_syntax_version(google_api_expr_v1alpha1_SourceInfo* msg) {
@@ -1736,12 +1726,12 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_set_value(go
 /* google.api.expr.v1alpha1.SourcePosition */
 
 UPB_INLINE google_api_expr_v1alpha1_SourcePosition* google_api_expr_v1alpha1_SourcePosition_new(upb_Arena* arena) {
-  return (google_api_expr_v1alpha1_SourcePosition*)_upb_Message_New(&google_api_expr_v1alpha1_SourcePosition_msg_init, arena);
+  return (google_api_expr_v1alpha1_SourcePosition*)_upb_Message_New(&google__api__expr__v1alpha1__SourcePosition_msg_init, arena);
 }
 UPB_INLINE google_api_expr_v1alpha1_SourcePosition* google_api_expr_v1alpha1_SourcePosition_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_expr_v1alpha1_SourcePosition* ret = google_api_expr_v1alpha1_SourcePosition_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__SourcePosition_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1751,7 +1741,7 @@ UPB_INLINE google_api_expr_v1alpha1_SourcePosition* google_api_expr_v1alpha1_Sou
                            int options, upb_Arena* arena) {
   google_api_expr_v1alpha1_SourcePosition* ret = google_api_expr_v1alpha1_SourcePosition_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__expr__v1alpha1__SourcePosition_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1759,13 +1749,13 @@ UPB_INLINE google_api_expr_v1alpha1_SourcePosition* google_api_expr_v1alpha1_Sou
 }
 UPB_INLINE char* google_api_expr_v1alpha1_SourcePosition_serialize(const google_api_expr_v1alpha1_SourcePosition* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_SourcePosition_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__SourcePosition_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_expr_v1alpha1_SourcePosition_serialize_ex(const google_api_expr_v1alpha1_SourcePosition* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_expr_v1alpha1_SourcePosition_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__expr__v1alpha1__SourcePosition_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_clear_location(google_api_expr_v1alpha1_SourcePosition* msg) {
@@ -1830,8 +1820,6 @@ UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_column(google_api_ex
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
new file mode 100644
index 0000000000000..1d5b68c2504b1
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
@@ -0,0 +1,399 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/expr/v1alpha1/syntax.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__SourceInfo_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_ParsedExpr__fields[2] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = {
+  &google_api_expr_v1alpha1_ParsedExpr_submsgs[0],
+  &google_api_expr_v1alpha1_ParsedExpr__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_max64b},
+    {0x001000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_submsgs[7] = {
+  {.submsg = &google__api__expr__v1alpha1__Constant_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__Ident_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__Select_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__Call_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__CreateList_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr__fields[8] = {
+  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 16), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 16), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 16), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 16), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 16), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 16), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(4, 16), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = {
+  &google_api_expr_v1alpha1_Expr_submsgs[0],
+  &google_api_expr_v1alpha1_Expr__fields[0],
+  UPB_SIZE(16, 24), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x001000000300001a, &upb_pom_1bt_max64b},
+    {0x0010000004010022, &upb_pom_1bt_max64b},
+    {0x001000000502002a, &upb_pom_1bt_max64b},
+    {0x0010000006030032, &upb_pom_1bt_max64b},
+    {0x001000000704003a, &upb_pom_1bt_max64b},
+    {0x0010000008050042, &upb_pom_1bt_max64b},
+    {0x001000000906004a, &upb_pom_1bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Ident__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = {
+  NULL,
+  &google_api_expr_v1alpha1_Expr_Ident__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Select_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Select__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = {
+  &google_api_expr_v1alpha1_Expr_Select_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_Select__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Call_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Call__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = {
+  &google_api_expr_v1alpha1_Expr_Call_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_Call__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f01001a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = {
+  &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_CreateList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct__fields[2] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = {
+  &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_CreateStruct__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[4] = {
+  {1, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 8), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init = {
+  &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0],
+  UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f000008, &upb_psv8_1bt},
+    {0x0008000402000012, &upb_pos_1bt},
+    {0x000800040300001a, &upb_pom_1bt_max64b},
+    {0x0020000001010022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fields[7] = {
+  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 64), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 72), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = {
+  &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0],
+  &google_api_expr_v1alpha1_Expr_Comprehension__fields[0],
+  UPB_SIZE(40, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x002000003f00001a, &upb_pss_1bt},
+    {0x0030000002010022, &upb_psm_1bt_max64b},
+    {0x003800000302002a, &upb_psm_1bt_max64b},
+    {0x0040000004030032, &upb_psm_1bt_max64b},
+    {0x004800000504003a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_Constant_submsgs[2] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_Constant__fields[9] = {
+  {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 8, -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, 8, -1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, 8, -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = {
+  &google_api_expr_v1alpha1_Constant_submsgs[0],
+  &google_api_expr_v1alpha1_Constant__fields[0],
+  UPB_SIZE(16, 24), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_pov4_1bt},
+    {0x0008000002000010, &upb_pob1_1bt},
+    {0x0008000003000018, &upb_pov8_1bt},
+    {0x0008000004000020, &upb_pov8_1bt},
+    {0x0008000005000029, &upb_pof8_1bt},
+    {0x0008000006000032, &upb_pos_1bt},
+    {0x000800000700003a, &upb_pob_1bt},
+    {0x0008000008000042, &upb_pom_1bt_maxmaxb},
+    {0x000800000901004a, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[5] = {
+  {1, UPB_SIZE(12, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(0, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = {
+  &google_api_expr_v1alpha1_SourceInfo_submsgs[0],
+  &google_api_expr_v1alpha1_SourceInfo__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_ppv4_1bt},
+  })
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init = {
+  NULL,
+  &google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x001800003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = {
+  {.submsg = &google__api__expr__v1alpha1__Expr_msg_init},
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init = {
+  &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0],
+  &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_api_expr_v1alpha1_SourcePosition__fields[4] = {
+  {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init = {
+  NULL,
+  &google_api_expr_v1alpha1_SourcePosition__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x000800003f000020, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[14] = {
+  &google__api__expr__v1alpha1__ParsedExpr_msg_init,
+  &google__api__expr__v1alpha1__Expr_msg_init,
+  &google__api__expr__v1alpha1__Expr__Ident_msg_init,
+  &google__api__expr__v1alpha1__Expr__Select_msg_init,
+  &google__api__expr__v1alpha1__Expr__Call_msg_init,
+  &google__api__expr__v1alpha1__Expr__CreateList_msg_init,
+  &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init,
+  &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init,
+  &google__api__expr__v1alpha1__Expr__Comprehension_msg_init,
+  &google__api__expr__v1alpha1__Constant_msg_init,
+  &google__api__expr__v1alpha1__SourceInfo_msg_init,
+  &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init,
+  &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init,
+  &google__api__expr__v1alpha1__SourcePosition_msg_init,
+};
+
+const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  14,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
new file mode 100644
index 0000000000000..c0232345d2baf
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
@@ -0,0 +1,43 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/expr/v1alpha1/syntax.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_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 google__api__expr__v1alpha1__ParsedExpr_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init;
+extern const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init;
+
+extern const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/http.upb.h b/src/core/ext/upb-gen/google/api/http.upb.h
new file mode 100644
index 0000000000000..2e5bb54bd285a
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/http.upb.h
@@ -0,0 +1,496 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_HTTP_PROTO_UPB_H_
+#define GOOGLE_API_HTTP_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/api/http.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_api_Http google_api_Http;
+typedef struct google_api_HttpRule google_api_HttpRule;
+typedef struct google_api_CustomHttpPattern google_api_CustomHttpPattern;
+
+
+
+/* google.api.Http */
+
+UPB_INLINE google_api_Http* google_api_Http_new(upb_Arena* arena) {
+  return (google_api_Http*)_upb_Message_New(&google__api__Http_msg_init, arena);
+}
+UPB_INLINE google_api_Http* google_api_Http_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_api_Http* ret = google_api_Http_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__Http_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_api_Http* google_api_Http_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_api_Http* ret = google_api_Http_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__Http_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_api_Http_serialize(const google_api_Http* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__Http_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_api_Http_serialize_ex(const google_api_Http* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__Http_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_api_Http_clear_rules(google_api_Http* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_api_HttpRule* const* google_api_Http_rules(const google_api_Http* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_api_HttpRule* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_api_Http_rules_upb_array(const google_api_Http* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_api_Http_rules_mutable_upb_array(const google_api_Http* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_api_Http_has_rules(const google_api_Http* msg) {
+  size_t size;
+  google_api_Http_rules(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_api_Http_clear_fully_decode_reserved_expansion(google_api_Http* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_api_Http_fully_decode_reserved_expansion(const google_api_Http* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE google_api_HttpRule** google_api_Http_mutable_rules(google_api_Http* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_api_HttpRule**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_api_HttpRule** google_api_Http_resize_rules(google_api_Http* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_api_HttpRule**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_api_HttpRule* google_api_Http_add_rules(google_api_Http* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_api_HttpRule* sub = (struct google_api_HttpRule*)_upb_Message_New(&google__api__HttpRule_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_api_Http_set_fully_decode_reserved_expansion(google_api_Http *msg, bool value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.api.HttpRule */
+
+UPB_INLINE google_api_HttpRule* google_api_HttpRule_new(upb_Arena* arena) {
+  return (google_api_HttpRule*)_upb_Message_New(&google__api__HttpRule_msg_init, arena);
+}
+UPB_INLINE google_api_HttpRule* google_api_HttpRule_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_api_HttpRule* ret = google_api_HttpRule_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__HttpRule_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_api_HttpRule* google_api_HttpRule_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_api_HttpRule* ret = google_api_HttpRule_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__HttpRule_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_api_HttpRule_serialize(const google_api_HttpRule* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__HttpRule_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_api_HttpRule_serialize_ex(const google_api_HttpRule* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__HttpRule_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  google_api_HttpRule_pattern_get = 2,
+  google_api_HttpRule_pattern_put = 3,
+  google_api_HttpRule_pattern_post = 4,
+  google_api_HttpRule_pattern_delete = 5,
+  google_api_HttpRule_pattern_patch = 6,
+  google_api_HttpRule_pattern_custom = 8,
+  google_api_HttpRule_pattern_NOT_SET = 0
+} google_api_HttpRule_pattern_oneofcases;
+UPB_INLINE google_api_HttpRule_pattern_oneofcases google_api_HttpRule_pattern_case(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (google_api_HttpRule_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_selector(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_selector(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void google_api_HttpRule_clear_get(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_get(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_get(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_put(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_put(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_put(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_post(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_post(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_post(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_delete(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_delete(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_delete(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_patch(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_patch(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_patch(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_body(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_body(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void google_api_HttpRule_clear_custom(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_api_CustomHttpPattern* google_api_HttpRule_custom(const google_api_HttpRule* msg) {
+  const google_api_CustomHttpPattern* default_val = NULL;
+  const google_api_CustomHttpPattern* ret;
+  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_api_HttpRule_has_custom(const google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_api_HttpRule_clear_additional_bindings(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_api_HttpRule* const* google_api_HttpRule_additional_bindings(const google_api_HttpRule* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_api_HttpRule* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_api_HttpRule_additional_bindings_upb_array(const google_api_HttpRule* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_api_HttpRule_additional_bindings_mutable_upb_array(const google_api_HttpRule* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_api_HttpRule_has_additional_bindings(const google_api_HttpRule* msg) {
+  size_t size;
+  google_api_HttpRule_additional_bindings(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_api_HttpRule_clear_response_body(google_api_HttpRule* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_HttpRule_response_body(const google_api_HttpRule* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void google_api_HttpRule_set_selector(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_get(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_put(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_post(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_delete(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_patch(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_body(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_HttpRule_set_custom(google_api_HttpRule *msg, google_api_CustomHttpPattern* value) {
+  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_api_CustomHttpPattern* google_api_HttpRule_mutable_custom(google_api_HttpRule* msg, upb_Arena* arena) {
+  struct google_api_CustomHttpPattern* sub = (struct google_api_CustomHttpPattern*)google_api_HttpRule_custom(msg);
+  if (sub == NULL) {
+    sub = (struct google_api_CustomHttpPattern*)_upb_Message_New(&google__api__CustomHttpPattern_msg_init, arena);
+    if (sub) google_api_HttpRule_set_custom(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_api_HttpRule** google_api_HttpRule_mutable_additional_bindings(google_api_HttpRule* msg, size_t* size) {
+  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_api_HttpRule**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_api_HttpRule** google_api_HttpRule_resize_additional_bindings(google_api_HttpRule* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_api_HttpRule**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_api_HttpRule* google_api_HttpRule_add_additional_bindings(google_api_HttpRule* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_api_HttpRule* sub = (struct google_api_HttpRule*)_upb_Message_New(&google__api__HttpRule_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_api_HttpRule_set_response_body(google_api_HttpRule *msg, upb_StringView value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.api.CustomHttpPattern */
+
+UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_new(upb_Arena* arena) {
+  return (google_api_CustomHttpPattern*)_upb_Message_New(&google__api__CustomHttpPattern_msg_init, arena);
+}
+UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_api_CustomHttpPattern* ret = google_api_CustomHttpPattern_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__CustomHttpPattern_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_api_CustomHttpPattern* ret = google_api_CustomHttpPattern_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__api__CustomHttpPattern_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_api_CustomHttpPattern_serialize(const google_api_CustomHttpPattern* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__CustomHttpPattern_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_api_CustomHttpPattern_serialize_ex(const google_api_CustomHttpPattern* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__api__CustomHttpPattern_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_api_CustomHttpPattern_clear_kind(google_api_CustomHttpPattern* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_CustomHttpPattern_kind(const google_api_CustomHttpPattern* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void google_api_CustomHttpPattern_clear_path(google_api_CustomHttpPattern* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_api_CustomHttpPattern_path(const google_api_CustomHttpPattern* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void google_api_CustomHttpPattern_set_kind(google_api_CustomHttpPattern *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPattern *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_HTTP_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.c b/src/core/ext/upb-gen/google/api/http.upb_minitable.c
new file mode 100644
index 0000000000000..32fa93ef25aeb
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.c
@@ -0,0 +1,111 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/api/http.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_api_Http_submsgs[1] = {
+  {.submsg = &google__api__HttpRule_msg_init},
+};
+
+static const upb_MiniTableField google_api_Http__fields[2] = {
+  {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__Http_msg_init = {
+  &google_api_Http_submsgs[0],
+  &google_api_Http__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max128b},
+    {0x000000003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_api_HttpRule_submsgs[2] = {
+  {.submsg = &google__api__CustomHttpPattern_msg_init},
+  {.submsg = &google__api__HttpRule_msg_init},
+};
+
+static const upb_MiniTableField google_api_HttpRule__fields[10] = {
+  {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__HttpRule_msg_init = {
+  &google_api_HttpRule_submsgs[0],
+  &google_api_HttpRule__fields[0],
+  UPB_SIZE(40, 80), 10, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00000a, &upb_pss_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x000800000300001a, &upb_pos_1bt},
+    {0x0008000004000022, &upb_pos_1bt},
+    {0x000800000500002a, &upb_pos_1bt},
+    {0x0008000006000032, &upb_pos_1bt},
+    {0x002800003f00003a, &upb_pss_1bt},
+    {0x0008000008000042, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f01005a, &upb_prm_1bt_max128b},
+    {0x004000003f000062, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_api_CustomHttpPattern__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__CustomHttpPattern_msg_init = {
+  NULL,
+  &google_api_CustomHttpPattern__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &google__api__Http_msg_init,
+  &google__api__HttpRule_msg_init,
+  &google__api__CustomHttpPattern_msg_init,
+};
+
+const upb_MiniTableFile google_api_http_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.h b/src/core/ext/upb-gen/google/api/http.upb_minitable.h
new file mode 100644
index 0000000000000..83ec6172940a6
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_API_HTTP_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 google__api__Http_msg_init;
+extern const upb_MiniTable google__api__HttpRule_msg_init;
+extern const upb_MiniTable google__api__CustomHttpPattern_msg_init;
+
+extern const upb_MiniTableFile google_api_http_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/api/httpbody.upb.h b/src/core/ext/upb-gen/google/api/httpbody.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/google/api/httpbody.upb.h
rename to src/core/ext/upb-gen/google/api/httpbody.upb.h
index a7998df5e7807..f901110ac2302 100644
--- a/src/core/ext/upb-generated/google/api/httpbody.upb.h
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/httpbody.proto
  *
@@ -10,7 +9,12 @@
 #define GOOGLE_API_HTTPBODY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/api/httpbody.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +22,19 @@ extern "C" {
 #endif
 
 typedef struct google_api_HttpBody google_api_HttpBody;
-extern const upb_MiniTable google_api_HttpBody_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
 
 
 
 /* google.api.HttpBody */
 
 UPB_INLINE google_api_HttpBody* google_api_HttpBody_new(upb_Arena* arena) {
-  return (google_api_HttpBody*)_upb_Message_New(&google_api_HttpBody_msg_init, arena);
+  return (google_api_HttpBody*)_upb_Message_New(&google__api__HttpBody_msg_init, arena);
 }
 UPB_INLINE google_api_HttpBody* google_api_HttpBody_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_api_HttpBody* ret = google_api_HttpBody_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_HttpBody_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__api__HttpBody_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +44,7 @@ UPB_INLINE google_api_HttpBody* google_api_HttpBody_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   google_api_HttpBody* ret = google_api_HttpBody_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_HttpBody_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__api__HttpBody_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +52,13 @@ UPB_INLINE google_api_HttpBody* google_api_HttpBody_parse_ex(const char* buf, si
 }
 UPB_INLINE char* google_api_HttpBody_serialize(const google_api_HttpBody* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_HttpBody_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__HttpBody_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_api_HttpBody_serialize_ex(const google_api_HttpBody* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_api_HttpBody_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__api__HttpBody_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_api_HttpBody_clear_content_type(google_api_HttpBody* msg) {
@@ -148,14 +150,12 @@ UPB_INLINE struct google_protobuf_Any* google_api_HttpBody_add_extensions(google
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-extern const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
new file mode 100644
index 0000000000000..185b8eb03b069
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/httpbody.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/api/httpbody.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_api_HttpBody_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField google_api_HttpBody__fields[3] = {
+  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(0, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__api__HttpBody_msg_init = {
+  &google_api_HttpBody_submsgs[0],
+  &google_api_HttpBody__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_psb_1bt},
+    {0x002000003f00001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__api__HttpBody_msg_init,
+};
+
+const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
new file mode 100644
index 0000000000000..58e4859ca953e
--- /dev/null
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/httpbody.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_API_HTTPBODY_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 google__api__HttpBody_msg_init;
+
+extern const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/any.upb.h b/src/core/ext/upb-gen/google/protobuf/any.upb.h
similarity index 84%
rename from src/core/ext/upb-generated/google/protobuf/any.upb.h
rename to src/core/ext/upb-gen/google/protobuf/any.upb.h
index bf1b5dd5db21d..610b7a5ae60a3 100644
--- a/src/core/ext/upb-generated/google/protobuf/any.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/any.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/any.proto
  *
@@ -10,7 +9,10 @@
 #define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +20,18 @@ extern "C" {
 #endif
 
 typedef struct google_protobuf_Any google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
 
 
 
 /* google.protobuf.Any */
 
 UPB_INLINE google_protobuf_Any* google_protobuf_Any_new(upb_Arena* arena) {
-  return (google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  return (google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
 }
 UPB_INLINE google_protobuf_Any* google_protobuf_Any_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_Any* ret = google_protobuf_Any_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Any_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__Any_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +41,7 @@ UPB_INLINE google_protobuf_Any* google_protobuf_Any_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   google_protobuf_Any* ret = google_protobuf_Any_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Any_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__Any_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +49,13 @@ UPB_INLINE google_protobuf_Any* google_protobuf_Any_parse_ex(const char* buf, si
 }
 UPB_INLINE char* google_protobuf_Any_serialize(const google_protobuf_Any* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Any_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Any_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_Any_serialize_ex(const google_protobuf_Any* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Any_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Any_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_Any_clear_type_url(google_protobuf_Any* msg) {
@@ -89,8 +90,6 @@ UPB_INLINE void google_protobuf_Any_set_value(google_protobuf_Any *msg, upb_Stri
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
new file mode 100644
index 0000000000000..7352f2d4b56cd
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/any.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField google_protobuf_Any__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Any_msg_init = {
+  NULL,
+  &google_protobuf_Any__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_psb_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__protobuf__Any_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
new file mode 100644
index 0000000000000..77f2ceee09430
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/any.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_ANY_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 google__protobuf__Any_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
new file mode 100644
index 0000000000000..44a98a31f2259
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
@@ -0,0 +1,6397 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
+typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
+typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
+typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
+typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
+typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
+typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration;
+typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
+typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
+typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
+typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
+typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
+typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
+typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
+typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
+typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
+typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
+typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault;
+typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
+typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
+typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
+typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
+typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
+typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
+typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
+typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet;
+typedef struct google_protobuf_FeatureSetDefaults google_protobuf_FeatureSetDefaults;
+typedef struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault;
+typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
+typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
+typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
+typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
+
+typedef enum {
+  google_protobuf_EDITION_UNKNOWN = 0,
+  google_protobuf_EDITION_1_TEST_ONLY = 1,
+  google_protobuf_EDITION_2_TEST_ONLY = 2,
+  google_protobuf_EDITION_PROTO2 = 998,
+  google_protobuf_EDITION_PROTO3 = 999,
+  google_protobuf_EDITION_2023 = 1000,
+  google_protobuf_EDITION_99997_TEST_ONLY = 99997,
+  google_protobuf_EDITION_99998_TEST_ONLY = 99998,
+  google_protobuf_EDITION_99999_TEST_ONLY = 99999
+} google_protobuf_Edition;
+
+typedef enum {
+  google_protobuf_ExtensionRangeOptions_DECLARATION = 0,
+  google_protobuf_ExtensionRangeOptions_UNVERIFIED = 1
+} google_protobuf_ExtensionRangeOptions_VerificationState;
+
+typedef enum {
+  google_protobuf_FeatureSet_ENUM_TYPE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_OPEN = 1,
+  google_protobuf_FeatureSet_CLOSED = 2
+} google_protobuf_FeatureSet_EnumType;
+
+typedef enum {
+  google_protobuf_FeatureSet_FIELD_PRESENCE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_EXPLICIT = 1,
+  google_protobuf_FeatureSet_IMPLICIT = 2,
+  google_protobuf_FeatureSet_LEGACY_REQUIRED = 3
+} google_protobuf_FeatureSet_FieldPresence;
+
+typedef enum {
+  google_protobuf_FeatureSet_JSON_FORMAT_UNKNOWN = 0,
+  google_protobuf_FeatureSet_ALLOW = 1,
+  google_protobuf_FeatureSet_LEGACY_BEST_EFFORT = 2
+} google_protobuf_FeatureSet_JsonFormat;
+
+typedef enum {
+  google_protobuf_FeatureSet_MESSAGE_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_LENGTH_PREFIXED = 1,
+  google_protobuf_FeatureSet_DELIMITED = 2
+} google_protobuf_FeatureSet_MessageEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_PACKED = 1,
+  google_protobuf_FeatureSet_EXPANDED = 2
+} google_protobuf_FeatureSet_RepeatedFieldEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_UTF8_VALIDATION_UNKNOWN = 0,
+  google_protobuf_FeatureSet_NONE = 1,
+  google_protobuf_FeatureSet_VERIFY = 2
+} google_protobuf_FeatureSet_Utf8Validation;
+
+typedef enum {
+  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
+  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
+  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
+} google_protobuf_FieldDescriptorProto_Label;
+
+typedef enum {
+  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
+  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
+  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
+  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
+  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
+  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
+  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
+  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
+  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
+  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
+  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
+  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
+  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
+  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
+  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
+  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
+  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
+  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
+} google_protobuf_FieldDescriptorProto_Type;
+
+typedef enum {
+  google_protobuf_FieldOptions_STRING = 0,
+  google_protobuf_FieldOptions_CORD = 1,
+  google_protobuf_FieldOptions_STRING_PIECE = 2
+} google_protobuf_FieldOptions_CType;
+
+typedef enum {
+  google_protobuf_FieldOptions_JS_NORMAL = 0,
+  google_protobuf_FieldOptions_JS_STRING = 1,
+  google_protobuf_FieldOptions_JS_NUMBER = 2
+} google_protobuf_FieldOptions_JSType;
+
+typedef enum {
+  google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0,
+  google_protobuf_FieldOptions_RETENTION_RUNTIME = 1,
+  google_protobuf_FieldOptions_RETENTION_SOURCE = 2
+} google_protobuf_FieldOptions_OptionRetention;
+
+typedef enum {
+  google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0,
+  google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1,
+  google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2,
+  google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3,
+  google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4,
+  google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5,
+  google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6,
+  google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7,
+  google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8,
+  google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9
+} google_protobuf_FieldOptions_OptionTargetType;
+
+typedef enum {
+  google_protobuf_FileOptions_SPEED = 1,
+  google_protobuf_FileOptions_CODE_SIZE = 2,
+  google_protobuf_FileOptions_LITE_RUNTIME = 3
+} google_protobuf_FileOptions_OptimizeMode;
+
+typedef enum {
+  google_protobuf_GeneratedCodeInfo_Annotation_NONE = 0,
+  google_protobuf_GeneratedCodeInfo_Annotation_SET = 1,
+  google_protobuf_GeneratedCodeInfo_Annotation_ALIAS = 2
+} google_protobuf_GeneratedCodeInfo_Annotation_Semantic;
+
+typedef enum {
+  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
+  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
+  google_protobuf_MethodOptions_IDEMPOTENT = 2
+} google_protobuf_MethodOptions_IdempotencyLevel;
+
+
+
+/* google.protobuf.FileDescriptorSet */
+
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
+  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google__protobuf__FileDescriptorSet_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorSet_file(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google__protobuf__FileDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FileDescriptorProto */
+
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google__protobuf__FileDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_message_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_enum_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_service(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_extension(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
+  const google_protobuf_FileOptions* default_val = NULL;
+  const google_protobuf_FileOptions* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
+  const google_protobuf_SourceCodeInfo* default_val = NULL;
+  const google_protobuf_SourceCodeInfo* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_public_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_weak_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_ServiceDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google__protobuf__ServiceDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google__protobuf__FileOptions_msg_init, arena);
+    if (sub) google_protobuf_FileDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google__protobuf__SourceCodeInfo_msg_init, arena);
+    if (sub) google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.DescriptorProto */
+
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_field(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_nested_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_enum_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_extension_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_extension(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
+  const google_protobuf_MessageOptions* default_val = NULL;
+  const google_protobuf_MessageOptions* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_oneof_decl(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_reserved_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_reserved_name(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ExtensionRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google__protobuf__MessageOptions_msg_init, arena);
+    if (sub) google_protobuf_DescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_OneofDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google__protobuf__OneofDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ReservedRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.DescriptorProto.ExtensionRange */
+
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ExtensionRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const google_protobuf_ExtensionRangeOptions* default_val = NULL;
+  const google_protobuf_ExtensionRangeOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
+  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions_msg_init, arena);
+    if (sub) google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.DescriptorProto.ReservedRange */
+
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ReservedRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ReservedRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ReservedRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ReservedRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.ExtensionRangeOptions */
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
+  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_declaration(const google_protobuf_ExtensionRangeOptions* msg) {
+  size_t size;
+  google_protobuf_ExtensionRangeOptions_declaration(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
+  size_t size;
+  google_protobuf_ExtensionRangeOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_ExtensionRangeOptions_Declaration* sub = (struct google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_ExtensionRangeOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.ExtensionRangeOptions.Declaration */
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_new(upb_Arena* arena) {
+  return (google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FieldDescriptorProto */
+
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
+  const google_protobuf_FieldOptions* default_val = NULL;
+  const google_protobuf_FieldOptions* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google__protobuf__FieldOptions_msg_init, arena);
+    if (sub) google_protobuf_FieldDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.OneofDescriptorProto */
+
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google__protobuf__OneofDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
+  const google_protobuf_OneofOptions* default_val = NULL;
+  const google_protobuf_OneofOptions* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google__protobuf__OneofOptions_msg_init, arena);
+    if (sub) google_protobuf_OneofDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.EnumDescriptorProto */
+
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_value(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
+  const google_protobuf_EnumOptions* default_val = NULL;
+  const google_protobuf_EnumOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_reserved_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_reserved_name(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumValueDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google__protobuf__EnumValueDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google__protobuf__EnumOptions_msg_init, arena);
+    if (sub) google_protobuf_EnumDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
+
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
+  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.EnumValueDescriptorProto */
+
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google__protobuf__EnumValueDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const google_protobuf_EnumValueOptions* default_val = NULL;
+  const google_protobuf_EnumValueOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google__protobuf__EnumValueOptions_msg_init, arena);
+    if (sub) google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.ServiceDescriptorProto */
+
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google__protobuf__ServiceDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_ServiceDescriptorProto_method(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
+  const google_protobuf_ServiceOptions* default_val = NULL;
+  const google_protobuf_ServiceOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_MethodDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google__protobuf__MethodDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google__protobuf__ServiceOptions_msg_init, arena);
+    if (sub) google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.MethodDescriptorProto */
+
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google__protobuf__MethodDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
+  const google_protobuf_MethodOptions* default_val = NULL;
+  const google_protobuf_MethodOptions* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google__protobuf__MethodOptions_msg_init, arena);
+    if (sub) google_protobuf_MethodDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FileOptions */
+
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
+  return (google_protobuf_FileOptions*)_upb_Message_New(&google__protobuf__FileOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
+  bool default_val = true;
+  bool ret;
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
+  size_t size;
+  google_protobuf_FileOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FileOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.MessageOptions */
+
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
+  return (google_protobuf_MessageOptions*)_upb_Message_New(&google__protobuf__MessageOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MessageOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MessageOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MessageOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MessageOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
+  size_t size;
+  google_protobuf_MessageOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_MessageOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FieldOptions */
+
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
+  return (google_protobuf_FieldOptions*)_upb_Message_New(&google__protobuf__FieldOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_targets(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_targets(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_edition_defaults(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_edition_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldOptions_EditionDefault* sub = (struct google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google__protobuf__FieldOptions__EditionDefault_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FieldOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FieldOptions.EditionDefault */
+
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google__protobuf__FieldOptions__EditionDefault_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions__EditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions__EditionDefault_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions__EditionDefault_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions__EditionDefault_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.OneofOptions */
+
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
+  return (google_protobuf_OneofOptions*)_upb_Message_New(&google__protobuf__OneofOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
+  size_t size;
+  google_protobuf_OneofOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_OneofOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.EnumOptions */
+
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
+  return (google_protobuf_EnumOptions*)_upb_Message_New(&google__protobuf__EnumOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
+  size_t size;
+  google_protobuf_EnumOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_EnumOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.EnumValueOptions */
+
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
+  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google__protobuf__EnumValueOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
+  size_t size;
+  google_protobuf_EnumValueOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_EnumValueOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.ServiceOptions */
+
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
+  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google__protobuf__ServiceOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
+  size_t size;
+  google_protobuf_ServiceOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_ServiceOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.MethodOptions */
+
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
+  return (google_protobuf_MethodOptions*)_upb_Message_New(&google__protobuf__MethodOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
+  size_t size;
+  google_protobuf_MethodOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_MethodOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.UninterpretedOption */
+
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
+  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+}
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
+  size_t size;
+  google_protobuf_UninterpretedOption_name(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google__protobuf__UninterpretedOption__NamePart_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.UninterpretedOption.NamePart */
+
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
+  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google__protobuf__UninterpretedOption__NamePart_msg_init, arena);
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption__NamePart_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption__NamePart_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption__NamePart_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption__NamePart_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSet */
+
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_utf8_validation(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults*)_upb_Message_New(&google__protobuf__FeatureSetDefaults_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize(const google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize_ex(const google_protobuf_FeatureSetDefaults* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_defaults(const google_protobuf_FeatureSetDefaults* msg) {
+  size_t size;
+  google_protobuf_FeatureSetDefaults_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_minimum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_maximum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_resize_defaults(google_protobuf_FeatureSetDefaults* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* sub = (struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize_ex(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.SourceCodeInfo */
+
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
+  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google__protobuf__SourceCodeInfo_msg_init, arena);
+}
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_location(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_SourceCodeInfo_Location**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google__protobuf__SourceCodeInfo__Location_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.SourceCodeInfo.Location */
+
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
+  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google__protobuf__SourceCodeInfo__Location_msg_init, arena);
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo__Location_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo__Location_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo__Location_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo__Location_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_path(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_span(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_span(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_leading_detached_comments(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.GeneratedCodeInfo */
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
+  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo_msg_init, arena);
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
+  size_t size;
+  google_protobuf_GeneratedCodeInfo_annotation(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.GeneratedCodeInfo.Annotation */
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
+  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init, arena);
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  size_t size;
+  google_protobuf_GeneratedCodeInfo_Annotation_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* Max size 32 is google.protobuf.FileOptions */
+/* Max size 64 is google.protobuf.FileOptions */
+#define _UPB_MAXOPT_SIZE UPB_SIZE(112, 200)
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
new file mode 100644
index 0000000000000..e7cdf4c4b22ab
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
@@ -0,0 +1,1357 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
+  {.submsg = &google__protobuf__FileDescriptorProto_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
+  &google_protobuf_FileDescriptorSet_submsgs[0],
+  &google_protobuf_FileDescriptorSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max192b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = {
+  {.submsg = &google__protobuf__DescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__ServiceDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__FileOptions_msg_init},
+  {.submsg = &google__protobuf__SourceCodeInfo_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
+  {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
+  &google_protobuf_FileDescriptorProto_submsgs[0],
+  &google_protobuf_FileDescriptorProto__fields[0],
+  UPB_SIZE(72, 128), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_prs_1bt},
+    {0x003000003f000022, &upb_prm_1bt_max128b},
+    {0x003800003f01002a, &upb_prm_1bt_max64b},
+    {0x004000003f020032, &upb_prm_1bt_max64b},
+    {0x004800003f03003a, &upb_prm_1bt_max128b},
+    {0x0050000003040042, &upb_psm_1bt_max256b},
+    {0x005800000405004a, &upb_psm_1bt_max64b},
+    {0x006000003f000050, &upb_prv4_1bt},
+    {0x006800003f000058, &upb_prv4_1bt},
+    {0x0070000005000062, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto__ExtensionRange_msg_init},
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__MessageOptions_msg_init},
+  {.submsg = &google__protobuf__OneofDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto__ReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
+  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
+  &google_protobuf_DescriptorProto_submsgs[0],
+  &google_protobuf_DescriptorProto__fields[0],
+  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000003f01001a, &upb_prm_1bt_max128b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f03002a, &upb_prm_1bt_max64b},
+    {0x003800003f040032, &upb_prm_1bt_max128b},
+    {0x004000000205003a, &upb_psm_1bt_max64b},
+    {0x004800003f060042, &upb_prm_1bt_max64b},
+    {0x005000003f07004a, &upb_prm_1bt_max64b},
+    {0x005800003f000052, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+  {.submsg = &google__protobuf__ExtensionRangeOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = {
+  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x001000000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+  {.submsg = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init},
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = {
+  &google_protobuf_ExtensionRangeOptions_submsgs[0],
+  &google_protobuf_ExtensionRangeOptions__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000002010392, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init = {
+  NULL,
+  &google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0010000002000012, &upb_pss_1bt},
+    {0x002000000300001a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000028, &upb_psb1_1bt},
+    {0x0009000005000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
+  {.submsg = &google__protobuf__FieldOptions_msg_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
+  &google_protobuf_FieldDescriptorProto_submsgs[0],
+  &google_protobuf_FieldDescriptorProto__fields[0],
+  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0028000002000012, &upb_pss_1bt},
+    {0x0004000003000018, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0038000006000032, &upb_pss_1bt},
+    {0x004800000700003a, &upb_pss_1bt},
+    {0x0058000008000042, &upb_psm_1bt_max64b},
+    {0x0010000009000048, &upb_psv4_1bt},
+    {0x006000000a000052, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001400000b000188, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__OneofOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
+  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
+  &google_protobuf_OneofDescriptorProto_submsgs[0],
+  &google_protobuf_OneofDescriptorProto__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
+  {.submsg = &google__protobuf__EnumValueDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumOptions_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
+  {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
+  &google_protobuf_EnumDescriptorProto_submsgs[0],
+  &google_protobuf_EnumDescriptorProto__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__EnumValueOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
+  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+  &google_protobuf_EnumValueDescriptorProto__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0004000002000010, &upb_psv4_1bt},
+    {0x001800000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+  {.submsg = &google__protobuf__MethodDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__ServiceOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
+  &google_protobuf_ServiceDescriptorProto_submsgs[0],
+  &google_protobuf_ServiceDescriptorProto__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__MethodOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
+  &google_protobuf_MethodDescriptorProto_submsgs[0],
+  &google_protobuf_MethodDescriptorProto__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800000300001a, &upb_pss_1bt},
+    {0x0038000004000022, &upb_psm_1bt_max64b},
+    {0x0001000005000028, &upb_psb1_1bt},
+    {0x0002000006000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileOptions__fields[22] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileOptions_msg_init = {
+  &google_protobuf_FileOptions_submsgs[0],
+  &google_protobuf_FileOptions__fields[0],
+  UPB_SIZE(112, 200), 22, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0028000002000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000050, &upb_psb1_1bt},
+    {0x003800000500005a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0009000006000180, &upb_psb1_2bt},
+    {0x000a000007000188, &upb_psb1_2bt},
+    {0x000b000008000190, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000c0000090001a0, &upb_psb1_2bt},
+    {0x005800000e0002aa, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000d00000a0001b8, &upb_psb1_2bt},
+    {0x00780000100002c2, &upb_pss_2bt},
+    {0x00880000110002ca, &upb_pss_2bt},
+    {0x00100000120002d0, &upb_psb1_2bt},
+    {0x000e00000b0001d8, &upb_psb1_2bt},
+    {0x00980000130002e2, &upb_pss_2bt},
+    {0x00a80000140002ea, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000f00000c0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
+  &google_protobuf_MessageOptions_submsgs[0],
+  &google_protobuf_MessageOptions__fields[0],
+  UPB_SIZE(16, 24), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0002000002000010, &upb_psb1_1bt},
+    {0x0003000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000004000038, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0005000005000058, &upb_psb1_1bt},
+    {0x0008000006000062, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = {
+  {.submsg = &google__protobuf__FieldOptions__EditionDefault_msg_init},
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FieldOptions_CType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = {
+  {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
+  &google_protobuf_FieldOptions_submsgs[0],
+  &google_protobuf_FieldOptions__fields[0],
+  UPB_SIZE(40, 56), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000002000010, &upb_psb1_1bt},
+    {0x0009000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000a000004000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000006000050, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0011000007000078, &upb_psb1_1bt},
+    {0x0012000008000180, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f0001a2, &upb_prm_2bt_max64b},
+    {0x002800000a0101aa, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
+  {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
+  &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+  &google_protobuf_FieldOptions_EditionDefault__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
+  &google_protobuf_OneofOptions_submsgs[0],
+  &google_protobuf_OneofOptions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
+  {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
+  &google_protobuf_EnumOptions_submsgs[0],
+  &google_protobuf_EnumOptions__fields[0],
+  UPB_SIZE(16, 24), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000010, &upb_psb1_1bt},
+    {0x0002000002000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0003000003000030, &upb_psb1_1bt},
+    {0x000800000400003a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
+  &google_protobuf_EnumValueOptions_submsgs[0],
+  &google_protobuf_EnumValueOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0008000002000012, &upb_psm_1bt_max64b},
+    {0x0002000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
+  &google_protobuf_ServiceOptions_submsgs[0],
+  &google_protobuf_ServiceOptions__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0008000002000292, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
+  &google_protobuf_MethodOptions_submsgs[0],
+  &google_protobuf_MethodOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000300029a, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
+  {.submsg = &google__protobuf__UninterpretedOption__NamePart_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = {
+  &google_protobuf_UninterpretedOption_submsgs[0],
+  &google_protobuf_UninterpretedOption__fields[0],
+  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x001000000100001a, &upb_pss_1bt},
+    {0x0020000002000020, &upb_psv8_1bt},
+    {0x0028000003000028, &upb_psv8_1bt},
+    {0x0030000004000031, &upb_psf8_1bt},
+    {0x003800000500003a, &upb_psb_1bt},
+    {0x0048000006000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = {
+  NULL,
+  &google_protobuf_UninterpretedOption_NamePart__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0001000002000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = {
+  {.subenum = &google_protobuf_FeatureSet_FieldPresence_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_EnumType_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_Utf8Validation_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
+  {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
+  &google_protobuf_FeatureSet_submsgs[0],
+  &google_protobuf_FeatureSet__fields[0],
+  32, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = {
+  {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
+  &google_protobuf_FeatureSetDefaults_submsgs[0],
+  &google_protobuf_FeatureSetDefaults__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[2] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = {
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
+  {.submsg = &google__protobuf__SourceCodeInfo__Location_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = {
+  &google_protobuf_SourceCodeInfo_submsgs[0],
+  &google_protobuf_SourceCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = {
+  NULL,
+  &google_protobuf_SourceCodeInfo_Location__fields[0],
+  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_ppv4_1bt},
+    {0x001000003f000012, &upb_ppv4_1bt},
+    {0x001800000100001a, &upb_pss_1bt},
+    {0x0028000002000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f000032, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+  {.submsg = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
+  {.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
+  {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
+  UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_ppv4_1bt},
+    {0x0018000001000012, &upb_pss_1bt},
+    {0x0004000002000018, &upb_psv4_1bt},
+    {0x0008000003000020, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[32] = {
+  &google__protobuf__FileDescriptorSet_msg_init,
+  &google__protobuf__FileDescriptorProto_msg_init,
+  &google__protobuf__DescriptorProto_msg_init,
+  &google__protobuf__DescriptorProto__ExtensionRange_msg_init,
+  &google__protobuf__DescriptorProto__ReservedRange_msg_init,
+  &google__protobuf__ExtensionRangeOptions_msg_init,
+  &google__protobuf__ExtensionRangeOptions__Declaration_msg_init,
+  &google__protobuf__FieldDescriptorProto_msg_init,
+  &google__protobuf__OneofDescriptorProto_msg_init,
+  &google__protobuf__EnumDescriptorProto_msg_init,
+  &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init,
+  &google__protobuf__EnumValueDescriptorProto_msg_init,
+  &google__protobuf__ServiceDescriptorProto_msg_init,
+  &google__protobuf__MethodDescriptorProto_msg_init,
+  &google__protobuf__FileOptions_msg_init,
+  &google__protobuf__MessageOptions_msg_init,
+  &google__protobuf__FieldOptions_msg_init,
+  &google__protobuf__FieldOptions__EditionDefault_msg_init,
+  &google__protobuf__OneofOptions_msg_init,
+  &google__protobuf__EnumOptions_msg_init,
+  &google__protobuf__EnumValueOptions_msg_init,
+  &google__protobuf__ServiceOptions_msg_init,
+  &google__protobuf__MethodOptions_msg_init,
+  &google__protobuf__UninterpretedOption_msg_init,
+  &google__protobuf__UninterpretedOption__NamePart_msg_init,
+  &google__protobuf__FeatureSet_msg_init,
+  &google__protobuf__FeatureSetDefaults_msg_init,
+  &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init,
+  &google__protobuf__SourceCodeInfo_msg_init,
+  &google__protobuf__SourceCodeInfo__Location_msg_init,
+  &google__protobuf__GeneratedCodeInfo_msg_init,
+  &google__protobuf__GeneratedCodeInfo__Annotation_msg_init,
+};
+
+const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+    64,
+    6,
+    {
+        0x7,
+        0x0,
+        0x3e6,
+        0x3e7,
+        0x3e8,
+        0x1869d,
+        0x1869e,
+        0x1869f,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+    64,
+    0,
+    {
+        0x3,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+    64,
+    0,
+    {
+        0xf,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+    64,
+    0,
+    {
+        0x7fffe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+    64,
+    0,
+    {
+        0x3ff,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+static const upb_MiniTableEnum *enums_layout[17] = {
+  &google_protobuf_Edition_enum_init,
+  &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
+  &google_protobuf_FeatureSet_EnumType_enum_init,
+  &google_protobuf_FeatureSet_FieldPresence_enum_init,
+  &google_protobuf_FeatureSet_JsonFormat_enum_init,
+  &google_protobuf_FeatureSet_MessageEncoding_enum_init,
+  &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
+  &google_protobuf_FeatureSet_Utf8Validation_enum_init,
+  &google_protobuf_FieldDescriptorProto_Label_enum_init,
+  &google_protobuf_FieldDescriptorProto_Type_enum_init,
+  &google_protobuf_FieldOptions_CType_enum_init,
+  &google_protobuf_FieldOptions_JSType_enum_init,
+  &google_protobuf_FieldOptions_OptionRetention_enum_init,
+  &google_protobuf_FieldOptions_OptionTargetType_enum_init,
+  &google_protobuf_FileOptions_OptimizeMode_enum_init,
+  &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
+  &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+};
+
+const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
+  messages_layout,
+  enums_layout,
+  NULL,
+  32,
+  17,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
new file mode 100644
index 0000000000000..8416e9a4f500d
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
@@ -0,0 +1,78 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_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 google__protobuf__FileDescriptorSet_msg_init;
+extern const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init;
+extern const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init;
+extern const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init;
+extern const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init;
+extern const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__FileOptions_msg_init;
+extern const upb_MiniTable google__protobuf__MessageOptions_msg_init;
+extern const upb_MiniTable google__protobuf__FieldOptions_msg_init;
+extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init;
+extern const upb_MiniTable google__protobuf__OneofOptions_msg_init;
+extern const upb_MiniTable google__protobuf__EnumOptions_msg_init;
+extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init;
+extern const upb_MiniTable google__protobuf__ServiceOptions_msg_init;
+extern const upb_MiniTable google__protobuf__MethodOptions_msg_init;
+extern const upb_MiniTable google__protobuf__UninterpretedOption_msg_init;
+extern const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSet_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init;
+extern const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init;
+extern const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init;
+extern const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init;
+extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
+
+extern const upb_MiniTableEnum google_protobuf_Edition_enum_init;
+extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
+extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
+extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
+extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/duration.upb.h b/src/core/ext/upb-gen/google/protobuf/duration.upb.h
similarity index 83%
rename from src/core/ext/upb-generated/google/protobuf/duration.upb.h
rename to src/core/ext/upb-gen/google/protobuf/duration.upb.h
index 301c6bc2ae15d..0052e518396b0 100644
--- a/src/core/ext/upb-generated/google/protobuf/duration.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/duration.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/duration.proto
  *
@@ -10,7 +9,10 @@
 #define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +20,18 @@ extern "C" {
 #endif
 
 typedef struct google_protobuf_Duration google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* google.protobuf.Duration */
 
 UPB_INLINE google_protobuf_Duration* google_protobuf_Duration_new(upb_Arena* arena) {
-  return (google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+  return (google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
 }
 UPB_INLINE google_protobuf_Duration* google_protobuf_Duration_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_Duration* ret = google_protobuf_Duration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Duration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__Duration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +41,7 @@ UPB_INLINE google_protobuf_Duration* google_protobuf_Duration_parse_ex(const cha
                            int options, upb_Arena* arena) {
   google_protobuf_Duration* ret = google_protobuf_Duration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Duration_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__Duration_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +49,13 @@ UPB_INLINE google_protobuf_Duration* google_protobuf_Duration_parse_ex(const cha
 }
 UPB_INLINE char* google_protobuf_Duration_serialize(const google_protobuf_Duration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Duration_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Duration_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_Duration_serialize_ex(const google_protobuf_Duration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Duration_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Duration_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_Duration_clear_seconds(google_protobuf_Duration* msg) {
@@ -89,8 +90,6 @@ UPB_INLINE void google_protobuf_Duration_set_nanos(google_protobuf_Duration *msg
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
new file mode 100644
index 0000000000000..e8ff8b9bb7c73
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/duration.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField google_protobuf_Duration__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Duration_msg_init = {
+  NULL,
+  &google_protobuf_Duration__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__protobuf__Duration_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
new file mode 100644
index 0000000000000..24a02156c1acc
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/duration.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DURATION_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 google__protobuf__Duration_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb.h b/src/core/ext/upb-gen/google/protobuf/empty.upb.h
new file mode 100644
index 0000000000000..cef6d325f2e84
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/empty.upb.h
@@ -0,0 +1,69 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/empty.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
+#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/protobuf/empty.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_protobuf_Empty google_protobuf_Empty;
+
+
+
+/* google.protobuf.Empty */
+
+UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_new(upb_Arena* arena) {
+  return (google_protobuf_Empty*)_upb_Message_New(&google__protobuf__Empty_msg_init, arena);
+}
+UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_Empty* ret = google_protobuf_Empty_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Empty_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_Empty* ret = google_protobuf_Empty_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Empty_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_Empty_serialize(const google_protobuf_Empty* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Empty_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_Empty_serialize_ex(const google_protobuf_Empty* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Empty_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
new file mode 100644
index 0000000000000..6229255c481ba
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/empty.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/empty.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTable google__protobuf__Empty_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__protobuf__Empty_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
new file mode 100644
index 0000000000000..f3fcccc641a47
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/empty.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_EMPTY_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 google__protobuf__Empty_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb.h b/src/core/ext/upb-gen/google/protobuf/struct.upb.h
new file mode 100644
index 0000000000000..713e657b896c1
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb.h
@@ -0,0 +1,422 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
+#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_protobuf_Struct google_protobuf_Struct;
+typedef struct google_protobuf_Struct_FieldsEntry google_protobuf_Struct_FieldsEntry;
+typedef struct google_protobuf_Value google_protobuf_Value;
+typedef struct google_protobuf_ListValue google_protobuf_ListValue;
+
+typedef enum {
+  google_protobuf_NULL_VALUE = 0
+} google_protobuf_NullValue;
+
+
+
+/* google.protobuf.Struct */
+
+UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_new(upb_Arena* arena) {
+  return (google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
+}
+UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_Struct* ret = google_protobuf_Struct_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Struct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_Struct* ret = google_protobuf_Struct_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Struct_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_Struct_serialize(const google_protobuf_Struct* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Struct_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_Struct_serialize_ex(const google_protobuf_Struct* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Struct_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_Struct_clear_fields(google_protobuf_Struct* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t google_protobuf_Struct_fields_size(const google_protobuf_Struct* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool google_protobuf_Struct_fields_get(const google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value** val) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_next(const google_protobuf_Struct* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter);
+}
+
+UPB_INLINE void google_protobuf_Struct_fields_clear(google_protobuf_Struct* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool google_protobuf_Struct_fields_set(google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value* val, upb_Arena* a) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool google_protobuf_Struct_fields_delete(google_protobuf_Struct* msg, upb_StringView key) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_nextmutable(google_protobuf_Struct* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter);
+}
+
+/* google.protobuf.Struct.FieldsEntry */
+
+UPB_INLINE upb_StringView google_protobuf_Struct_FieldsEntry_key(const google_protobuf_Struct_FieldsEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const google_protobuf_Value* google_protobuf_Struct_FieldsEntry_value(const google_protobuf_Struct_FieldsEntry* msg) {
+  google_protobuf_Value* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Struct_FieldsEntry_has_value(const google_protobuf_Struct_FieldsEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_Struct_FieldsEntry_set_value(google_protobuf_Struct_FieldsEntry *msg, google_protobuf_Value* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(google_protobuf_Value*));
+}
+
+/* google.protobuf.Value */
+
+UPB_INLINE google_protobuf_Value* google_protobuf_Value_new(upb_Arena* arena) {
+  return (google_protobuf_Value*)_upb_Message_New(&google__protobuf__Value_msg_init, arena);
+}
+UPB_INLINE google_protobuf_Value* google_protobuf_Value_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_Value* ret = google_protobuf_Value_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_Value* google_protobuf_Value_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_Value* ret = google_protobuf_Value_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__Value_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_Value_serialize(const google_protobuf_Value* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Value_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_Value_serialize_ex(const google_protobuf_Value* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__Value_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  google_protobuf_Value_kind_null_value = 1,
+  google_protobuf_Value_kind_number_value = 2,
+  google_protobuf_Value_kind_string_value = 3,
+  google_protobuf_Value_kind_bool_value = 4,
+  google_protobuf_Value_kind_struct_value = 5,
+  google_protobuf_Value_kind_list_value = 6,
+  google_protobuf_Value_kind_NOT_SET = 0
+} google_protobuf_Value_kind_oneofcases;
+UPB_INLINE google_protobuf_Value_kind_oneofcases google_protobuf_Value_kind_case(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return (google_protobuf_Value_kind_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_null_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_Value_null_value(const google_protobuf_Value* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_null_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_number_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double google_protobuf_Value_number_value(const google_protobuf_Value* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_number_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_string_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_Value_string_value(const google_protobuf_Value* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_string_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_bool_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_Value_bool_value(const google_protobuf_Value* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_bool_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_struct_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_Struct* google_protobuf_Value_struct_value(const google_protobuf_Value* msg) {
+  const google_protobuf_Struct* default_val = NULL;
+  const google_protobuf_Struct* ret;
+  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_struct_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_Value_clear_list_value(google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ListValue* google_protobuf_Value_list_value(const google_protobuf_Value* msg) {
+  const google_protobuf_ListValue* default_val = NULL;
+  const google_protobuf_ListValue* ret;
+  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_Value_has_list_value(const google_protobuf_Value* msg) {
+  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_Value_set_null_value(google_protobuf_Value *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_Value_set_number_value(google_protobuf_Value *msg, double value) {
+  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_Value_set_string_value(google_protobuf_Value *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_Value_set_bool_value(google_protobuf_Value *msg, bool value) {
+  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_Value_set_struct_value(google_protobuf_Value *msg, google_protobuf_Struct* value) {
+  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_value(google_protobuf_Value* msg, upb_Arena* arena) {
+  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)google_protobuf_Value_struct_value(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
+    if (sub) google_protobuf_Value_set_struct_value(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_Value_set_list_value(google_protobuf_Value *msg, google_protobuf_ListValue* value) {
+  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_ListValue* google_protobuf_Value_mutable_list_value(google_protobuf_Value* msg, upb_Arena* arena) {
+  struct google_protobuf_ListValue* sub = (struct google_protobuf_ListValue*)google_protobuf_Value_list_value(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_ListValue*)_upb_Message_New(&google__protobuf__ListValue_msg_init, arena);
+    if (sub) google_protobuf_Value_set_list_value(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.ListValue */
+
+UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_new(upb_Arena* arena) {
+  return (google_protobuf_ListValue*)_upb_Message_New(&google__protobuf__ListValue_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ListValue* ret = google_protobuf_ListValue_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ListValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ListValue* ret = google_protobuf_ListValue_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ListValue_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ListValue_serialize(const google_protobuf_ListValue* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ListValue_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ListValue_serialize_ex(const google_protobuf_ListValue* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ListValue_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ListValue_clear_values(google_protobuf_ListValue* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_Value* const* google_protobuf_ListValue_values(const google_protobuf_ListValue* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_Value* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ListValue_values_upb_array(const google_protobuf_ListValue* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ListValue_values_mutable_upb_array(const google_protobuf_ListValue* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ListValue_has_values(const google_protobuf_ListValue* msg) {
+  size_t size;
+  google_protobuf_ListValue_values(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_mutable_values(google_protobuf_ListValue* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_Value**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_resize_values(google_protobuf_ListValue* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_Value**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_Value* google_protobuf_ListValue_add_values(google_protobuf_ListValue* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_Value* sub = (struct google_protobuf_Value*)_upb_Message_New(&google__protobuf__Value_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
new file mode 100644
index 0000000000000..cc2ddf8fe30cc
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
@@ -0,0 +1,115 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_protobuf_Struct_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct__FieldsEntry_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_Struct__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Struct_msg_init = {
+  &google_protobuf_Struct_submsgs[0],
+  &google_protobuf_Struct__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub google_protobuf_Struct_FieldsEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Value_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_Struct_FieldsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = {
+  &google_protobuf_Struct_FieldsEntry_submsgs[0],
+  &google_protobuf_Struct_FieldsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_Value_submsgs[2] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &google__protobuf__ListValue_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_Value__fields[6] = {
+  {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Value_msg_init = {
+  &google_protobuf_Value_submsgs[0],
+  &google_protobuf_Value__fields[0],
+  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_pov4_1bt},
+    {0x0008000002000011, &upb_pof8_1bt},
+    {0x000800000300001a, &upb_pos_1bt},
+    {0x0008000004000020, &upb_pob1_1bt},
+    {0x000800000500002a, &upb_pom_1bt_max64b},
+    {0x0008000006010032, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ListValue_submsgs[1] = {
+  {.submsg = &google__protobuf__Value_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ListValue__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ListValue_msg_init = {
+  &google_protobuf_ListValue_submsgs[0],
+  &google_protobuf_ListValue__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &google__protobuf__Struct_msg_init,
+  &google__protobuf__Struct__FieldsEntry_msg_init,
+  &google__protobuf__Value_msg_init,
+  &google__protobuf__ListValue_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
new file mode 100644
index 0000000000000..0f52e89b497a5
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_STRUCT_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 google__protobuf__Struct_msg_init;
+extern const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init;
+extern const upb_MiniTable google__protobuf__Value_msg_init;
+extern const upb_MiniTable google__protobuf__ListValue_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
similarity index 83%
rename from src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
rename to src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
index 582ccbc94baee..2d9295fa6a610 100644
--- a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/timestamp.proto
  *
@@ -10,7 +9,10 @@
 #define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +20,18 @@ extern "C" {
 #endif
 
 typedef struct google_protobuf_Timestamp google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 
 
 /* google.protobuf.Timestamp */
 
 UPB_INLINE google_protobuf_Timestamp* google_protobuf_Timestamp_new(upb_Arena* arena) {
-  return (google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+  return (google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
 }
 UPB_INLINE google_protobuf_Timestamp* google_protobuf_Timestamp_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_Timestamp* ret = google_protobuf_Timestamp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Timestamp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__Timestamp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +41,7 @@ UPB_INLINE google_protobuf_Timestamp* google_protobuf_Timestamp_parse_ex(const c
                            int options, upb_Arena* arena) {
   google_protobuf_Timestamp* ret = google_protobuf_Timestamp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Timestamp_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__Timestamp_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +49,13 @@ UPB_INLINE google_protobuf_Timestamp* google_protobuf_Timestamp_parse_ex(const c
 }
 UPB_INLINE char* google_protobuf_Timestamp_serialize(const google_protobuf_Timestamp* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Timestamp_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Timestamp_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_Timestamp_serialize_ex(const google_protobuf_Timestamp* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Timestamp_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Timestamp_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_Timestamp_clear_seconds(google_protobuf_Timestamp* msg) {
@@ -89,8 +90,6 @@ UPB_INLINE void google_protobuf_Timestamp_set_nanos(google_protobuf_Timestamp *m
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
new file mode 100644
index 0000000000000..d6b216bf992ac
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/timestamp.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField google_protobuf_Timestamp__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Timestamp_msg_init = {
+  NULL,
+  &google_protobuf_Timestamp__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv8_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__protobuf__Timestamp_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
new file mode 100644
index 0000000000000..6aaecbf6cb8da
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/timestamp.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_TIMESTAMP_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 google__protobuf__Timestamp_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
similarity index 81%
rename from src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
rename to src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
index fa49bfd504766..1c5740291ce7b 100644
--- a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/wrappers.proto
  *
@@ -10,7 +9,10 @@
 #define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "google/protobuf/wrappers.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -26,27 +28,18 @@ typedef struct google_protobuf_UInt32Value google_protobuf_UInt32Value;
 typedef struct google_protobuf_BoolValue google_protobuf_BoolValue;
 typedef struct google_protobuf_StringValue google_protobuf_StringValue;
 typedef struct google_protobuf_BytesValue google_protobuf_BytesValue;
-extern const upb_MiniTable google_protobuf_DoubleValue_msg_init;
-extern const upb_MiniTable google_protobuf_FloatValue_msg_init;
-extern const upb_MiniTable google_protobuf_Int64Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
-extern const upb_MiniTable google_protobuf_Int32Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_StringValue_msg_init;
-extern const upb_MiniTable google_protobuf_BytesValue_msg_init;
 
 
 
 /* google.protobuf.DoubleValue */
 
 UPB_INLINE google_protobuf_DoubleValue* google_protobuf_DoubleValue_new(upb_Arena* arena) {
-  return (google_protobuf_DoubleValue*)_upb_Message_New(&google_protobuf_DoubleValue_msg_init, arena);
+  return (google_protobuf_DoubleValue*)_upb_Message_New(&google__protobuf__DoubleValue_msg_init, arena);
 }
 UPB_INLINE google_protobuf_DoubleValue* google_protobuf_DoubleValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_DoubleValue* ret = google_protobuf_DoubleValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DoubleValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__DoubleValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -56,7 +49,7 @@ UPB_INLINE google_protobuf_DoubleValue* google_protobuf_DoubleValue_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_DoubleValue* ret = google_protobuf_DoubleValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DoubleValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__DoubleValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -64,13 +57,13 @@ UPB_INLINE google_protobuf_DoubleValue* google_protobuf_DoubleValue_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_DoubleValue_serialize(const google_protobuf_DoubleValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DoubleValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__DoubleValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_DoubleValue_serialize_ex(const google_protobuf_DoubleValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DoubleValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__DoubleValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_DoubleValue_clear_value(google_protobuf_DoubleValue* msg) {
@@ -93,12 +86,12 @@ UPB_INLINE void google_protobuf_DoubleValue_set_value(google_protobuf_DoubleValu
 /* google.protobuf.FloatValue */
 
 UPB_INLINE google_protobuf_FloatValue* google_protobuf_FloatValue_new(upb_Arena* arena) {
-  return (google_protobuf_FloatValue*)_upb_Message_New(&google_protobuf_FloatValue_msg_init, arena);
+  return (google_protobuf_FloatValue*)_upb_Message_New(&google__protobuf__FloatValue_msg_init, arena);
 }
 UPB_INLINE google_protobuf_FloatValue* google_protobuf_FloatValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_FloatValue* ret = google_protobuf_FloatValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FloatValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__FloatValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -108,7 +101,7 @@ UPB_INLINE google_protobuf_FloatValue* google_protobuf_FloatValue_parse_ex(const
                            int options, upb_Arena* arena) {
   google_protobuf_FloatValue* ret = google_protobuf_FloatValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FloatValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__FloatValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -116,13 +109,13 @@ UPB_INLINE google_protobuf_FloatValue* google_protobuf_FloatValue_parse_ex(const
 }
 UPB_INLINE char* google_protobuf_FloatValue_serialize(const google_protobuf_FloatValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FloatValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__FloatValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_FloatValue_serialize_ex(const google_protobuf_FloatValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FloatValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__FloatValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_FloatValue_clear_value(google_protobuf_FloatValue* msg) {
@@ -145,12 +138,12 @@ UPB_INLINE void google_protobuf_FloatValue_set_value(google_protobuf_FloatValue
 /* google.protobuf.Int64Value */
 
 UPB_INLINE google_protobuf_Int64Value* google_protobuf_Int64Value_new(upb_Arena* arena) {
-  return (google_protobuf_Int64Value*)_upb_Message_New(&google_protobuf_Int64Value_msg_init, arena);
+  return (google_protobuf_Int64Value*)_upb_Message_New(&google__protobuf__Int64Value_msg_init, arena);
 }
 UPB_INLINE google_protobuf_Int64Value* google_protobuf_Int64Value_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_Int64Value* ret = google_protobuf_Int64Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Int64Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__Int64Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -160,7 +153,7 @@ UPB_INLINE google_protobuf_Int64Value* google_protobuf_Int64Value_parse_ex(const
                            int options, upb_Arena* arena) {
   google_protobuf_Int64Value* ret = google_protobuf_Int64Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Int64Value_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__Int64Value_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -168,13 +161,13 @@ UPB_INLINE google_protobuf_Int64Value* google_protobuf_Int64Value_parse_ex(const
 }
 UPB_INLINE char* google_protobuf_Int64Value_serialize(const google_protobuf_Int64Value* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Int64Value_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Int64Value_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_Int64Value_serialize_ex(const google_protobuf_Int64Value* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Int64Value_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Int64Value_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_Int64Value_clear_value(google_protobuf_Int64Value* msg) {
@@ -197,12 +190,12 @@ UPB_INLINE void google_protobuf_Int64Value_set_value(google_protobuf_Int64Value
 /* google.protobuf.UInt64Value */
 
 UPB_INLINE google_protobuf_UInt64Value* google_protobuf_UInt64Value_new(upb_Arena* arena) {
-  return (google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
+  return (google_protobuf_UInt64Value*)_upb_Message_New(&google__protobuf__UInt64Value_msg_init, arena);
 }
 UPB_INLINE google_protobuf_UInt64Value* google_protobuf_UInt64Value_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_UInt64Value* ret = google_protobuf_UInt64Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UInt64Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__UInt64Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -212,7 +205,7 @@ UPB_INLINE google_protobuf_UInt64Value* google_protobuf_UInt64Value_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_UInt64Value* ret = google_protobuf_UInt64Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UInt64Value_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__UInt64Value_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -220,13 +213,13 @@ UPB_INLINE google_protobuf_UInt64Value* google_protobuf_UInt64Value_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_UInt64Value_serialize(const google_protobuf_UInt64Value* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UInt64Value_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__UInt64Value_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_UInt64Value_serialize_ex(const google_protobuf_UInt64Value* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UInt64Value_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__UInt64Value_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_UInt64Value_clear_value(google_protobuf_UInt64Value* msg) {
@@ -249,12 +242,12 @@ UPB_INLINE void google_protobuf_UInt64Value_set_value(google_protobuf_UInt64Valu
 /* google.protobuf.Int32Value */
 
 UPB_INLINE google_protobuf_Int32Value* google_protobuf_Int32Value_new(upb_Arena* arena) {
-  return (google_protobuf_Int32Value*)_upb_Message_New(&google_protobuf_Int32Value_msg_init, arena);
+  return (google_protobuf_Int32Value*)_upb_Message_New(&google__protobuf__Int32Value_msg_init, arena);
 }
 UPB_INLINE google_protobuf_Int32Value* google_protobuf_Int32Value_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_Int32Value* ret = google_protobuf_Int32Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Int32Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__Int32Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -264,7 +257,7 @@ UPB_INLINE google_protobuf_Int32Value* google_protobuf_Int32Value_parse_ex(const
                            int options, upb_Arena* arena) {
   google_protobuf_Int32Value* ret = google_protobuf_Int32Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Int32Value_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__Int32Value_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -272,13 +265,13 @@ UPB_INLINE google_protobuf_Int32Value* google_protobuf_Int32Value_parse_ex(const
 }
 UPB_INLINE char* google_protobuf_Int32Value_serialize(const google_protobuf_Int32Value* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Int32Value_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Int32Value_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_Int32Value_serialize_ex(const google_protobuf_Int32Value* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Int32Value_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__Int32Value_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_Int32Value_clear_value(google_protobuf_Int32Value* msg) {
@@ -301,12 +294,12 @@ UPB_INLINE void google_protobuf_Int32Value_set_value(google_protobuf_Int32Value
 /* google.protobuf.UInt32Value */
 
 UPB_INLINE google_protobuf_UInt32Value* google_protobuf_UInt32Value_new(upb_Arena* arena) {
-  return (google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+  return (google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
 }
 UPB_INLINE google_protobuf_UInt32Value* google_protobuf_UInt32Value_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_UInt32Value* ret = google_protobuf_UInt32Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UInt32Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__UInt32Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -316,7 +309,7 @@ UPB_INLINE google_protobuf_UInt32Value* google_protobuf_UInt32Value_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_UInt32Value* ret = google_protobuf_UInt32Value_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UInt32Value_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__UInt32Value_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -324,13 +317,13 @@ UPB_INLINE google_protobuf_UInt32Value* google_protobuf_UInt32Value_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_UInt32Value_serialize(const google_protobuf_UInt32Value* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UInt32Value_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__UInt32Value_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_UInt32Value_serialize_ex(const google_protobuf_UInt32Value* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UInt32Value_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__UInt32Value_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_UInt32Value_clear_value(google_protobuf_UInt32Value* msg) {
@@ -353,12 +346,12 @@ UPB_INLINE void google_protobuf_UInt32Value_set_value(google_protobuf_UInt32Valu
 /* google.protobuf.BoolValue */
 
 UPB_INLINE google_protobuf_BoolValue* google_protobuf_BoolValue_new(upb_Arena* arena) {
-  return (google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+  return (google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
 }
 UPB_INLINE google_protobuf_BoolValue* google_protobuf_BoolValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_BoolValue* ret = google_protobuf_BoolValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_BoolValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__BoolValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -368,7 +361,7 @@ UPB_INLINE google_protobuf_BoolValue* google_protobuf_BoolValue_parse_ex(const c
                            int options, upb_Arena* arena) {
   google_protobuf_BoolValue* ret = google_protobuf_BoolValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_BoolValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__BoolValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -376,13 +369,13 @@ UPB_INLINE google_protobuf_BoolValue* google_protobuf_BoolValue_parse_ex(const c
 }
 UPB_INLINE char* google_protobuf_BoolValue_serialize(const google_protobuf_BoolValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_BoolValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__BoolValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_BoolValue_serialize_ex(const google_protobuf_BoolValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_BoolValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__BoolValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_BoolValue_clear_value(google_protobuf_BoolValue* msg) {
@@ -405,12 +398,12 @@ UPB_INLINE void google_protobuf_BoolValue_set_value(google_protobuf_BoolValue *m
 /* google.protobuf.StringValue */
 
 UPB_INLINE google_protobuf_StringValue* google_protobuf_StringValue_new(upb_Arena* arena) {
-  return (google_protobuf_StringValue*)_upb_Message_New(&google_protobuf_StringValue_msg_init, arena);
+  return (google_protobuf_StringValue*)_upb_Message_New(&google__protobuf__StringValue_msg_init, arena);
 }
 UPB_INLINE google_protobuf_StringValue* google_protobuf_StringValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_StringValue* ret = google_protobuf_StringValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_StringValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__StringValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -420,7 +413,7 @@ UPB_INLINE google_protobuf_StringValue* google_protobuf_StringValue_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_StringValue* ret = google_protobuf_StringValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_StringValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__StringValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -428,13 +421,13 @@ UPB_INLINE google_protobuf_StringValue* google_protobuf_StringValue_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_StringValue_serialize(const google_protobuf_StringValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_StringValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__StringValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_StringValue_serialize_ex(const google_protobuf_StringValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_StringValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__StringValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_StringValue_clear_value(google_protobuf_StringValue* msg) {
@@ -457,12 +450,12 @@ UPB_INLINE void google_protobuf_StringValue_set_value(google_protobuf_StringValu
 /* google.protobuf.BytesValue */
 
 UPB_INLINE google_protobuf_BytesValue* google_protobuf_BytesValue_new(upb_Arena* arena) {
-  return (google_protobuf_BytesValue*)_upb_Message_New(&google_protobuf_BytesValue_msg_init, arena);
+  return (google_protobuf_BytesValue*)_upb_Message_New(&google__protobuf__BytesValue_msg_init, arena);
 }
 UPB_INLINE google_protobuf_BytesValue* google_protobuf_BytesValue_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_BytesValue* ret = google_protobuf_BytesValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_BytesValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &google__protobuf__BytesValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -472,7 +465,7 @@ UPB_INLINE google_protobuf_BytesValue* google_protobuf_BytesValue_parse_ex(const
                            int options, upb_Arena* arena) {
   google_protobuf_BytesValue* ret = google_protobuf_BytesValue_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_BytesValue_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &google__protobuf__BytesValue_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -480,13 +473,13 @@ UPB_INLINE google_protobuf_BytesValue* google_protobuf_BytesValue_parse_ex(const
 }
 UPB_INLINE char* google_protobuf_BytesValue_serialize(const google_protobuf_BytesValue* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_BytesValue_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__BytesValue_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_BytesValue_serialize_ex(const google_protobuf_BytesValue* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_BytesValue_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &google__protobuf__BytesValue_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_BytesValue_clear_value(google_protobuf_BytesValue* msg) {
@@ -506,8 +499,6 @@ UPB_INLINE void google_protobuf_BytesValue_set_value(google_protobuf_BytesValue
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
new file mode 100644
index 0000000000000..501ed9fa93b84
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c
@@ -0,0 +1,163 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/wrappers.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField google_protobuf_DoubleValue__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DoubleValue_msg_init = {
+  NULL,
+  &google_protobuf_DoubleValue__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_FloatValue__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FloatValue_msg_init = {
+  NULL,
+  &google_protobuf_FloatValue__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000d, &upb_psf4_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_Int64Value__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Int64Value_msg_init = {
+  NULL,
+  &google_protobuf_Int64Value__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_UInt64Value__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UInt64Value_msg_init = {
+  NULL,
+  &google_protobuf_UInt64Value__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_Int32Value__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__Int32Value_msg_init = {
+  NULL,
+  &google_protobuf_Int32Value__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_UInt32Value__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UInt32Value_msg_init = {
+  NULL,
+  &google_protobuf_UInt32Value__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_BoolValue__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__BoolValue_msg_init = {
+  NULL,
+  &google_protobuf_BoolValue__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_StringValue__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__StringValue_msg_init = {
+  NULL,
+  &google_protobuf_StringValue__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_BytesValue__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__BytesValue_msg_init = {
+  NULL,
+  &google_protobuf_BytesValue__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_psb_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[9] = {
+  &google__protobuf__DoubleValue_msg_init,
+  &google__protobuf__FloatValue_msg_init,
+  &google__protobuf__Int64Value_msg_init,
+  &google__protobuf__UInt64Value_msg_init,
+  &google__protobuf__Int32Value_msg_init,
+  &google__protobuf__UInt32Value_msg_init,
+  &google__protobuf__BoolValue_msg_init,
+  &google__protobuf__StringValue_msg_init,
+  &google__protobuf__BytesValue_msg_init,
+};
+
+const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  9,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
new file mode 100644
index 0000000000000..38ea22f3239a4
--- /dev/null
+++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/wrappers.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_WRAPPERS_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 google__protobuf__DoubleValue_msg_init;
+extern const upb_MiniTable google__protobuf__FloatValue_msg_init;
+extern const upb_MiniTable google__protobuf__Int64Value_msg_init;
+extern const upb_MiniTable google__protobuf__UInt64Value_msg_init;
+extern const upb_MiniTable google__protobuf__Int32Value_msg_init;
+extern const upb_MiniTable google__protobuf__UInt32Value_msg_init;
+extern const upb_MiniTable google__protobuf__BoolValue_msg_init;
+extern const upb_MiniTable google__protobuf__StringValue_msg_init;
+extern const upb_MiniTable google__protobuf__BytesValue_msg_init;
+
+extern const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb.h b/src/core/ext/upb-gen/google/rpc/status.upb.h
new file mode 100644
index 0000000000000..262fa20986acd
--- /dev/null
+++ b/src/core/ext/upb-gen/google/rpc/status.upb.h
@@ -0,0 +1,165 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/rpc/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_
+#define GOOGLE_RPC_STATUS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/rpc/status.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_rpc_Status google_rpc_Status;
+struct google_protobuf_Any;
+
+
+
+/* google.rpc.Status */
+
+UPB_INLINE google_rpc_Status* google_rpc_Status_new(upb_Arena* arena) {
+  return (google_rpc_Status*)_upb_Message_New(&google__rpc__Status_msg_init, arena);
+}
+UPB_INLINE google_rpc_Status* google_rpc_Status_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_rpc_Status* ret = google_rpc_Status_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__rpc__Status_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_rpc_Status* google_rpc_Status_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_rpc_Status* ret = google_rpc_Status_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__rpc__Status_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_rpc_Status_serialize(const google_rpc_Status* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__rpc__Status_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_rpc_Status_serialize_ex(const google_rpc_Status* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__rpc__Status_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_rpc_Status_clear_code(google_rpc_Status* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_rpc_Status_code(const google_rpc_Status* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void google_rpc_Status_clear_message(google_rpc_Status* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_rpc_Status_message(const google_rpc_Status* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void google_rpc_Status_clear_details(google_rpc_Status* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* const* google_rpc_Status_details(const google_rpc_Status* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct google_protobuf_Any* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_rpc_Status_details_upb_array(const google_rpc_Status* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_rpc_Status_details_mutable_upb_array(const google_rpc_Status* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_rpc_Status_has_details(const google_rpc_Status* msg) {
+  size_t size;
+  google_rpc_Status_details(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_rpc_Status_set_code(google_rpc_Status *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_rpc_Status_set_message(google_rpc_Status *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any** google_rpc_Status_mutable_details(google_rpc_Status* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct google_protobuf_Any**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct google_protobuf_Any** google_rpc_Status_resize_details(google_rpc_Status* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct google_protobuf_Any**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_Any* google_rpc_Status_add_details(google_rpc_Status* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_RPC_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
new file mode 100644
index 0000000000000..f1ccc44066252
--- /dev/null
+++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/rpc/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/rpc/status.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_rpc_Status_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField google_rpc_Status__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__rpc__Status_msg_init = {
+  &google_rpc_Status_submsgs[0],
+  &google_rpc_Status__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x001800003f00001a, &upb_prm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &google__rpc__Status_msg_init,
+};
+
+const upb_MiniTableFile google_rpc_status_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
new file mode 100644
index 0000000000000..bcd12d149e5ea
--- /dev/null
+++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/rpc/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_RPC_STATUS_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 google__rpc__Status_msg_init;
+
+extern const upb_MiniTableFile google_rpc_status_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h
rename to src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
index 8682a1cf76c9a..1c52aa6ad553c 100644
--- a/src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     opencensus/proto/trace/v1/trace_config.proto
  *
@@ -10,7 +9,10 @@
 #define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -21,10 +23,6 @@ typedef struct opencensus_proto_trace_v1_TraceConfig opencensus_proto_trace_v1_T
 typedef struct opencensus_proto_trace_v1_ProbabilitySampler opencensus_proto_trace_v1_ProbabilitySampler;
 typedef struct opencensus_proto_trace_v1_ConstantSampler opencensus_proto_trace_v1_ConstantSampler;
 typedef struct opencensus_proto_trace_v1_RateLimitingSampler opencensus_proto_trace_v1_RateLimitingSampler;
-extern const upb_MiniTable opencensus_proto_trace_v1_TraceConfig_msg_init;
-extern const upb_MiniTable opencensus_proto_trace_v1_ProbabilitySampler_msg_init;
-extern const upb_MiniTable opencensus_proto_trace_v1_ConstantSampler_msg_init;
-extern const upb_MiniTable opencensus_proto_trace_v1_RateLimitingSampler_msg_init;
 
 typedef enum {
   opencensus_proto_trace_v1_ConstantSampler_ALWAYS_OFF = 0,
@@ -37,12 +35,12 @@ typedef enum {
 /* opencensus.proto.trace.v1.TraceConfig */
 
 UPB_INLINE opencensus_proto_trace_v1_TraceConfig* opencensus_proto_trace_v1_TraceConfig_new(upb_Arena* arena) {
-  return (opencensus_proto_trace_v1_TraceConfig*)_upb_Message_New(&opencensus_proto_trace_v1_TraceConfig_msg_init, arena);
+  return (opencensus_proto_trace_v1_TraceConfig*)_upb_Message_New(&opencensus__proto__trace__v1__TraceConfig_msg_init, arena);
 }
 UPB_INLINE opencensus_proto_trace_v1_TraceConfig* opencensus_proto_trace_v1_TraceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   opencensus_proto_trace_v1_TraceConfig* ret = opencensus_proto_trace_v1_TraceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_TraceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__TraceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -52,7 +50,7 @@ UPB_INLINE opencensus_proto_trace_v1_TraceConfig* opencensus_proto_trace_v1_Trac
                            int options, upb_Arena* arena) {
   opencensus_proto_trace_v1_TraceConfig* ret = opencensus_proto_trace_v1_TraceConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_TraceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__TraceConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -60,13 +58,13 @@ UPB_INLINE opencensus_proto_trace_v1_TraceConfig* opencensus_proto_trace_v1_Trac
 }
 UPB_INLINE char* opencensus_proto_trace_v1_TraceConfig_serialize(const opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_TraceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__TraceConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* opencensus_proto_trace_v1_TraceConfig_serialize_ex(const opencensus_proto_trace_v1_TraceConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_TraceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__TraceConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -176,7 +174,7 @@ UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_probability_sampler(op
 UPB_INLINE struct opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_v1_TraceConfig_mutable_probability_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) {
   struct opencensus_proto_trace_v1_ProbabilitySampler* sub = (struct opencensus_proto_trace_v1_ProbabilitySampler*)opencensus_proto_trace_v1_TraceConfig_probability_sampler(msg);
   if (sub == NULL) {
-    sub = (struct opencensus_proto_trace_v1_ProbabilitySampler*)_upb_Message_New(&opencensus_proto_trace_v1_ProbabilitySampler_msg_init, arena);
+    sub = (struct opencensus_proto_trace_v1_ProbabilitySampler*)_upb_Message_New(&opencensus__proto__trace__v1__ProbabilitySampler_msg_init, arena);
     if (sub) opencensus_proto_trace_v1_TraceConfig_set_probability_sampler(msg, sub);
   }
   return sub;
@@ -188,7 +186,7 @@ UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_constant_sampler(openc
 UPB_INLINE struct opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_TraceConfig_mutable_constant_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) {
   struct opencensus_proto_trace_v1_ConstantSampler* sub = (struct opencensus_proto_trace_v1_ConstantSampler*)opencensus_proto_trace_v1_TraceConfig_constant_sampler(msg);
   if (sub == NULL) {
-    sub = (struct opencensus_proto_trace_v1_ConstantSampler*)_upb_Message_New(&opencensus_proto_trace_v1_ConstantSampler_msg_init, arena);
+    sub = (struct opencensus_proto_trace_v1_ConstantSampler*)_upb_Message_New(&opencensus__proto__trace__v1__ConstantSampler_msg_init, arena);
     if (sub) opencensus_proto_trace_v1_TraceConfig_set_constant_sampler(msg, sub);
   }
   return sub;
@@ -200,7 +198,7 @@ UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_rate_limiting_sampler(
 UPB_INLINE struct opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace_v1_TraceConfig_mutable_rate_limiting_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) {
   struct opencensus_proto_trace_v1_RateLimitingSampler* sub = (struct opencensus_proto_trace_v1_RateLimitingSampler*)opencensus_proto_trace_v1_TraceConfig_rate_limiting_sampler(msg);
   if (sub == NULL) {
-    sub = (struct opencensus_proto_trace_v1_RateLimitingSampler*)_upb_Message_New(&opencensus_proto_trace_v1_RateLimitingSampler_msg_init, arena);
+    sub = (struct opencensus_proto_trace_v1_RateLimitingSampler*)_upb_Message_New(&opencensus__proto__trace__v1__RateLimitingSampler_msg_init, arena);
     if (sub) opencensus_proto_trace_v1_TraceConfig_set_rate_limiting_sampler(msg, sub);
   }
   return sub;
@@ -225,12 +223,12 @@ UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_links(op
 /* opencensus.proto.trace.v1.ProbabilitySampler */
 
 UPB_INLINE opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_v1_ProbabilitySampler_new(upb_Arena* arena) {
-  return (opencensus_proto_trace_v1_ProbabilitySampler*)_upb_Message_New(&opencensus_proto_trace_v1_ProbabilitySampler_msg_init, arena);
+  return (opencensus_proto_trace_v1_ProbabilitySampler*)_upb_Message_New(&opencensus__proto__trace__v1__ProbabilitySampler_msg_init, arena);
 }
 UPB_INLINE opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_v1_ProbabilitySampler_parse(const char* buf, size_t size, upb_Arena* arena) {
   opencensus_proto_trace_v1_ProbabilitySampler* ret = opencensus_proto_trace_v1_ProbabilitySampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_ProbabilitySampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__ProbabilitySampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -240,7 +238,7 @@ UPB_INLINE opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_
                            int options, upb_Arena* arena) {
   opencensus_proto_trace_v1_ProbabilitySampler* ret = opencensus_proto_trace_v1_ProbabilitySampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_ProbabilitySampler_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__ProbabilitySampler_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -248,13 +246,13 @@ UPB_INLINE opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_
 }
 UPB_INLINE char* opencensus_proto_trace_v1_ProbabilitySampler_serialize(const opencensus_proto_trace_v1_ProbabilitySampler* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_ProbabilitySampler_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__ProbabilitySampler_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* opencensus_proto_trace_v1_ProbabilitySampler_serialize_ex(const opencensus_proto_trace_v1_ProbabilitySampler* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_ProbabilitySampler_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__ProbabilitySampler_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void opencensus_proto_trace_v1_ProbabilitySampler_clear_samplingProbability(opencensus_proto_trace_v1_ProbabilitySampler* msg) {
@@ -277,12 +275,12 @@ UPB_INLINE void opencensus_proto_trace_v1_ProbabilitySampler_set_samplingProbabi
 /* opencensus.proto.trace.v1.ConstantSampler */
 
 UPB_INLINE opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_ConstantSampler_new(upb_Arena* arena) {
-  return (opencensus_proto_trace_v1_ConstantSampler*)_upb_Message_New(&opencensus_proto_trace_v1_ConstantSampler_msg_init, arena);
+  return (opencensus_proto_trace_v1_ConstantSampler*)_upb_Message_New(&opencensus__proto__trace__v1__ConstantSampler_msg_init, arena);
 }
 UPB_INLINE opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_ConstantSampler_parse(const char* buf, size_t size, upb_Arena* arena) {
   opencensus_proto_trace_v1_ConstantSampler* ret = opencensus_proto_trace_v1_ConstantSampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_ConstantSampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__ConstantSampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -292,7 +290,7 @@ UPB_INLINE opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_
                            int options, upb_Arena* arena) {
   opencensus_proto_trace_v1_ConstantSampler* ret = opencensus_proto_trace_v1_ConstantSampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_ConstantSampler_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__ConstantSampler_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -300,13 +298,13 @@ UPB_INLINE opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_
 }
 UPB_INLINE char* opencensus_proto_trace_v1_ConstantSampler_serialize(const opencensus_proto_trace_v1_ConstantSampler* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_ConstantSampler_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__ConstantSampler_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* opencensus_proto_trace_v1_ConstantSampler_serialize_ex(const opencensus_proto_trace_v1_ConstantSampler* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_ConstantSampler_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__ConstantSampler_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void opencensus_proto_trace_v1_ConstantSampler_clear_decision(opencensus_proto_trace_v1_ConstantSampler* msg) {
@@ -329,12 +327,12 @@ UPB_INLINE void opencensus_proto_trace_v1_ConstantSampler_set_decision(opencensu
 /* opencensus.proto.trace.v1.RateLimitingSampler */
 
 UPB_INLINE opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace_v1_RateLimitingSampler_new(upb_Arena* arena) {
-  return (opencensus_proto_trace_v1_RateLimitingSampler*)_upb_Message_New(&opencensus_proto_trace_v1_RateLimitingSampler_msg_init, arena);
+  return (opencensus_proto_trace_v1_RateLimitingSampler*)_upb_Message_New(&opencensus__proto__trace__v1__RateLimitingSampler_msg_init, arena);
 }
 UPB_INLINE opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace_v1_RateLimitingSampler_parse(const char* buf, size_t size, upb_Arena* arena) {
   opencensus_proto_trace_v1_RateLimitingSampler* ret = opencensus_proto_trace_v1_RateLimitingSampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_RateLimitingSampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__RateLimitingSampler_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -344,7 +342,7 @@ UPB_INLINE opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace
                            int options, upb_Arena* arena) {
   opencensus_proto_trace_v1_RateLimitingSampler* ret = opencensus_proto_trace_v1_RateLimitingSampler_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &opencensus_proto_trace_v1_RateLimitingSampler_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &opencensus__proto__trace__v1__RateLimitingSampler_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -352,13 +350,13 @@ UPB_INLINE opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace
 }
 UPB_INLINE char* opencensus_proto_trace_v1_RateLimitingSampler_serialize(const opencensus_proto_trace_v1_RateLimitingSampler* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_RateLimitingSampler_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__RateLimitingSampler_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* opencensus_proto_trace_v1_RateLimitingSampler_serialize_ex(const opencensus_proto_trace_v1_RateLimitingSampler* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &opencensus_proto_trace_v1_RateLimitingSampler_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &opencensus__proto__trace__v1__RateLimitingSampler_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_clear_qps(opencensus_proto_trace_v1_RateLimitingSampler* msg) {
@@ -378,8 +376,6 @@ UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_set_qps(opencensus
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
new file mode 100644
index 0000000000000..ad23e5524bb61
--- /dev/null
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
@@ -0,0 +1,106 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     opencensus/proto/trace/v1/trace_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub opencensus_proto_trace_v1_TraceConfig_submsgs[3] = {
+  {.submsg = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init},
+  {.submsg = &opencensus__proto__trace__v1__ConstantSampler_msg_init},
+  {.submsg = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init},
+};
+
+static const upb_MiniTableField opencensus_proto_trace_v1_TraceConfig__fields[7] = {
+  {1, UPB_SIZE(4, 40), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 40), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = {
+  &opencensus_proto_trace_v1_TraceConfig_submsgs[0],
+  &opencensus_proto_trace_v1_TraceConfig__fields[0],
+  UPB_SIZE(40, 48), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002800000100000a, &upb_pom_1bt_max64b},
+    {0x0028000002010012, &upb_pom_1bt_max64b},
+    {0x002800000302001a, &upb_pom_1bt_max64b},
+    {0x000800003f000020, &upb_psv8_1bt},
+    {0x001000003f000028, &upb_psv8_1bt},
+    {0x001800003f000030, &upb_psv8_1bt},
+    {0x002000003f000038, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTableField opencensus_proto_trace_v1_ProbabilitySampler__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init = {
+  NULL,
+  &opencensus_proto_trace_v1_ProbabilitySampler__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+  })
+};
+
+static const upb_MiniTableField opencensus_proto_trace_v1_ConstantSampler__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init = {
+  NULL,
+  &opencensus_proto_trace_v1_ConstantSampler__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableField opencensus_proto_trace_v1_RateLimitingSampler__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init = {
+  NULL,
+  &opencensus_proto_trace_v1_RateLimitingSampler__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &opencensus__proto__trace__v1__TraceConfig_msg_init,
+  &opencensus__proto__trace__v1__ProbabilitySampler_msg_init,
+  &opencensus__proto__trace__v1__ConstantSampler_msg_init,
+  &opencensus__proto__trace__v1__RateLimitingSampler_msg_init,
+};
+
+const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
new file mode 100644
index 0000000000000..f781fd44a35fc
--- /dev/null
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     opencensus/proto/trace/v1/trace_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_
+#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_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 opencensus__proto__trace__v1__TraceConfig_msg_init;
+extern const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init;
+extern const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init;
+extern const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init;
+
+extern const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
index 02221f0c54217..aa615c3ffae5b 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/gcp/altscontext.proto
  *
@@ -10,7 +9,12 @@
 #define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/gcp/altscontext.upb_minitable.h"
+
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,22 +23,19 @@ extern "C" {
 
 typedef struct grpc_gcp_AltsContext grpc_gcp_AltsContext;
 typedef struct grpc_gcp_AltsContext_PeerAttributesEntry grpc_gcp_AltsContext_PeerAttributesEntry;
-extern const upb_MiniTable grpc_gcp_AltsContext_msg_init;
-extern const upb_MiniTable grpc_gcp_AltsContext_PeerAttributesEntry_msg_init;
 struct grpc_gcp_RpcProtocolVersions;
-extern const upb_MiniTable grpc_gcp_RpcProtocolVersions_msg_init;
 
 
 
 /* grpc.gcp.AltsContext */
 
 UPB_INLINE grpc_gcp_AltsContext* grpc_gcp_AltsContext_new(upb_Arena* arena) {
-  return (grpc_gcp_AltsContext*)_upb_Message_New(&grpc_gcp_AltsContext_msg_init, arena);
+  return (grpc_gcp_AltsContext*)_upb_Message_New(&grpc__gcp__AltsContext_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_AltsContext* grpc_gcp_AltsContext_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_AltsContext* ret = grpc_gcp_AltsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_AltsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__AltsContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +45,7 @@ UPB_INLINE grpc_gcp_AltsContext* grpc_gcp_AltsContext_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   grpc_gcp_AltsContext* ret = grpc_gcp_AltsContext_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_AltsContext_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__AltsContext_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +53,13 @@ UPB_INLINE grpc_gcp_AltsContext* grpc_gcp_AltsContext_parse_ex(const char* buf,
 }
 UPB_INLINE char* grpc_gcp_AltsContext_serialize(const grpc_gcp_AltsContext* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_AltsContext_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__AltsContext_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_AltsContext_serialize_ex(const grpc_gcp_AltsContext* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_AltsContext_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__AltsContext_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_AltsContext_clear_application_protocol(grpc_gcp_AltsContext* msg) {
@@ -180,7 +181,7 @@ UPB_INLINE void grpc_gcp_AltsContext_set_peer_rpc_versions(grpc_gcp_AltsContext
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_AltsContext_mutable_peer_rpc_versions(grpc_gcp_AltsContext* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_AltsContext_peer_rpc_versions(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions_msg_init, arena);
     if (sub) grpc_gcp_AltsContext_set_peer_rpc_versions(msg, sub);
   }
   return sub;
@@ -227,8 +228,6 @@ UPB_INLINE void grpc_gcp_AltsContext_PeerAttributesEntry_set_value(grpc_gcp_Alts
   _upb_msg_map_set_value(msg, &value, 0);
 }
 
-extern const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
new file mode 100644
index 0000000000000..249eaf8b54b9b
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -0,0 +1,79 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/altscontext.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/gcp/altscontext.upb_minitable.h"
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub grpc_gcp_AltsContext_submsgs[2] = {
+  {.submsg = &grpc__gcp__RpcProtocolVersions_msg_init},
+  {.submsg = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_AltsContext__fields[7] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(8, 72), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 80), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__AltsContext_msg_init = {
+  &grpc_gcp_AltsContext_submsgs[0],
+  &grpc_gcp_AltsContext__fields[0],
+  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x000400003f000018, &upb_psv4_1bt},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x003800003f00002a, &upb_pss_1bt},
+    {0x0048000001000032, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_gcp_AltsContext_PeerAttributesEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init = {
+  NULL,
+  &grpc_gcp_AltsContext_PeerAttributesEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &grpc__gcp__AltsContext_msg_init,
+  &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
new file mode 100644
index 0000000000000..07231cf05c120
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/altscontext.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_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 grpc__gcp__AltsContext_msg_init;
+extern const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
similarity index 93%
rename from src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
index 51ccd0cfe3742..2413e661b9ff5 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/gcp/handshaker.proto
  *
@@ -10,7 +9,12 @@
 #define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/gcp/handshaker.upb_minitable.h"
+
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -29,20 +33,7 @@ typedef struct grpc_gcp_HandshakerReq grpc_gcp_HandshakerReq;
 typedef struct grpc_gcp_HandshakerResult grpc_gcp_HandshakerResult;
 typedef struct grpc_gcp_HandshakerStatus grpc_gcp_HandshakerStatus;
 typedef struct grpc_gcp_HandshakerResp grpc_gcp_HandshakerResp;
-extern const upb_MiniTable grpc_gcp_Endpoint_msg_init;
-extern const upb_MiniTable grpc_gcp_Identity_msg_init;
-extern const upb_MiniTable grpc_gcp_Identity_AttributesEntry_msg_init;
-extern const upb_MiniTable grpc_gcp_StartClientHandshakeReq_msg_init;
-extern const upb_MiniTable grpc_gcp_ServerHandshakeParameters_msg_init;
-extern const upb_MiniTable grpc_gcp_StartServerHandshakeReq_msg_init;
-extern const upb_MiniTable grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_msg_init;
-extern const upb_MiniTable grpc_gcp_NextHandshakeMessageReq_msg_init;
-extern const upb_MiniTable grpc_gcp_HandshakerReq_msg_init;
-extern const upb_MiniTable grpc_gcp_HandshakerResult_msg_init;
-extern const upb_MiniTable grpc_gcp_HandshakerStatus_msg_init;
-extern const upb_MiniTable grpc_gcp_HandshakerResp_msg_init;
 struct grpc_gcp_RpcProtocolVersions;
-extern const upb_MiniTable grpc_gcp_RpcProtocolVersions_msg_init;
 
 typedef enum {
   grpc_gcp_HANDSHAKE_PROTOCOL_UNSPECIFIED = 0,
@@ -61,12 +52,12 @@ typedef enum {
 /* grpc.gcp.Endpoint */
 
 UPB_INLINE grpc_gcp_Endpoint* grpc_gcp_Endpoint_new(upb_Arena* arena) {
-  return (grpc_gcp_Endpoint*)_upb_Message_New(&grpc_gcp_Endpoint_msg_init, arena);
+  return (grpc_gcp_Endpoint*)_upb_Message_New(&grpc__gcp__Endpoint_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_Endpoint* grpc_gcp_Endpoint_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_Endpoint* ret = grpc_gcp_Endpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_Endpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__Endpoint_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -76,7 +67,7 @@ UPB_INLINE grpc_gcp_Endpoint* grpc_gcp_Endpoint_parse_ex(const char* buf, size_t
                            int options, upb_Arena* arena) {
   grpc_gcp_Endpoint* ret = grpc_gcp_Endpoint_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_Endpoint_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__Endpoint_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -84,13 +75,13 @@ UPB_INLINE grpc_gcp_Endpoint* grpc_gcp_Endpoint_parse_ex(const char* buf, size_t
 }
 UPB_INLINE char* grpc_gcp_Endpoint_serialize(const grpc_gcp_Endpoint* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_Endpoint_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__Endpoint_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_Endpoint_serialize_ex(const grpc_gcp_Endpoint* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_Endpoint_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__Endpoint_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_Endpoint_clear_ip_address(grpc_gcp_Endpoint* msg) {
@@ -143,12 +134,12 @@ UPB_INLINE void grpc_gcp_Endpoint_set_protocol(grpc_gcp_Endpoint *msg, int32_t v
 /* grpc.gcp.Identity */
 
 UPB_INLINE grpc_gcp_Identity* grpc_gcp_Identity_new(upb_Arena* arena) {
-  return (grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+  return (grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_Identity* grpc_gcp_Identity_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_Identity* ret = grpc_gcp_Identity_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_Identity_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__Identity_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -158,7 +149,7 @@ UPB_INLINE grpc_gcp_Identity* grpc_gcp_Identity_parse_ex(const char* buf, size_t
                            int options, upb_Arena* arena) {
   grpc_gcp_Identity* ret = grpc_gcp_Identity_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_Identity_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__Identity_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -166,13 +157,13 @@ UPB_INLINE grpc_gcp_Identity* grpc_gcp_Identity_parse_ex(const char* buf, size_t
 }
 UPB_INLINE char* grpc_gcp_Identity_serialize(const grpc_gcp_Identity* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_Identity_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__Identity_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_Identity_serialize_ex(const grpc_gcp_Identity* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_Identity_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__Identity_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -289,12 +280,12 @@ UPB_INLINE void grpc_gcp_Identity_AttributesEntry_set_value(grpc_gcp_Identity_At
 /* grpc.gcp.StartClientHandshakeReq */
 
 UPB_INLINE grpc_gcp_StartClientHandshakeReq* grpc_gcp_StartClientHandshakeReq_new(upb_Arena* arena) {
-  return (grpc_gcp_StartClientHandshakeReq*)_upb_Message_New(&grpc_gcp_StartClientHandshakeReq_msg_init, arena);
+  return (grpc_gcp_StartClientHandshakeReq*)_upb_Message_New(&grpc__gcp__StartClientHandshakeReq_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_StartClientHandshakeReq* grpc_gcp_StartClientHandshakeReq_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_StartClientHandshakeReq* ret = grpc_gcp_StartClientHandshakeReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__StartClientHandshakeReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -304,7 +295,7 @@ UPB_INLINE grpc_gcp_StartClientHandshakeReq* grpc_gcp_StartClientHandshakeReq_pa
                            int options, upb_Arena* arena) {
   grpc_gcp_StartClientHandshakeReq* ret = grpc_gcp_StartClientHandshakeReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__StartClientHandshakeReq_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -312,13 +303,13 @@ UPB_INLINE grpc_gcp_StartClientHandshakeReq* grpc_gcp_StartClientHandshakeReq_pa
 }
 UPB_INLINE char* grpc_gcp_StartClientHandshakeReq_serialize(const grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_StartClientHandshakeReq_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__StartClientHandshakeReq_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_StartClientHandshakeReq_serialize_ex(const grpc_gcp_StartClientHandshakeReq* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_StartClientHandshakeReq_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__StartClientHandshakeReq_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_StartClientHandshakeReq_clear_handshake_security_protocol(grpc_gcp_StartClientHandshakeReq* msg) {
@@ -599,7 +590,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_add_target
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+  struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -611,7 +602,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_identity(grpc_gcp_Sta
 UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_mutable_local_identity(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_StartClientHandshakeReq_local_identity(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
     if (sub) grpc_gcp_StartClientHandshakeReq_set_local_identity(msg, sub);
   }
   return sub;
@@ -623,7 +614,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_endpoint(grpc_gcp_Sta
 UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_local_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_local_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc_gcp_Endpoint_msg_init, arena);
+    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc__gcp__Endpoint_msg_init, arena);
     if (sub) grpc_gcp_StartClientHandshakeReq_set_local_endpoint(msg, sub);
   }
   return sub;
@@ -635,7 +626,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_remote_endpoint(grpc_gcp_St
 UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_remote_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc_gcp_Endpoint_msg_init, arena);
+    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc__gcp__Endpoint_msg_init, arena);
     if (sub) grpc_gcp_StartClientHandshakeReq_set_remote_endpoint(msg, sub);
   }
   return sub;
@@ -651,7 +642,7 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_rpc_versions(grpc_gcp_Start
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandshakeReq_mutable_rpc_versions(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartClientHandshakeReq_rpc_versions(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions_msg_init, arena);
     if (sub) grpc_gcp_StartClientHandshakeReq_set_rpc_versions(msg, sub);
   }
   return sub;
@@ -664,12 +655,12 @@ UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_max_frame_size(grpc_gcp_Sta
 /* grpc.gcp.ServerHandshakeParameters */
 
 UPB_INLINE grpc_gcp_ServerHandshakeParameters* grpc_gcp_ServerHandshakeParameters_new(upb_Arena* arena) {
-  return (grpc_gcp_ServerHandshakeParameters*)_upb_Message_New(&grpc_gcp_ServerHandshakeParameters_msg_init, arena);
+  return (grpc_gcp_ServerHandshakeParameters*)_upb_Message_New(&grpc__gcp__ServerHandshakeParameters_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_ServerHandshakeParameters* grpc_gcp_ServerHandshakeParameters_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_ServerHandshakeParameters* ret = grpc_gcp_ServerHandshakeParameters_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__ServerHandshakeParameters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -679,7 +670,7 @@ UPB_INLINE grpc_gcp_ServerHandshakeParameters* grpc_gcp_ServerHandshakeParameter
                            int options, upb_Arena* arena) {
   grpc_gcp_ServerHandshakeParameters* ret = grpc_gcp_ServerHandshakeParameters_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__ServerHandshakeParameters_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -687,13 +678,13 @@ UPB_INLINE grpc_gcp_ServerHandshakeParameters* grpc_gcp_ServerHandshakeParameter
 }
 UPB_INLINE char* grpc_gcp_ServerHandshakeParameters_serialize(const grpc_gcp_ServerHandshakeParameters* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_ServerHandshakeParameters_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__ServerHandshakeParameters_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_ServerHandshakeParameters_serialize_ex(const grpc_gcp_ServerHandshakeParameters* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_ServerHandshakeParameters_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__ServerHandshakeParameters_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_ServerHandshakeParameters_clear_record_protocols(grpc_gcp_ServerHandshakeParameters* msg) {
@@ -816,7 +807,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_ServerHandshakeParameters_add_loca
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+  struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -825,12 +816,12 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_ServerHandshakeParameters_add_loca
 /* grpc.gcp.StartServerHandshakeReq */
 
 UPB_INLINE grpc_gcp_StartServerHandshakeReq* grpc_gcp_StartServerHandshakeReq_new(upb_Arena* arena) {
-  return (grpc_gcp_StartServerHandshakeReq*)_upb_Message_New(&grpc_gcp_StartServerHandshakeReq_msg_init, arena);
+  return (grpc_gcp_StartServerHandshakeReq*)_upb_Message_New(&grpc__gcp__StartServerHandshakeReq_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_StartServerHandshakeReq* grpc_gcp_StartServerHandshakeReq_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_StartServerHandshakeReq* ret = grpc_gcp_StartServerHandshakeReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__StartServerHandshakeReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -840,7 +831,7 @@ UPB_INLINE grpc_gcp_StartServerHandshakeReq* grpc_gcp_StartServerHandshakeReq_pa
                            int options, upb_Arena* arena) {
   grpc_gcp_StartServerHandshakeReq* ret = grpc_gcp_StartServerHandshakeReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__StartServerHandshakeReq_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -848,13 +839,13 @@ UPB_INLINE grpc_gcp_StartServerHandshakeReq* grpc_gcp_StartServerHandshakeReq_pa
 }
 UPB_INLINE char* grpc_gcp_StartServerHandshakeReq_serialize(const grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_StartServerHandshakeReq_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__StartServerHandshakeReq_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_StartServerHandshakeReq_serialize_ex(const grpc_gcp_StartServerHandshakeReq* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_StartServerHandshakeReq_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__StartServerHandshakeReq_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_StartServerHandshakeReq_clear_application_protocols(grpc_gcp_StartServerHandshakeReq* msg) {
@@ -1042,7 +1033,7 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_local_endpoint(grpc_gcp_Sta
 UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_local_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_local_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc_gcp_Endpoint_msg_init, arena);
+    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc__gcp__Endpoint_msg_init, arena);
     if (sub) grpc_gcp_StartServerHandshakeReq_set_local_endpoint(msg, sub);
   }
   return sub;
@@ -1054,7 +1045,7 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_remote_endpoint(grpc_gcp_St
 UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_remote_endpoint(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc_gcp_Endpoint_msg_init, arena);
+    sub = (struct grpc_gcp_Endpoint*)_upb_Message_New(&grpc__gcp__Endpoint_msg_init, arena);
     if (sub) grpc_gcp_StartServerHandshakeReq_set_remote_endpoint(msg, sub);
   }
   return sub;
@@ -1066,7 +1057,7 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_rpc_versions(grpc_gcp_Start
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandshakeReq_mutable_rpc_versions(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartServerHandshakeReq_rpc_versions(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions_msg_init, arena);
     if (sub) grpc_gcp_StartServerHandshakeReq_set_rpc_versions(msg, sub);
   }
   return sub;
@@ -1100,12 +1091,12 @@ UPB_INLINE void grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_set_va
 /* grpc.gcp.NextHandshakeMessageReq */
 
 UPB_INLINE grpc_gcp_NextHandshakeMessageReq* grpc_gcp_NextHandshakeMessageReq_new(upb_Arena* arena) {
-  return (grpc_gcp_NextHandshakeMessageReq*)_upb_Message_New(&grpc_gcp_NextHandshakeMessageReq_msg_init, arena);
+  return (grpc_gcp_NextHandshakeMessageReq*)_upb_Message_New(&grpc__gcp__NextHandshakeMessageReq_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_NextHandshakeMessageReq* grpc_gcp_NextHandshakeMessageReq_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_NextHandshakeMessageReq* ret = grpc_gcp_NextHandshakeMessageReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__NextHandshakeMessageReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1115,7 +1106,7 @@ UPB_INLINE grpc_gcp_NextHandshakeMessageReq* grpc_gcp_NextHandshakeMessageReq_pa
                            int options, upb_Arena* arena) {
   grpc_gcp_NextHandshakeMessageReq* ret = grpc_gcp_NextHandshakeMessageReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__NextHandshakeMessageReq_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1123,13 +1114,13 @@ UPB_INLINE grpc_gcp_NextHandshakeMessageReq* grpc_gcp_NextHandshakeMessageReq_pa
 }
 UPB_INLINE char* grpc_gcp_NextHandshakeMessageReq_serialize(const grpc_gcp_NextHandshakeMessageReq* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_NextHandshakeMessageReq_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__NextHandshakeMessageReq_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_NextHandshakeMessageReq_serialize_ex(const grpc_gcp_NextHandshakeMessageReq* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_NextHandshakeMessageReq_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__NextHandshakeMessageReq_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_NextHandshakeMessageReq_clear_in_bytes(grpc_gcp_NextHandshakeMessageReq* msg) {
@@ -1152,12 +1143,12 @@ UPB_INLINE void grpc_gcp_NextHandshakeMessageReq_set_in_bytes(grpc_gcp_NextHands
 /* grpc.gcp.HandshakerReq */
 
 UPB_INLINE grpc_gcp_HandshakerReq* grpc_gcp_HandshakerReq_new(upb_Arena* arena) {
-  return (grpc_gcp_HandshakerReq*)_upb_Message_New(&grpc_gcp_HandshakerReq_msg_init, arena);
+  return (grpc_gcp_HandshakerReq*)_upb_Message_New(&grpc__gcp__HandshakerReq_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_HandshakerReq* grpc_gcp_HandshakerReq_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_HandshakerReq* ret = grpc_gcp_HandshakerReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerReq_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1167,7 +1158,7 @@ UPB_INLINE grpc_gcp_HandshakerReq* grpc_gcp_HandshakerReq_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   grpc_gcp_HandshakerReq* ret = grpc_gcp_HandshakerReq_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerReq_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerReq_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1175,13 +1166,13 @@ UPB_INLINE grpc_gcp_HandshakerReq* grpc_gcp_HandshakerReq_parse_ex(const char* b
 }
 UPB_INLINE char* grpc_gcp_HandshakerReq_serialize(const grpc_gcp_HandshakerReq* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerReq_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerReq_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_HandshakerReq_serialize_ex(const grpc_gcp_HandshakerReq* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerReq_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerReq_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -1247,7 +1238,7 @@ UPB_INLINE void grpc_gcp_HandshakerReq_set_client_start(grpc_gcp_HandshakerReq *
 UPB_INLINE struct grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_mutable_client_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) {
   struct grpc_gcp_StartClientHandshakeReq* sub = (struct grpc_gcp_StartClientHandshakeReq*)grpc_gcp_HandshakerReq_client_start(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_StartClientHandshakeReq*)_upb_Message_New(&grpc_gcp_StartClientHandshakeReq_msg_init, arena);
+    sub = (struct grpc_gcp_StartClientHandshakeReq*)_upb_Message_New(&grpc__gcp__StartClientHandshakeReq_msg_init, arena);
     if (sub) grpc_gcp_HandshakerReq_set_client_start(msg, sub);
   }
   return sub;
@@ -1259,7 +1250,7 @@ UPB_INLINE void grpc_gcp_HandshakerReq_set_server_start(grpc_gcp_HandshakerReq *
 UPB_INLINE struct grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_mutable_server_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) {
   struct grpc_gcp_StartServerHandshakeReq* sub = (struct grpc_gcp_StartServerHandshakeReq*)grpc_gcp_HandshakerReq_server_start(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_StartServerHandshakeReq*)_upb_Message_New(&grpc_gcp_StartServerHandshakeReq_msg_init, arena);
+    sub = (struct grpc_gcp_StartServerHandshakeReq*)_upb_Message_New(&grpc__gcp__StartServerHandshakeReq_msg_init, arena);
     if (sub) grpc_gcp_HandshakerReq_set_server_start(msg, sub);
   }
   return sub;
@@ -1271,7 +1262,7 @@ UPB_INLINE void grpc_gcp_HandshakerReq_set_next(grpc_gcp_HandshakerReq *msg, grp
 UPB_INLINE struct grpc_gcp_NextHandshakeMessageReq* grpc_gcp_HandshakerReq_mutable_next(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) {
   struct grpc_gcp_NextHandshakeMessageReq* sub = (struct grpc_gcp_NextHandshakeMessageReq*)grpc_gcp_HandshakerReq_next(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_NextHandshakeMessageReq*)_upb_Message_New(&grpc_gcp_NextHandshakeMessageReq_msg_init, arena);
+    sub = (struct grpc_gcp_NextHandshakeMessageReq*)_upb_Message_New(&grpc__gcp__NextHandshakeMessageReq_msg_init, arena);
     if (sub) grpc_gcp_HandshakerReq_set_next(msg, sub);
   }
   return sub;
@@ -1280,12 +1271,12 @@ UPB_INLINE struct grpc_gcp_NextHandshakeMessageReq* grpc_gcp_HandshakerReq_mutab
 /* grpc.gcp.HandshakerResult */
 
 UPB_INLINE grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResult_new(upb_Arena* arena) {
-  return (grpc_gcp_HandshakerResult*)_upb_Message_New(&grpc_gcp_HandshakerResult_msg_init, arena);
+  return (grpc_gcp_HandshakerResult*)_upb_Message_New(&grpc__gcp__HandshakerResult_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResult_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_HandshakerResult* ret = grpc_gcp_HandshakerResult_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerResult_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerResult_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1295,7 +1286,7 @@ UPB_INLINE grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResult_parse_ex(const c
                            int options, upb_Arena* arena) {
   grpc_gcp_HandshakerResult* ret = grpc_gcp_HandshakerResult_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerResult_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerResult_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1303,13 +1294,13 @@ UPB_INLINE grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResult_parse_ex(const c
 }
 UPB_INLINE char* grpc_gcp_HandshakerResult_serialize(const grpc_gcp_HandshakerResult* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerResult_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerResult_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_HandshakerResult_serialize_ex(const grpc_gcp_HandshakerResult* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerResult_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerResult_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_HandshakerResult_clear_application_protocol(grpc_gcp_HandshakerResult* msg) {
@@ -1432,7 +1423,7 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_identity(grpc_gcp_HandshakerR
 UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_peer_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) {
   struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_peer_identity(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
     if (sub) grpc_gcp_HandshakerResult_set_peer_identity(msg, sub);
   }
   return sub;
@@ -1444,7 +1435,7 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_local_identity(grpc_gcp_Handshaker
 UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_local_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) {
   struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_local_identity(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc_gcp_Identity_msg_init, arena);
+    sub = (struct grpc_gcp_Identity*)_upb_Message_New(&grpc__gcp__Identity_msg_init, arena);
     if (sub) grpc_gcp_HandshakerResult_set_local_identity(msg, sub);
   }
   return sub;
@@ -1460,7 +1451,7 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_rpc_versions(grpc_gcp_Handsha
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_mutable_peer_rpc_versions(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_HandshakerResult_peer_rpc_versions(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions_msg_init, arena);
     if (sub) grpc_gcp_HandshakerResult_set_peer_rpc_versions(msg, sub);
   }
   return sub;
@@ -1473,12 +1464,12 @@ UPB_INLINE void grpc_gcp_HandshakerResult_set_max_frame_size(grpc_gcp_Handshaker
 /* grpc.gcp.HandshakerStatus */
 
 UPB_INLINE grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerStatus_new(upb_Arena* arena) {
-  return (grpc_gcp_HandshakerStatus*)_upb_Message_New(&grpc_gcp_HandshakerStatus_msg_init, arena);
+  return (grpc_gcp_HandshakerStatus*)_upb_Message_New(&grpc__gcp__HandshakerStatus_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_HandshakerStatus* ret = grpc_gcp_HandshakerStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1488,7 +1479,7 @@ UPB_INLINE grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerStatus_parse_ex(const c
                            int options, upb_Arena* arena) {
   grpc_gcp_HandshakerStatus* ret = grpc_gcp_HandshakerStatus_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerStatus_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1496,13 +1487,13 @@ UPB_INLINE grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerStatus_parse_ex(const c
 }
 UPB_INLINE char* grpc_gcp_HandshakerStatus_serialize(const grpc_gcp_HandshakerStatus* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerStatus_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_HandshakerStatus_serialize_ex(const grpc_gcp_HandshakerStatus* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerStatus_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_HandshakerStatus_clear_code(grpc_gcp_HandshakerStatus* msg) {
@@ -1540,12 +1531,12 @@ UPB_INLINE void grpc_gcp_HandshakerStatus_set_details(grpc_gcp_HandshakerStatus
 /* grpc.gcp.HandshakerResp */
 
 UPB_INLINE grpc_gcp_HandshakerResp* grpc_gcp_HandshakerResp_new(upb_Arena* arena) {
-  return (grpc_gcp_HandshakerResp*)_upb_Message_New(&grpc_gcp_HandshakerResp_msg_init, arena);
+  return (grpc_gcp_HandshakerResp*)_upb_Message_New(&grpc__gcp__HandshakerResp_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_HandshakerResp* grpc_gcp_HandshakerResp_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_HandshakerResp* ret = grpc_gcp_HandshakerResp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerResp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerResp_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1555,7 +1546,7 @@ UPB_INLINE grpc_gcp_HandshakerResp* grpc_gcp_HandshakerResp_parse_ex(const char*
                            int options, upb_Arena* arena) {
   grpc_gcp_HandshakerResp* ret = grpc_gcp_HandshakerResp_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_HandshakerResp_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__HandshakerResp_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1563,13 +1554,13 @@ UPB_INLINE grpc_gcp_HandshakerResp* grpc_gcp_HandshakerResp_parse_ex(const char*
 }
 UPB_INLINE char* grpc_gcp_HandshakerResp_serialize(const grpc_gcp_HandshakerResp* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerResp_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerResp_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_HandshakerResp_serialize_ex(const grpc_gcp_HandshakerResp* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_HandshakerResp_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__HandshakerResp_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_HandshakerResp_clear_out_frames(grpc_gcp_HandshakerResp* msg) {
@@ -1640,7 +1631,7 @@ UPB_INLINE void grpc_gcp_HandshakerResp_set_result(grpc_gcp_HandshakerResp *msg,
 UPB_INLINE struct grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_mutable_result(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) {
   struct grpc_gcp_HandshakerResult* sub = (struct grpc_gcp_HandshakerResult*)grpc_gcp_HandshakerResp_result(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_HandshakerResult*)_upb_Message_New(&grpc_gcp_HandshakerResult_msg_init, arena);
+    sub = (struct grpc_gcp_HandshakerResult*)_upb_Message_New(&grpc__gcp__HandshakerResult_msg_init, arena);
     if (sub) grpc_gcp_HandshakerResp_set_result(msg, sub);
   }
   return sub;
@@ -1652,14 +1643,12 @@ UPB_INLINE void grpc_gcp_HandshakerResp_set_status(grpc_gcp_HandshakerResp *msg,
 UPB_INLINE struct grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_mutable_status(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) {
   struct grpc_gcp_HandshakerStatus* sub = (struct grpc_gcp_HandshakerStatus*)grpc_gcp_HandshakerResp_status(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_HandshakerStatus*)_upb_Message_New(&grpc_gcp_HandshakerStatus_msg_init, arena);
+    sub = (struct grpc_gcp_HandshakerStatus*)_upb_Message_New(&grpc__gcp__HandshakerStatus_msg_init, arena);
     if (sub) grpc_gcp_HandshakerResp_set_status(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
new file mode 100644
index 0000000000000..c9bf100f2227a
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
@@ -0,0 +1,342 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/handshaker.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/gcp/handshaker.upb_minitable.h"
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField grpc_gcp_Endpoint__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__Endpoint_msg_init = {
+  NULL,
+  &grpc_gcp_Endpoint__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x000400003f000018, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_Identity_submsgs[1] = {
+  {.submsg = &grpc__gcp__Identity__AttributesEntry_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_Identity__fields[3] = {
+  {1, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__Identity_msg_init = {
+  &grpc_gcp_Identity_submsgs[0],
+  &grpc_gcp_Identity__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pos_1bt},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_gcp_Identity_AttributesEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = {
+  NULL,
+  &grpc_gcp_Identity_AttributesEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_StartClientHandshakeReq_submsgs[5] = {
+  {.submsg = &grpc__gcp__Identity_msg_init},
+  {.submsg = &grpc__gcp__Identity_msg_init},
+  {.submsg = &grpc__gcp__Endpoint_msg_init},
+  {.submsg = &grpc__gcp__Endpoint_msg_init},
+  {.submsg = &grpc__gcp__RpcProtocolVersions_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = {
+  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(20, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = {
+  &grpc_gcp_StartClientHandshakeReq_submsgs[0],
+  &grpc_gcp_StartClientHandshakeReq__fields[0],
+  UPB_SIZE(48, 88), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400003f000008, &upb_psv4_1bt},
+    {0x001000003f000012, &upb_prs_1bt},
+    {0x001800003f00001a, &upb_prs_1bt},
+    {0x002000003f000022, &upb_prm_1bt_max64b},
+    {0x002800000101002a, &upb_psm_1bt_max64b},
+    {0x0030000002020032, &upb_psm_1bt_max64b},
+    {0x003800000303003a, &upb_psm_1bt_max64b},
+    {0x004000003f000042, &upb_pss_1bt},
+    {0x005000000404004a, &upb_psm_1bt_maxmaxb},
+    {0x000800003f000050, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_ServerHandshakeParameters_submsgs[1] = {
+  {.submsg = &grpc__gcp__Identity_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_ServerHandshakeParameters__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = {
+  &grpc_gcp_ServerHandshakeParameters_submsgs[0],
+  &grpc_gcp_ServerHandshakeParameters__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prs_1bt},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_submsgs[4] = {
+  {.submsg = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init},
+  {.submsg = &grpc__gcp__Endpoint_msg_init},
+  {.submsg = &grpc__gcp__Endpoint_msg_init},
+  {.submsg = &grpc__gcp__RpcProtocolVersions_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = {
+  &grpc_gcp_StartServerHandshakeReq_submsgs[0],
+  &grpc_gcp_StartServerHandshakeReq__fields[0],
+  UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f00001a, &upb_psb_1bt},
+    {0x0028000001010022, &upb_psm_1bt_max64b},
+    {0x003000000202002a, &upb_psm_1bt_max64b},
+    {0x0038000003030032, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000038, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = {
+  {.submsg = &grpc__gcp__ServerHandshakeParameters_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init = {
+  &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0],
+  &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000008, &upb_psv4_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_gcp_NextHandshakeMessageReq__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = {
+  NULL,
+  &grpc_gcp_NextHandshakeMessageReq__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_psb_1bt},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_HandshakerReq_submsgs[3] = {
+  {.submsg = &grpc__gcp__StartClientHandshakeReq_msg_init},
+  {.submsg = &grpc__gcp__StartServerHandshakeReq_msg_init},
+  {.submsg = &grpc__gcp__NextHandshakeMessageReq_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_HandshakerReq__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = {
+  &grpc_gcp_HandshakerReq_submsgs[0],
+  &grpc_gcp_HandshakerReq__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max128b},
+    {0x0008000002010012, &upb_pom_1bt_max128b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_HandshakerResult_submsgs[3] = {
+  {.submsg = &grpc__gcp__Identity_msg_init},
+  {.submsg = &grpc__gcp__Identity_msg_init},
+  {.submsg = &grpc__gcp__RpcProtocolVersions_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = {
+  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 40, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 64), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(16, 72), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(20, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = {
+  &grpc_gcp_HandshakerResult_submsgs[0],
+  &grpc_gcp_HandshakerResult__fields[0],
+  UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_psb_1bt},
+    {0x0038000001000022, &upb_psm_1bt_max64b},
+    {0x004000000201002a, &upb_psm_1bt_max64b},
+    {0x000100003f000030, &upb_psb1_1bt},
+    {0x004800000302003a, &upb_psm_1bt_maxmaxb},
+    {0x000400003f000040, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_gcp_HandshakerStatus__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = {
+  NULL,
+  &grpc_gcp_HandshakerStatus__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_gcp_HandshakerResp_submsgs[2] = {
+  {.submsg = &grpc__gcp__HandshakerResult_msg_init},
+  {.submsg = &grpc__gcp__HandshakerStatus_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_HandshakerResp__fields[4] = {
+  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = {
+  &grpc_gcp_HandshakerResp_submsgs[0],
+  &grpc_gcp_HandshakerResp__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_psb_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x001800000100001a, &upb_psm_1bt_max128b},
+    {0x0020000002010022, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[12] = {
+  &grpc__gcp__Endpoint_msg_init,
+  &grpc__gcp__Identity_msg_init,
+  &grpc__gcp__Identity__AttributesEntry_msg_init,
+  &grpc__gcp__StartClientHandshakeReq_msg_init,
+  &grpc__gcp__ServerHandshakeParameters_msg_init,
+  &grpc__gcp__StartServerHandshakeReq_msg_init,
+  &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init,
+  &grpc__gcp__NextHandshakeMessageReq_msg_init,
+  &grpc__gcp__HandshakerReq_msg_init,
+  &grpc__gcp__HandshakerResult_msg_init,
+  &grpc__gcp__HandshakerStatus_msg_init,
+  &grpc__gcp__HandshakerResp_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  12,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
new file mode 100644
index 0000000000000..52a73951ccc85
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
@@ -0,0 +1,41 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/handshaker.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_HANDSHAKER_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 grpc__gcp__Endpoint_msg_init;
+extern const upb_MiniTable grpc__gcp__Identity_msg_init;
+extern const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init;
+extern const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init;
+extern const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init;
+extern const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init;
+extern const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init;
+extern const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init;
+extern const upb_MiniTable grpc__gcp__HandshakerReq_msg_init;
+extern const upb_MiniTable grpc__gcp__HandshakerResult_msg_init;
+extern const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init;
+extern const upb_MiniTable grpc__gcp__HandshakerResp_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
similarity index 86%
rename from src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
index 79b67b20c9125..bd0aae3d1c757 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/gcp/transport_security_common.proto
  *
@@ -10,7 +9,10 @@
 #define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,8 +21,6 @@ extern "C" {
 
 typedef struct grpc_gcp_RpcProtocolVersions grpc_gcp_RpcProtocolVersions;
 typedef struct grpc_gcp_RpcProtocolVersions_Version grpc_gcp_RpcProtocolVersions_Version;
-extern const upb_MiniTable grpc_gcp_RpcProtocolVersions_msg_init;
-extern const upb_MiniTable grpc_gcp_RpcProtocolVersions_Version_msg_init;
 
 typedef enum {
   grpc_gcp_SECURITY_NONE = 0,
@@ -33,12 +33,12 @@ typedef enum {
 /* grpc.gcp.RpcProtocolVersions */
 
 UPB_INLINE grpc_gcp_RpcProtocolVersions* grpc_gcp_RpcProtocolVersions_new(upb_Arena* arena) {
-  return (grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_msg_init, arena);
+  return (grpc_gcp_RpcProtocolVersions*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_RpcProtocolVersions* grpc_gcp_RpcProtocolVersions_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_RpcProtocolVersions* ret = grpc_gcp_RpcProtocolVersions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__RpcProtocolVersions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -48,7 +48,7 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions* grpc_gcp_RpcProtocolVersions_parse_ex(c
                            int options, upb_Arena* arena) {
   grpc_gcp_RpcProtocolVersions* ret = grpc_gcp_RpcProtocolVersions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__RpcProtocolVersions_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -56,13 +56,13 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions* grpc_gcp_RpcProtocolVersions_parse_ex(c
 }
 UPB_INLINE char* grpc_gcp_RpcProtocolVersions_serialize(const grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_RpcProtocolVersions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__RpcProtocolVersions_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_RpcProtocolVersions_serialize_ex(const grpc_gcp_RpcProtocolVersions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_RpcProtocolVersions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__RpcProtocolVersions_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_RpcProtocolVersions_clear_max_rpc_version(grpc_gcp_RpcProtocolVersions* msg) {
@@ -103,7 +103,7 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_max_rpc_version(grpc_gcp_RpcPro
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_max_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_max_rpc_version(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_Version_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions__Version_msg_init, arena);
     if (sub) grpc_gcp_RpcProtocolVersions_set_max_rpc_version(msg, sub);
   }
   return sub;
@@ -115,7 +115,7 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_min_rpc_version(grpc_gcp_RpcPro
 UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_min_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) {
   struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_min_rpc_version(msg);
   if (sub == NULL) {
-    sub = (struct grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_Version_msg_init, arena);
+    sub = (struct grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions__Version_msg_init, arena);
     if (sub) grpc_gcp_RpcProtocolVersions_set_min_rpc_version(msg, sub);
   }
   return sub;
@@ -124,12 +124,12 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVers
 /* grpc.gcp.RpcProtocolVersions.Version */
 
 UPB_INLINE grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_Version_new(upb_Arena* arena) {
-  return (grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc_gcp_RpcProtocolVersions_Version_msg_init, arena);
+  return (grpc_gcp_RpcProtocolVersions_Version*)_upb_Message_New(&grpc__gcp__RpcProtocolVersions__Version_msg_init, arena);
 }
 UPB_INLINE grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_Version_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_gcp_RpcProtocolVersions_Version* ret = grpc_gcp_RpcProtocolVersions_Version_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__gcp__RpcProtocolVersions__Version_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -139,7 +139,7 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_Ve
                            int options, upb_Arena* arena) {
   grpc_gcp_RpcProtocolVersions_Version* ret = grpc_gcp_RpcProtocolVersions_Version_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__gcp__RpcProtocolVersions__Version_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -147,13 +147,13 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_Ve
 }
 UPB_INLINE char* grpc_gcp_RpcProtocolVersions_Version_serialize(const grpc_gcp_RpcProtocolVersions_Version* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_RpcProtocolVersions_Version_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__RpcProtocolVersions__Version_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_gcp_RpcProtocolVersions_Version_serialize_ex(const grpc_gcp_RpcProtocolVersions_Version* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_gcp_RpcProtocolVersions_Version_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__gcp__RpcProtocolVersions__Version_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_clear_major(grpc_gcp_RpcProtocolVersions_Version* msg) {
@@ -188,8 +188,6 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProto
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
new file mode 100644
index 0000000000000..bdd01e0c4b6dc
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
@@ -0,0 +1,69 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/transport_security_common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub grpc_gcp_RpcProtocolVersions_submsgs[2] = {
+  {.submsg = &grpc__gcp__RpcProtocolVersions__Version_msg_init},
+  {.submsg = &grpc__gcp__RpcProtocolVersions__Version_msg_init},
+};
+
+static const upb_MiniTableField grpc_gcp_RpcProtocolVersions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = {
+  &grpc_gcp_RpcProtocolVersions_submsgs[0],
+  &grpc_gcp_RpcProtocolVersions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_gcp_RpcProtocolVersions_Version__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init = {
+  NULL,
+  &grpc_gcp_RpcProtocolVersions_Version__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &grpc__gcp__RpcProtocolVersions_msg_init,
+  &grpc__gcp__RpcProtocolVersions__Version_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
new file mode 100644
index 0000000000000..9a667c071e455
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/gcp/transport_security_common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_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 grpc__gcp__RpcProtocolVersions_msg_init;
+extern const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
similarity index 82%
rename from src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
index 0d4c43e5e360e..9846844d06c37 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/health/v1/health.proto
  *
@@ -10,7 +9,10 @@
 #define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/health/v1/health.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,8 +21,6 @@ extern "C" {
 
 typedef struct grpc_health_v1_HealthCheckRequest grpc_health_v1_HealthCheckRequest;
 typedef struct grpc_health_v1_HealthCheckResponse grpc_health_v1_HealthCheckResponse;
-extern const upb_MiniTable grpc_health_v1_HealthCheckRequest_msg_init;
-extern const upb_MiniTable grpc_health_v1_HealthCheckResponse_msg_init;
 
 typedef enum {
   grpc_health_v1_HealthCheckResponse_UNKNOWN = 0,
@@ -34,12 +34,12 @@ typedef enum {
 /* grpc.health.v1.HealthCheckRequest */
 
 UPB_INLINE grpc_health_v1_HealthCheckRequest* grpc_health_v1_HealthCheckRequest_new(upb_Arena* arena) {
-  return (grpc_health_v1_HealthCheckRequest*)_upb_Message_New(&grpc_health_v1_HealthCheckRequest_msg_init, arena);
+  return (grpc_health_v1_HealthCheckRequest*)_upb_Message_New(&grpc__health__v1__HealthCheckRequest_msg_init, arena);
 }
 UPB_INLINE grpc_health_v1_HealthCheckRequest* grpc_health_v1_HealthCheckRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_health_v1_HealthCheckRequest* ret = grpc_health_v1_HealthCheckRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__health__v1__HealthCheckRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -49,7 +49,7 @@ UPB_INLINE grpc_health_v1_HealthCheckRequest* grpc_health_v1_HealthCheckRequest_
                            int options, upb_Arena* arena) {
   grpc_health_v1_HealthCheckRequest* ret = grpc_health_v1_HealthCheckRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__health__v1__HealthCheckRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -57,13 +57,13 @@ UPB_INLINE grpc_health_v1_HealthCheckRequest* grpc_health_v1_HealthCheckRequest_
 }
 UPB_INLINE char* grpc_health_v1_HealthCheckRequest_serialize(const grpc_health_v1_HealthCheckRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_health_v1_HealthCheckRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__health__v1__HealthCheckRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_health_v1_HealthCheckRequest_serialize_ex(const grpc_health_v1_HealthCheckRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_health_v1_HealthCheckRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__health__v1__HealthCheckRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_health_v1_HealthCheckRequest_clear_service(grpc_health_v1_HealthCheckRequest* msg) {
@@ -86,12 +86,12 @@ UPB_INLINE void grpc_health_v1_HealthCheckRequest_set_service(grpc_health_v1_Hea
 /* grpc.health.v1.HealthCheckResponse */
 
 UPB_INLINE grpc_health_v1_HealthCheckResponse* grpc_health_v1_HealthCheckResponse_new(upb_Arena* arena) {
-  return (grpc_health_v1_HealthCheckResponse*)_upb_Message_New(&grpc_health_v1_HealthCheckResponse_msg_init, arena);
+  return (grpc_health_v1_HealthCheckResponse*)_upb_Message_New(&grpc__health__v1__HealthCheckResponse_msg_init, arena);
 }
 UPB_INLINE grpc_health_v1_HealthCheckResponse* grpc_health_v1_HealthCheckResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_health_v1_HealthCheckResponse* ret = grpc_health_v1_HealthCheckResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__health__v1__HealthCheckResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -101,7 +101,7 @@ UPB_INLINE grpc_health_v1_HealthCheckResponse* grpc_health_v1_HealthCheckRespons
                            int options, upb_Arena* arena) {
   grpc_health_v1_HealthCheckResponse* ret = grpc_health_v1_HealthCheckResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__health__v1__HealthCheckResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -109,13 +109,13 @@ UPB_INLINE grpc_health_v1_HealthCheckResponse* grpc_health_v1_HealthCheckRespons
 }
 UPB_INLINE char* grpc_health_v1_HealthCheckResponse_serialize(const grpc_health_v1_HealthCheckResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_health_v1_HealthCheckResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__health__v1__HealthCheckResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_health_v1_HealthCheckResponse_serialize_ex(const grpc_health_v1_HealthCheckResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_health_v1_HealthCheckResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__health__v1__HealthCheckResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_health_v1_HealthCheckResponse_clear_status(grpc_health_v1_HealthCheckResponse* msg) {
@@ -135,8 +135,6 @@ UPB_INLINE void grpc_health_v1_HealthCheckResponse_set_status(grpc_health_v1_Hea
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
new file mode 100644
index 0000000000000..2e47b2c0ab563
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
@@ -0,0 +1,58 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/health/v1/health.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/health/v1/health.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField grpc_health_v1_HealthCheckRequest__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__health__v1__HealthCheckRequest_msg_init = {
+  NULL,
+  &grpc_health_v1_HealthCheckRequest__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField grpc_health_v1_HealthCheckResponse__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init = {
+  NULL,
+  &grpc_health_v1_HealthCheckResponse__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &grpc__health__v1__HealthCheckRequest_msg_init,
+  &grpc__health__v1__HealthCheckResponse_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
new file mode 100644
index 0000000000000..2980e46b791d0
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/health/v1/health.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_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 grpc__health__v1__HealthCheckRequest_msg_init;
+extern const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
index ba1e552936b6e..81be2c0b7a19a 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/lb/v1/load_balancer.proto
  *
@@ -10,7 +9,13 @@
 #define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/lb/v1/load_balancer.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -26,31 +31,20 @@ typedef struct grpc_lb_v1_FallbackResponse grpc_lb_v1_FallbackResponse;
 typedef struct grpc_lb_v1_InitialLoadBalanceResponse grpc_lb_v1_InitialLoadBalanceResponse;
 typedef struct grpc_lb_v1_ServerList grpc_lb_v1_ServerList;
 typedef struct grpc_lb_v1_Server grpc_lb_v1_Server;
-extern const upb_MiniTable grpc_lb_v1_LoadBalanceRequest_msg_init;
-extern const upb_MiniTable grpc_lb_v1_InitialLoadBalanceRequest_msg_init;
-extern const upb_MiniTable grpc_lb_v1_ClientStatsPerToken_msg_init;
-extern const upb_MiniTable grpc_lb_v1_ClientStats_msg_init;
-extern const upb_MiniTable grpc_lb_v1_LoadBalanceResponse_msg_init;
-extern const upb_MiniTable grpc_lb_v1_FallbackResponse_msg_init;
-extern const upb_MiniTable grpc_lb_v1_InitialLoadBalanceResponse_msg_init;
-extern const upb_MiniTable grpc_lb_v1_ServerList_msg_init;
-extern const upb_MiniTable grpc_lb_v1_Server_msg_init;
 struct google_protobuf_Duration;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 
 
 /* grpc.lb.v1.LoadBalanceRequest */
 
 UPB_INLINE grpc_lb_v1_LoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_new(upb_Arena* arena) {
-  return (grpc_lb_v1_LoadBalanceRequest*)_upb_Message_New(&grpc_lb_v1_LoadBalanceRequest_msg_init, arena);
+  return (grpc_lb_v1_LoadBalanceRequest*)_upb_Message_New(&grpc__lb__v1__LoadBalanceRequest_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_LoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_LoadBalanceRequest* ret = grpc_lb_v1_LoadBalanceRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__LoadBalanceRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -60,7 +54,7 @@ UPB_INLINE grpc_lb_v1_LoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_parse_ex
                            int options, upb_Arena* arena) {
   grpc_lb_v1_LoadBalanceRequest* ret = grpc_lb_v1_LoadBalanceRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__LoadBalanceRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -68,13 +62,13 @@ UPB_INLINE grpc_lb_v1_LoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_parse_ex
 }
 UPB_INLINE char* grpc_lb_v1_LoadBalanceRequest_serialize(const grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_LoadBalanceRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__LoadBalanceRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_LoadBalanceRequest_serialize_ex(const grpc_lb_v1_LoadBalanceRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_LoadBalanceRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__LoadBalanceRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -124,7 +118,7 @@ UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_initial_request(grpc_lb_v1_Loa
 UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_mutable_initial_request(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) {
   struct grpc_lb_v1_InitialLoadBalanceRequest* sub = (struct grpc_lb_v1_InitialLoadBalanceRequest*)grpc_lb_v1_LoadBalanceRequest_initial_request(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lb_v1_InitialLoadBalanceRequest*)_upb_Message_New(&grpc_lb_v1_InitialLoadBalanceRequest_msg_init, arena);
+    sub = (struct grpc_lb_v1_InitialLoadBalanceRequest*)_upb_Message_New(&grpc__lb__v1__InitialLoadBalanceRequest_msg_init, arena);
     if (sub) grpc_lb_v1_LoadBalanceRequest_set_initial_request(msg, sub);
   }
   return sub;
@@ -136,7 +130,7 @@ UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_client_stats(grpc_lb_v1_LoadBa
 UPB_INLINE struct grpc_lb_v1_ClientStats* grpc_lb_v1_LoadBalanceRequest_mutable_client_stats(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) {
   struct grpc_lb_v1_ClientStats* sub = (struct grpc_lb_v1_ClientStats*)grpc_lb_v1_LoadBalanceRequest_client_stats(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lb_v1_ClientStats*)_upb_Message_New(&grpc_lb_v1_ClientStats_msg_init, arena);
+    sub = (struct grpc_lb_v1_ClientStats*)_upb_Message_New(&grpc__lb__v1__ClientStats_msg_init, arena);
     if (sub) grpc_lb_v1_LoadBalanceRequest_set_client_stats(msg, sub);
   }
   return sub;
@@ -145,12 +139,12 @@ UPB_INLINE struct grpc_lb_v1_ClientStats* grpc_lb_v1_LoadBalanceRequest_mutable_
 /* grpc.lb.v1.InitialLoadBalanceRequest */
 
 UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_InitialLoadBalanceRequest_new(upb_Arena* arena) {
-  return (grpc_lb_v1_InitialLoadBalanceRequest*)_upb_Message_New(&grpc_lb_v1_InitialLoadBalanceRequest_msg_init, arena);
+  return (grpc_lb_v1_InitialLoadBalanceRequest*)_upb_Message_New(&grpc__lb__v1__InitialLoadBalanceRequest_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_InitialLoadBalanceRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_InitialLoadBalanceRequest* ret = grpc_lb_v1_InitialLoadBalanceRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__InitialLoadBalanceRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -160,7 +154,7 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_InitialLoadBalanceRe
                            int options, upb_Arena* arena) {
   grpc_lb_v1_InitialLoadBalanceRequest* ret = grpc_lb_v1_InitialLoadBalanceRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__InitialLoadBalanceRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -168,13 +162,13 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_InitialLoadBalanceRe
 }
 UPB_INLINE char* grpc_lb_v1_InitialLoadBalanceRequest_serialize(const grpc_lb_v1_InitialLoadBalanceRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_InitialLoadBalanceRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__InitialLoadBalanceRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_InitialLoadBalanceRequest_serialize_ex(const grpc_lb_v1_InitialLoadBalanceRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_InitialLoadBalanceRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__InitialLoadBalanceRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_InitialLoadBalanceRequest_clear_name(grpc_lb_v1_InitialLoadBalanceRequest* msg) {
@@ -197,12 +191,12 @@ UPB_INLINE void grpc_lb_v1_InitialLoadBalanceRequest_set_name(grpc_lb_v1_Initial
 /* grpc.lb.v1.ClientStatsPerToken */
 
 UPB_INLINE grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStatsPerToken_new(upb_Arena* arena) {
-  return (grpc_lb_v1_ClientStatsPerToken*)_upb_Message_New(&grpc_lb_v1_ClientStatsPerToken_msg_init, arena);
+  return (grpc_lb_v1_ClientStatsPerToken*)_upb_Message_New(&grpc__lb__v1__ClientStatsPerToken_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStatsPerToken_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_ClientStatsPerToken* ret = grpc_lb_v1_ClientStatsPerToken_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ClientStatsPerToken_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -212,7 +206,7 @@ UPB_INLINE grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStatsPerToken_parse_
                            int options, upb_Arena* arena) {
   grpc_lb_v1_ClientStatsPerToken* ret = grpc_lb_v1_ClientStatsPerToken_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ClientStatsPerToken_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -220,13 +214,13 @@ UPB_INLINE grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStatsPerToken_parse_
 }
 UPB_INLINE char* grpc_lb_v1_ClientStatsPerToken_serialize(const grpc_lb_v1_ClientStatsPerToken* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ClientStatsPerToken_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ClientStatsPerToken_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_ClientStatsPerToken_serialize_ex(const grpc_lb_v1_ClientStatsPerToken* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ClientStatsPerToken_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ClientStatsPerToken_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_clear_load_balance_token(grpc_lb_v1_ClientStatsPerToken* msg) {
@@ -264,12 +258,12 @@ UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_set_num_calls(grpc_lb_v1_ClientSt
 /* grpc.lb.v1.ClientStats */
 
 UPB_INLINE grpc_lb_v1_ClientStats* grpc_lb_v1_ClientStats_new(upb_Arena* arena) {
-  return (grpc_lb_v1_ClientStats*)_upb_Message_New(&grpc_lb_v1_ClientStats_msg_init, arena);
+  return (grpc_lb_v1_ClientStats*)_upb_Message_New(&grpc__lb__v1__ClientStats_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_ClientStats* grpc_lb_v1_ClientStats_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_ClientStats* ret = grpc_lb_v1_ClientStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ClientStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ClientStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -279,7 +273,7 @@ UPB_INLINE grpc_lb_v1_ClientStats* grpc_lb_v1_ClientStats_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   grpc_lb_v1_ClientStats* ret = grpc_lb_v1_ClientStats_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ClientStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ClientStats_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -287,13 +281,13 @@ UPB_INLINE grpc_lb_v1_ClientStats* grpc_lb_v1_ClientStats_parse_ex(const char* b
 }
 UPB_INLINE char* grpc_lb_v1_ClientStats_serialize(const grpc_lb_v1_ClientStats* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ClientStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ClientStats_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_ClientStats_serialize_ex(const grpc_lb_v1_ClientStats* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ClientStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ClientStats_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_ClientStats_clear_timestamp(grpc_lb_v1_ClientStats* msg) {
@@ -400,7 +394,7 @@ UPB_INLINE void grpc_lb_v1_ClientStats_set_timestamp(grpc_lb_v1_ClientStats *msg
 UPB_INLINE struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_mutable_timestamp(grpc_lb_v1_ClientStats* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)grpc_lb_v1_ClientStats_timestamp(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) grpc_lb_v1_ClientStats_set_timestamp(msg, sub);
   }
   return sub;
@@ -442,7 +436,7 @@ UPB_INLINE struct grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStats_add_cal
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lb_v1_ClientStatsPerToken* sub = (struct grpc_lb_v1_ClientStatsPerToken*)_upb_Message_New(&grpc_lb_v1_ClientStatsPerToken_msg_init, arena);
+  struct grpc_lb_v1_ClientStatsPerToken* sub = (struct grpc_lb_v1_ClientStatsPerToken*)_upb_Message_New(&grpc__lb__v1__ClientStatsPerToken_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -451,12 +445,12 @@ UPB_INLINE struct grpc_lb_v1_ClientStatsPerToken* grpc_lb_v1_ClientStats_add_cal
 /* grpc.lb.v1.LoadBalanceResponse */
 
 UPB_INLINE grpc_lb_v1_LoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_new(upb_Arena* arena) {
-  return (grpc_lb_v1_LoadBalanceResponse*)_upb_Message_New(&grpc_lb_v1_LoadBalanceResponse_msg_init, arena);
+  return (grpc_lb_v1_LoadBalanceResponse*)_upb_Message_New(&grpc__lb__v1__LoadBalanceResponse_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_LoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_LoadBalanceResponse* ret = grpc_lb_v1_LoadBalanceResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__LoadBalanceResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -466,7 +460,7 @@ UPB_INLINE grpc_lb_v1_LoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_parse_
                            int options, upb_Arena* arena) {
   grpc_lb_v1_LoadBalanceResponse* ret = grpc_lb_v1_LoadBalanceResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__LoadBalanceResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -474,13 +468,13 @@ UPB_INLINE grpc_lb_v1_LoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_parse_
 }
 UPB_INLINE char* grpc_lb_v1_LoadBalanceResponse_serialize(const grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_LoadBalanceResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__LoadBalanceResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_LoadBalanceResponse_serialize_ex(const grpc_lb_v1_LoadBalanceResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_LoadBalanceResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__LoadBalanceResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -546,7 +540,7 @@ UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_initial_response(grpc_lb_v1_L
 UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_mutable_initial_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) {
   struct grpc_lb_v1_InitialLoadBalanceResponse* sub = (struct grpc_lb_v1_InitialLoadBalanceResponse*)grpc_lb_v1_LoadBalanceResponse_initial_response(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lb_v1_InitialLoadBalanceResponse*)_upb_Message_New(&grpc_lb_v1_InitialLoadBalanceResponse_msg_init, arena);
+    sub = (struct grpc_lb_v1_InitialLoadBalanceResponse*)_upb_Message_New(&grpc__lb__v1__InitialLoadBalanceResponse_msg_init, arena);
     if (sub) grpc_lb_v1_LoadBalanceResponse_set_initial_response(msg, sub);
   }
   return sub;
@@ -558,7 +552,7 @@ UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_server_list(grpc_lb_v1_LoadBa
 UPB_INLINE struct grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_mutable_server_list(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) {
   struct grpc_lb_v1_ServerList* sub = (struct grpc_lb_v1_ServerList*)grpc_lb_v1_LoadBalanceResponse_server_list(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lb_v1_ServerList*)_upb_Message_New(&grpc_lb_v1_ServerList_msg_init, arena);
+    sub = (struct grpc_lb_v1_ServerList*)_upb_Message_New(&grpc__lb__v1__ServerList_msg_init, arena);
     if (sub) grpc_lb_v1_LoadBalanceResponse_set_server_list(msg, sub);
   }
   return sub;
@@ -570,7 +564,7 @@ UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_fallback_response(grpc_lb_v1_
 UPB_INLINE struct grpc_lb_v1_FallbackResponse* grpc_lb_v1_LoadBalanceResponse_mutable_fallback_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) {
   struct grpc_lb_v1_FallbackResponse* sub = (struct grpc_lb_v1_FallbackResponse*)grpc_lb_v1_LoadBalanceResponse_fallback_response(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lb_v1_FallbackResponse*)_upb_Message_New(&grpc_lb_v1_FallbackResponse_msg_init, arena);
+    sub = (struct grpc_lb_v1_FallbackResponse*)_upb_Message_New(&grpc__lb__v1__FallbackResponse_msg_init, arena);
     if (sub) grpc_lb_v1_LoadBalanceResponse_set_fallback_response(msg, sub);
   }
   return sub;
@@ -579,12 +573,12 @@ UPB_INLINE struct grpc_lb_v1_FallbackResponse* grpc_lb_v1_LoadBalanceResponse_mu
 /* grpc.lb.v1.FallbackResponse */
 
 UPB_INLINE grpc_lb_v1_FallbackResponse* grpc_lb_v1_FallbackResponse_new(upb_Arena* arena) {
-  return (grpc_lb_v1_FallbackResponse*)_upb_Message_New(&grpc_lb_v1_FallbackResponse_msg_init, arena);
+  return (grpc_lb_v1_FallbackResponse*)_upb_Message_New(&grpc__lb__v1__FallbackResponse_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_FallbackResponse* grpc_lb_v1_FallbackResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_FallbackResponse* ret = grpc_lb_v1_FallbackResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__FallbackResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -594,7 +588,7 @@ UPB_INLINE grpc_lb_v1_FallbackResponse* grpc_lb_v1_FallbackResponse_parse_ex(con
                            int options, upb_Arena* arena) {
   grpc_lb_v1_FallbackResponse* ret = grpc_lb_v1_FallbackResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__FallbackResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -602,13 +596,13 @@ UPB_INLINE grpc_lb_v1_FallbackResponse* grpc_lb_v1_FallbackResponse_parse_ex(con
 }
 UPB_INLINE char* grpc_lb_v1_FallbackResponse_serialize(const grpc_lb_v1_FallbackResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_FallbackResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__FallbackResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_FallbackResponse_serialize_ex(const grpc_lb_v1_FallbackResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_FallbackResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__FallbackResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 
@@ -616,12 +610,12 @@ UPB_INLINE char* grpc_lb_v1_FallbackResponse_serialize_ex(const grpc_lb_v1_Fallb
 /* grpc.lb.v1.InitialLoadBalanceResponse */
 
 UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_InitialLoadBalanceResponse_new(upb_Arena* arena) {
-  return (grpc_lb_v1_InitialLoadBalanceResponse*)_upb_Message_New(&grpc_lb_v1_InitialLoadBalanceResponse_msg_init, arena);
+  return (grpc_lb_v1_InitialLoadBalanceResponse*)_upb_Message_New(&grpc__lb__v1__InitialLoadBalanceResponse_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_InitialLoadBalanceResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_InitialLoadBalanceResponse* ret = grpc_lb_v1_InitialLoadBalanceResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__InitialLoadBalanceResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -631,7 +625,7 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_InitialLoadBalanceR
                            int options, upb_Arena* arena) {
   grpc_lb_v1_InitialLoadBalanceResponse* ret = grpc_lb_v1_InitialLoadBalanceResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__InitialLoadBalanceResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -639,13 +633,13 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_InitialLoadBalanceR
 }
 UPB_INLINE char* grpc_lb_v1_InitialLoadBalanceResponse_serialize(const grpc_lb_v1_InitialLoadBalanceResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_InitialLoadBalanceResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__InitialLoadBalanceResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_InitialLoadBalanceResponse_serialize_ex(const grpc_lb_v1_InitialLoadBalanceResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_InitialLoadBalanceResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__InitialLoadBalanceResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_InitialLoadBalanceResponse_clear_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse* msg) {
@@ -671,7 +665,7 @@ UPB_INLINE void grpc_lb_v1_InitialLoadBalanceResponse_set_client_stats_report_in
 UPB_INLINE struct google_protobuf_Duration* grpc_lb_v1_InitialLoadBalanceResponse_mutable_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lb_v1_InitialLoadBalanceResponse_client_stats_report_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) grpc_lb_v1_InitialLoadBalanceResponse_set_client_stats_report_interval(msg, sub);
   }
   return sub;
@@ -680,12 +674,12 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lb_v1_InitialLoadBalanceRespons
 /* grpc.lb.v1.ServerList */
 
 UPB_INLINE grpc_lb_v1_ServerList* grpc_lb_v1_ServerList_new(upb_Arena* arena) {
-  return (grpc_lb_v1_ServerList*)_upb_Message_New(&grpc_lb_v1_ServerList_msg_init, arena);
+  return (grpc_lb_v1_ServerList*)_upb_Message_New(&grpc__lb__v1__ServerList_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_ServerList* grpc_lb_v1_ServerList_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_ServerList* ret = grpc_lb_v1_ServerList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ServerList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ServerList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -695,7 +689,7 @@ UPB_INLINE grpc_lb_v1_ServerList* grpc_lb_v1_ServerList_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   grpc_lb_v1_ServerList* ret = grpc_lb_v1_ServerList_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_ServerList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__ServerList_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -703,13 +697,13 @@ UPB_INLINE grpc_lb_v1_ServerList* grpc_lb_v1_ServerList_parse_ex(const char* buf
 }
 UPB_INLINE char* grpc_lb_v1_ServerList_serialize(const grpc_lb_v1_ServerList* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ServerList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ServerList_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_ServerList_serialize_ex(const grpc_lb_v1_ServerList* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_ServerList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__ServerList_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_ServerList_clear_servers(grpc_lb_v1_ServerList* msg) {
@@ -771,7 +765,7 @@ UPB_INLINE struct grpc_lb_v1_Server* grpc_lb_v1_ServerList_add_servers(grpc_lb_v
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lb_v1_Server* sub = (struct grpc_lb_v1_Server*)_upb_Message_New(&grpc_lb_v1_Server_msg_init, arena);
+  struct grpc_lb_v1_Server* sub = (struct grpc_lb_v1_Server*)_upb_Message_New(&grpc__lb__v1__Server_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -780,12 +774,12 @@ UPB_INLINE struct grpc_lb_v1_Server* grpc_lb_v1_ServerList_add_servers(grpc_lb_v
 /* grpc.lb.v1.Server */
 
 UPB_INLINE grpc_lb_v1_Server* grpc_lb_v1_Server_new(upb_Arena* arena) {
-  return (grpc_lb_v1_Server*)_upb_Message_New(&grpc_lb_v1_Server_msg_init, arena);
+  return (grpc_lb_v1_Server*)_upb_Message_New(&grpc__lb__v1__Server_msg_init, arena);
 }
 UPB_INLINE grpc_lb_v1_Server* grpc_lb_v1_Server_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lb_v1_Server* ret = grpc_lb_v1_Server_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_Server_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__Server_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -795,7 +789,7 @@ UPB_INLINE grpc_lb_v1_Server* grpc_lb_v1_Server_parse_ex(const char* buf, size_t
                            int options, upb_Arena* arena) {
   grpc_lb_v1_Server* ret = grpc_lb_v1_Server_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lb_v1_Server_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lb__v1__Server_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -803,13 +797,13 @@ UPB_INLINE grpc_lb_v1_Server* grpc_lb_v1_Server_parse_ex(const char* buf, size_t
 }
 UPB_INLINE char* grpc_lb_v1_Server_serialize(const grpc_lb_v1_Server* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_Server_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__Server_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lb_v1_Server_serialize_ex(const grpc_lb_v1_Server* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lb_v1_Server_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lb__v1__Server_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lb_v1_Server_clear_ip_address(grpc_lb_v1_Server* msg) {
@@ -874,8 +868,6 @@ UPB_INLINE void grpc_lb_v1_Server_set_drop(grpc_lb_v1_Server *msg, bool value) {
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
new file mode 100644
index 0000000000000..d6f9cc0965017
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
@@ -0,0 +1,221 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lb/v1/load_balancer.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/lb/v1/load_balancer.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub grpc_lb_v1_LoadBalanceRequest_submsgs[2] = {
+  {.submsg = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init},
+  {.submsg = &grpc__lb__v1__ClientStats_msg_init},
+};
+
+static const upb_MiniTableField grpc_lb_v1_LoadBalanceRequest__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = {
+  &grpc_lb_v1_LoadBalanceRequest_submsgs[0],
+  &grpc_lb_v1_LoadBalanceRequest__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceRequest__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init = {
+  NULL,
+  &grpc_lb_v1_InitialLoadBalanceRequest__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField grpc_lb_v1_ClientStatsPerToken__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = {
+  NULL,
+  &grpc_lb_v1_ClientStatsPerToken__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lb_v1_ClientStats_submsgs[2] = {
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &grpc__lb__v1__ClientStatsPerToken_msg_init},
+};
+
+static const upb_MiniTableField grpc_lb_v1_ClientStats__fields[6] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = {
+  &grpc_lb_v1_ClientStats_submsgs[0],
+  &grpc_lb_v1_ClientStats__fields[0],
+  UPB_SIZE(48, 56), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000010, &upb_psv8_1bt},
+    {0x001800003f000018, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f000030, &upb_psv8_1bt},
+    {0x002800003f000038, &upb_psv8_1bt},
+    {0x003000003f010042, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lb_v1_LoadBalanceResponse_submsgs[3] = {
+  {.submsg = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init},
+  {.submsg = &grpc__lb__v1__ServerList_msg_init},
+  {.submsg = &grpc__lb__v1__FallbackResponse_msg_init},
+};
+
+static const upb_MiniTableField grpc_lb_v1_LoadBalanceResponse__fields[3] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = {
+  &grpc_lb_v1_LoadBalanceResponse_submsgs[0],
+  &grpc_lb_v1_LoadBalanceResponse__fields[0],
+  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+  })
+};
+
+const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceResponse__fields[1] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = {
+  &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0],
+  &grpc_lb_v1_InitialLoadBalanceResponse__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lb_v1_ServerList_submsgs[1] = {
+  {.submsg = &grpc__lb__v1__Server_msg_init},
+};
+
+static const upb_MiniTableField grpc_lb_v1_ServerList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__ServerList_msg_init = {
+  &grpc_lb_v1_ServerList_submsgs[0],
+  &grpc_lb_v1_ServerList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField grpc_lb_v1_Server__fields[4] = {
+  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lb__v1__Server_msg_init = {
+  NULL,
+  &grpc_lb_v1_Server__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_psb_1bt},
+    {0x000000003f000010, &upb_psv4_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x000400003f000020, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[9] = {
+  &grpc__lb__v1__LoadBalanceRequest_msg_init,
+  &grpc__lb__v1__InitialLoadBalanceRequest_msg_init,
+  &grpc__lb__v1__ClientStatsPerToken_msg_init,
+  &grpc__lb__v1__ClientStats_msg_init,
+  &grpc__lb__v1__LoadBalanceResponse_msg_init,
+  &grpc__lb__v1__FallbackResponse_msg_init,
+  &grpc__lb__v1__InitialLoadBalanceResponse_msg_init,
+  &grpc__lb__v1__ServerList_msg_init,
+  &grpc__lb__v1__Server_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  9,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
new file mode 100644
index 0000000000000..6178f8c94a38d
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lb/v1/load_balancer.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_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 grpc__lb__v1__LoadBalanceRequest_msg_init;
+extern const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init;
+extern const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init;
+extern const upb_MiniTable grpc__lb__v1__ClientStats_msg_init;
+extern const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init;
+extern const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init;
+extern const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init;
+extern const upb_MiniTable grpc__lb__v1__ServerList_msg_init;
+extern const upb_MiniTable grpc__lb__v1__Server_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
index ba3a53c263a94..41bbb0992eb26 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/lookup/v1/rls.proto
  *
@@ -10,7 +9,10 @@
 #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/lookup/v1/rls.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -20,9 +22,6 @@ extern "C" {
 typedef struct grpc_lookup_v1_RouteLookupRequest grpc_lookup_v1_RouteLookupRequest;
 typedef struct grpc_lookup_v1_RouteLookupRequest_KeyMapEntry grpc_lookup_v1_RouteLookupRequest_KeyMapEntry;
 typedef struct grpc_lookup_v1_RouteLookupResponse grpc_lookup_v1_RouteLookupResponse;
-extern const upb_MiniTable grpc_lookup_v1_RouteLookupRequest_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_RouteLookupResponse_msg_init;
 
 typedef enum {
   grpc_lookup_v1_RouteLookupRequest_REASON_UNKNOWN = 0,
@@ -35,12 +34,12 @@ typedef enum {
 /* grpc.lookup.v1.RouteLookupRequest */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupRequest* grpc_lookup_v1_RouteLookupRequest_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_RouteLookupRequest*)_upb_Message_New(&grpc_lookup_v1_RouteLookupRequest_msg_init, arena);
+  return (grpc_lookup_v1_RouteLookupRequest*)_upb_Message_New(&grpc__lookup__v1__RouteLookupRequest_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_RouteLookupRequest* grpc_lookup_v1_RouteLookupRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupRequest* ret = grpc_lookup_v1_RouteLookupRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +49,7 @@ UPB_INLINE grpc_lookup_v1_RouteLookupRequest* grpc_lookup_v1_RouteLookupRequest_
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupRequest* ret = grpc_lookup_v1_RouteLookupRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +57,13 @@ UPB_INLINE grpc_lookup_v1_RouteLookupRequest* grpc_lookup_v1_RouteLookupRequest_
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupRequest_serialize(const grpc_lookup_v1_RouteLookupRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupRequest_serialize_ex(const grpc_lookup_v1_RouteLookupRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_clear_target_type(grpc_lookup_v1_RouteLookupRequest* msg) {
@@ -179,12 +178,12 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_set_value(grpc_loo
 /* grpc.lookup.v1.RouteLookupResponse */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupResponse* grpc_lookup_v1_RouteLookupResponse_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_RouteLookupResponse*)_upb_Message_New(&grpc_lookup_v1_RouteLookupResponse_msg_init, arena);
+  return (grpc_lookup_v1_RouteLookupResponse*)_upb_Message_New(&grpc__lookup__v1__RouteLookupResponse_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_RouteLookupResponse* grpc_lookup_v1_RouteLookupResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupResponse* ret = grpc_lookup_v1_RouteLookupResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupResponse_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -194,7 +193,7 @@ UPB_INLINE grpc_lookup_v1_RouteLookupResponse* grpc_lookup_v1_RouteLookupRespons
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupResponse* ret = grpc_lookup_v1_RouteLookupResponse_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupResponse_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupResponse_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -202,13 +201,13 @@ UPB_INLINE grpc_lookup_v1_RouteLookupResponse* grpc_lookup_v1_RouteLookupRespons
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupResponse_serialize(const grpc_lookup_v1_RouteLookupResponse* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupResponse_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupResponse_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupResponse_serialize_ex(const grpc_lookup_v1_RouteLookupResponse* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupResponse_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupResponse_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_RouteLookupResponse_clear_header_data(grpc_lookup_v1_RouteLookupResponse* msg) {
@@ -289,8 +288,6 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupResponse_add_targets(grpc_lookup_v1_Ro
   return true;
 }
 
-extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
new file mode 100644
index 0000000000000..d1c77b94b42f3
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
@@ -0,0 +1,92 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lookup/v1/rls.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/lookup/v1/rls.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub grpc_lookup_v1_RouteLookupRequest_submsgs[1] = {
+  {.submsg = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init},
+};
+
+static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest__fields[4] = {
+  {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(0, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = {
+  &grpc_lookup_v1_RouteLookupRequest_submsgs[0],
+  &grpc_lookup_v1_RouteLookupRequest__fields[0],
+  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00001a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000028, &upb_psv4_1bt},
+    {0x002000003f000032, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init = {
+  NULL,
+  &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_RouteLookupResponse__fields[2] = {
+  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init = {
+  NULL,
+  &grpc_lookup_v1_RouteLookupResponse__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_pss_1bt},
+    {0x001000003f00001a, &upb_prs_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &grpc__lookup__v1__RouteLookupRequest_msg_init,
+  &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init,
+  &grpc__lookup__v1__RouteLookupResponse_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
new file mode 100644
index 0000000000000..2f94131cf51cb
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lookup/v1/rls.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_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 grpc__lookup__v1__RouteLookupRequest_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
similarity index 94%
rename from src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h
rename to src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
index 9c6b93f1ce086..397a5ca1c2e0e 100644
--- a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/lookup/v1/rls_config.proto
  *
@@ -10,7 +9,12 @@
 #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "src/proto/grpc/lookup/v1/rls_config.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -26,29 +30,19 @@ typedef struct grpc_lookup_v1_HttpKeyBuilder grpc_lookup_v1_HttpKeyBuilder;
 typedef struct grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry;
 typedef struct grpc_lookup_v1_RouteLookupConfig grpc_lookup_v1_RouteLookupConfig;
 typedef struct grpc_lookup_v1_RouteLookupClusterSpecifier grpc_lookup_v1_RouteLookupClusterSpecifier;
-extern const upb_MiniTable grpc_lookup_v1_NameMatcher_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_HttpKeyBuilder_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_RouteLookupConfig_msg_init;
-extern const upb_MiniTable grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init;
 struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* grpc.lookup.v1.NameMatcher */
 
 UPB_INLINE grpc_lookup_v1_NameMatcher* grpc_lookup_v1_NameMatcher_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc_lookup_v1_NameMatcher_msg_init, arena);
+  return (grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc__lookup__v1__NameMatcher_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_NameMatcher* grpc_lookup_v1_NameMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_NameMatcher* ret = grpc_lookup_v1_NameMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_NameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__NameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -58,7 +52,7 @@ UPB_INLINE grpc_lookup_v1_NameMatcher* grpc_lookup_v1_NameMatcher_parse_ex(const
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_NameMatcher* ret = grpc_lookup_v1_NameMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_NameMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__NameMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -66,13 +60,13 @@ UPB_INLINE grpc_lookup_v1_NameMatcher* grpc_lookup_v1_NameMatcher_parse_ex(const
 }
 UPB_INLINE char* grpc_lookup_v1_NameMatcher_serialize(const grpc_lookup_v1_NameMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_NameMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__NameMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_NameMatcher_serialize_ex(const grpc_lookup_v1_NameMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_NameMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__NameMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_NameMatcher_clear_key(grpc_lookup_v1_NameMatcher* msg) {
@@ -171,12 +165,12 @@ UPB_INLINE void grpc_lookup_v1_NameMatcher_set_required_match(grpc_lookup_v1_Nam
 /* grpc.lookup.v1.GrpcKeyBuilder */
 
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_GrpcKeyBuilder_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_GrpcKeyBuilder*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_msg_init, arena);
+  return (grpc_lookup_v1_GrpcKeyBuilder*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_GrpcKeyBuilder_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder* ret = grpc_lookup_v1_GrpcKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -186,7 +180,7 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_GrpcKeyBuilder_parse_ex
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder* ret = grpc_lookup_v1_GrpcKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -194,13 +188,13 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_GrpcKeyBuilder_parse_ex
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_serialize(const grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_serialize_ex(const grpc_lookup_v1_GrpcKeyBuilder* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_clear_names(grpc_lookup_v1_GrpcKeyBuilder* msg) {
@@ -335,7 +329,7 @@ UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuil
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_GrpcKeyBuilder_Name* sub = (struct grpc_lookup_v1_GrpcKeyBuilder_Name*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, arena);
+  struct grpc_lookup_v1_GrpcKeyBuilder_Name* sub = (struct grpc_lookup_v1_GrpcKeyBuilder_Name*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -361,7 +355,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_GrpcKeyBuilder_add_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc_lookup_v1_NameMatcher_msg_init, arena);
+  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc__lookup__v1__NameMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -373,7 +367,7 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_set_extra_keys(grpc_lookup_v1_Grpc
 UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilder_mutable_extra_keys(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena) {
   struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* sub = (struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)grpc_lookup_v1_GrpcKeyBuilder_extra_keys(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, arena);
+    sub = (struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, arena);
     if (sub) grpc_lookup_v1_GrpcKeyBuilder_set_extra_keys(msg, sub);
   }
   return sub;
@@ -406,12 +400,12 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry* grpc_lookup_v1_GrpcK
 /* grpc.lookup.v1.GrpcKeyBuilder.Name */
 
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuilder_Name_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_GrpcKeyBuilder_Name*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, arena);
+  return (grpc_lookup_v1_GrpcKeyBuilder_Name*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuilder_Name_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder_Name* ret = grpc_lookup_v1_GrpcKeyBuilder_Name_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -421,7 +415,7 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuilder_Nam
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder_Name* ret = grpc_lookup_v1_GrpcKeyBuilder_Name_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -429,13 +423,13 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_Name* grpc_lookup_v1_GrpcKeyBuilder_Nam
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_Name_serialize(const grpc_lookup_v1_GrpcKeyBuilder_Name* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_Name_serialize_ex(const grpc_lookup_v1_GrpcKeyBuilder_Name* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_clear_service(grpc_lookup_v1_GrpcKeyBuilder_Name* msg) {
@@ -473,12 +467,12 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_set_method(grpc_lookup_v1_Grp
 /* grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys */
 
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, arena);
+  return (grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* ret = grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -488,7 +482,7 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilde
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* ret = grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -496,13 +490,13 @@ UPB_INLINE grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilde
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_serialize(const grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_serialize_ex(const grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_clear_host(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* msg) {
@@ -572,12 +566,12 @@ UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_set_value(grpc_l
 /* grpc.lookup.v1.HttpKeyBuilder */
 
 UPB_INLINE grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_HttpKeyBuilder_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_HttpKeyBuilder*)_upb_Message_New(&grpc_lookup_v1_HttpKeyBuilder_msg_init, arena);
+  return (grpc_lookup_v1_HttpKeyBuilder*)_upb_Message_New(&grpc__lookup__v1__HttpKeyBuilder_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_HttpKeyBuilder_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_HttpKeyBuilder* ret = grpc_lookup_v1_HttpKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_HttpKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__HttpKeyBuilder_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -587,7 +581,7 @@ UPB_INLINE grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_HttpKeyBuilder_parse_ex
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_HttpKeyBuilder* ret = grpc_lookup_v1_HttpKeyBuilder_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_HttpKeyBuilder_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__HttpKeyBuilder_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -595,13 +589,13 @@ UPB_INLINE grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_HttpKeyBuilder_parse_ex
 }
 UPB_INLINE char* grpc_lookup_v1_HttpKeyBuilder_serialize(const grpc_lookup_v1_HttpKeyBuilder* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_HttpKeyBuilder_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__HttpKeyBuilder_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_HttpKeyBuilder_serialize_ex(const grpc_lookup_v1_HttpKeyBuilder* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_HttpKeyBuilder_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__HttpKeyBuilder_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_clear_host_patterns(grpc_lookup_v1_HttpKeyBuilder* msg) {
@@ -843,7 +837,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_HttpKeyBuilder_add_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc_lookup_v1_NameMatcher_msg_init, arena);
+  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc__lookup__v1__NameMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -869,7 +863,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_HttpKeyBuilder_add_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc_lookup_v1_NameMatcher_msg_init, arena);
+  struct grpc_lookup_v1_NameMatcher* sub = (struct grpc_lookup_v1_NameMatcher*)_upb_Message_New(&grpc__lookup__v1__NameMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -919,12 +913,12 @@ UPB_INLINE void grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_set_value(grpc_l
 /* grpc.lookup.v1.RouteLookupConfig */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupConfig_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_RouteLookupConfig*)_upb_Message_New(&grpc_lookup_v1_RouteLookupConfig_msg_init, arena);
+  return (grpc_lookup_v1_RouteLookupConfig*)_upb_Message_New(&grpc__lookup__v1__RouteLookupConfig_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupConfig* ret = grpc_lookup_v1_RouteLookupConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -934,7 +928,7 @@ UPB_INLINE grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupConfig_pa
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupConfig* ret = grpc_lookup_v1_RouteLookupConfig_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupConfig_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -942,13 +936,13 @@ UPB_INLINE grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupConfig_pa
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupConfig_serialize(const grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupConfig_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupConfig_serialize_ex(const grpc_lookup_v1_RouteLookupConfig* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupConfig_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_clear_http_keybuilders(grpc_lookup_v1_RouteLookupConfig* msg) {
@@ -1162,7 +1156,7 @@ UPB_INLINE struct grpc_lookup_v1_HttpKeyBuilder* grpc_lookup_v1_RouteLookupConfi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_HttpKeyBuilder* sub = (struct grpc_lookup_v1_HttpKeyBuilder*)_upb_Message_New(&grpc_lookup_v1_HttpKeyBuilder_msg_init, arena);
+  struct grpc_lookup_v1_HttpKeyBuilder* sub = (struct grpc_lookup_v1_HttpKeyBuilder*)_upb_Message_New(&grpc__lookup__v1__HttpKeyBuilder_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1188,7 +1182,7 @@ UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_RouteLookupConfi
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct grpc_lookup_v1_GrpcKeyBuilder* sub = (struct grpc_lookup_v1_GrpcKeyBuilder*)_upb_Message_New(&grpc_lookup_v1_GrpcKeyBuilder_msg_init, arena);
+  struct grpc_lookup_v1_GrpcKeyBuilder* sub = (struct grpc_lookup_v1_GrpcKeyBuilder*)_upb_Message_New(&grpc__lookup__v1__GrpcKeyBuilder_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -1204,7 +1198,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service_timeout(grpc
 UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_lookup_service_timeout(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_lookup_service_timeout(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) grpc_lookup_v1_RouteLookupConfig_set_lookup_service_timeout(msg, sub);
   }
   return sub;
@@ -1216,7 +1210,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_max_age(grpc_lookup_v1_Rout
 UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_max_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_max_age(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) grpc_lookup_v1_RouteLookupConfig_set_max_age(msg, sub);
   }
   return sub;
@@ -1228,7 +1222,7 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_stale_age(grpc_lookup_v1_Ro
 UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_stale_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_stale_age(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) grpc_lookup_v1_RouteLookupConfig_set_stale_age(msg, sub);
   }
   return sub;
@@ -1269,12 +1263,12 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_default_target(grpc_lookup_
 /* grpc.lookup.v1.RouteLookupClusterSpecifier */
 
 UPB_INLINE grpc_lookup_v1_RouteLookupClusterSpecifier* grpc_lookup_v1_RouteLookupClusterSpecifier_new(upb_Arena* arena) {
-  return (grpc_lookup_v1_RouteLookupClusterSpecifier*)_upb_Message_New(&grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init, arena);
+  return (grpc_lookup_v1_RouteLookupClusterSpecifier*)_upb_Message_New(&grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init, arena);
 }
 UPB_INLINE grpc_lookup_v1_RouteLookupClusterSpecifier* grpc_lookup_v1_RouteLookupClusterSpecifier_parse(const char* buf, size_t size, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupClusterSpecifier* ret = grpc_lookup_v1_RouteLookupClusterSpecifier_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1284,7 +1278,7 @@ UPB_INLINE grpc_lookup_v1_RouteLookupClusterSpecifier* grpc_lookup_v1_RouteLooku
                            int options, upb_Arena* arena) {
   grpc_lookup_v1_RouteLookupClusterSpecifier* ret = grpc_lookup_v1_RouteLookupClusterSpecifier_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1292,13 +1286,13 @@ UPB_INLINE grpc_lookup_v1_RouteLookupClusterSpecifier* grpc_lookup_v1_RouteLooku
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupClusterSpecifier_serialize(const grpc_lookup_v1_RouteLookupClusterSpecifier* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* grpc_lookup_v1_RouteLookupClusterSpecifier_serialize_ex(const grpc_lookup_v1_RouteLookupClusterSpecifier* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void grpc_lookup_v1_RouteLookupClusterSpecifier_clear_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier* msg) {
@@ -1324,14 +1318,12 @@ UPB_INLINE void grpc_lookup_v1_RouteLookupClusterSpecifier_set_route_lookup_conf
 UPB_INLINE struct grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupClusterSpecifier_mutable_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier* msg, upb_Arena* arena) {
   struct grpc_lookup_v1_RouteLookupConfig* sub = (struct grpc_lookup_v1_RouteLookupConfig*)grpc_lookup_v1_RouteLookupClusterSpecifier_route_lookup_config(msg);
   if (sub == NULL) {
-    sub = (struct grpc_lookup_v1_RouteLookupConfig*)_upb_Message_New(&grpc_lookup_v1_RouteLookupConfig_msg_init, arena);
+    sub = (struct grpc_lookup_v1_RouteLookupConfig*)_upb_Message_New(&grpc__lookup__v1__RouteLookupConfig_msg_init, arena);
     if (sub) grpc_lookup_v1_RouteLookupClusterSpecifier_set_route_lookup_config(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
new file mode 100644
index 0000000000000..aa54ef6179feb
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
@@ -0,0 +1,243 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lookup/v1/rls_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "src/proto/grpc/lookup/v1/rls_config.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField grpc_lookup_v1_NameMatcher__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(0, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = {
+  NULL,
+  &grpc_lookup_v1_NameMatcher__fields[0],
+  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prs_1bt},
+    {0x000000003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = {
+  {.submsg = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init},
+  {.submsg = &grpc__lookup__v1__NameMatcher_msg_init},
+  {.submsg = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init},
+  {.submsg = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init},
+};
+
+static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder__fields[4] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = {
+  &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0],
+  &grpc_lookup_v1_GrpcKeyBuilder__fields[0],
+  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x001800000102001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_Name__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init = {
+  NULL,
+  &grpc_lookup_v1_GrpcKeyBuilder_Name__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[3] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init = {
+  NULL,
+  &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000003f00001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init = {
+  NULL,
+  &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = {
+  {.submsg = &grpc__lookup__v1__NameMatcher_msg_init},
+  {.submsg = &grpc__lookup__v1__NameMatcher_msg_init},
+  {.submsg = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init},
+};
+
+static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder__fields[5] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = {
+  &grpc_lookup_v1_HttpKeyBuilder_submsgs[0],
+  &grpc_lookup_v1_HttpKeyBuilder__fields[0],
+  UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prs_1bt},
+    {0x000800003f000012, &upb_prs_1bt},
+    {0x001000003f00001a, &upb_prm_1bt_max64b},
+    {0x001800003f010022, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init = {
+  NULL,
+  &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lookup_v1_RouteLookupConfig_submsgs[5] = {
+  {.submsg = &grpc__lookup__v1__HttpKeyBuilder_msg_init},
+  {.submsg = &grpc__lookup__v1__GrpcKeyBuilder_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField grpc_lookup_v1_RouteLookupConfig__fields[9] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = {
+  &grpc_lookup_v1_RouteLookupConfig_submsgs[0],
+  &grpc_lookup_v1_RouteLookupConfig__fields[0],
+  UPB_SIZE(56, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_max64b},
+    {0x001000003f010012, &upb_prm_1bt_max64b},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x0028000001020022, &upb_psm_1bt_maxmaxb},
+    {0x003000000203002a, &upb_psm_1bt_maxmaxb},
+    {0x0038000003040032, &upb_psm_1bt_maxmaxb},
+    {0x004000003f000038, &upb_psv8_1bt},
+    {0x004800003f000042, &upb_prs_1bt},
+    {0x005000003f00004a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = {
+  {.submsg = &grpc__lookup__v1__RouteLookupConfig_msg_init},
+};
+
+static const upb_MiniTableField grpc_lookup_v1_RouteLookupClusterSpecifier__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = {
+  &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0],
+  &grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[9] = {
+  &grpc__lookup__v1__NameMatcher_msg_init,
+  &grpc__lookup__v1__GrpcKeyBuilder_msg_init,
+  &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init,
+  &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init,
+  &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init,
+  &grpc__lookup__v1__HttpKeyBuilder_msg_init,
+  &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init,
+  &grpc__lookup__v1__RouteLookupConfig_msg_init,
+  &grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init,
+};
+
+const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  9,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
new file mode 100644
index 0000000000000..d56e6e943ae70
--- /dev/null
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     src/proto/grpc/lookup/v1/rls_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_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 grpc__lookup__v1__NameMatcher_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init;
+extern const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init;
+
+extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
new file mode 100644
index 0000000000000..94ec3622c30c7
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
@@ -0,0 +1,322 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "udpa/annotations/migrate.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct udpa_annotations_MigrateAnnotation udpa_annotations_MigrateAnnotation;
+typedef struct udpa_annotations_FieldMigrateAnnotation udpa_annotations_FieldMigrateAnnotation;
+typedef struct udpa_annotations_FileMigrateAnnotation udpa_annotations_FileMigrateAnnotation;
+struct google_protobuf_EnumOptions;
+struct google_protobuf_EnumValueOptions;
+struct google_protobuf_FieldOptions;
+struct google_protobuf_FileOptions;
+struct google_protobuf_MessageOptions;
+
+
+
+/* udpa.annotations.MigrateAnnotation */
+
+UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_MigrateAnnotation* ret = udpa_annotations_MigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__MigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_MigrateAnnotation* ret = udpa_annotations_MigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__MigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_MigrateAnnotation_serialize(const udpa_annotations_MigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__MigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_MigrateAnnotation_serialize_ex(const udpa_annotations_MigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__MigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_MigrateAnnotation_clear_rename(udpa_annotations_MigrateAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView udpa_annotations_MigrateAnnotation_rename(const udpa_annotations_MigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_MigrateAnnotation_set_rename(udpa_annotations_MigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* udpa.annotations.FieldMigrateAnnotation */
+
+UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_FieldMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FieldMigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_FieldMigrateAnnotation* ret = udpa_annotations_FieldMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FieldMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_FieldMigrateAnnotation* ret = udpa_annotations_FieldMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FieldMigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_FieldMigrateAnnotation_serialize(const udpa_annotations_FieldMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FieldMigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_FieldMigrateAnnotation_serialize_ex(const udpa_annotations_FieldMigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FieldMigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_clear_rename(udpa_annotations_FieldMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_rename(const udpa_annotations_FieldMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_clear_oneof_promotion(udpa_annotations_FieldMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_oneof_promotion(const udpa_annotations_FieldMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_rename(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_oneof_promotion(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* udpa.annotations.FileMigrateAnnotation */
+
+UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_FileMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FileMigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_FileMigrateAnnotation* ret = udpa_annotations_FileMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FileMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_FileMigrateAnnotation* ret = udpa_annotations_FileMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FileMigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_FileMigrateAnnotation_serialize(const udpa_annotations_FileMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FileMigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_FileMigrateAnnotation_serialize_ex(const udpa_annotations_FileMigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FileMigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_FileMigrateAnnotation_clear_move_to_package(udpa_annotations_FileMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView udpa_annotations_FileMigrateAnnotation_move_to_package(const udpa_annotations_FileMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_FileMigrateAnnotation_set_move_to_package(udpa_annotations_FileMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool udpa_annotations_has_message_migrate(const struct google_protobuf_MessageOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_message_migrate_ext);
+}
+UPB_INLINE void udpa_annotations_clear_message_migrate(struct google_protobuf_MessageOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_message_migrate_ext);
+}
+UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_message_migrate(const struct google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_MigrateAnnotation* default_val = NULL;
+  const udpa_annotations_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_MessageOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool udpa_annotations_has_field_migrate(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_field_migrate_ext);
+}
+UPB_INLINE void udpa_annotations_clear_field_migrate(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_field_migrate_ext);
+}
+UPB_INLINE const udpa_annotations_FieldMigrateAnnotation* udpa_annotations_field_migrate(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_FieldMigrateAnnotation* default_val = NULL;
+  const udpa_annotations_FieldMigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldOptions* msg, const udpa_annotations_FieldMigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool udpa_annotations_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_enum_migrate_ext);
+}
+UPB_INLINE void udpa_annotations_clear_enum_migrate(struct google_protobuf_EnumOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_enum_migrate_ext);
+}
+UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_MigrateAnnotation* default_val = NULL;
+  const udpa_annotations_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool udpa_annotations_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_enum_value_migrate_ext);
+}
+UPB_INLINE void udpa_annotations_clear_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_enum_value_migrate_ext);
+}
+UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_MigrateAnnotation* default_val = NULL;
+  const udpa_annotations_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool udpa_annotations_has_file_migrate(const struct google_protobuf_FileOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_file_migrate_ext);
+}
+UPB_INLINE void udpa_annotations_clear_file_migrate(struct google_protobuf_FileOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_file_migrate_ext);
+}
+UPB_INLINE const udpa_annotations_FileMigrateAnnotation* udpa_annotations_file_migrate(const struct google_protobuf_FileOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_FileMigrateAnnotation* default_val = NULL;
+  const udpa_annotations_FileMigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOptions* msg, const udpa_annotations_FileMigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
new file mode 100644
index 0000000000000..8272341e0a681
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
@@ -0,0 +1,118 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField udpa_annotations_MigrateAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_MigrateAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField udpa_annotations_FieldMigrateAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_FieldMigrateAnnotation__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField udpa_annotations_FileMigrateAnnotation__fields[1] = {
+  {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_FileMigrateAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &udpa__annotations__MigrateAnnotation_msg_init,
+  &udpa__annotations__FieldMigrateAnnotation_msg_init,
+  &udpa__annotations__FileMigrateAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension udpa_annotations_message_migrate_ext = {
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = &udpa__annotations__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension udpa_annotations_field_migrate_ext = {
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &udpa__annotations__FieldMigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = {
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumOptions_msg_init,
+  {.submsg = &udpa__annotations__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = {
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumValueOptions_msg_init,
+  {.submsg = &udpa__annotations__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension udpa_annotations_file_migrate_ext = {
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FileOptions_msg_init,
+  {.submsg = &udpa__annotations__FileMigrateAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[5] = {
+  &udpa_annotations_message_migrate_ext,
+  &udpa_annotations_field_migrate_ext,
+  &udpa_annotations_enum_migrate_ext,
+  &udpa_annotations_enum_value_migrate_ext,
+  &udpa_annotations_file_migrate_ext,
+};
+
+const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  3,
+  0,
+  5,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
new file mode 100644
index 0000000000000..21c1a12b78dcc
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_MIGRATE_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 udpa__annotations__MigrateAnnotation_msg_init;
+extern const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init;
+extern const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init;
+extern const upb_MiniTableExtension udpa_annotations_message_migrate_ext;
+extern const upb_MiniTableExtension udpa_annotations_field_migrate_ext;
+extern const upb_MiniTableExtension udpa_annotations_enum_migrate_ext;
+extern const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext;
+extern const upb_MiniTableExtension udpa_annotations_file_migrate_ext;
+
+extern const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb.h b/src/core/ext/upb-gen/udpa/annotations/security.upb.h
new file mode 100644
index 0000000000000..6daef994e4023
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb.h
@@ -0,0 +1,125 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "udpa/annotations/security.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct udpa_annotations_FieldSecurityAnnotation udpa_annotations_FieldSecurityAnnotation;
+struct google_protobuf_FieldOptions;
+
+
+
+/* udpa.annotations.FieldSecurityAnnotation */
+
+UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_FieldSecurityAnnotation*)_upb_Message_New(&udpa__annotations__FieldSecurityAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_FieldSecurityAnnotation* ret = udpa_annotations_FieldSecurityAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FieldSecurityAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_FieldSecurityAnnotation* ret = udpa_annotations_FieldSecurityAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__FieldSecurityAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_FieldSecurityAnnotation_serialize(const udpa_annotations_FieldSecurityAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FieldSecurityAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_FieldSecurityAnnotation_serialize_ex(const udpa_annotations_FieldSecurityAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__FieldSecurityAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_clear_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted_downstream(const udpa_annotations_FieldSecurityAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_clear_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation* msg) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted_upstream(const udpa_annotations_FieldSecurityAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool udpa_annotations_has_security(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_security_ext);
+}
+UPB_INLINE void udpa_annotations_clear_security(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_security_ext);
+}
+UPB_INLINE const udpa_annotations_FieldSecurityAnnotation* udpa_annotations_security(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_FieldSecurityAnnotation* default_val = NULL;
+  const udpa_annotations_FieldSecurityAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOptions* msg, const udpa_annotations_FieldSecurityAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
new file mode 100644
index 0000000000000..5b63e530a8d1a
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
@@ -0,0 +1,59 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField udpa_annotations_FieldSecurityAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_FieldSecurityAnnotation__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &udpa__annotations__FieldSecurityAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension udpa_annotations_security_ext = {
+  {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &udpa__annotations__FieldSecurityAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &udpa_annotations_security_ext,
+};
+
+const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
new file mode 100644
index 0000000000000..839106b78ca3c
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SECURITY_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 udpa__annotations__FieldSecurityAnnotation_msg_init;
+extern const upb_MiniTableExtension udpa_annotations_security_ext;
+
+extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
new file mode 100644
index 0000000000000..9fae4497b0d28
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "udpa/annotations/sensitive.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct google_protobuf_FieldOptions;
+
+
+UPB_INLINE bool udpa_annotations_has_sensitive(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_sensitive_ext);
+}
+UPB_INLINE void udpa_annotations_clear_sensitive(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_sensitive_ext);
+}
+UPB_INLINE bool udpa_annotations_sensitive(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_sensitive_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
+  bool default_val = false;
+  bool ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptions* msg, bool val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_sensitive_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
new file mode 100644
index 0000000000000..25b6464a6f79d
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableExtension udpa_annotations_sensitive_ext = {
+  {76569463, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = NULL},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &udpa_annotations_sensitive_ext,
+};
+
+const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  extensions_layout,
+  0,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
new file mode 100644
index 0000000000000..90ac5b1f2193f
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_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_MiniTableExtension udpa_annotations_sensitive_ext;
+
+extern const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb.h b/src/core/ext/upb-gen/udpa/annotations/status.upb.h
new file mode 100644
index 0000000000000..719962eae1bce
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb.h
@@ -0,0 +1,131 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct udpa_annotations_StatusAnnotation udpa_annotations_StatusAnnotation;
+struct google_protobuf_FileOptions;
+
+typedef enum {
+  udpa_annotations_UNKNOWN = 0,
+  udpa_annotations_FROZEN = 1,
+  udpa_annotations_ACTIVE = 2,
+  udpa_annotations_NEXT_MAJOR_VERSION_CANDIDATE = 3
+} udpa_annotations_PackageVersionStatus;
+
+
+
+/* udpa.annotations.StatusAnnotation */
+
+UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_StatusAnnotation*)_upb_Message_New(&udpa__annotations__StatusAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_StatusAnnotation* ret = udpa_annotations_StatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__StatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_StatusAnnotation* ret = udpa_annotations_StatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__StatusAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_StatusAnnotation_serialize(const udpa_annotations_StatusAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__StatusAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_StatusAnnotation_serialize_ex(const udpa_annotations_StatusAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__StatusAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_StatusAnnotation_clear_work_in_progress(udpa_annotations_StatusAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool udpa_annotations_StatusAnnotation_work_in_progress(const udpa_annotations_StatusAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_StatusAnnotation_clear_package_version_status(udpa_annotations_StatusAnnotation* msg) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t udpa_annotations_StatusAnnotation_package_version_status(const udpa_annotations_StatusAnnotation* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_StatusAnnotation_set_work_in_progress(udpa_annotations_StatusAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void udpa_annotations_StatusAnnotation_set_package_version_status(udpa_annotations_StatusAnnotation *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool udpa_annotations_has_file_status(const struct google_protobuf_FileOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_file_status_ext);
+}
+UPB_INLINE void udpa_annotations_clear_file_status(struct google_protobuf_FileOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_file_status_ext);
+}
+UPB_INLINE const udpa_annotations_StatusAnnotation* udpa_annotations_file_status(const struct google_protobuf_FileOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_StatusAnnotation* default_val = NULL;
+  const udpa_annotations_StatusAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOptions* msg, const udpa_annotations_StatusAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
new file mode 100644
index 0000000000000..e2b8ce98a424b
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
@@ -0,0 +1,58 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField udpa_annotations_StatusAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_StatusAnnotation__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &udpa__annotations__StatusAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension udpa_annotations_file_status_ext = {
+  {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FileOptions_msg_init,
+  {.submsg = &udpa__annotations__StatusAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &udpa_annotations_file_status_ext,
+};
+
+const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
new file mode 100644
index 0000000000000..67fc12750591c
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_STATUS_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 udpa__annotations__StatusAnnotation_msg_init;
+extern const upb_MiniTableExtension udpa_annotations_file_status_ext;
+
+extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
new file mode 100644
index 0000000000000..c82128f4d5155
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
@@ -0,0 +1,109 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct udpa_annotations_VersioningAnnotation udpa_annotations_VersioningAnnotation;
+struct google_protobuf_MessageOptions;
+
+
+
+/* udpa.annotations.VersioningAnnotation */
+
+UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_new(upb_Arena* arena) {
+  return (udpa_annotations_VersioningAnnotation*)_upb_Message_New(&udpa__annotations__VersioningAnnotation_msg_init, arena);
+}
+UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  udpa_annotations_VersioningAnnotation* ret = udpa_annotations_VersioningAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__VersioningAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  udpa_annotations_VersioningAnnotation* ret = udpa_annotations_VersioningAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &udpa__annotations__VersioningAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* udpa_annotations_VersioningAnnotation_serialize(const udpa_annotations_VersioningAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__VersioningAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* udpa_annotations_VersioningAnnotation_serialize_ex(const udpa_annotations_VersioningAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &udpa__annotations__VersioningAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void udpa_annotations_VersioningAnnotation_clear_previous_message_type(udpa_annotations_VersioningAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView udpa_annotations_VersioningAnnotation_previous_message_type(const udpa_annotations_VersioningAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void udpa_annotations_VersioningAnnotation_set_previous_message_type(udpa_annotations_VersioningAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool udpa_annotations_has_versioning(const struct google_protobuf_MessageOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &udpa_annotations_versioning_ext);
+}
+UPB_INLINE void udpa_annotations_clear_versioning(struct google_protobuf_MessageOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &udpa_annotations_versioning_ext);
+}
+UPB_INLINE const udpa_annotations_VersioningAnnotation* udpa_annotations_versioning(const struct google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const udpa_annotations_VersioningAnnotation* default_val = NULL;
+  const udpa_annotations_VersioningAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOptions* msg, const udpa_annotations_VersioningAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
new file mode 100644
index 0000000000000..61b770c0255ce
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField udpa_annotations_VersioningAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = {
+  NULL,
+  &udpa_annotations_VersioningAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &udpa__annotations__VersioningAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension udpa_annotations_versioning_ext = {
+  {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = &udpa__annotations__VersioningAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &udpa_annotations_versioning_ext,
+};
+
+const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
new file mode 100644
index 0000000000000..752e4ae20cfa8
--- /dev/null
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_VERSIONING_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 udpa__annotations__VersioningAnnotation_msg_init;
+extern const upb_MiniTableExtension udpa_annotations_versioning_ext;
+
+extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/validate/validate.upb.h b/src/core/ext/upb-gen/validate/validate.upb.h
similarity index 96%
rename from src/core/ext/upb-generated/validate/validate.upb.h
rename to src/core/ext/upb-gen/validate/validate.upb.h
index f8b0edcfedf65..738d1f3628954 100644
--- a/src/core/ext/upb-generated/validate/validate.upb.h
+++ b/src/core/ext/upb-gen/validate/validate.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     validate/validate.proto
  *
@@ -10,7 +9,14 @@
 #define VALIDATE_VALIDATE_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "validate/validate.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -40,43 +46,11 @@ typedef struct validate_MapRules validate_MapRules;
 typedef struct validate_AnyRules validate_AnyRules;
 typedef struct validate_DurationRules validate_DurationRules;
 typedef struct validate_TimestampRules validate_TimestampRules;
-extern const upb_MiniTable validate_FieldRules_msg_init;
-extern const upb_MiniTable validate_FloatRules_msg_init;
-extern const upb_MiniTable validate_DoubleRules_msg_init;
-extern const upb_MiniTable validate_Int32Rules_msg_init;
-extern const upb_MiniTable validate_Int64Rules_msg_init;
-extern const upb_MiniTable validate_UInt32Rules_msg_init;
-extern const upb_MiniTable validate_UInt64Rules_msg_init;
-extern const upb_MiniTable validate_SInt32Rules_msg_init;
-extern const upb_MiniTable validate_SInt64Rules_msg_init;
-extern const upb_MiniTable validate_Fixed32Rules_msg_init;
-extern const upb_MiniTable validate_Fixed64Rules_msg_init;
-extern const upb_MiniTable validate_SFixed32Rules_msg_init;
-extern const upb_MiniTable validate_SFixed64Rules_msg_init;
-extern const upb_MiniTable validate_BoolRules_msg_init;
-extern const upb_MiniTable validate_StringRules_msg_init;
-extern const upb_MiniTable validate_BytesRules_msg_init;
-extern const upb_MiniTable validate_EnumRules_msg_init;
-extern const upb_MiniTable validate_MessageRules_msg_init;
-extern const upb_MiniTable validate_RepeatedRules_msg_init;
-extern const upb_MiniTable validate_MapRules_msg_init;
-extern const upb_MiniTable validate_AnyRules_msg_init;
-extern const upb_MiniTable validate_DurationRules_msg_init;
-extern const upb_MiniTable validate_TimestampRules_msg_init;
-extern const upb_MiniTableExtension validate_disabled_ext;
-extern const upb_MiniTableExtension validate_ignored_ext;
-extern const upb_MiniTableExtension validate_required_ext;
-extern const upb_MiniTableExtension validate_rules_ext;
 struct google_protobuf_Duration;
 struct google_protobuf_FieldOptions;
 struct google_protobuf_MessageOptions;
 struct google_protobuf_OneofOptions;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable google_protobuf_OneofOptions_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
 
 typedef enum {
   validate_UNKNOWN = 0,
@@ -85,17 +59,16 @@ typedef enum {
 } validate_KnownRegex;
 
 
-extern const upb_MiniTableEnum validate_KnownRegex_enum_init;
 
 /* validate.FieldRules */
 
 UPB_INLINE validate_FieldRules* validate_FieldRules_new(upb_Arena* arena) {
-  return (validate_FieldRules*)_upb_Message_New(&validate_FieldRules_msg_init, arena);
+  return (validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena);
 }
 UPB_INLINE validate_FieldRules* validate_FieldRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_FieldRules* ret = validate_FieldRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_FieldRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__FieldRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -105,7 +78,7 @@ UPB_INLINE validate_FieldRules* validate_FieldRules_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   validate_FieldRules* ret = validate_FieldRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_FieldRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__FieldRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -113,13 +86,13 @@ UPB_INLINE validate_FieldRules* validate_FieldRules_parse_ex(const char* buf, si
 }
 UPB_INLINE char* validate_FieldRules_serialize(const validate_FieldRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_FieldRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__FieldRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_FieldRules_serialize_ex(const validate_FieldRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_FieldRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__FieldRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -488,7 +461,7 @@ UPB_INLINE void validate_FieldRules_set_float(validate_FieldRules *msg, validate
 UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_FloatRules* sub = (struct validate_FloatRules*)validate_FieldRules_float(msg);
   if (sub == NULL) {
-    sub = (struct validate_FloatRules*)_upb_Message_New(&validate_FloatRules_msg_init, arena);
+    sub = (struct validate_FloatRules*)_upb_Message_New(&validate__FloatRules_msg_init, arena);
     if (sub) validate_FieldRules_set_float(msg, sub);
   }
   return sub;
@@ -500,7 +473,7 @@ UPB_INLINE void validate_FieldRules_set_double(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_DoubleRules* sub = (struct validate_DoubleRules*)validate_FieldRules_double(msg);
   if (sub == NULL) {
-    sub = (struct validate_DoubleRules*)_upb_Message_New(&validate_DoubleRules_msg_init, arena);
+    sub = (struct validate_DoubleRules*)_upb_Message_New(&validate__DoubleRules_msg_init, arena);
     if (sub) validate_FieldRules_set_double(msg, sub);
   }
   return sub;
@@ -512,7 +485,7 @@ UPB_INLINE void validate_FieldRules_set_int32(validate_FieldRules *msg, validate
 UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_Int32Rules* sub = (struct validate_Int32Rules*)validate_FieldRules_int32(msg);
   if (sub == NULL) {
-    sub = (struct validate_Int32Rules*)_upb_Message_New(&validate_Int32Rules_msg_init, arena);
+    sub = (struct validate_Int32Rules*)_upb_Message_New(&validate__Int32Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_int32(msg, sub);
   }
   return sub;
@@ -524,7 +497,7 @@ UPB_INLINE void validate_FieldRules_set_int64(validate_FieldRules *msg, validate
 UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_Int64Rules* sub = (struct validate_Int64Rules*)validate_FieldRules_int64(msg);
   if (sub == NULL) {
-    sub = (struct validate_Int64Rules*)_upb_Message_New(&validate_Int64Rules_msg_init, arena);
+    sub = (struct validate_Int64Rules*)_upb_Message_New(&validate__Int64Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_int64(msg, sub);
   }
   return sub;
@@ -536,7 +509,7 @@ UPB_INLINE void validate_FieldRules_set_uint32(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_UInt32Rules* sub = (struct validate_UInt32Rules*)validate_FieldRules_uint32(msg);
   if (sub == NULL) {
-    sub = (struct validate_UInt32Rules*)_upb_Message_New(&validate_UInt32Rules_msg_init, arena);
+    sub = (struct validate_UInt32Rules*)_upb_Message_New(&validate__UInt32Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_uint32(msg, sub);
   }
   return sub;
@@ -548,7 +521,7 @@ UPB_INLINE void validate_FieldRules_set_uint64(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_UInt64Rules* sub = (struct validate_UInt64Rules*)validate_FieldRules_uint64(msg);
   if (sub == NULL) {
-    sub = (struct validate_UInt64Rules*)_upb_Message_New(&validate_UInt64Rules_msg_init, arena);
+    sub = (struct validate_UInt64Rules*)_upb_Message_New(&validate__UInt64Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_uint64(msg, sub);
   }
   return sub;
@@ -560,7 +533,7 @@ UPB_INLINE void validate_FieldRules_set_sint32(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_SInt32Rules* sub = (struct validate_SInt32Rules*)validate_FieldRules_sint32(msg);
   if (sub == NULL) {
-    sub = (struct validate_SInt32Rules*)_upb_Message_New(&validate_SInt32Rules_msg_init, arena);
+    sub = (struct validate_SInt32Rules*)_upb_Message_New(&validate__SInt32Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_sint32(msg, sub);
   }
   return sub;
@@ -572,7 +545,7 @@ UPB_INLINE void validate_FieldRules_set_sint64(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_SInt64Rules* sub = (struct validate_SInt64Rules*)validate_FieldRules_sint64(msg);
   if (sub == NULL) {
-    sub = (struct validate_SInt64Rules*)_upb_Message_New(&validate_SInt64Rules_msg_init, arena);
+    sub = (struct validate_SInt64Rules*)_upb_Message_New(&validate__SInt64Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_sint64(msg, sub);
   }
   return sub;
@@ -584,7 +557,7 @@ UPB_INLINE void validate_FieldRules_set_fixed32(validate_FieldRules *msg, valida
 UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_Fixed32Rules* sub = (struct validate_Fixed32Rules*)validate_FieldRules_fixed32(msg);
   if (sub == NULL) {
-    sub = (struct validate_Fixed32Rules*)_upb_Message_New(&validate_Fixed32Rules_msg_init, arena);
+    sub = (struct validate_Fixed32Rules*)_upb_Message_New(&validate__Fixed32Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_fixed32(msg, sub);
   }
   return sub;
@@ -596,7 +569,7 @@ UPB_INLINE void validate_FieldRules_set_fixed64(validate_FieldRules *msg, valida
 UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_Fixed64Rules* sub = (struct validate_Fixed64Rules*)validate_FieldRules_fixed64(msg);
   if (sub == NULL) {
-    sub = (struct validate_Fixed64Rules*)_upb_Message_New(&validate_Fixed64Rules_msg_init, arena);
+    sub = (struct validate_Fixed64Rules*)_upb_Message_New(&validate__Fixed64Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_fixed64(msg, sub);
   }
   return sub;
@@ -608,7 +581,7 @@ UPB_INLINE void validate_FieldRules_set_sfixed32(validate_FieldRules *msg, valid
 UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_SFixed32Rules* sub = (struct validate_SFixed32Rules*)validate_FieldRules_sfixed32(msg);
   if (sub == NULL) {
-    sub = (struct validate_SFixed32Rules*)_upb_Message_New(&validate_SFixed32Rules_msg_init, arena);
+    sub = (struct validate_SFixed32Rules*)_upb_Message_New(&validate__SFixed32Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_sfixed32(msg, sub);
   }
   return sub;
@@ -620,7 +593,7 @@ UPB_INLINE void validate_FieldRules_set_sfixed64(validate_FieldRules *msg, valid
 UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_SFixed64Rules* sub = (struct validate_SFixed64Rules*)validate_FieldRules_sfixed64(msg);
   if (sub == NULL) {
-    sub = (struct validate_SFixed64Rules*)_upb_Message_New(&validate_SFixed64Rules_msg_init, arena);
+    sub = (struct validate_SFixed64Rules*)_upb_Message_New(&validate__SFixed64Rules_msg_init, arena);
     if (sub) validate_FieldRules_set_sfixed64(msg, sub);
   }
   return sub;
@@ -632,7 +605,7 @@ UPB_INLINE void validate_FieldRules_set_bool(validate_FieldRules *msg, validate_
 UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_BoolRules* sub = (struct validate_BoolRules*)validate_FieldRules_bool(msg);
   if (sub == NULL) {
-    sub = (struct validate_BoolRules*)_upb_Message_New(&validate_BoolRules_msg_init, arena);
+    sub = (struct validate_BoolRules*)_upb_Message_New(&validate__BoolRules_msg_init, arena);
     if (sub) validate_FieldRules_set_bool(msg, sub);
   }
   return sub;
@@ -644,7 +617,7 @@ UPB_INLINE void validate_FieldRules_set_string(validate_FieldRules *msg, validat
 UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_StringRules* sub = (struct validate_StringRules*)validate_FieldRules_string(msg);
   if (sub == NULL) {
-    sub = (struct validate_StringRules*)_upb_Message_New(&validate_StringRules_msg_init, arena);
+    sub = (struct validate_StringRules*)_upb_Message_New(&validate__StringRules_msg_init, arena);
     if (sub) validate_FieldRules_set_string(msg, sub);
   }
   return sub;
@@ -656,7 +629,7 @@ UPB_INLINE void validate_FieldRules_set_bytes(validate_FieldRules *msg, validate
 UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_BytesRules* sub = (struct validate_BytesRules*)validate_FieldRules_bytes(msg);
   if (sub == NULL) {
-    sub = (struct validate_BytesRules*)_upb_Message_New(&validate_BytesRules_msg_init, arena);
+    sub = (struct validate_BytesRules*)_upb_Message_New(&validate__BytesRules_msg_init, arena);
     if (sub) validate_FieldRules_set_bytes(msg, sub);
   }
   return sub;
@@ -668,7 +641,7 @@ UPB_INLINE void validate_FieldRules_set_enum(validate_FieldRules *msg, validate_
 UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_EnumRules* sub = (struct validate_EnumRules*)validate_FieldRules_enum(msg);
   if (sub == NULL) {
-    sub = (struct validate_EnumRules*)_upb_Message_New(&validate_EnumRules_msg_init, arena);
+    sub = (struct validate_EnumRules*)_upb_Message_New(&validate__EnumRules_msg_init, arena);
     if (sub) validate_FieldRules_set_enum(msg, sub);
   }
   return sub;
@@ -680,7 +653,7 @@ UPB_INLINE void validate_FieldRules_set_message(validate_FieldRules *msg, valida
 UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_MessageRules* sub = (struct validate_MessageRules*)validate_FieldRules_message(msg);
   if (sub == NULL) {
-    sub = (struct validate_MessageRules*)_upb_Message_New(&validate_MessageRules_msg_init, arena);
+    sub = (struct validate_MessageRules*)_upb_Message_New(&validate__MessageRules_msg_init, arena);
     if (sub) validate_FieldRules_set_message(msg, sub);
   }
   return sub;
@@ -692,7 +665,7 @@ UPB_INLINE void validate_FieldRules_set_repeated(validate_FieldRules *msg, valid
 UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_RepeatedRules* sub = (struct validate_RepeatedRules*)validate_FieldRules_repeated(msg);
   if (sub == NULL) {
-    sub = (struct validate_RepeatedRules*)_upb_Message_New(&validate_RepeatedRules_msg_init, arena);
+    sub = (struct validate_RepeatedRules*)_upb_Message_New(&validate__RepeatedRules_msg_init, arena);
     if (sub) validate_FieldRules_set_repeated(msg, sub);
   }
   return sub;
@@ -704,7 +677,7 @@ UPB_INLINE void validate_FieldRules_set_map(validate_FieldRules *msg, validate_M
 UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_MapRules* sub = (struct validate_MapRules*)validate_FieldRules_map(msg);
   if (sub == NULL) {
-    sub = (struct validate_MapRules*)_upb_Message_New(&validate_MapRules_msg_init, arena);
+    sub = (struct validate_MapRules*)_upb_Message_New(&validate__MapRules_msg_init, arena);
     if (sub) validate_FieldRules_set_map(msg, sub);
   }
   return sub;
@@ -716,7 +689,7 @@ UPB_INLINE void validate_FieldRules_set_any(validate_FieldRules *msg, validate_A
 UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_AnyRules* sub = (struct validate_AnyRules*)validate_FieldRules_any(msg);
   if (sub == NULL) {
-    sub = (struct validate_AnyRules*)_upb_Message_New(&validate_AnyRules_msg_init, arena);
+    sub = (struct validate_AnyRules*)_upb_Message_New(&validate__AnyRules_msg_init, arena);
     if (sub) validate_FieldRules_set_any(msg, sub);
   }
   return sub;
@@ -728,7 +701,7 @@ UPB_INLINE void validate_FieldRules_set_duration(validate_FieldRules *msg, valid
 UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_DurationRules* sub = (struct validate_DurationRules*)validate_FieldRules_duration(msg);
   if (sub == NULL) {
-    sub = (struct validate_DurationRules*)_upb_Message_New(&validate_DurationRules_msg_init, arena);
+    sub = (struct validate_DurationRules*)_upb_Message_New(&validate__DurationRules_msg_init, arena);
     if (sub) validate_FieldRules_set_duration(msg, sub);
   }
   return sub;
@@ -740,7 +713,7 @@ UPB_INLINE void validate_FieldRules_set_timestamp(validate_FieldRules *msg, vali
 UPB_INLINE struct validate_TimestampRules* validate_FieldRules_mutable_timestamp(validate_FieldRules* msg, upb_Arena* arena) {
   struct validate_TimestampRules* sub = (struct validate_TimestampRules*)validate_FieldRules_timestamp(msg);
   if (sub == NULL) {
-    sub = (struct validate_TimestampRules*)_upb_Message_New(&validate_TimestampRules_msg_init, arena);
+    sub = (struct validate_TimestampRules*)_upb_Message_New(&validate__TimestampRules_msg_init, arena);
     if (sub) validate_FieldRules_set_timestamp(msg, sub);
   }
   return sub;
@@ -749,12 +722,12 @@ UPB_INLINE struct validate_TimestampRules* validate_FieldRules_mutable_timestamp
 /* validate.FloatRules */
 
 UPB_INLINE validate_FloatRules* validate_FloatRules_new(upb_Arena* arena) {
-  return (validate_FloatRules*)_upb_Message_New(&validate_FloatRules_msg_init, arena);
+  return (validate_FloatRules*)_upb_Message_New(&validate__FloatRules_msg_init, arena);
 }
 UPB_INLINE validate_FloatRules* validate_FloatRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_FloatRules* ret = validate_FloatRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_FloatRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__FloatRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -764,7 +737,7 @@ UPB_INLINE validate_FloatRules* validate_FloatRules_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   validate_FloatRules* ret = validate_FloatRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_FloatRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__FloatRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -772,13 +745,13 @@ UPB_INLINE validate_FloatRules* validate_FloatRules_parse_ex(const char* buf, si
 }
 UPB_INLINE char* validate_FloatRules_serialize(const validate_FloatRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_FloatRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__FloatRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_FloatRules_serialize_ex(const validate_FloatRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_FloatRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__FloatRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_FloatRules_clear_const(validate_FloatRules* msg) {
@@ -1022,12 +995,12 @@ UPB_INLINE void validate_FloatRules_set_ignore_empty(validate_FloatRules *msg, b
 /* validate.DoubleRules */
 
 UPB_INLINE validate_DoubleRules* validate_DoubleRules_new(upb_Arena* arena) {
-  return (validate_DoubleRules*)_upb_Message_New(&validate_DoubleRules_msg_init, arena);
+  return (validate_DoubleRules*)_upb_Message_New(&validate__DoubleRules_msg_init, arena);
 }
 UPB_INLINE validate_DoubleRules* validate_DoubleRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_DoubleRules* ret = validate_DoubleRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_DoubleRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__DoubleRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1037,7 +1010,7 @@ UPB_INLINE validate_DoubleRules* validate_DoubleRules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_DoubleRules* ret = validate_DoubleRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_DoubleRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__DoubleRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1045,13 +1018,13 @@ UPB_INLINE validate_DoubleRules* validate_DoubleRules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_DoubleRules_serialize(const validate_DoubleRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_DoubleRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__DoubleRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_DoubleRules_serialize_ex(const validate_DoubleRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_DoubleRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__DoubleRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_DoubleRules_clear_const(validate_DoubleRules* msg) {
@@ -1295,12 +1268,12 @@ UPB_INLINE void validate_DoubleRules_set_ignore_empty(validate_DoubleRules *msg,
 /* validate.Int32Rules */
 
 UPB_INLINE validate_Int32Rules* validate_Int32Rules_new(upb_Arena* arena) {
-  return (validate_Int32Rules*)_upb_Message_New(&validate_Int32Rules_msg_init, arena);
+  return (validate_Int32Rules*)_upb_Message_New(&validate__Int32Rules_msg_init, arena);
 }
 UPB_INLINE validate_Int32Rules* validate_Int32Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_Int32Rules* ret = validate_Int32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Int32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__Int32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1310,7 +1283,7 @@ UPB_INLINE validate_Int32Rules* validate_Int32Rules_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   validate_Int32Rules* ret = validate_Int32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Int32Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__Int32Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1318,13 +1291,13 @@ UPB_INLINE validate_Int32Rules* validate_Int32Rules_parse_ex(const char* buf, si
 }
 UPB_INLINE char* validate_Int32Rules_serialize(const validate_Int32Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Int32Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Int32Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_Int32Rules_serialize_ex(const validate_Int32Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Int32Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Int32Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_Int32Rules_clear_const(validate_Int32Rules* msg) {
@@ -1568,12 +1541,12 @@ UPB_INLINE void validate_Int32Rules_set_ignore_empty(validate_Int32Rules *msg, b
 /* validate.Int64Rules */
 
 UPB_INLINE validate_Int64Rules* validate_Int64Rules_new(upb_Arena* arena) {
-  return (validate_Int64Rules*)_upb_Message_New(&validate_Int64Rules_msg_init, arena);
+  return (validate_Int64Rules*)_upb_Message_New(&validate__Int64Rules_msg_init, arena);
 }
 UPB_INLINE validate_Int64Rules* validate_Int64Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_Int64Rules* ret = validate_Int64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Int64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__Int64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1583,7 +1556,7 @@ UPB_INLINE validate_Int64Rules* validate_Int64Rules_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   validate_Int64Rules* ret = validate_Int64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Int64Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__Int64Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1591,13 +1564,13 @@ UPB_INLINE validate_Int64Rules* validate_Int64Rules_parse_ex(const char* buf, si
 }
 UPB_INLINE char* validate_Int64Rules_serialize(const validate_Int64Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Int64Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Int64Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_Int64Rules_serialize_ex(const validate_Int64Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Int64Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Int64Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_Int64Rules_clear_const(validate_Int64Rules* msg) {
@@ -1841,12 +1814,12 @@ UPB_INLINE void validate_Int64Rules_set_ignore_empty(validate_Int64Rules *msg, b
 /* validate.UInt32Rules */
 
 UPB_INLINE validate_UInt32Rules* validate_UInt32Rules_new(upb_Arena* arena) {
-  return (validate_UInt32Rules*)_upb_Message_New(&validate_UInt32Rules_msg_init, arena);
+  return (validate_UInt32Rules*)_upb_Message_New(&validate__UInt32Rules_msg_init, arena);
 }
 UPB_INLINE validate_UInt32Rules* validate_UInt32Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_UInt32Rules* ret = validate_UInt32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_UInt32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__UInt32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1856,7 +1829,7 @@ UPB_INLINE validate_UInt32Rules* validate_UInt32Rules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_UInt32Rules* ret = validate_UInt32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_UInt32Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__UInt32Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1864,13 +1837,13 @@ UPB_INLINE validate_UInt32Rules* validate_UInt32Rules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_UInt32Rules_serialize(const validate_UInt32Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_UInt32Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__UInt32Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_UInt32Rules_serialize_ex(const validate_UInt32Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_UInt32Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__UInt32Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_UInt32Rules_clear_const(validate_UInt32Rules* msg) {
@@ -2114,12 +2087,12 @@ UPB_INLINE void validate_UInt32Rules_set_ignore_empty(validate_UInt32Rules *msg,
 /* validate.UInt64Rules */
 
 UPB_INLINE validate_UInt64Rules* validate_UInt64Rules_new(upb_Arena* arena) {
-  return (validate_UInt64Rules*)_upb_Message_New(&validate_UInt64Rules_msg_init, arena);
+  return (validate_UInt64Rules*)_upb_Message_New(&validate__UInt64Rules_msg_init, arena);
 }
 UPB_INLINE validate_UInt64Rules* validate_UInt64Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_UInt64Rules* ret = validate_UInt64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_UInt64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__UInt64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2129,7 +2102,7 @@ UPB_INLINE validate_UInt64Rules* validate_UInt64Rules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_UInt64Rules* ret = validate_UInt64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_UInt64Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__UInt64Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2137,13 +2110,13 @@ UPB_INLINE validate_UInt64Rules* validate_UInt64Rules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_UInt64Rules_serialize(const validate_UInt64Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_UInt64Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__UInt64Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_UInt64Rules_serialize_ex(const validate_UInt64Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_UInt64Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__UInt64Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_UInt64Rules_clear_const(validate_UInt64Rules* msg) {
@@ -2387,12 +2360,12 @@ UPB_INLINE void validate_UInt64Rules_set_ignore_empty(validate_UInt64Rules *msg,
 /* validate.SInt32Rules */
 
 UPB_INLINE validate_SInt32Rules* validate_SInt32Rules_new(upb_Arena* arena) {
-  return (validate_SInt32Rules*)_upb_Message_New(&validate_SInt32Rules_msg_init, arena);
+  return (validate_SInt32Rules*)_upb_Message_New(&validate__SInt32Rules_msg_init, arena);
 }
 UPB_INLINE validate_SInt32Rules* validate_SInt32Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_SInt32Rules* ret = validate_SInt32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SInt32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__SInt32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2402,7 +2375,7 @@ UPB_INLINE validate_SInt32Rules* validate_SInt32Rules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_SInt32Rules* ret = validate_SInt32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SInt32Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__SInt32Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2410,13 +2383,13 @@ UPB_INLINE validate_SInt32Rules* validate_SInt32Rules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_SInt32Rules_serialize(const validate_SInt32Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SInt32Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SInt32Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_SInt32Rules_serialize_ex(const validate_SInt32Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SInt32Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SInt32Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_SInt32Rules_clear_const(validate_SInt32Rules* msg) {
@@ -2660,12 +2633,12 @@ UPB_INLINE void validate_SInt32Rules_set_ignore_empty(validate_SInt32Rules *msg,
 /* validate.SInt64Rules */
 
 UPB_INLINE validate_SInt64Rules* validate_SInt64Rules_new(upb_Arena* arena) {
-  return (validate_SInt64Rules*)_upb_Message_New(&validate_SInt64Rules_msg_init, arena);
+  return (validate_SInt64Rules*)_upb_Message_New(&validate__SInt64Rules_msg_init, arena);
 }
 UPB_INLINE validate_SInt64Rules* validate_SInt64Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_SInt64Rules* ret = validate_SInt64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SInt64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__SInt64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2675,7 +2648,7 @@ UPB_INLINE validate_SInt64Rules* validate_SInt64Rules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_SInt64Rules* ret = validate_SInt64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SInt64Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__SInt64Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2683,13 +2656,13 @@ UPB_INLINE validate_SInt64Rules* validate_SInt64Rules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_SInt64Rules_serialize(const validate_SInt64Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SInt64Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SInt64Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_SInt64Rules_serialize_ex(const validate_SInt64Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SInt64Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SInt64Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_SInt64Rules_clear_const(validate_SInt64Rules* msg) {
@@ -2933,12 +2906,12 @@ UPB_INLINE void validate_SInt64Rules_set_ignore_empty(validate_SInt64Rules *msg,
 /* validate.Fixed32Rules */
 
 UPB_INLINE validate_Fixed32Rules* validate_Fixed32Rules_new(upb_Arena* arena) {
-  return (validate_Fixed32Rules*)_upb_Message_New(&validate_Fixed32Rules_msg_init, arena);
+  return (validate_Fixed32Rules*)_upb_Message_New(&validate__Fixed32Rules_msg_init, arena);
 }
 UPB_INLINE validate_Fixed32Rules* validate_Fixed32Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_Fixed32Rules* ret = validate_Fixed32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Fixed32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__Fixed32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2948,7 +2921,7 @@ UPB_INLINE validate_Fixed32Rules* validate_Fixed32Rules_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   validate_Fixed32Rules* ret = validate_Fixed32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Fixed32Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__Fixed32Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2956,13 +2929,13 @@ UPB_INLINE validate_Fixed32Rules* validate_Fixed32Rules_parse_ex(const char* buf
 }
 UPB_INLINE char* validate_Fixed32Rules_serialize(const validate_Fixed32Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Fixed32Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Fixed32Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_Fixed32Rules_serialize_ex(const validate_Fixed32Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Fixed32Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Fixed32Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_Fixed32Rules_clear_const(validate_Fixed32Rules* msg) {
@@ -3206,12 +3179,12 @@ UPB_INLINE void validate_Fixed32Rules_set_ignore_empty(validate_Fixed32Rules *ms
 /* validate.Fixed64Rules */
 
 UPB_INLINE validate_Fixed64Rules* validate_Fixed64Rules_new(upb_Arena* arena) {
-  return (validate_Fixed64Rules*)_upb_Message_New(&validate_Fixed64Rules_msg_init, arena);
+  return (validate_Fixed64Rules*)_upb_Message_New(&validate__Fixed64Rules_msg_init, arena);
 }
 UPB_INLINE validate_Fixed64Rules* validate_Fixed64Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_Fixed64Rules* ret = validate_Fixed64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Fixed64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__Fixed64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3221,7 +3194,7 @@ UPB_INLINE validate_Fixed64Rules* validate_Fixed64Rules_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   validate_Fixed64Rules* ret = validate_Fixed64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_Fixed64Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__Fixed64Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3229,13 +3202,13 @@ UPB_INLINE validate_Fixed64Rules* validate_Fixed64Rules_parse_ex(const char* buf
 }
 UPB_INLINE char* validate_Fixed64Rules_serialize(const validate_Fixed64Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Fixed64Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Fixed64Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_Fixed64Rules_serialize_ex(const validate_Fixed64Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_Fixed64Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__Fixed64Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_Fixed64Rules_clear_const(validate_Fixed64Rules* msg) {
@@ -3479,12 +3452,12 @@ UPB_INLINE void validate_Fixed64Rules_set_ignore_empty(validate_Fixed64Rules *ms
 /* validate.SFixed32Rules */
 
 UPB_INLINE validate_SFixed32Rules* validate_SFixed32Rules_new(upb_Arena* arena) {
-  return (validate_SFixed32Rules*)_upb_Message_New(&validate_SFixed32Rules_msg_init, arena);
+  return (validate_SFixed32Rules*)_upb_Message_New(&validate__SFixed32Rules_msg_init, arena);
 }
 UPB_INLINE validate_SFixed32Rules* validate_SFixed32Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_SFixed32Rules* ret = validate_SFixed32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SFixed32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__SFixed32Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3494,7 +3467,7 @@ UPB_INLINE validate_SFixed32Rules* validate_SFixed32Rules_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   validate_SFixed32Rules* ret = validate_SFixed32Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SFixed32Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__SFixed32Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3502,13 +3475,13 @@ UPB_INLINE validate_SFixed32Rules* validate_SFixed32Rules_parse_ex(const char* b
 }
 UPB_INLINE char* validate_SFixed32Rules_serialize(const validate_SFixed32Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SFixed32Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SFixed32Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_SFixed32Rules_serialize_ex(const validate_SFixed32Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SFixed32Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SFixed32Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_SFixed32Rules_clear_const(validate_SFixed32Rules* msg) {
@@ -3752,12 +3725,12 @@ UPB_INLINE void validate_SFixed32Rules_set_ignore_empty(validate_SFixed32Rules *
 /* validate.SFixed64Rules */
 
 UPB_INLINE validate_SFixed64Rules* validate_SFixed64Rules_new(upb_Arena* arena) {
-  return (validate_SFixed64Rules*)_upb_Message_New(&validate_SFixed64Rules_msg_init, arena);
+  return (validate_SFixed64Rules*)_upb_Message_New(&validate__SFixed64Rules_msg_init, arena);
 }
 UPB_INLINE validate_SFixed64Rules* validate_SFixed64Rules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_SFixed64Rules* ret = validate_SFixed64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SFixed64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__SFixed64Rules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3767,7 +3740,7 @@ UPB_INLINE validate_SFixed64Rules* validate_SFixed64Rules_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   validate_SFixed64Rules* ret = validate_SFixed64Rules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_SFixed64Rules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__SFixed64Rules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3775,13 +3748,13 @@ UPB_INLINE validate_SFixed64Rules* validate_SFixed64Rules_parse_ex(const char* b
 }
 UPB_INLINE char* validate_SFixed64Rules_serialize(const validate_SFixed64Rules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SFixed64Rules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SFixed64Rules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_SFixed64Rules_serialize_ex(const validate_SFixed64Rules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_SFixed64Rules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__SFixed64Rules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_SFixed64Rules_clear_const(validate_SFixed64Rules* msg) {
@@ -4025,12 +3998,12 @@ UPB_INLINE void validate_SFixed64Rules_set_ignore_empty(validate_SFixed64Rules *
 /* validate.BoolRules */
 
 UPB_INLINE validate_BoolRules* validate_BoolRules_new(upb_Arena* arena) {
-  return (validate_BoolRules*)_upb_Message_New(&validate_BoolRules_msg_init, arena);
+  return (validate_BoolRules*)_upb_Message_New(&validate__BoolRules_msg_init, arena);
 }
 UPB_INLINE validate_BoolRules* validate_BoolRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_BoolRules* ret = validate_BoolRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_BoolRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__BoolRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4040,7 +4013,7 @@ UPB_INLINE validate_BoolRules* validate_BoolRules_parse_ex(const char* buf, size
                            int options, upb_Arena* arena) {
   validate_BoolRules* ret = validate_BoolRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_BoolRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__BoolRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4048,13 +4021,13 @@ UPB_INLINE validate_BoolRules* validate_BoolRules_parse_ex(const char* buf, size
 }
 UPB_INLINE char* validate_BoolRules_serialize(const validate_BoolRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_BoolRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__BoolRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_BoolRules_serialize_ex(const validate_BoolRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_BoolRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__BoolRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_BoolRules_clear_const(validate_BoolRules* msg) {
@@ -4081,12 +4054,12 @@ UPB_INLINE void validate_BoolRules_set_const(validate_BoolRules *msg, bool value
 /* validate.StringRules */
 
 UPB_INLINE validate_StringRules* validate_StringRules_new(upb_Arena* arena) {
-  return (validate_StringRules*)_upb_Message_New(&validate_StringRules_msg_init, arena);
+  return (validate_StringRules*)_upb_Message_New(&validate__StringRules_msg_init, arena);
 }
 UPB_INLINE validate_StringRules* validate_StringRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_StringRules* ret = validate_StringRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_StringRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__StringRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4096,7 +4069,7 @@ UPB_INLINE validate_StringRules* validate_StringRules_parse_ex(const char* buf,
                            int options, upb_Arena* arena) {
   validate_StringRules* ret = validate_StringRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_StringRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__StringRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4104,13 +4077,13 @@ UPB_INLINE validate_StringRules* validate_StringRules_parse_ex(const char* buf,
 }
 UPB_INLINE char* validate_StringRules_serialize(const validate_StringRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_StringRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__StringRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_StringRules_serialize_ex(const validate_StringRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_StringRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__StringRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -4713,12 +4686,12 @@ UPB_INLINE void validate_StringRules_set_ignore_empty(validate_StringRules *msg,
 /* validate.BytesRules */
 
 UPB_INLINE validate_BytesRules* validate_BytesRules_new(upb_Arena* arena) {
-  return (validate_BytesRules*)_upb_Message_New(&validate_BytesRules_msg_init, arena);
+  return (validate_BytesRules*)_upb_Message_New(&validate__BytesRules_msg_init, arena);
 }
 UPB_INLINE validate_BytesRules* validate_BytesRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_BytesRules* ret = validate_BytesRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_BytesRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__BytesRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4728,7 +4701,7 @@ UPB_INLINE validate_BytesRules* validate_BytesRules_parse_ex(const char* buf, si
                            int options, upb_Arena* arena) {
   validate_BytesRules* ret = validate_BytesRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_BytesRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__BytesRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4736,13 +4709,13 @@ UPB_INLINE validate_BytesRules* validate_BytesRules_parse_ex(const char* buf, si
 }
 UPB_INLINE char* validate_BytesRules_serialize(const validate_BytesRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_BytesRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__BytesRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_BytesRules_serialize_ex(const validate_BytesRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_BytesRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__BytesRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -5110,12 +5083,12 @@ UPB_INLINE void validate_BytesRules_set_ignore_empty(validate_BytesRules *msg, b
 /* validate.EnumRules */
 
 UPB_INLINE validate_EnumRules* validate_EnumRules_new(upb_Arena* arena) {
-  return (validate_EnumRules*)_upb_Message_New(&validate_EnumRules_msg_init, arena);
+  return (validate_EnumRules*)_upb_Message_New(&validate__EnumRules_msg_init, arena);
 }
 UPB_INLINE validate_EnumRules* validate_EnumRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_EnumRules* ret = validate_EnumRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_EnumRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__EnumRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5125,7 +5098,7 @@ UPB_INLINE validate_EnumRules* validate_EnumRules_parse_ex(const char* buf, size
                            int options, upb_Arena* arena) {
   validate_EnumRules* ret = validate_EnumRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_EnumRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__EnumRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5133,13 +5106,13 @@ UPB_INLINE validate_EnumRules* validate_EnumRules_parse_ex(const char* buf, size
 }
 UPB_INLINE char* validate_EnumRules_serialize(const validate_EnumRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_EnumRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__EnumRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_EnumRules_serialize_ex(const validate_EnumRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_EnumRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__EnumRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_EnumRules_clear_const(validate_EnumRules* msg) {
@@ -5307,12 +5280,12 @@ UPB_INLINE bool validate_EnumRules_add_not_in(validate_EnumRules* msg, int32_t v
 /* validate.MessageRules */
 
 UPB_INLINE validate_MessageRules* validate_MessageRules_new(upb_Arena* arena) {
-  return (validate_MessageRules*)_upb_Message_New(&validate_MessageRules_msg_init, arena);
+  return (validate_MessageRules*)_upb_Message_New(&validate__MessageRules_msg_init, arena);
 }
 UPB_INLINE validate_MessageRules* validate_MessageRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_MessageRules* ret = validate_MessageRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_MessageRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__MessageRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5322,7 +5295,7 @@ UPB_INLINE validate_MessageRules* validate_MessageRules_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   validate_MessageRules* ret = validate_MessageRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_MessageRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__MessageRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5330,13 +5303,13 @@ UPB_INLINE validate_MessageRules* validate_MessageRules_parse_ex(const char* buf
 }
 UPB_INLINE char* validate_MessageRules_serialize(const validate_MessageRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_MessageRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__MessageRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_MessageRules_serialize_ex(const validate_MessageRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_MessageRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__MessageRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_MessageRules_clear_skip(validate_MessageRules* msg) {
@@ -5382,12 +5355,12 @@ UPB_INLINE void validate_MessageRules_set_required(validate_MessageRules *msg, b
 /* validate.RepeatedRules */
 
 UPB_INLINE validate_RepeatedRules* validate_RepeatedRules_new(upb_Arena* arena) {
-  return (validate_RepeatedRules*)_upb_Message_New(&validate_RepeatedRules_msg_init, arena);
+  return (validate_RepeatedRules*)_upb_Message_New(&validate__RepeatedRules_msg_init, arena);
 }
 UPB_INLINE validate_RepeatedRules* validate_RepeatedRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_RepeatedRules* ret = validate_RepeatedRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_RepeatedRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__RepeatedRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5397,7 +5370,7 @@ UPB_INLINE validate_RepeatedRules* validate_RepeatedRules_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   validate_RepeatedRules* ret = validate_RepeatedRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_RepeatedRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__RepeatedRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5405,13 +5378,13 @@ UPB_INLINE validate_RepeatedRules* validate_RepeatedRules_parse_ex(const char* b
 }
 UPB_INLINE char* validate_RepeatedRules_serialize(const validate_RepeatedRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_RepeatedRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__RepeatedRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_RepeatedRules_serialize_ex(const validate_RepeatedRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_RepeatedRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__RepeatedRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_RepeatedRules_clear_min_items(validate_RepeatedRules* msg) {
@@ -5509,7 +5482,7 @@ UPB_INLINE void validate_RepeatedRules_set_items(validate_RepeatedRules *msg, va
 UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(validate_RepeatedRules* msg, upb_Arena* arena) {
   struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_RepeatedRules_items(msg);
   if (sub == NULL) {
-    sub = (struct validate_FieldRules*)_upb_Message_New(&validate_FieldRules_msg_init, arena);
+    sub = (struct validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena);
     if (sub) validate_RepeatedRules_set_items(msg, sub);
   }
   return sub;
@@ -5522,12 +5495,12 @@ UPB_INLINE void validate_RepeatedRules_set_ignore_empty(validate_RepeatedRules *
 /* validate.MapRules */
 
 UPB_INLINE validate_MapRules* validate_MapRules_new(upb_Arena* arena) {
-  return (validate_MapRules*)_upb_Message_New(&validate_MapRules_msg_init, arena);
+  return (validate_MapRules*)_upb_Message_New(&validate__MapRules_msg_init, arena);
 }
 UPB_INLINE validate_MapRules* validate_MapRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_MapRules* ret = validate_MapRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_MapRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__MapRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5537,7 +5510,7 @@ UPB_INLINE validate_MapRules* validate_MapRules_parse_ex(const char* buf, size_t
                            int options, upb_Arena* arena) {
   validate_MapRules* ret = validate_MapRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_MapRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__MapRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5545,13 +5518,13 @@ UPB_INLINE validate_MapRules* validate_MapRules_parse_ex(const char* buf, size_t
 }
 UPB_INLINE char* validate_MapRules_serialize(const validate_MapRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_MapRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__MapRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_MapRules_serialize_ex(const validate_MapRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_MapRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__MapRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_MapRules_clear_min_pairs(validate_MapRules* msg) {
@@ -5664,7 +5637,7 @@ UPB_INLINE void validate_MapRules_set_keys(validate_MapRules *msg, validate_Fiel
 UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_MapRules* msg, upb_Arena* arena) {
   struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_keys(msg);
   if (sub == NULL) {
-    sub = (struct validate_FieldRules*)_upb_Message_New(&validate_FieldRules_msg_init, arena);
+    sub = (struct validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena);
     if (sub) validate_MapRules_set_keys(msg, sub);
   }
   return sub;
@@ -5676,7 +5649,7 @@ UPB_INLINE void validate_MapRules_set_values(validate_MapRules *msg, validate_Fi
 UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate_MapRules* msg, upb_Arena* arena) {
   struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_values(msg);
   if (sub == NULL) {
-    sub = (struct validate_FieldRules*)_upb_Message_New(&validate_FieldRules_msg_init, arena);
+    sub = (struct validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena);
     if (sub) validate_MapRules_set_values(msg, sub);
   }
   return sub;
@@ -5689,12 +5662,12 @@ UPB_INLINE void validate_MapRules_set_ignore_empty(validate_MapRules *msg, bool
 /* validate.AnyRules */
 
 UPB_INLINE validate_AnyRules* validate_AnyRules_new(upb_Arena* arena) {
-  return (validate_AnyRules*)_upb_Message_New(&validate_AnyRules_msg_init, arena);
+  return (validate_AnyRules*)_upb_Message_New(&validate__AnyRules_msg_init, arena);
 }
 UPB_INLINE validate_AnyRules* validate_AnyRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_AnyRules* ret = validate_AnyRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_AnyRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__AnyRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5704,7 +5677,7 @@ UPB_INLINE validate_AnyRules* validate_AnyRules_parse_ex(const char* buf, size_t
                            int options, upb_Arena* arena) {
   validate_AnyRules* ret = validate_AnyRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_AnyRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__AnyRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5712,13 +5685,13 @@ UPB_INLINE validate_AnyRules* validate_AnyRules_parse_ex(const char* buf, size_t
 }
 UPB_INLINE char* validate_AnyRules_serialize(const validate_AnyRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_AnyRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__AnyRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_AnyRules_serialize_ex(const validate_AnyRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_AnyRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__AnyRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_AnyRules_clear_required(validate_AnyRules* msg) {
@@ -5867,12 +5840,12 @@ UPB_INLINE bool validate_AnyRules_add_not_in(validate_AnyRules* msg, upb_StringV
 /* validate.DurationRules */
 
 UPB_INLINE validate_DurationRules* validate_DurationRules_new(upb_Arena* arena) {
-  return (validate_DurationRules*)_upb_Message_New(&validate_DurationRules_msg_init, arena);
+  return (validate_DurationRules*)_upb_Message_New(&validate__DurationRules_msg_init, arena);
 }
 UPB_INLINE validate_DurationRules* validate_DurationRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_DurationRules* ret = validate_DurationRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_DurationRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__DurationRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -5882,7 +5855,7 @@ UPB_INLINE validate_DurationRules* validate_DurationRules_parse_ex(const char* b
                            int options, upb_Arena* arena) {
   validate_DurationRules* ret = validate_DurationRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_DurationRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__DurationRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -5890,13 +5863,13 @@ UPB_INLINE validate_DurationRules* validate_DurationRules_parse_ex(const char* b
 }
 UPB_INLINE char* validate_DurationRules_serialize(const validate_DurationRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_DurationRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__DurationRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_DurationRules_serialize_ex(const validate_DurationRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_DurationRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__DurationRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_DurationRules_clear_required(validate_DurationRules* msg) {
@@ -6075,7 +6048,7 @@ UPB_INLINE void validate_DurationRules_set_const(validate_DurationRules *msg, st
 UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const(validate_DurationRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_const(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_DurationRules_set_const(msg, sub);
   }
   return sub;
@@ -6087,7 +6060,7 @@ UPB_INLINE void validate_DurationRules_set_lt(validate_DurationRules *msg, struc
 UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(validate_DurationRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lt(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_DurationRules_set_lt(msg, sub);
   }
   return sub;
@@ -6099,7 +6072,7 @@ UPB_INLINE void validate_DurationRules_set_lte(validate_DurationRules *msg, stru
 UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(validate_DurationRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lte(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_DurationRules_set_lte(msg, sub);
   }
   return sub;
@@ -6111,7 +6084,7 @@ UPB_INLINE void validate_DurationRules_set_gt(validate_DurationRules *msg, struc
 UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(validate_DurationRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gt(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_DurationRules_set_gt(msg, sub);
   }
   return sub;
@@ -6123,7 +6096,7 @@ UPB_INLINE void validate_DurationRules_set_gte(validate_DurationRules *msg, stru
 UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gte(validate_DurationRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gte(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_DurationRules_set_gte(msg, sub);
   }
   return sub;
@@ -6149,7 +6122,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_in(valida
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6175,7 +6148,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_not_in(va
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -6184,12 +6157,12 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_add_not_in(va
 /* validate.TimestampRules */
 
 UPB_INLINE validate_TimestampRules* validate_TimestampRules_new(upb_Arena* arena) {
-  return (validate_TimestampRules*)_upb_Message_New(&validate_TimestampRules_msg_init, arena);
+  return (validate_TimestampRules*)_upb_Message_New(&validate__TimestampRules_msg_init, arena);
 }
 UPB_INLINE validate_TimestampRules* validate_TimestampRules_parse(const char* buf, size_t size, upb_Arena* arena) {
   validate_TimestampRules* ret = validate_TimestampRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_TimestampRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &validate__TimestampRules_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -6199,7 +6172,7 @@ UPB_INLINE validate_TimestampRules* validate_TimestampRules_parse_ex(const char*
                            int options, upb_Arena* arena) {
   validate_TimestampRules* ret = validate_TimestampRules_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &validate_TimestampRules_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &validate__TimestampRules_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -6207,13 +6180,13 @@ UPB_INLINE validate_TimestampRules* validate_TimestampRules_parse_ex(const char*
 }
 UPB_INLINE char* validate_TimestampRules_serialize(const validate_TimestampRules* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_TimestampRules_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__TimestampRules_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* validate_TimestampRules_serialize_ex(const validate_TimestampRules* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &validate_TimestampRules_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &validate__TimestampRules_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void validate_TimestampRules_clear_required(validate_TimestampRules* msg) {
@@ -6363,7 +6336,7 @@ UPB_INLINE void validate_TimestampRules_set_const(validate_TimestampRules *msg,
 UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_const(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_const(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) validate_TimestampRules_set_const(msg, sub);
   }
   return sub;
@@ -6375,7 +6348,7 @@ UPB_INLINE void validate_TimestampRules_set_lt(validate_TimestampRules *msg, str
 UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lt(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) validate_TimestampRules_set_lt(msg, sub);
   }
   return sub;
@@ -6387,7 +6360,7 @@ UPB_INLINE void validate_TimestampRules_set_lte(validate_TimestampRules *msg, st
 UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lte(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) validate_TimestampRules_set_lte(msg, sub);
   }
   return sub;
@@ -6399,7 +6372,7 @@ UPB_INLINE void validate_TimestampRules_set_gt(validate_TimestampRules *msg, str
 UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gt(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) validate_TimestampRules_set_gt(msg, sub);
   }
   return sub;
@@ -6411,7 +6384,7 @@ UPB_INLINE void validate_TimestampRules_set_gte(validate_TimestampRules *msg, st
 UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gte(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
     if (sub) validate_TimestampRules_set_gte(msg, sub);
   }
   return sub;
@@ -6431,7 +6404,7 @@ UPB_INLINE void validate_TimestampRules_set_within(validate_TimestampRules *msg,
 UPB_INLINE struct google_protobuf_Duration* validate_TimestampRules_mutable_within(validate_TimestampRules* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_TimestampRules_within(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) validate_TimestampRules_set_within(msg, sub);
   }
   return sub;
@@ -6525,8 +6498,6 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con
   bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
-extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.c b/src/core/ext/upb-gen/validate/validate.upb_minitable.c
new file mode 100644
index 0000000000000..56de8fc6cee0e
--- /dev/null
+++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.c
@@ -0,0 +1,943 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     validate/validate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "validate/validate.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub validate_FieldRules_submsgs[22] = {
+  {.submsg = &validate__FloatRules_msg_init},
+  {.submsg = &validate__DoubleRules_msg_init},
+  {.submsg = &validate__Int32Rules_msg_init},
+  {.submsg = &validate__Int64Rules_msg_init},
+  {.submsg = &validate__UInt32Rules_msg_init},
+  {.submsg = &validate__UInt64Rules_msg_init},
+  {.submsg = &validate__SInt32Rules_msg_init},
+  {.submsg = &validate__SInt64Rules_msg_init},
+  {.submsg = &validate__Fixed32Rules_msg_init},
+  {.submsg = &validate__Fixed64Rules_msg_init},
+  {.submsg = &validate__SFixed32Rules_msg_init},
+  {.submsg = &validate__SFixed64Rules_msg_init},
+  {.submsg = &validate__BoolRules_msg_init},
+  {.submsg = &validate__StringRules_msg_init},
+  {.submsg = &validate__BytesRules_msg_init},
+  {.submsg = &validate__EnumRules_msg_init},
+  {.submsg = &validate__MessageRules_msg_init},
+  {.submsg = &validate__RepeatedRules_msg_init},
+  {.submsg = &validate__MapRules_msg_init},
+  {.submsg = &validate__AnyRules_msg_init},
+  {.submsg = &validate__DurationRules_msg_init},
+  {.submsg = &validate__TimestampRules_msg_init},
+};
+
+static const upb_MiniTableField validate_FieldRules__fields[22] = {
+  {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(4, 8), 1, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__FieldRules_msg_init = {
+  &validate_FieldRules_submsgs[0],
+  &validate_FieldRules__fields[0],
+  UPB_SIZE(16, 24), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040100000a, &upb_pom_1bt_max64b},
+    {0x0010000402010012, &upb_pom_1bt_max128b},
+    {0x001000040302001a, &upb_pom_1bt_max64b},
+    {0x0010000404030022, &upb_pom_1bt_max128b},
+    {0x001000040504002a, &upb_pom_1bt_max64b},
+    {0x0010000406050032, &upb_pom_1bt_max128b},
+    {0x001000040706003a, &upb_pom_1bt_max64b},
+    {0x0010000408070042, &upb_pom_1bt_max128b},
+    {0x001000040908004a, &upb_pom_1bt_max64b},
+    {0x001000040a090052, &upb_pom_1bt_max128b},
+    {0x001000040b0a005a, &upb_pom_1bt_max64b},
+    {0x001000040c0b0062, &upb_pom_1bt_max128b},
+    {0x001000040d0c006a, &upb_pom_1bt_max64b},
+    {0x001000040e0d0072, &upb_pom_1bt_max192b},
+    {0x001000040f0e007a, &upb_pom_1bt_max192b},
+    {0x00100004100f0182, &upb_pom_2bt_max64b},
+    {0x000800000110018a, &upb_psm_2bt_max64b},
+    {0x0010000412110192, &upb_pom_2bt_max64b},
+    {0x001000041312019a, &upb_pom_2bt_max64b},
+    {0x00100004141301a2, &upb_pom_2bt_max64b},
+    {0x00100004151401aa, &upb_pom_2bt_max128b},
+    {0x00100004161501b2, &upb_pom_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_FloatRules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__FloatRules_msg_init = {
+  NULL,
+  &validate_FloatRules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400000100000d, &upb_psf4_1bt},
+    {0x0008000002000015, &upb_psf4_1bt},
+    {0x000c00000300001d, &upb_psf4_1bt},
+    {0x0010000004000025, &upb_psf4_1bt},
+    {0x001400000500002d, &upb_psf4_1bt},
+    {0x002000003f000035, &upb_prf4_1bt},
+    {0x002800003f00003d, &upb_prf4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_DoubleRules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__DoubleRules_msg_init = {
+  NULL,
+  &validate_DoubleRules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000009, &upb_psf8_1bt},
+    {0x0010000002000011, &upb_psf8_1bt},
+    {0x0018000003000019, &upb_psf8_1bt},
+    {0x0020000004000021, &upb_psf8_1bt},
+    {0x0028000005000029, &upb_psf8_1bt},
+    {0x003000003f000031, &upb_prf8_1bt},
+    {0x003800003f000039, &upb_prf8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_Int32Rules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__Int32Rules_msg_init = {
+  NULL,
+  &validate_Int32Rules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x000c000003000018, &upb_psv4_1bt},
+    {0x0010000004000020, &upb_psv4_1bt},
+    {0x0014000005000028, &upb_psv4_1bt},
+    {0x002000003f000030, &upb_prv4_1bt},
+    {0x002800003f000038, &upb_prv4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_Int64Rules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__Int64Rules_msg_init = {
+  NULL,
+  &validate_Int64Rules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_psv8_1bt},
+    {0x0010000002000010, &upb_psv8_1bt},
+    {0x0018000003000018, &upb_psv8_1bt},
+    {0x0020000004000020, &upb_psv8_1bt},
+    {0x0028000005000028, &upb_psv8_1bt},
+    {0x003000003f000030, &upb_prv8_1bt},
+    {0x003800003f000038, &upb_prv8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_UInt32Rules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__UInt32Rules_msg_init = {
+  NULL,
+  &validate_UInt32Rules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x000c000003000018, &upb_psv4_1bt},
+    {0x0010000004000020, &upb_psv4_1bt},
+    {0x0014000005000028, &upb_psv4_1bt},
+    {0x002000003f000030, &upb_prv4_1bt},
+    {0x002800003f000038, &upb_prv4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_UInt64Rules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__UInt64Rules_msg_init = {
+  NULL,
+  &validate_UInt64Rules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_psv8_1bt},
+    {0x0010000002000010, &upb_psv8_1bt},
+    {0x0018000003000018, &upb_psv8_1bt},
+    {0x0020000004000020, &upb_psv8_1bt},
+    {0x0028000005000028, &upb_psv8_1bt},
+    {0x003000003f000030, &upb_prv8_1bt},
+    {0x003800003f000038, &upb_prv8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_SInt32Rules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__SInt32Rules_msg_init = {
+  NULL,
+  &validate_SInt32Rules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psz4_1bt},
+    {0x0008000002000010, &upb_psz4_1bt},
+    {0x000c000003000018, &upb_psz4_1bt},
+    {0x0010000004000020, &upb_psz4_1bt},
+    {0x0014000005000028, &upb_psz4_1bt},
+    {0x002000003f000030, &upb_prz4_1bt},
+    {0x002800003f000038, &upb_prz4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_SInt64Rules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__SInt64Rules_msg_init = {
+  NULL,
+  &validate_SInt64Rules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_psz8_1bt},
+    {0x0010000002000010, &upb_psz8_1bt},
+    {0x0018000003000018, &upb_psz8_1bt},
+    {0x0020000004000020, &upb_psz8_1bt},
+    {0x0028000005000028, &upb_psz8_1bt},
+    {0x003000003f000030, &upb_prz8_1bt},
+    {0x003800003f000038, &upb_prz8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_Fixed32Rules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__Fixed32Rules_msg_init = {
+  NULL,
+  &validate_Fixed32Rules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400000100000d, &upb_psf4_1bt},
+    {0x0008000002000015, &upb_psf4_1bt},
+    {0x000c00000300001d, &upb_psf4_1bt},
+    {0x0010000004000025, &upb_psf4_1bt},
+    {0x001400000500002d, &upb_psf4_1bt},
+    {0x002000003f000035, &upb_prf4_1bt},
+    {0x002800003f00003d, &upb_prf4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_Fixed64Rules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__Fixed64Rules_msg_init = {
+  NULL,
+  &validate_Fixed64Rules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000009, &upb_psf8_1bt},
+    {0x0010000002000011, &upb_psf8_1bt},
+    {0x0018000003000019, &upb_psf8_1bt},
+    {0x0020000004000021, &upb_psf8_1bt},
+    {0x0028000005000029, &upb_psf8_1bt},
+    {0x003000003f000031, &upb_prf8_1bt},
+    {0x003800003f000039, &upb_prf8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_SFixed32Rules__fields[8] = {
+  {1, 4, 1, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__SFixed32Rules_msg_init = {
+  NULL,
+  &validate_SFixed32Rules__fields[0],
+  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000400000100000d, &upb_psf4_1bt},
+    {0x0008000002000015, &upb_psf4_1bt},
+    {0x000c00000300001d, &upb_psf4_1bt},
+    {0x0010000004000025, &upb_psf4_1bt},
+    {0x001400000500002d, &upb_psf4_1bt},
+    {0x002000003f000035, &upb_prf4_1bt},
+    {0x002800003f00003d, &upb_prf4_1bt},
+    {0x0018000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_SFixed64Rules__fields[8] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__SFixed64Rules_msg_init = {
+  NULL,
+  &validate_SFixed64Rules__fields[0],
+  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000009, &upb_psf8_1bt},
+    {0x0010000002000011, &upb_psf8_1bt},
+    {0x0018000003000019, &upb_psf8_1bt},
+    {0x0020000004000021, &upb_psf8_1bt},
+    {0x0028000005000029, &upb_psf8_1bt},
+    {0x003000003f000031, &upb_prf8_1bt},
+    {0x003800003f000039, &upb_prf8_1bt},
+    {0x0001000006000040, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_BoolRules__fields[1] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__BoolRules_msg_init = {
+  NULL,
+  &validate_BoolRules__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableSub validate_StringRules_submsgs[1] = {
+  {.subenum = &validate_KnownRegex_enum_init},
+};
+
+static const upb_MiniTableField validate_StringRules__fields[26] = {
+  {1, UPB_SIZE(24, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 32, 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 40, 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, 48, 4, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, 56, 5, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, 64, 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(72, 80), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(80, 96), 8, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(88, 112), 9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(4, 128), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(8, 136), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {19, UPB_SIZE(96, 144), 10, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(104, 152), 11, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {22, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, UPB_SIZE(112, 160), 12, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {24, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {25, UPB_SIZE(16, 8), 13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {26, UPB_SIZE(17, 9), 14, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__StringRules_msg_init = {
+  &validate_StringRules_submsgs[0],
+  &validate_StringRules__fields[0],
+  UPB_SIZE(120, 176), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_pss_1bt},
+    {0x0020000002000010, &upb_psv8_1bt},
+    {0x0028000003000018, &upb_psv8_1bt},
+    {0x0030000004000020, &upb_psv8_1bt},
+    {0x0038000005000028, &upb_psv8_1bt},
+    {0x0040000006000032, &upb_pss_1bt},
+    {0x005000000700003a, &upb_pss_1bt},
+    {0x0060000008000042, &upb_pss_1bt},
+    {0x007000000900004a, &upb_pss_1bt},
+    {0x008000003f000052, &upb_prs_1bt},
+    {0x008800003f00005a, &upb_prs_1bt},
+    {0x000c00040c000060, &upb_pob1_1bt},
+    {0x000c00040d000068, &upb_pob1_1bt},
+    {0x000c00040e000070, &upb_pob1_1bt},
+    {0x000c00040f000078, &upb_pob1_1bt},
+    {0x000c000410000180, &upb_pob1_2bt},
+    {0x000c000411000188, &upb_pob1_2bt},
+    {0x000c000412000190, &upb_pob1_2bt},
+    {0x009000000a000198, &upb_psv8_2bt},
+    {0x009800000b0001a0, &upb_psv8_2bt},
+    {0x000c0004150001a8, &upb_pob1_2bt},
+    {0x000c0004160001b0, &upb_pob1_2bt},
+    {0x00a000000c0001ba, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000d0001c8, &upb_psb1_2bt},
+    {0x000900000e0001d0, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_BytesRules__fields[14] = {
+  {1, UPB_SIZE(20, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 32, 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 40, 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, 48, 4, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(56, 64), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(64, 80), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(72, 96), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(4, 112), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(8, 120), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(80, 128), 8, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(16, 8), 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__BytesRules_msg_init = {
+  NULL,
+  &validate_BytesRules__fields[0],
+  UPB_SIZE(88, 136), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000000100000a, &upb_psb_1bt},
+    {0x0020000002000010, &upb_psv8_1bt},
+    {0x0028000003000018, &upb_psv8_1bt},
+    {0x0030000004000022, &upb_pss_1bt},
+    {0x004000000500002a, &upb_psb_1bt},
+    {0x0050000006000032, &upb_psb_1bt},
+    {0x006000000700003a, &upb_psb_1bt},
+    {0x007000003f000042, &upb_prb_1bt},
+    {0x007800003f00004a, &upb_prb_1bt},
+    {0x000200040a000050, &upb_pob1_1bt},
+    {0x000200040b000058, &upb_pob1_1bt},
+    {0x000200040c000060, &upb_pob1_1bt},
+    {0x0080000008000068, &upb_psv8_1bt},
+    {0x0008000009000070, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_EnumRules__fields[4] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__EnumRules_msg_init = {
+  NULL,
+  &validate_EnumRules__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psb1_1bt},
+    {0x001000003f000018, &upb_prv4_1bt},
+    {0x001800003f000020, &upb_prv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_MessageRules__fields[2] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__MessageRules_msg_init = {
+  NULL,
+  &validate_MessageRules__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0002000002000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub validate_RepeatedRules_submsgs[1] = {
+  {.submsg = &validate__FieldRules_msg_init},
+};
+
+static const upb_MiniTableField validate_RepeatedRules__fields[5] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 1, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 2), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__RepeatedRules_msg_init = {
+  &validate_RepeatedRules_submsgs[0],
+  &validate_RepeatedRules__fields[0],
+  32, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_psv8_1bt},
+    {0x0010000002000010, &upb_psv8_1bt},
+    {0x0001000003000018, &upb_psb1_1bt},
+    {0x0018000004000022, &upb_psm_1bt_max64b},
+    {0x0002000005000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub validate_MapRules_submsgs[2] = {
+  {.submsg = &validate__FieldRules_msg_init},
+  {.submsg = &validate__FieldRules_msg_init},
+};
+
+static const upb_MiniTableField validate_MapRules__fields[6] = {
+  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, 1, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 24), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 32), 5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__MapRules_msg_init = {
+  &validate_MapRules_submsgs[0],
+  &validate_MapRules__fields[0],
+  UPB_SIZE(32, 40), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000008, &upb_psv8_1bt},
+    {0x0010000002000010, &upb_psv8_1bt},
+    {0x0001000003000018, &upb_psb1_1bt},
+    {0x0018000004000022, &upb_psm_1bt_max64b},
+    {0x002000000501002a, &upb_psm_1bt_max64b},
+    {0x0002000006000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField validate_AnyRules__fields[3] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__AnyRules_msg_init = {
+  NULL,
+  &validate_AnyRules__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x000800003f000012, &upb_prs_1bt},
+    {0x001000003f00001a, &upb_prs_1bt},
+  })
+};
+
+static const upb_MiniTableSub validate_DurationRules_submsgs[7] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField validate_DurationRules__fields[8] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 3, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 4, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 40), 6, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 48), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 56), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__DurationRules_msg_init = {
+  &validate_DurationRules_submsgs[0],
+  &validate_DurationRules__fields[0],
+  UPB_SIZE(32, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0008000002000012, &upb_psm_1bt_maxmaxb},
+    {0x001000000301001a, &upb_psm_1bt_maxmaxb},
+    {0x0018000004020022, &upb_psm_1bt_maxmaxb},
+    {0x002000000503002a, &upb_psm_1bt_maxmaxb},
+    {0x0028000006040032, &upb_psm_1bt_maxmaxb},
+    {0x003000003f05003a, &upb_prm_1bt_maxmaxb},
+    {0x003800003f060042, &upb_prm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub validate_TimestampRules_submsgs[6] = {
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField validate_TimestampRules__fields[9] = {
+  {1, 2, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 3, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 24), 4, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 32), 5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 40), 6, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 3), 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(25, 4), 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 48), 9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable validate__TimestampRules_msg_init = {
+  &validate_TimestampRules_submsgs[0],
+  &validate_TimestampRules__fields[0],
+  UPB_SIZE(32, 56), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0002000001000008, &upb_psb1_1bt},
+    {0x0008000002000012, &upb_psm_1bt_maxmaxb},
+    {0x001000000301001a, &upb_psm_1bt_maxmaxb},
+    {0x0018000004020022, &upb_psm_1bt_maxmaxb},
+    {0x002000000503002a, &upb_psm_1bt_maxmaxb},
+    {0x0028000006040032, &upb_psm_1bt_maxmaxb},
+    {0x0003000007000038, &upb_psb1_1bt},
+    {0x0004000008000040, &upb_psb1_1bt},
+    {0x003000000905004a, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[23] = {
+  &validate__FieldRules_msg_init,
+  &validate__FloatRules_msg_init,
+  &validate__DoubleRules_msg_init,
+  &validate__Int32Rules_msg_init,
+  &validate__Int64Rules_msg_init,
+  &validate__UInt32Rules_msg_init,
+  &validate__UInt64Rules_msg_init,
+  &validate__SInt32Rules_msg_init,
+  &validate__SInt64Rules_msg_init,
+  &validate__Fixed32Rules_msg_init,
+  &validate__Fixed64Rules_msg_init,
+  &validate__SFixed32Rules_msg_init,
+  &validate__SFixed64Rules_msg_init,
+  &validate__BoolRules_msg_init,
+  &validate__StringRules_msg_init,
+  &validate__BytesRules_msg_init,
+  &validate__EnumRules_msg_init,
+  &validate__MessageRules_msg_init,
+  &validate__RepeatedRules_msg_init,
+  &validate__MapRules_msg_init,
+  &validate__AnyRules_msg_init,
+  &validate__DurationRules_msg_init,
+  &validate__TimestampRules_msg_init,
+};
+
+const upb_MiniTableExtension validate_disabled_ext = {
+  {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension validate_ignored_ext = {
+  {1072, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension validate_required_ext = {
+  {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__OneofOptions_msg_init,
+  {.submsg = NULL},
+
+};
+const upb_MiniTableExtension validate_rules_ext = {
+  {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &validate__FieldRules_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[4] = {
+  &validate_disabled_ext,
+  &validate_ignored_ext,
+  &validate_required_ext,
+  &validate_rules_ext,
+};
+
+const upb_MiniTableEnum validate_KnownRegex_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+static const upb_MiniTableEnum *enums_layout[1] = {
+  &validate_KnownRegex_enum_init,
+};
+
+const upb_MiniTableFile validate_validate_proto_upb_file_layout = {
+  messages_layout,
+  enums_layout,
+  extensions_layout,
+  23,
+  1,
+  4,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.h b/src/core/ext/upb-gen/validate/validate.upb_minitable.h
new file mode 100644
index 0000000000000..c89f6cd4beea7
--- /dev/null
+++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.h
@@ -0,0 +1,57 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     validate/validate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_
+#define VALIDATE_VALIDATE_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 validate__FieldRules_msg_init;
+extern const upb_MiniTable validate__FloatRules_msg_init;
+extern const upb_MiniTable validate__DoubleRules_msg_init;
+extern const upb_MiniTable validate__Int32Rules_msg_init;
+extern const upb_MiniTable validate__Int64Rules_msg_init;
+extern const upb_MiniTable validate__UInt32Rules_msg_init;
+extern const upb_MiniTable validate__UInt64Rules_msg_init;
+extern const upb_MiniTable validate__SInt32Rules_msg_init;
+extern const upb_MiniTable validate__SInt64Rules_msg_init;
+extern const upb_MiniTable validate__Fixed32Rules_msg_init;
+extern const upb_MiniTable validate__Fixed64Rules_msg_init;
+extern const upb_MiniTable validate__SFixed32Rules_msg_init;
+extern const upb_MiniTable validate__SFixed64Rules_msg_init;
+extern const upb_MiniTable validate__BoolRules_msg_init;
+extern const upb_MiniTable validate__StringRules_msg_init;
+extern const upb_MiniTable validate__BytesRules_msg_init;
+extern const upb_MiniTable validate__EnumRules_msg_init;
+extern const upb_MiniTable validate__MessageRules_msg_init;
+extern const upb_MiniTable validate__RepeatedRules_msg_init;
+extern const upb_MiniTable validate__MapRules_msg_init;
+extern const upb_MiniTable validate__AnyRules_msg_init;
+extern const upb_MiniTable validate__DurationRules_msg_init;
+extern const upb_MiniTable validate__TimestampRules_msg_init;
+extern const upb_MiniTableExtension validate_disabled_ext;
+extern const upb_MiniTableExtension validate_ignored_ext;
+extern const upb_MiniTableExtension validate_required_ext;
+extern const upb_MiniTableExtension validate_rules_ext;
+
+extern const upb_MiniTableEnum validate_KnownRegex_enum_init;
+extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
new file mode 100644
index 0000000000000..64de9c08f95ae
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
@@ -0,0 +1,322 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/annotations/v3/migrate.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_annotations_v3_MigrateAnnotation xds_annotations_v3_MigrateAnnotation;
+typedef struct xds_annotations_v3_FieldMigrateAnnotation xds_annotations_v3_FieldMigrateAnnotation;
+typedef struct xds_annotations_v3_FileMigrateAnnotation xds_annotations_v3_FileMigrateAnnotation;
+struct google_protobuf_EnumOptions;
+struct google_protobuf_EnumValueOptions;
+struct google_protobuf_FieldOptions;
+struct google_protobuf_FileOptions;
+struct google_protobuf_MessageOptions;
+
+
+
+/* xds.annotations.v3.MigrateAnnotation */
+
+UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_MigrateAnnotation* ret = xds_annotations_v3_MigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__MigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_MigrateAnnotation* ret = xds_annotations_v3_MigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__MigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_MigrateAnnotation_serialize(const xds_annotations_v3_MigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__MigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_MigrateAnnotation_serialize_ex(const xds_annotations_v3_MigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__MigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_MigrateAnnotation_clear_rename(xds_annotations_v3_MigrateAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_annotations_v3_MigrateAnnotation_rename(const xds_annotations_v3_MigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_MigrateAnnotation_set_rename(xds_annotations_v3_MigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.annotations.v3.FieldMigrateAnnotation */
+
+UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_FieldMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldMigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_FieldMigrateAnnotation* ret = xds_annotations_v3_FieldMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_FieldMigrateAnnotation* ret = xds_annotations_v3_FieldMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldMigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_FieldMigrateAnnotation_serialize(const xds_annotations_v3_FieldMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldMigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_FieldMigrateAnnotation_serialize_ex(const xds_annotations_v3_FieldMigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldMigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_clear_rename(xds_annotations_v3_FieldMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_rename(const xds_annotations_v3_FieldMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_clear_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_oneof_promotion(const xds_annotations_v3_FieldMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_rename(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.annotations.v3.FileMigrateAnnotation */
+
+UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_FileMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FileMigrateAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_FileMigrateAnnotation* ret = xds_annotations_v3_FileMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FileMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_FileMigrateAnnotation* ret = xds_annotations_v3_FileMigrateAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FileMigrateAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_FileMigrateAnnotation_serialize(const xds_annotations_v3_FileMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FileMigrateAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_FileMigrateAnnotation_serialize_ex(const xds_annotations_v3_FileMigrateAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FileMigrateAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_clear_move_to_package(xds_annotations_v3_FileMigrateAnnotation* msg) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_annotations_v3_FileMigrateAnnotation_move_to_package(const xds_annotations_v3_FileMigrateAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_set_move_to_package(xds_annotations_v3_FileMigrateAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool xds_annotations_v3_has_message_migrate(const struct google_protobuf_MessageOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_message_migrate_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_message_migrate(struct google_protobuf_MessageOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_message_migrate_ext);
+}
+UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_message_migrate(const struct google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
+  const xds_annotations_v3_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_field_migrate(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_field_migrate_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_field_migrate(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_field_migrate_ext);
+}
+UPB_INLINE const xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_field_migrate(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_FieldMigrateAnnotation* default_val = NULL;
+  const xds_annotations_v3_FieldMigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldMigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_enum_migrate_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_enum_migrate(struct google_protobuf_EnumOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_enum_migrate_ext);
+}
+UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
+  const xds_annotations_v3_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_enum_value_migrate_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_enum_value_migrate_ext);
+}
+UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
+  const xds_annotations_v3_MigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_file_migrate(const struct google_protobuf_FileOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_file_migrate_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_file_migrate(struct google_protobuf_FileOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_file_migrate_ext);
+}
+UPB_INLINE const xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_file_migrate(const struct google_protobuf_FileOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_FileMigrateAnnotation* default_val = NULL;
+  const xds_annotations_v3_FileMigrateAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileOptions* msg, const xds_annotations_v3_FileMigrateAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
new file mode 100644
index 0000000000000..969728f5ffd01
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
@@ -0,0 +1,118 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/annotations/v3/migrate.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_annotations_v3_MigrateAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__MigrateAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_MigrateAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableField xds_annotations_v3_FieldMigrateAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_FieldMigrateAnnotation__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_annotations_v3_FileMigrateAnnotation__fields[1] = {
+  {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_FileMigrateAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &xds__annotations__v3__MigrateAnnotation_msg_init,
+  &xds__annotations__v3__FieldMigrateAnnotation_msg_init,
+  &xds__annotations__v3__FileMigrateAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = {
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = &xds__annotations__v3__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = {
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &xds__annotations__v3__FieldMigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = {
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumOptions_msg_init,
+  {.submsg = &xds__annotations__v3__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = {
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumValueOptions_msg_init,
+  {.submsg = &xds__annotations__v3__MigrateAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = {
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FileOptions_msg_init,
+  {.submsg = &xds__annotations__v3__FileMigrateAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[5] = {
+  &xds_annotations_v3_message_migrate_ext,
+  &xds_annotations_v3_field_migrate_ext,
+  &xds_annotations_v3_enum_migrate_ext,
+  &xds_annotations_v3_enum_value_migrate_ext,
+  &xds_annotations_v3_file_migrate_ext,
+};
+
+const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  3,
+  0,
+  5,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
new file mode 100644
index 0000000000000..58a07e5925610
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_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 xds__annotations__v3__MigrateAnnotation_msg_init;
+extern const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init;
+extern const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init;
+extern const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext;
+
+extern const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
new file mode 100644
index 0000000000000..3c7ab0b567836
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
@@ -0,0 +1,125 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/annotations/v3/security.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_annotations_v3_FieldSecurityAnnotation xds_annotations_v3_FieldSecurityAnnotation;
+struct google_protobuf_FieldOptions;
+
+
+
+/* xds.annotations.v3.FieldSecurityAnnotation */
+
+UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_FieldSecurityAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldSecurityAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_FieldSecurityAnnotation* ret = xds_annotations_v3_FieldSecurityAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldSecurityAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_FieldSecurityAnnotation* ret = xds_annotations_v3_FieldSecurityAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldSecurityAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_FieldSecurityAnnotation_serialize(const xds_annotations_v3_FieldSecurityAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldSecurityAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_FieldSecurityAnnotation_serialize_ex(const xds_annotations_v3_FieldSecurityAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldSecurityAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_clear_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrusted_downstream(const xds_annotations_v3_FieldSecurityAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_clear_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation* msg) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrusted_upstream(const xds_annotations_v3_FieldSecurityAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool xds_annotations_v3_has_security(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_security_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_security(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_security_ext);
+}
+UPB_INLINE const xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_security(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_FieldSecurityAnnotation* default_val = NULL;
+  const xds_annotations_v3_FieldSecurityAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldSecurityAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
new file mode 100644
index 0000000000000..1f72822b383e7
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
@@ -0,0 +1,59 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/annotations/v3/security.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_annotations_v3_FieldSecurityAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_FieldSecurityAnnotation__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000100003f000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__annotations__v3__FieldSecurityAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension xds_annotations_v3_security_ext = {
+  {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &xds__annotations__v3__FieldSecurityAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &xds_annotations_v3_security_ext,
+};
+
+const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
new file mode 100644
index 0000000000000..29051672adf32
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_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 xds__annotations__v3__FieldSecurityAnnotation_msg_init;
+extern const upb_MiniTableExtension xds_annotations_v3_security_ext;
+
+extern const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
new file mode 100644
index 0000000000000..b5359f6f35f68
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/annotations/v3/sensitive.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct google_protobuf_FieldOptions;
+
+
+UPB_INLINE bool xds_annotations_v3_has_sensitive(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_sensitive_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_sensitive(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_sensitive_ext);
+}
+UPB_INLINE bool xds_annotations_v3_sensitive(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_sensitive_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
+  bool default_val = false;
+  bool ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOptions* msg, bool val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_sensitive_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
new file mode 100644
index 0000000000000..1b692ae665c61
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/annotations/v3/sensitive.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTableExtension xds_annotations_v3_sensitive_ext = {
+  {61008053, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = NULL},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &xds_annotations_v3_sensitive_ext,
+};
+
+const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layout = {
+  NULL,
+  NULL,
+  extensions_layout,
+  0,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
new file mode 100644
index 0000000000000..1123f0ecf5fbe
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_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_MiniTableExtension xds_annotations_v3_sensitive_ext;
+
+extern const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
new file mode 100644
index 0000000000000..4761ee1b75bd9
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
@@ -0,0 +1,336 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
+#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_annotations_v3_FileStatusAnnotation xds_annotations_v3_FileStatusAnnotation;
+typedef struct xds_annotations_v3_MessageStatusAnnotation xds_annotations_v3_MessageStatusAnnotation;
+typedef struct xds_annotations_v3_FieldStatusAnnotation xds_annotations_v3_FieldStatusAnnotation;
+typedef struct xds_annotations_v3_StatusAnnotation xds_annotations_v3_StatusAnnotation;
+struct google_protobuf_FieldOptions;
+struct google_protobuf_FileOptions;
+struct google_protobuf_MessageOptions;
+
+typedef enum {
+  xds_annotations_v3_UNKNOWN = 0,
+  xds_annotations_v3_FROZEN = 1,
+  xds_annotations_v3_ACTIVE = 2,
+  xds_annotations_v3_NEXT_MAJOR_VERSION_CANDIDATE = 3
+} xds_annotations_v3_PackageVersionStatus;
+
+
+
+/* xds.annotations.v3.FileStatusAnnotation */
+
+UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_FileStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FileStatusAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_FileStatusAnnotation* ret = xds_annotations_v3_FileStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FileStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_FileStatusAnnotation* ret = xds_annotations_v3_FileStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FileStatusAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_FileStatusAnnotation_serialize(const xds_annotations_v3_FileStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FileStatusAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_FileStatusAnnotation_serialize_ex(const xds_annotations_v3_FileStatusAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FileStatusAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_clear_work_in_progress(xds_annotations_v3_FileStatusAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_FileStatusAnnotation_work_in_progress(const xds_annotations_v3_FileStatusAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_set_work_in_progress(xds_annotations_v3_FileStatusAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.annotations.v3.MessageStatusAnnotation */
+
+UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_MessageStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__MessageStatusAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_MessageStatusAnnotation* ret = xds_annotations_v3_MessageStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__MessageStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_MessageStatusAnnotation* ret = xds_annotations_v3_MessageStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__MessageStatusAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_MessageStatusAnnotation_serialize(const xds_annotations_v3_MessageStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__MessageStatusAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_MessageStatusAnnotation_serialize_ex(const xds_annotations_v3_MessageStatusAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__MessageStatusAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_clear_work_in_progress(xds_annotations_v3_MessageStatusAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_MessageStatusAnnotation_work_in_progress(const xds_annotations_v3_MessageStatusAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_set_work_in_progress(xds_annotations_v3_MessageStatusAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.annotations.v3.FieldStatusAnnotation */
+
+UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_FieldStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldStatusAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_FieldStatusAnnotation* ret = xds_annotations_v3_FieldStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_FieldStatusAnnotation* ret = xds_annotations_v3_FieldStatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__FieldStatusAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_FieldStatusAnnotation_serialize(const xds_annotations_v3_FieldStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldStatusAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_FieldStatusAnnotation_serialize_ex(const xds_annotations_v3_FieldStatusAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__FieldStatusAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_clear_work_in_progress(xds_annotations_v3_FieldStatusAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_FieldStatusAnnotation_work_in_progress(const xds_annotations_v3_FieldStatusAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_set_work_in_progress(xds_annotations_v3_FieldStatusAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.annotations.v3.StatusAnnotation */
+
+UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_StatusAnnotation*)_upb_Message_New(&xds__annotations__v3__StatusAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_StatusAnnotation* ret = xds_annotations_v3_StatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__StatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_StatusAnnotation* ret = xds_annotations_v3_StatusAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__StatusAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_StatusAnnotation_serialize(const xds_annotations_v3_StatusAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__StatusAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_StatusAnnotation_serialize_ex(const xds_annotations_v3_StatusAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__StatusAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_StatusAnnotation_clear_work_in_progress(xds_annotations_v3_StatusAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_annotations_v3_StatusAnnotation_work_in_progress(const xds_annotations_v3_StatusAnnotation* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_StatusAnnotation_clear_package_version_status(xds_annotations_v3_StatusAnnotation* msg) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t xds_annotations_v3_StatusAnnotation_package_version_status(const xds_annotations_v3_StatusAnnotation* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_work_in_progress(xds_annotations_v3_StatusAnnotation *msg, bool value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_package_version_status(xds_annotations_v3_StatusAnnotation *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool xds_annotations_v3_has_file_status(const struct google_protobuf_FileOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_file_status_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_file_status(struct google_protobuf_FileOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_file_status_ext);
+}
+UPB_INLINE const xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_file_status(const struct google_protobuf_FileOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_FileStatusAnnotation* default_val = NULL;
+  const xds_annotations_v3_FileStatusAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOptions* msg, const xds_annotations_v3_FileStatusAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_message_status(const struct google_protobuf_MessageOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_message_status_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_message_status(struct google_protobuf_MessageOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_message_status_ext);
+}
+UPB_INLINE const xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_message_status(const struct google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_MessageStatusAnnotation* default_val = NULL;
+  const xds_annotations_v3_MessageStatusAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_MessageStatusAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+UPB_INLINE bool xds_annotations_v3_has_field_status(const struct google_protobuf_FieldOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_field_status_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_field_status(struct google_protobuf_FieldOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_field_status_ext);
+}
+UPB_INLINE const xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_field_status(const struct google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_FieldStatusAnnotation* default_val = NULL;
+  const xds_annotations_v3_FieldStatusAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldStatusAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
new file mode 100644
index 0000000000000..aa0c15acc157f
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
@@ -0,0 +1,117 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_annotations_v3_FileStatusAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__FileStatusAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_FileStatusAnnotation__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableField xds_annotations_v3_MessageStatusAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_MessageStatusAnnotation__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableField xds_annotations_v3_FieldStatusAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_FieldStatusAnnotation__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTableField xds_annotations_v3_StatusAnnotation__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_StatusAnnotation__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psb1_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &xds__annotations__v3__FileStatusAnnotation_msg_init,
+  &xds__annotations__v3__MessageStatusAnnotation_msg_init,
+  &xds__annotations__v3__FieldStatusAnnotation_msg_init,
+  &xds__annotations__v3__StatusAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension xds_annotations_v3_file_status_ext = {
+  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FileOptions_msg_init,
+  {.submsg = &xds__annotations__v3__FileStatusAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_message_status_ext = {
+  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = &xds__annotations__v3__MessageStatusAnnotation_msg_init},
+
+};
+const upb_MiniTableExtension xds_annotations_v3_field_status_ext = {
+  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
+  {.submsg = &xds__annotations__v3__FieldStatusAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[3] = {
+  &xds_annotations_v3_file_status_ext,
+  &xds_annotations_v3_message_status_ext,
+  &xds_annotations_v3_field_status_ext,
+};
+
+const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  4,
+  0,
+  3,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
new file mode 100644
index 0000000000000..a70db6f8f2e5e
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_STATUS_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 xds__annotations__v3__FileStatusAnnotation_msg_init;
+extern const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init;
+extern const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init;
+extern const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init;
+extern const upb_MiniTableExtension xds_annotations_v3_file_status_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_message_status_ext;
+extern const upb_MiniTableExtension xds_annotations_v3_field_status_ext;
+
+extern const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
new file mode 100644
index 0000000000000..a4f2c9b45d41c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
@@ -0,0 +1,109 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/annotations/v3/versioning.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_annotations_v3_VersioningAnnotation xds_annotations_v3_VersioningAnnotation;
+struct google_protobuf_MessageOptions;
+
+
+
+/* xds.annotations.v3.VersioningAnnotation */
+
+UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_new(upb_Arena* arena) {
+  return (xds_annotations_v3_VersioningAnnotation*)_upb_Message_New(&xds__annotations__v3__VersioningAnnotation_msg_init, arena);
+}
+UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_annotations_v3_VersioningAnnotation* ret = xds_annotations_v3_VersioningAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__VersioningAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_annotations_v3_VersioningAnnotation* ret = xds_annotations_v3_VersioningAnnotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__annotations__v3__VersioningAnnotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_annotations_v3_VersioningAnnotation_serialize(const xds_annotations_v3_VersioningAnnotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__VersioningAnnotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_annotations_v3_VersioningAnnotation_serialize_ex(const xds_annotations_v3_VersioningAnnotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__annotations__v3__VersioningAnnotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_annotations_v3_VersioningAnnotation_clear_previous_message_type(xds_annotations_v3_VersioningAnnotation* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_annotations_v3_VersioningAnnotation_previous_message_type(const xds_annotations_v3_VersioningAnnotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_annotations_v3_VersioningAnnotation_set_previous_message_type(xds_annotations_v3_VersioningAnnotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+UPB_INLINE bool xds_annotations_v3_has_versioning(const struct google_protobuf_MessageOptions* msg) {
+  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_versioning_ext);
+}
+UPB_INLINE void xds_annotations_v3_clear_versioning(struct google_protobuf_MessageOptions* msg) {
+  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_versioning_ext);
+}
+UPB_INLINE const xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_versioning(const struct google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  const xds_annotations_v3_VersioningAnnotation* default_val = NULL;
+  const xds_annotations_v3_VersioningAnnotation* ret;
+  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_VersioningAnnotation* val, upb_Arena* arena) {
+  const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
+  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
+  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
+  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
+  UPB_ASSERT(ok);
+}
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
new file mode 100644
index 0000000000000..dba740bd7b634
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/annotations/v3/versioning.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_annotations_v3_VersioningAnnotation__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = {
+  NULL,
+  &xds_annotations_v3_VersioningAnnotation__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__annotations__v3__VersioningAnnotation_msg_init,
+};
+
+const upb_MiniTableExtension xds_annotations_v3_versioning_ext = {
+  {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  &google__protobuf__MessageOptions_msg_init,
+  {.submsg = &xds__annotations__v3__VersioningAnnotation_msg_init},
+
+};
+
+static const upb_MiniTableExtension *extensions_layout[1] = {
+  &xds_annotations_v3_versioning_ext,
+};
+
+const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  extensions_layout,
+  1,
+  0,
+  1,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
new file mode 100644
index 0000000000000..47a42b3c2736c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_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 xds__annotations__v3__VersioningAnnotation_msg_init;
+extern const upb_MiniTableExtension xds_annotations_v3_versioning_ext;
+
+extern const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/authority.upb.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h
similarity index 78%
rename from src/core/ext/upb-generated/xds/core/v3/authority.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/authority.upb.h
index ece8e9d80f136..8f931b923688b 100644
--- a/src/core/ext/upb-generated/xds/core/v3/authority.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/authority.proto
  *
@@ -10,7 +9,13 @@
 #define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/authority.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,19 +23,18 @@ extern "C" {
 #endif
 
 typedef struct xds_core_v3_Authority xds_core_v3_Authority;
-extern const upb_MiniTable xds_core_v3_Authority_msg_init;
 
 
 
 /* xds.core.v3.Authority */
 
 UPB_INLINE xds_core_v3_Authority* xds_core_v3_Authority_new(upb_Arena* arena) {
-  return (xds_core_v3_Authority*)_upb_Message_New(&xds_core_v3_Authority_msg_init, arena);
+  return (xds_core_v3_Authority*)_upb_Message_New(&xds__core__v3__Authority_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_Authority* xds_core_v3_Authority_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_Authority* ret = xds_core_v3_Authority_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_Authority_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__Authority_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -40,7 +44,7 @@ UPB_INLINE xds_core_v3_Authority* xds_core_v3_Authority_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   xds_core_v3_Authority* ret = xds_core_v3_Authority_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_Authority_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__Authority_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -48,13 +52,13 @@ UPB_INLINE xds_core_v3_Authority* xds_core_v3_Authority_parse_ex(const char* buf
 }
 UPB_INLINE char* xds_core_v3_Authority_serialize(const xds_core_v3_Authority* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_Authority_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__Authority_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_Authority_serialize_ex(const xds_core_v3_Authority* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_Authority_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__Authority_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_core_v3_Authority_clear_name(xds_core_v3_Authority* msg) {
@@ -74,8 +78,6 @@ UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_S
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
new file mode 100644
index 0000000000000..bfcc49263ed8c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/authority.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/authority.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_core_v3_Authority__fields[1] = {
+  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__Authority_msg_init = {
+  NULL,
+  &xds_core_v3_Authority__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__core__v3__Authority_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
new file mode 100644
index 0000000000000..b8607ef593bd1
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/authority.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_AUTHORITY_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 xds__core__v3__Authority_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/cidr.upb.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/xds/core/v3/cidr.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
index 57dc04972e5ff..a502dde0b7a8e 100644
--- a/src/core/ext/upb-generated/xds/core/v3/cidr.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/cidr.proto
  *
@@ -10,7 +9,14 @@
 #define XDS_CORE_V3_CIDR_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/cidr.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +24,19 @@ extern "C" {
 #endif
 
 typedef struct xds_core_v3_CidrRange xds_core_v3_CidrRange;
-extern const upb_MiniTable xds_core_v3_CidrRange_msg_init;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
 
 
 
 /* xds.core.v3.CidrRange */
 
 UPB_INLINE xds_core_v3_CidrRange* xds_core_v3_CidrRange_new(upb_Arena* arena) {
-  return (xds_core_v3_CidrRange*)_upb_Message_New(&xds_core_v3_CidrRange_msg_init, arena);
+  return (xds_core_v3_CidrRange*)_upb_Message_New(&xds__core__v3__CidrRange_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_CidrRange* xds_core_v3_CidrRange_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_CidrRange* ret = xds_core_v3_CidrRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE xds_core_v3_CidrRange* xds_core_v3_CidrRange_parse_ex(const char* buf
                            int options, upb_Arena* arena) {
   xds_core_v3_CidrRange* ret = xds_core_v3_CidrRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CidrRange_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CidrRange_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE xds_core_v3_CidrRange* xds_core_v3_CidrRange_parse_ex(const char* buf
 }
 UPB_INLINE char* xds_core_v3_CidrRange_serialize(const xds_core_v3_CidrRange* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CidrRange_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CidrRange_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_CidrRange_serialize_ex(const xds_core_v3_CidrRange* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CidrRange_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CidrRange_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_core_v3_CidrRange_clear_address_prefix(xds_core_v3_CidrRange* msg) {
@@ -97,14 +101,12 @@ UPB_INLINE void xds_core_v3_CidrRange_set_prefix_len(xds_core_v3_CidrRange *msg,
 UPB_INLINE struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_mutable_prefix_len(xds_core_v3_CidrRange* msg, upb_Arena* arena) {
   struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)xds_core_v3_CidrRange_prefix_len(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
     if (sub) xds_core_v3_CidrRange_set_prefix_len(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
new file mode 100644
index 0000000000000..a2fbd4ebac454
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/cidr.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/cidr.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_CidrRange_submsgs[1] = {
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_CidrRange__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__CidrRange_msg_init = {
+  &xds_core_v3_CidrRange_submsgs[0],
+  &xds_core_v3_CidrRange__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__core__v3__CidrRange_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
new file mode 100644
index 0000000000000..c70599c99232c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/cidr.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_CIDR_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 xds__core__v3__CidrRange_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
similarity index 88%
rename from src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
index 54866ba50de49..98a24dfa87666 100644
--- a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/collection_entry.proto
  *
@@ -10,7 +9,15 @@
 #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/resource_locator.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,24 +26,20 @@ extern "C" {
 
 typedef struct xds_core_v3_CollectionEntry xds_core_v3_CollectionEntry;
 typedef struct xds_core_v3_CollectionEntry_InlineEntry xds_core_v3_CollectionEntry_InlineEntry;
-extern const upb_MiniTable xds_core_v3_CollectionEntry_msg_init;
-extern const upb_MiniTable xds_core_v3_CollectionEntry_InlineEntry_msg_init;
 struct google_protobuf_Any;
 struct xds_core_v3_ResourceLocator;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable xds_core_v3_ResourceLocator_msg_init;
 
 
 
 /* xds.core.v3.CollectionEntry */
 
 UPB_INLINE xds_core_v3_CollectionEntry* xds_core_v3_CollectionEntry_new(upb_Arena* arena) {
-  return (xds_core_v3_CollectionEntry*)_upb_Message_New(&xds_core_v3_CollectionEntry_msg_init, arena);
+  return (xds_core_v3_CollectionEntry*)_upb_Message_New(&xds__core__v3__CollectionEntry_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_CollectionEntry* xds_core_v3_CollectionEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_CollectionEntry* ret = xds_core_v3_CollectionEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CollectionEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CollectionEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +49,7 @@ UPB_INLINE xds_core_v3_CollectionEntry* xds_core_v3_CollectionEntry_parse_ex(con
                            int options, upb_Arena* arena) {
   xds_core_v3_CollectionEntry* ret = xds_core_v3_CollectionEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CollectionEntry_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CollectionEntry_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +57,13 @@ UPB_INLINE xds_core_v3_CollectionEntry* xds_core_v3_CollectionEntry_parse_ex(con
 }
 UPB_INLINE char* xds_core_v3_CollectionEntry_serialize(const xds_core_v3_CollectionEntry* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CollectionEntry_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CollectionEntry_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_CollectionEntry_serialize_ex(const xds_core_v3_CollectionEntry* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CollectionEntry_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CollectionEntry_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -110,7 +113,7 @@ UPB_INLINE void xds_core_v3_CollectionEntry_set_locator(xds_core_v3_CollectionEn
 UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_mutable_locator(xds_core_v3_CollectionEntry* msg, upb_Arena* arena) {
   struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_CollectionEntry_locator(msg);
   if (sub == NULL) {
-    sub = (struct xds_core_v3_ResourceLocator*)_upb_Message_New(&xds_core_v3_ResourceLocator_msg_init, arena);
+    sub = (struct xds_core_v3_ResourceLocator*)_upb_Message_New(&xds__core__v3__ResourceLocator_msg_init, arena);
     if (sub) xds_core_v3_CollectionEntry_set_locator(msg, sub);
   }
   return sub;
@@ -122,7 +125,7 @@ UPB_INLINE void xds_core_v3_CollectionEntry_set_inline_entry(xds_core_v3_Collect
 UPB_INLINE struct xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_mutable_inline_entry(xds_core_v3_CollectionEntry* msg, upb_Arena* arena) {
   struct xds_core_v3_CollectionEntry_InlineEntry* sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)xds_core_v3_CollectionEntry_inline_entry(msg);
   if (sub == NULL) {
-    sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)_upb_Message_New(&xds_core_v3_CollectionEntry_InlineEntry_msg_init, arena);
+    sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)_upb_Message_New(&xds__core__v3__CollectionEntry__InlineEntry_msg_init, arena);
     if (sub) xds_core_v3_CollectionEntry_set_inline_entry(msg, sub);
   }
   return sub;
@@ -131,12 +134,12 @@ UPB_INLINE struct xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_Collectio
 /* xds.core.v3.CollectionEntry.InlineEntry */
 
 UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_InlineEntry_new(upb_Arena* arena) {
-  return (xds_core_v3_CollectionEntry_InlineEntry*)_upb_Message_New(&xds_core_v3_CollectionEntry_InlineEntry_msg_init, arena);
+  return (xds_core_v3_CollectionEntry_InlineEntry*)_upb_Message_New(&xds__core__v3__CollectionEntry__InlineEntry_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_InlineEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_CollectionEntry_InlineEntry* ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CollectionEntry__InlineEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -146,7 +149,7 @@ UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_
                            int options, upb_Arena* arena) {
   xds_core_v3_CollectionEntry_InlineEntry* ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__CollectionEntry__InlineEntry_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -154,13 +157,13 @@ UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_
 }
 UPB_INLINE char* xds_core_v3_CollectionEntry_InlineEntry_serialize(const xds_core_v3_CollectionEntry_InlineEntry* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CollectionEntry_InlineEntry_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CollectionEntry__InlineEntry_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_CollectionEntry_InlineEntry_serialize_ex(const xds_core_v3_CollectionEntry_InlineEntry* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_CollectionEntry_InlineEntry_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__CollectionEntry__InlineEntry_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_clear_name(xds_core_v3_CollectionEntry_InlineEntry* msg) {
@@ -216,14 +219,12 @@ UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_resource(xds_core_v3
 UPB_INLINE struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_mutable_resource(xds_core_v3_CollectionEntry_InlineEntry* msg, upb_Arena* arena) {
   struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_CollectionEntry_InlineEntry_resource(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
     if (sub) xds_core_v3_CollectionEntry_InlineEntry_set_resource(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
new file mode 100644
index 0000000000000..60f380194cda3
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
@@ -0,0 +1,78 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/collection_entry.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/resource_locator.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_CollectionEntry_submsgs[2] = {
+  {.submsg = &xds__core__v3__ResourceLocator_msg_init},
+  {.submsg = &xds__core__v3__CollectionEntry__InlineEntry_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_CollectionEntry__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = {
+  &xds_core_v3_CollectionEntry_submsgs[0],
+  &xds_core_v3_CollectionEntry__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_CollectionEntry_InlineEntry__fields[3] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = {
+  &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0],
+  &xds_core_v3_CollectionEntry_InlineEntry__fields[0],
+  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__core__v3__CollectionEntry_msg_init,
+  &xds__core__v3__CollectionEntry__InlineEntry_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
new file mode 100644
index 0000000000000..61a9130dac7fd
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/collection_entry.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_COLLECTION_ENTRY_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 xds__core__v3__CollectionEntry_msg_init;
+extern const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
similarity index 87%
rename from src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
index a8e3d06a07410..86e323f8248fa 100644
--- a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/context_params.proto
  *
@@ -10,7 +9,12 @@
 #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/context_params.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,20 +23,18 @@ extern "C" {
 
 typedef struct xds_core_v3_ContextParams xds_core_v3_ContextParams;
 typedef struct xds_core_v3_ContextParams_ParamsEntry xds_core_v3_ContextParams_ParamsEntry;
-extern const upb_MiniTable xds_core_v3_ContextParams_msg_init;
-extern const upb_MiniTable xds_core_v3_ContextParams_ParamsEntry_msg_init;
 
 
 
 /* xds.core.v3.ContextParams */
 
 UPB_INLINE xds_core_v3_ContextParams* xds_core_v3_ContextParams_new(upb_Arena* arena) {
-  return (xds_core_v3_ContextParams*)_upb_Message_New(&xds_core_v3_ContextParams_msg_init, arena);
+  return (xds_core_v3_ContextParams*)_upb_Message_New(&xds__core__v3__ContextParams_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_ContextParams* xds_core_v3_ContextParams_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_ContextParams* ret = xds_core_v3_ContextParams_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ContextParams_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ContextParams_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +44,7 @@ UPB_INLINE xds_core_v3_ContextParams* xds_core_v3_ContextParams_parse_ex(const c
                            int options, upb_Arena* arena) {
   xds_core_v3_ContextParams* ret = xds_core_v3_ContextParams_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ContextParams_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ContextParams_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +52,13 @@ UPB_INLINE xds_core_v3_ContextParams* xds_core_v3_ContextParams_parse_ex(const c
 }
 UPB_INLINE char* xds_core_v3_ContextParams_serialize(const xds_core_v3_ContextParams* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ContextParams_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ContextParams_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_ContextParams_serialize_ex(const xds_core_v3_ContextParams* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ContextParams_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ContextParams_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_core_v3_ContextParams_clear_params(xds_core_v3_ContextParams* msg) {
@@ -123,8 +125,6 @@ UPB_INLINE void xds_core_v3_ContextParams_ParamsEntry_set_value(xds_core_v3_Cont
   _upb_msg_map_set_value(msg, &value, 0);
 }
 
-extern const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
new file mode 100644
index 0000000000000..0da827c995b5b
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
@@ -0,0 +1,62 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/context_params.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_ContextParams_submsgs[1] = {
+  {.submsg = &xds__core__v3__ContextParams__ParamsEntry_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_ContextParams__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__ContextParams_msg_init = {
+  &xds_core_v3_ContextParams_submsgs[0],
+  &xds_core_v3_ContextParams__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableField xds_core_v3_ContextParams_ParamsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init = {
+  NULL,
+  &xds_core_v3_ContextParams_ParamsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__core__v3__ContextParams_msg_init,
+  &xds__core__v3__ContextParams__ParamsEntry_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
new file mode 100644
index 0000000000000..1b67d6a1001f3
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/context_params.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_CONTEXT_PARAMS_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 xds__core__v3__ContextParams_msg_init;
+extern const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h
new file mode 100644
index 0000000000000..914bc3f876ecd
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h
@@ -0,0 +1,115 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
+#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/core/v3/extension.upb_minitable.h"
+
+#include "validate/validate.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_core_v3_TypedExtensionConfig xds_core_v3_TypedExtensionConfig;
+struct google_protobuf_Any;
+
+
+
+/* xds.core.v3.TypedExtensionConfig */
+
+UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_new(upb_Arena* arena) {
+  return (xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+}
+UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_core_v3_TypedExtensionConfig* ret = xds_core_v3_TypedExtensionConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__core__v3__TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_core_v3_TypedExtensionConfig* ret = xds_core_v3_TypedExtensionConfig_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__core__v3__TypedExtensionConfig_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_core_v3_TypedExtensionConfig_serialize(const xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__core__v3__TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_core_v3_TypedExtensionConfig_serialize_ex(const xds_core_v3_TypedExtensionConfig* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__core__v3__TypedExtensionConfig_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_core_v3_TypedExtensionConfig_clear_name(xds_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_core_v3_TypedExtensionConfig_name(const xds_core_v3_TypedExtensionConfig* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_core_v3_TypedExtensionConfig_clear_typed_config(xds_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_typed_config(const xds_core_v3_TypedExtensionConfig* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_core_v3_TypedExtensionConfig_has_typed_config(const xds_core_v3_TypedExtensionConfig* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_name(xds_core_v3_TypedExtensionConfig *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_typed_config(xds_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_typed_config(xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_TypedExtensionConfig_typed_config(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) xds_core_v3_TypedExtensionConfig_set_typed_config(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
new file mode 100644
index 0000000000000..42010f9a6ce55
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/extension.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_TypedExtensionConfig_submsgs[1] = {
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_TypedExtensionConfig__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = {
+  &xds_core_v3_TypedExtensionConfig_submsgs[0],
+  &xds_core_v3_TypedExtensionConfig__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__core__v3__TypedExtensionConfig_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
new file mode 100644
index 0000000000000..600b8ea7d3de3
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_EXTENSION_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 xds__core__v3__TypedExtensionConfig_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h
new file mode 100644
index 0000000000000..cbb33c73bb43b
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h
@@ -0,0 +1,144 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
+#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/core/v3/resource.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/resource_name.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_core_v3_Resource xds_core_v3_Resource;
+struct google_protobuf_Any;
+struct xds_core_v3_ResourceName;
+
+
+
+/* xds.core.v3.Resource */
+
+UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_new(upb_Arena* arena) {
+  return (xds_core_v3_Resource*)_upb_Message_New(&xds__core__v3__Resource_msg_init, arena);
+}
+UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_core_v3_Resource* ret = xds_core_v3_Resource_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__core__v3__Resource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_core_v3_Resource* ret = xds_core_v3_Resource_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__core__v3__Resource_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_core_v3_Resource_serialize(const xds_core_v3_Resource* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__core__v3__Resource_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_core_v3_Resource_serialize_ex(const xds_core_v3_Resource* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__core__v3__Resource_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_core_v3_Resource_clear_name(xds_core_v3_Resource* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_ResourceName* xds_core_v3_Resource_name(const xds_core_v3_Resource* msg) {
+  const struct xds_core_v3_ResourceName* default_val = NULL;
+  const struct xds_core_v3_ResourceName* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_core_v3_Resource_has_name(const xds_core_v3_Resource* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_core_v3_Resource_clear_version(xds_core_v3_Resource* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_core_v3_Resource_version(const xds_core_v3_Resource* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_core_v3_Resource_clear_resource(xds_core_v3_Resource* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_Any* xds_core_v3_Resource_resource(const xds_core_v3_Resource* msg) {
+  const struct google_protobuf_Any* default_val = NULL;
+  const struct google_protobuf_Any* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_core_v3_Resource_has_resource(const xds_core_v3_Resource* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_core_v3_Resource_set_name(xds_core_v3_Resource *msg, struct xds_core_v3_ResourceName* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xds_core_v3_Resource* msg, upb_Arena* arena) {
+  struct xds_core_v3_ResourceName* sub = (struct xds_core_v3_ResourceName*)xds_core_v3_Resource_name(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_ResourceName*)_upb_Message_New(&xds__core__v3__ResourceName_msg_init, arena);
+    if (sub) xds_core_v3_Resource_set_name(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_core_v3_Resource_set_resource(xds_core_v3_Resource *msg, struct google_protobuf_Any* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds_core_v3_Resource* msg, upb_Arena* arena) {
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_Resource_resource(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
+    if (sub) xds_core_v3_Resource_set_resource(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
new file mode 100644
index 0000000000000..25f2f2f92a0ce
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/resource.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/resource_name.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_Resource_submsgs[2] = {
+  {.submsg = &xds__core__v3__ResourceName_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_Resource__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__Resource_msg_init = {
+  &xds_core_v3_Resource_submsgs[0],
+  &xds_core_v3_Resource__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_pss_1bt},
+    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__core__v3__Resource_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
new file mode 100644
index 0000000000000..070cfe27730dc
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_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 xds__core__v3__Resource_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
similarity index 92%
rename from src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
index e4732b5c4cbdb..77c3f706d678f 100644
--- a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_locator.proto
  *
@@ -10,7 +9,14 @@
 #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/resource_locator.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,10 +25,7 @@ extern "C" {
 
 typedef struct xds_core_v3_ResourceLocator xds_core_v3_ResourceLocator;
 typedef struct xds_core_v3_ResourceLocator_Directive xds_core_v3_ResourceLocator_Directive;
-extern const upb_MiniTable xds_core_v3_ResourceLocator_msg_init;
-extern const upb_MiniTable xds_core_v3_ResourceLocator_Directive_msg_init;
 struct xds_core_v3_ContextParams;
-extern const upb_MiniTable xds_core_v3_ContextParams_msg_init;
 
 typedef enum {
   xds_core_v3_ResourceLocator_XDSTP = 0,
@@ -35,12 +38,12 @@ typedef enum {
 /* xds.core.v3.ResourceLocator */
 
 UPB_INLINE xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_new(upb_Arena* arena) {
-  return (xds_core_v3_ResourceLocator*)_upb_Message_New(&xds_core_v3_ResourceLocator_msg_init, arena);
+  return (xds_core_v3_ResourceLocator*)_upb_Message_New(&xds__core__v3__ResourceLocator_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_ResourceLocator* ret = xds_core_v3_ResourceLocator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceLocator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceLocator_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -50,7 +53,7 @@ UPB_INLINE xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_parse_ex(con
                            int options, upb_Arena* arena) {
   xds_core_v3_ResourceLocator* ret = xds_core_v3_ResourceLocator_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceLocator_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceLocator_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -58,13 +61,13 @@ UPB_INLINE xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_parse_ex(con
 }
 UPB_INLINE char* xds_core_v3_ResourceLocator_serialize(const xds_core_v3_ResourceLocator* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceLocator_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceLocator_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_ResourceLocator_serialize_ex(const xds_core_v3_ResourceLocator* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceLocator_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceLocator_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -195,7 +198,7 @@ UPB_INLINE void xds_core_v3_ResourceLocator_set_exact_context(xds_core_v3_Resour
 UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_mutable_exact_context(xds_core_v3_ResourceLocator* msg, upb_Arena* arena) {
   struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceLocator_exact_context(msg);
   if (sub == NULL) {
-    sub = (struct xds_core_v3_ContextParams*)_upb_Message_New(&xds_core_v3_ContextParams_msg_init, arena);
+    sub = (struct xds_core_v3_ContextParams*)_upb_Message_New(&xds__core__v3__ContextParams_msg_init, arena);
     if (sub) xds_core_v3_ResourceLocator_set_exact_context(msg, sub);
   }
   return sub;
@@ -221,7 +224,7 @@ UPB_INLINE struct xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLoc
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_core_v3_ResourceLocator_Directive* sub = (struct xds_core_v3_ResourceLocator_Directive*)_upb_Message_New(&xds_core_v3_ResourceLocator_Directive_msg_init, arena);
+  struct xds_core_v3_ResourceLocator_Directive* sub = (struct xds_core_v3_ResourceLocator_Directive*)_upb_Message_New(&xds__core__v3__ResourceLocator__Directive_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -230,12 +233,12 @@ UPB_INLINE struct xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLoc
 /* xds.core.v3.ResourceLocator.Directive */
 
 UPB_INLINE xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_Directive_new(upb_Arena* arena) {
-  return (xds_core_v3_ResourceLocator_Directive*)_upb_Message_New(&xds_core_v3_ResourceLocator_Directive_msg_init, arena);
+  return (xds_core_v3_ResourceLocator_Directive*)_upb_Message_New(&xds__core__v3__ResourceLocator__Directive_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_Directive_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_ResourceLocator_Directive* ret = xds_core_v3_ResourceLocator_Directive_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceLocator__Directive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -245,7 +248,7 @@ UPB_INLINE xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_Di
                            int options, upb_Arena* arena) {
   xds_core_v3_ResourceLocator_Directive* ret = xds_core_v3_ResourceLocator_Directive_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceLocator__Directive_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -253,13 +256,13 @@ UPB_INLINE xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_Di
 }
 UPB_INLINE char* xds_core_v3_ResourceLocator_Directive_serialize(const xds_core_v3_ResourceLocator_Directive* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceLocator_Directive_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceLocator__Directive_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_ResourceLocator_Directive_serialize_ex(const xds_core_v3_ResourceLocator_Directive* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceLocator_Directive_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceLocator__Directive_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 typedef enum {
@@ -309,7 +312,7 @@ UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_alt(xds_core_v3_Resour
 UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Directive_mutable_alt(xds_core_v3_ResourceLocator_Directive* msg, upb_Arena* arena) {
   struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_ResourceLocator_Directive_alt(msg);
   if (sub == NULL) {
-    sub = (struct xds_core_v3_ResourceLocator*)_upb_Message_New(&xds_core_v3_ResourceLocator_msg_init, arena);
+    sub = (struct xds_core_v3_ResourceLocator*)_upb_Message_New(&xds__core__v3__ResourceLocator_msg_init, arena);
     if (sub) xds_core_v3_ResourceLocator_Directive_set_alt(msg, sub);
   }
   return sub;
@@ -319,8 +322,6 @@ UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_Reso
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
new file mode 100644
index 0000000000000..3d34fd8c29891
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
@@ -0,0 +1,84 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource_locator.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/resource_locator.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_ResourceLocator_submsgs[2] = {
+  {.submsg = &xds__core__v3__ContextParams_msg_init},
+  {.submsg = &xds__core__v3__ResourceLocator__Directive_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 64), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(8, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = {
+  &xds_core_v3_ResourceLocator_submsgs[0],
+  &xds_core_v3_ResourceLocator__fields[0],
+  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x001800003f00001a, &upb_pss_1bt},
+    {0x002800003f000022, &upb_pss_1bt},
+    {0x004000040500002a, &upb_pom_1bt_maxmaxb},
+    {0x003800003f010032, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_core_v3_ResourceLocator_Directive_submsgs[1] = {
+  {.submsg = &xds__core__v3__ResourceLocator_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = {
+  &xds_core_v3_ResourceLocator_Directive_submsgs[0],
+  &xds_core_v3_ResourceLocator_Directive__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max128b},
+    {0x0008000002000012, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__core__v3__ResourceLocator_msg_init,
+  &xds__core__v3__ResourceLocator__Directive_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
new file mode 100644
index 0000000000000..c51c2ea2a8dfc
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource_locator.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_LOCATOR_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 xds__core__v3__ResourceLocator_msg_init;
+extern const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
rename to src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
index b21872fe8c03c..4e7b4e47b509c 100644
--- a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_name.proto
  *
@@ -10,7 +9,14 @@
 #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/core/v3/resource_name.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +24,19 @@ extern "C" {
 #endif
 
 typedef struct xds_core_v3_ResourceName xds_core_v3_ResourceName;
-extern const upb_MiniTable xds_core_v3_ResourceName_msg_init;
 struct xds_core_v3_ContextParams;
-extern const upb_MiniTable xds_core_v3_ContextParams_msg_init;
 
 
 
 /* xds.core.v3.ResourceName */
 
 UPB_INLINE xds_core_v3_ResourceName* xds_core_v3_ResourceName_new(upb_Arena* arena) {
-  return (xds_core_v3_ResourceName*)_upb_Message_New(&xds_core_v3_ResourceName_msg_init, arena);
+  return (xds_core_v3_ResourceName*)_upb_Message_New(&xds__core__v3__ResourceName_msg_init, arena);
 }
 UPB_INLINE xds_core_v3_ResourceName* xds_core_v3_ResourceName_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_core_v3_ResourceName* ret = xds_core_v3_ResourceName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +46,7 @@ UPB_INLINE xds_core_v3_ResourceName* xds_core_v3_ResourceName_parse_ex(const cha
                            int options, upb_Arena* arena) {
   xds_core_v3_ResourceName* ret = xds_core_v3_ResourceName_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_ResourceName_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__core__v3__ResourceName_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +54,13 @@ UPB_INLINE xds_core_v3_ResourceName* xds_core_v3_ResourceName_parse_ex(const cha
 }
 UPB_INLINE char* xds_core_v3_ResourceName_serialize(const xds_core_v3_ResourceName* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceName_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceName_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_core_v3_ResourceName_serialize_ex(const xds_core_v3_ResourceName* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_ResourceName_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__core__v3__ResourceName_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_core_v3_ResourceName_clear_id(xds_core_v3_ResourceName* msg) {
@@ -127,14 +131,12 @@ UPB_INLINE void xds_core_v3_ResourceName_set_context(xds_core_v3_ResourceName *m
 UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_context(xds_core_v3_ResourceName* msg, upb_Arena* arena) {
   struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceName_context(msg);
   if (sub == NULL) {
-    sub = (struct xds_core_v3_ContextParams*)_upb_Message_New(&xds_core_v3_ContextParams_msg_init, arena);
+    sub = (struct xds_core_v3_ContextParams*)_upb_Message_New(&xds__core__v3__ContextParams_msg_init, arena);
     if (sub) xds_core_v3_ResourceName_set_context(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
new file mode 100644
index 0000000000000..19fb64354a1f3
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
@@ -0,0 +1,59 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource_name.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/core/v3/resource_name.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_core_v3_ResourceName_submsgs[1] = {
+  {.submsg = &xds__core__v3__ContextParams_msg_init},
+};
+
+static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__core__v3__ResourceName_msg_init = {
+  &xds_core_v3_ResourceName_submsgs[0],
+  &xds_core_v3_ResourceName__fields[0],
+  UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_pss_1bt},
+    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__core__v3__ResourceName_msg_init,
+};
+
+const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
new file mode 100644
index 0000000000000..2a3068ac999a9
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource_name.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_NAME_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 xds__core__v3__ResourceName_msg_init;
+
+extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
similarity index 95%
rename from src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h
rename to src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
index 8f69910ec6e66..0945b93129980 100644
--- a/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/data/orca/v3/orca_load_report.proto
  *
@@ -10,7 +9,12 @@
 #define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/data/orca/v3/orca_load_report.upb_minitable.h"
+
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -21,22 +25,18 @@ typedef struct xds_data_orca_v3_OrcaLoadReport xds_data_orca_v3_OrcaLoadReport;
 typedef struct xds_data_orca_v3_OrcaLoadReport_RequestCostEntry xds_data_orca_v3_OrcaLoadReport_RequestCostEntry;
 typedef struct xds_data_orca_v3_OrcaLoadReport_UtilizationEntry xds_data_orca_v3_OrcaLoadReport_UtilizationEntry;
 typedef struct xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry;
-extern const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_msg_init;
-extern const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_msg_init;
-extern const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_msg_init;
-extern const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_msg_init;
 
 
 
 /* xds.data.orca.v3.OrcaLoadReport */
 
 UPB_INLINE xds_data_orca_v3_OrcaLoadReport* xds_data_orca_v3_OrcaLoadReport_new(upb_Arena* arena) {
-  return (xds_data_orca_v3_OrcaLoadReport*)_upb_Message_New(&xds_data_orca_v3_OrcaLoadReport_msg_init, arena);
+  return (xds_data_orca_v3_OrcaLoadReport*)_upb_Message_New(&xds__data__orca__v3__OrcaLoadReport_msg_init, arena);
 }
 UPB_INLINE xds_data_orca_v3_OrcaLoadReport* xds_data_orca_v3_OrcaLoadReport_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_data_orca_v3_OrcaLoadReport* ret = xds_data_orca_v3_OrcaLoadReport_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_data_orca_v3_OrcaLoadReport_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__data__orca__v3__OrcaLoadReport_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +46,7 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport* xds_data_orca_v3_OrcaLoadReport_pars
                            int options, upb_Arena* arena) {
   xds_data_orca_v3_OrcaLoadReport* ret = xds_data_orca_v3_OrcaLoadReport_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_data_orca_v3_OrcaLoadReport_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__data__orca__v3__OrcaLoadReport_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +54,13 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport* xds_data_orca_v3_OrcaLoadReport_pars
 }
 UPB_INLINE char* xds_data_orca_v3_OrcaLoadReport_serialize(const xds_data_orca_v3_OrcaLoadReport* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_data_orca_v3_OrcaLoadReport_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__data__orca__v3__OrcaLoadReport_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_data_orca_v3_OrcaLoadReport_serialize_ex(const xds_data_orca_v3_OrcaLoadReport* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_data_orca_v3_OrcaLoadReport_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__data__orca__v3__OrcaLoadReport_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_clear_cpu_utilization(xds_data_orca_v3_OrcaLoadReport* msg) {
@@ -341,8 +341,6 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_set_value(xds_
   _upb_msg_map_set_value(msg, &value, sizeof(double));
 }
 
-extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
new file mode 100644
index 0000000000000..3723fd01e83f5
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
@@ -0,0 +1,126 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/data/orca/v3/orca_load_report.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/data/orca/v3/orca_load_report.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_data_orca_v3_OrcaLoadReport_submsgs[3] = {
+  {.submsg = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init},
+  {.submsg = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init},
+  {.submsg = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init},
+};
+
+static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = {
+  {1, UPB_SIZE(16, 0), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(24, 8), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(32, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(0, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(4, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 40, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, 48, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(8, 56), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(56, 64), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = {
+  &xds_data_orca_v3_OrcaLoadReport_submsgs[0],
+  &xds_data_orca_v3_OrcaLoadReport__fields[0],
+  UPB_SIZE(64, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+    {0x000800003f000011, &upb_psf8_1bt},
+    {0x001000003f000018, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002800003f000031, &upb_psf8_1bt},
+    {0x003000003f000039, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x004000003f000049, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init = {
+  NULL,
+  &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init = {
+  NULL,
+  &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init = {
+  NULL,
+  &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x001800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[4] = {
+  &xds__data__orca__v3__OrcaLoadReport_msg_init,
+  &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init,
+  &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init,
+  &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init,
+};
+
+const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  4,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
new file mode 100644
index 0000000000000..4dca993433cf5
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/data/orca/v3/orca_load_report.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_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 xds__data__orca__v3__OrcaLoadReport_msg_init;
+extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init;
+extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init;
+extern const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init;
+
+extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
similarity index 90%
rename from src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h
rename to src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
index 2937fdab55a61..a8607008ade26 100644
--- a/src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/service/orca/v3/orca.proto
  *
@@ -10,7 +9,13 @@
 #define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/service/orca/v3/orca.upb_minitable.h"
+
+#include "xds/data/orca/v3/orca_load_report.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +23,19 @@ extern "C" {
 #endif
 
 typedef struct xds_service_orca_v3_OrcaLoadReportRequest xds_service_orca_v3_OrcaLoadReportRequest;
-extern const upb_MiniTable xds_service_orca_v3_OrcaLoadReportRequest_msg_init;
 struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
 
 
 
 /* xds.service.orca.v3.OrcaLoadReportRequest */
 
 UPB_INLINE xds_service_orca_v3_OrcaLoadReportRequest* xds_service_orca_v3_OrcaLoadReportRequest_new(upb_Arena* arena) {
-  return (xds_service_orca_v3_OrcaLoadReportRequest*)_upb_Message_New(&xds_service_orca_v3_OrcaLoadReportRequest_msg_init, arena);
+  return (xds_service_orca_v3_OrcaLoadReportRequest*)_upb_Message_New(&xds__service__orca__v3__OrcaLoadReportRequest_msg_init, arena);
 }
 UPB_INLINE xds_service_orca_v3_OrcaLoadReportRequest* xds_service_orca_v3_OrcaLoadReportRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_service_orca_v3_OrcaLoadReportRequest* ret = xds_service_orca_v3_OrcaLoadReportRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_service_orca_v3_OrcaLoadReportRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__service__orca__v3__OrcaLoadReportRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +45,7 @@ UPB_INLINE xds_service_orca_v3_OrcaLoadReportRequest* xds_service_orca_v3_OrcaLo
                            int options, upb_Arena* arena) {
   xds_service_orca_v3_OrcaLoadReportRequest* ret = xds_service_orca_v3_OrcaLoadReportRequest_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_service_orca_v3_OrcaLoadReportRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__service__orca__v3__OrcaLoadReportRequest_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +53,13 @@ UPB_INLINE xds_service_orca_v3_OrcaLoadReportRequest* xds_service_orca_v3_OrcaLo
 }
 UPB_INLINE char* xds_service_orca_v3_OrcaLoadReportRequest_serialize(const xds_service_orca_v3_OrcaLoadReportRequest* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_service_orca_v3_OrcaLoadReportRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__service__orca__v3__OrcaLoadReportRequest_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_service_orca_v3_OrcaLoadReportRequest_serialize_ex(const xds_service_orca_v3_OrcaLoadReportRequest* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_service_orca_v3_OrcaLoadReportRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__service__orca__v3__OrcaLoadReportRequest_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_service_orca_v3_OrcaLoadReportRequest_clear_report_interval(xds_service_orca_v3_OrcaLoadReportRequest* msg) {
@@ -119,7 +122,7 @@ UPB_INLINE void xds_service_orca_v3_OrcaLoadReportRequest_set_report_interval(xd
 UPB_INLINE struct google_protobuf_Duration* xds_service_orca_v3_OrcaLoadReportRequest_mutable_report_interval(xds_service_orca_v3_OrcaLoadReportRequest* msg, upb_Arena* arena) {
   struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)xds_service_orca_v3_OrcaLoadReportRequest_report_interval(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
     if (sub) xds_service_orca_v3_OrcaLoadReportRequest_set_report_interval(msg, sub);
   }
   return sub;
@@ -149,8 +152,6 @@ UPB_INLINE bool xds_service_orca_v3_OrcaLoadReportRequest_add_request_cost_names
   return true;
 }
 
-extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
new file mode 100644
index 0000000000000..cffdf252e36c5
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/service/orca/v3/orca.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/service/orca/v3/orca.upb_minitable.h"
+#include "xds/data/orca/v3/orca_load_report.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = {
+  {.submsg = &google__protobuf__Duration_msg_init},
+};
+
+static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = {
+  &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0],
+  &xds_service_orca_v3_OrcaLoadReportRequest__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x001000003f000012, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__service__orca__v3__OrcaLoadReportRequest_msg_init,
+};
+
+const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
new file mode 100644
index 0000000000000..b0a75eee87f8c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/service/orca/v3/orca.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_
+#define XDS_SERVICE_ORCA_V3_ORCA_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 xds__service__orca__v3__OrcaLoadReportRequest_msg_init;
+
+extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
new file mode 100644
index 0000000000000..dd2e4222aa984
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
@@ -0,0 +1,101 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/cel.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/v3/cel.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_CelMatcher xds_type_matcher_v3_CelMatcher;
+struct xds_type_v3_CelExpression;
+
+
+
+/* xds.type.matcher.v3.CelMatcher */
+
+UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_CelMatcher*)_upb_Message_New(&xds__type__matcher__v3__CelMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_CelMatcher* ret = xds_type_matcher_v3_CelMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__CelMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_CelMatcher* ret = xds_type_matcher_v3_CelMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__CelMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_CelMatcher_serialize(const xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__CelMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_CelMatcher_serialize_ex(const xds_type_matcher_v3_CelMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__CelMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_CelMatcher_clear_expr_match(xds_type_matcher_v3_CelMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_expr_match(const xds_type_matcher_v3_CelMatcher* msg) {
+  const struct xds_type_v3_CelExpression* default_val = NULL;
+  const struct xds_type_v3_CelExpression* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_CelMatcher_has_expr_match(const xds_type_matcher_v3_CelMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_expr_match(xds_type_matcher_v3_CelMatcher *msg, struct xds_type_v3_CelExpression* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_mutable_expr_match(xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena) {
+  struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_matcher_v3_CelMatcher_expr_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_v3_CelExpression*)_upb_Message_New(&xds__type__v3__CelExpression_msg_init, arena);
+    if (sub) xds_type_matcher_v3_CelMatcher_set_expr_match(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
new file mode 100644
index 0000000000000..f97c407c134c0
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/cel.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/v3/cel.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_CelMatcher_submsgs[1] = {
+  {.submsg = &xds__type__v3__CelExpression_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[1] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = {
+  &xds_type_matcher_v3_CelMatcher_submsgs[0],
+  &xds_type_matcher_v3_CelMatcher__fields[0],
+  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__type__matcher__v3__CelMatcher_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
new file mode 100644
index 0000000000000..229c34bfcc70c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_CEL_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 xds__type__matcher__v3__CelMatcher_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h
rename to src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
index 2896e7f7b2e40..9822cb8e3a7be 100644
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/domain.proto
  *
@@ -10,7 +9,14 @@
 #define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/type/matcher/v3/domain.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,22 +25,19 @@ extern "C" {
 
 typedef struct xds_type_matcher_v3_ServerNameMatcher xds_type_matcher_v3_ServerNameMatcher;
 typedef struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher xds_type_matcher_v3_ServerNameMatcher_DomainMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_ServerNameMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init;
 struct xds_type_matcher_v3_Matcher_OnMatch;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_OnMatch_msg_init;
 
 
 
 /* xds.type.matcher.v3.ServerNameMatcher */
 
 UPB_INLINE xds_type_matcher_v3_ServerNameMatcher* xds_type_matcher_v3_ServerNameMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_ServerNameMatcher*)_upb_Message_New(&xds_type_matcher_v3_ServerNameMatcher_msg_init, arena);
+  return (xds_type_matcher_v3_ServerNameMatcher*)_upb_Message_New(&xds__type__matcher__v3__ServerNameMatcher_msg_init, arena);
 }
 UPB_INLINE xds_type_matcher_v3_ServerNameMatcher* xds_type_matcher_v3_ServerNameMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_type_matcher_v3_ServerNameMatcher* ret = xds_type_matcher_v3_ServerNameMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ServerNameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ServerNameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -44,7 +47,7 @@ UPB_INLINE xds_type_matcher_v3_ServerNameMatcher* xds_type_matcher_v3_ServerName
                            int options, upb_Arena* arena) {
   xds_type_matcher_v3_ServerNameMatcher* ret = xds_type_matcher_v3_ServerNameMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ServerNameMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ServerNameMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -52,13 +55,13 @@ UPB_INLINE xds_type_matcher_v3_ServerNameMatcher* xds_type_matcher_v3_ServerName
 }
 UPB_INLINE char* xds_type_matcher_v3_ServerNameMatcher_serialize(const xds_type_matcher_v3_ServerNameMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ServerNameMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ServerNameMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_type_matcher_v3_ServerNameMatcher_serialize_ex(const xds_type_matcher_v3_ServerNameMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ServerNameMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ServerNameMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_clear_domain_matchers(xds_type_matcher_v3_ServerNameMatcher* msg) {
@@ -120,7 +123,7 @@ UPB_INLINE struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* sub = (struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher*)_upb_Message_New(&xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, arena);
+  struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* sub = (struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher*)_upb_Message_New(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -129,12 +132,12 @@ UPB_INLINE struct xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_
 /* xds.type.matcher.v3.ServerNameMatcher.DomainMatcher */
 
 UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_ServerNameMatcher_DomainMatcher*)_upb_Message_New(&xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, arena);
+  return (xds_type_matcher_v3_ServerNameMatcher_DomainMatcher*)_upb_Message_New(&xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, arena);
 }
 UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* ret = xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -144,7 +147,7 @@ UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_matcher
                            int options, upb_Arena* arena) {
   xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* ret = xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -152,13 +155,13 @@ UPB_INLINE xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* xds_type_matcher
 }
 UPB_INLINE char* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_serialize(const xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_serialize_ex(const xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_clear_domains(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg) {
@@ -245,14 +248,12 @@ UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_set_on_match
 UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_mutable_on_match(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg, upb_Arena* arena) {
   struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_on_match(msg);
   if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
     if (sub) xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_set_on_match(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
new file mode 100644
index 0000000000000..8e3ce6dbf0801
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
@@ -0,0 +1,72 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/domain.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/domain.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = {
+  &xds_type_matcher_v3_ServerNameMatcher_submsgs[0],
+  &xds_type_matcher_v3_ServerNameMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init = {
+  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0],
+  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prs_1bt},
+    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__type__matcher__v3__ServerNameMatcher_msg_init,
+  &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
new file mode 100644
index 0000000000000..40a7d6c72c3e7
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/domain.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_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 xds__type__matcher__v3__ServerNameMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
new file mode 100644
index 0000000000000..be663ce5bd6a6
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
@@ -0,0 +1,71 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/http_inputs.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_HttpAttributesCelMatchInput xds_type_matcher_v3_HttpAttributesCelMatchInput;
+
+
+
+/* xds.type.matcher.v3.HttpAttributesCelMatchInput */
+
+UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_HttpAttributesCelMatchInput*)_upb_Message_New(&xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_HttpAttributesCelMatchInput* ret = xds_type_matcher_v3_HttpAttributesCelMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_HttpAttributesCelMatchInput* ret = xds_type_matcher_v3_HttpAttributesCelMatchInput_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize(const xds_type_matcher_v3_HttpAttributesCelMatchInput* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize_ex(const xds_type_matcher_v3_HttpAttributesCelMatchInput* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
new file mode 100644
index 0000000000000..286e0bac6c234
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/http_inputs.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
new file mode 100644
index 0000000000000..11c8ca398dda6
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_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 xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
similarity index 89%
rename from src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h
rename to src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
index 022916a9ae3b9..3a6d5140576dc 100644
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/ip.proto
  *
@@ -10,7 +9,15 @@
 #define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/type/matcher/v3/ip.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/cidr.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -19,24 +26,20 @@ extern "C" {
 
 typedef struct xds_type_matcher_v3_IPMatcher xds_type_matcher_v3_IPMatcher;
 typedef struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher xds_type_matcher_v3_IPMatcher_IPRangeMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_IPMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init;
 struct xds_core_v3_CidrRange;
 struct xds_type_matcher_v3_Matcher_OnMatch;
-extern const upb_MiniTable xds_core_v3_CidrRange_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_OnMatch_msg_init;
 
 
 
 /* xds.type.matcher.v3.IPMatcher */
 
 UPB_INLINE xds_type_matcher_v3_IPMatcher* xds_type_matcher_v3_IPMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_IPMatcher*)_upb_Message_New(&xds_type_matcher_v3_IPMatcher_msg_init, arena);
+  return (xds_type_matcher_v3_IPMatcher*)_upb_Message_New(&xds__type__matcher__v3__IPMatcher_msg_init, arena);
 }
 UPB_INLINE xds_type_matcher_v3_IPMatcher* xds_type_matcher_v3_IPMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_type_matcher_v3_IPMatcher* ret = xds_type_matcher_v3_IPMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_IPMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__IPMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -46,7 +49,7 @@ UPB_INLINE xds_type_matcher_v3_IPMatcher* xds_type_matcher_v3_IPMatcher_parse_ex
                            int options, upb_Arena* arena) {
   xds_type_matcher_v3_IPMatcher* ret = xds_type_matcher_v3_IPMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_IPMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__IPMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -54,13 +57,13 @@ UPB_INLINE xds_type_matcher_v3_IPMatcher* xds_type_matcher_v3_IPMatcher_parse_ex
 }
 UPB_INLINE char* xds_type_matcher_v3_IPMatcher_serialize(const xds_type_matcher_v3_IPMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_IPMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__IPMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_type_matcher_v3_IPMatcher_serialize_ex(const xds_type_matcher_v3_IPMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_IPMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__IPMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_type_matcher_v3_IPMatcher_clear_range_matchers(xds_type_matcher_v3_IPMatcher* msg) {
@@ -122,7 +125,7 @@ UPB_INLINE struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher* sub = (struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, arena);
+  struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher* sub = (struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -131,12 +134,12 @@ UPB_INLINE struct xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher
 /* xds.type.matcher.v3.IPMatcher.IPRangeMatcher */
 
 UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_IPMatcher_IPRangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, arena);
+  return (xds_type_matcher_v3_IPMatcher_IPRangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, arena);
 }
 UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_type_matcher_v3_IPMatcher_IPRangeMatcher* ret = xds_type_matcher_v3_IPMatcher_IPRangeMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -146,7 +149,7 @@ UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher_v3_IPM
                            int options, upb_Arena* arena) {
   xds_type_matcher_v3_IPMatcher_IPRangeMatcher* ret = xds_type_matcher_v3_IPMatcher_IPRangeMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -154,13 +157,13 @@ UPB_INLINE xds_type_matcher_v3_IPMatcher_IPRangeMatcher* xds_type_matcher_v3_IPM
 }
 UPB_INLINE char* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_serialize(const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_serialize_ex(const xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_clear_ranges(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg) {
@@ -248,7 +251,7 @@ UPB_INLINE struct xds_core_v3_CidrRange* xds_type_matcher_v3_IPMatcher_IPRangeMa
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct xds_core_v3_CidrRange* sub = (struct xds_core_v3_CidrRange*)_upb_Message_New(&xds_core_v3_CidrRange_msg_init, arena);
+  struct xds_core_v3_CidrRange* sub = (struct xds_core_v3_CidrRange*)_upb_Message_New(&xds__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -260,7 +263,7 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_on_match(xds_ty
 UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_mutable_on_match(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, upb_Arena* arena) {
   struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_IPMatcher_IPRangeMatcher_on_match(msg);
   if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
     if (sub) xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_on_match(msg, sub);
   }
   return sub;
@@ -270,8 +273,6 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_t
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
new file mode 100644
index 0000000000000..04716e43897dc
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
@@ -0,0 +1,75 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/ip.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/ip.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/cidr.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = {
+  &xds_type_matcher_v3_IPMatcher_submsgs[0],
+  &xds_type_matcher_v3_IPMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = {
+  {.submsg = &xds__core__v3__CidrRange_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[3] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = {
+  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x000100003f000018, &upb_psb1_1bt},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__type__matcher__v3__IPMatcher_msg_init,
+  &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
new file mode 100644
index 0000000000000..c20f904848f18
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/ip.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_IP_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 xds__type__matcher__v3__IPMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
new file mode 100644
index 0000000000000..692ee1442653c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
@@ -0,0 +1,1107 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/extension.upb_minitable.h"
+#include "xds/type/matcher/v3/string.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_Matcher xds_type_matcher_v3_Matcher;
+typedef struct xds_type_matcher_v3_Matcher_OnMatch xds_type_matcher_v3_Matcher_OnMatch;
+typedef struct xds_type_matcher_v3_Matcher_MatcherList xds_type_matcher_v3_Matcher_MatcherList;
+typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate xds_type_matcher_v3_Matcher_MatcherList_Predicate;
+typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate;
+typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList;
+typedef struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher;
+typedef struct xds_type_matcher_v3_Matcher_MatcherTree xds_type_matcher_v3_Matcher_MatcherTree;
+typedef struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap xds_type_matcher_v3_Matcher_MatcherTree_MatchMap;
+typedef struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry;
+struct xds_core_v3_TypedExtensionConfig;
+struct xds_type_matcher_v3_StringMatcher;
+
+
+
+/* xds.type.matcher.v3.Matcher */
+
+UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher* ret = xds_type_matcher_v3_Matcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher* ret = xds_type_matcher_v3_Matcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_serialize(const xds_type_matcher_v3_Matcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_serialize_ex(const xds_type_matcher_v3_Matcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_Matcher_matcher_type_matcher_list = 1,
+  xds_type_matcher_v3_Matcher_matcher_type_matcher_tree = 2,
+  xds_type_matcher_v3_Matcher_matcher_type_NOT_SET = 0
+} xds_type_matcher_v3_Matcher_matcher_type_oneofcases;
+UPB_INLINE xds_type_matcher_v3_Matcher_matcher_type_oneofcases xds_type_matcher_v3_Matcher_matcher_type_case(const xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_matcher_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_clear_matcher_list(xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_matcher_list(const xds_type_matcher_v3_Matcher* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_has_matcher_list(const xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_clear_matcher_tree(xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_matcher_tree(const xds_type_matcher_v3_Matcher* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherTree* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherTree* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_has_matcher_tree(const xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_clear_on_no_match(xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_on_no_match(const xds_type_matcher_v3_Matcher* msg) {
+  const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_has_on_no_match(const xds_type_matcher_v3_Matcher* msg) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_list(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherList* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_mutable_matcher_list(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)xds_type_matcher_v3_Matcher_matcher_list(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_set_matcher_list(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_tree(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherTree* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_mutable_matcher_tree(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherTree* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)xds_type_matcher_v3_Matcher_matcher_tree(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherTree_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_set_matcher_tree(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_set_on_no_match(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_mutable_on_no_match(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_on_no_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_set_on_no_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.OnMatch */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_OnMatch* ret = xds_type_matcher_v3_Matcher_OnMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_OnMatch* ret = xds_type_matcher_v3_Matcher_OnMatch_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__OnMatch_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_OnMatch_serialize(const xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__OnMatch_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_OnMatch_serialize_ex(const xds_type_matcher_v3_Matcher_OnMatch* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__OnMatch_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_Matcher_OnMatch_on_match_matcher = 1,
+  xds_type_matcher_v3_Matcher_OnMatch_on_match_action = 2,
+  xds_type_matcher_v3_Matcher_OnMatch_on_match_NOT_SET = 0
+} xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases;
+UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases xds_type_matcher_v3_Matcher_OnMatch_on_match_case(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_clear_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_matcher(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const xds_type_matcher_v3_Matcher* default_val = NULL;
+  const xds_type_matcher_v3_Matcher* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_matcher(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_clear_action(xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_action(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct xds_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_action(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_matcher(xds_type_matcher_v3_Matcher_OnMatch *msg, xds_type_matcher_v3_Matcher* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_mutable_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)xds_type_matcher_v3_Matcher_OnMatch_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_OnMatch_set_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_action(xds_type_matcher_v3_Matcher_OnMatch *msg, struct xds_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_mutable_action(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
+  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_OnMatch_action(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_OnMatch_set_action(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherList */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList* ret = xds_type_matcher_v3_Matcher_MatcherList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList* ret = xds_type_matcher_v3_Matcher_MatcherList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_serialize(const xds_type_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_clear_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const* xds_type_matcher_v3_Matcher_MatcherList_matchers(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_upb_array(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_has_matchers(const xds_type_matcher_v3_Matcher_MatcherList* msg) {
+  size_t size;
+  xds_type_matcher_v3_Matcher_MatcherList_matchers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_matcher_v3_Matcher_MatcherList_mutable_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_matcher_v3_Matcher_MatcherList_resize_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_add_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherList.Predicate */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_single_predicate = 1,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_or_matcher = 2,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_and_matcher = 3,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_not_matcher = 4,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_NOT_SET = 0
+} xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases;
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_case(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_single_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_or_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_and_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_not_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_value_match = 2,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_custom_match = 3,
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_NOT_SET = 0
+} xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases;
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_case(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct xds_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_input(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct xds_type_matcher_v3_StringMatcher* default_val = NULL;
+  const struct xds_type_matcher_v3_StringMatcher* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_value_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct xds_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_custom_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds__type__matcher__v3__StringMatcher_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
+  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_clear_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_has_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
+  size_t size;
+  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_Matcher_MatcherList_Predicate**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_resize_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_predicate(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_match(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherTree */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherTree_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherTree* ret = xds_type_matcher_v3_Matcher_MatcherTree_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherTree* ret = xds_type_matcher_v3_Matcher_MatcherTree_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherTree_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_serialize(const xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherTree_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherTree* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherTree_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_exact_match_map = 2,
+  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_prefix_match_map = 3,
+  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_custom_match = 4,
+  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_NOT_SET = 0
+} xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases;
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases xds_type_matcher_v3_Matcher_MatcherTree_tree_type_case(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_input(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_input(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct xds_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_input(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_exact_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
+  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_prefix_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_custom_match(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
+  const struct xds_core_v3_TypedExtensionConfig* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_custom_match(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_input(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_input(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_input(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_input(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
+  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_custom_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherTree.MatchMap */
+
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret = xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret = xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_serialize(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_clear_map(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE size_t xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_size(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  return map ? _upb_Map_Size(map) : 0;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch** val) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Map* map = upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_clear(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return;
+  _upb_Map_Clear(map);
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
+  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_delete(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return false;
+  return _upb_Map_Delete(map, &key, 0, NULL);
+}
+UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
+  if (!map) return NULL;
+  return (xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
+}
+
+/* xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry */
+
+UPB_INLINE upb_StringView xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_key(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  upb_StringView ret;
+  _upb_msg_map_key(msg, &ret, 0);
+  return ret;
+}
+UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_value(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  xds_type_matcher_v3_Matcher_OnMatch* ret;
+  _upb_msg_map_value(msg, &ret, sizeof(ret));
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_has_value(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_value(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
+  _upb_msg_map_set_value(msg, &value, sizeof(xds_type_matcher_v3_Matcher_OnMatch*));
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
new file mode 100644
index 0000000000000..aec7f443764f0
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
@@ -0,0 +1,265 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "xds/core/v3/extension.upb_minitable.h"
+#include "xds/type/matcher/v3/string.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_submsgs[3] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = {
+  {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = {
+  &xds_type_matcher_v3_Matcher_submsgs[0],
+  &xds_type_matcher_v3_Matcher__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000040100000a, &upb_pom_1bt_max64b},
+    {0x0010000402010012, &upb_pom_1bt_max64b},
+    {0x000800000102001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = {
+  {.submsg = &xds__type__matcher__v3__Matcher_msg_init},
+  {.submsg = &xds__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = {
+  &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0],
+  &xds_type_matcher_v3_Matcher_OnMatch__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
+  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_max64b},
+    {0x0008000002010012, &upb_pom_1bt_max64b},
+    {0x000800000302001a, &upb_pom_1bt_max64b},
+    {0x0008000004030022, &upb_pom_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
+  {.submsg = &xds__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &xds__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &xds__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000402010012, &upb_pom_1bt_maxmaxb},
+    {0x001000040302001a, &upb_pom_1bt_maxmaxb},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
+  {.submsg = &xds__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &xds__core__v3__TypedExtensionConfig_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[4] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
+    {0x0010000402010012, &upb_pom_1bt_max64b},
+    {0x001000040302001a, &upb_pom_1bt_max64b},
+    {0x0010000404030022, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
+  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
+  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[10] = {
+  &xds__type__matcher__v3__Matcher_msg_init,
+  &xds__type__matcher__v3__Matcher__OnMatch_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherList_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherTree_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init,
+  &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  10,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
new file mode 100644
index 0000000000000..2c7520d58bcba
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_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 xds__type__matcher__v3__Matcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
new file mode 100644
index 0000000000000..748babe2f5c4c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
@@ -0,0 +1,726 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/range.upb_minitable.h"
+
+#include "xds/type/v3/range.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_Int64RangeMatcher xds_type_matcher_v3_Int64RangeMatcher;
+typedef struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher;
+typedef struct xds_type_matcher_v3_Int32RangeMatcher xds_type_matcher_v3_Int32RangeMatcher;
+typedef struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher;
+typedef struct xds_type_matcher_v3_DoubleRangeMatcher xds_type_matcher_v3_DoubleRangeMatcher;
+typedef struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher;
+struct xds_type_matcher_v3_Matcher_OnMatch;
+struct xds_type_v3_DoubleRange;
+struct xds_type_v3_Int32Range;
+struct xds_type_v3_Int64Range;
+
+
+
+/* xds.type.matcher.v3.Int64RangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Int64RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int64RangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Int64RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int64RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Int64RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int64RangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_serialize(const xds_type_matcher_v3_Int64RangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int64RangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int64RangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int64RangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_clear_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int64RangeMatcher_range_matchers(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_has_range_matchers(const xds_type_matcher_v3_Int64RangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_Int64RangeMatcher_range_matchers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int64RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int64RangeMatcher_resize_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_v3_Int64Range* const* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct xds_type_v3_Int64Range* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
+  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct xds_type_v3_Int64Range**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct xds_type_v3_Int64Range**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_v3_Int64Range* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_v3_Int64Range* sub = (struct xds_type_v3_Int64Range*)_upb_Message_New(&xds__type__v3__Int64Range_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.Int32RangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Int32RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int32RangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Int32RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int32RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Int32RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int32RangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_serialize(const xds_type_matcher_v3_Int32RangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int32RangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int32RangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int32RangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_clear_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int32RangeMatcher_range_matchers(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_has_range_matchers(const xds_type_matcher_v3_Int32RangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_Int32RangeMatcher_range_matchers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int32RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int32RangeMatcher_resize_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_v3_Int32Range* const* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct xds_type_v3_Int32Range* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
+  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct xds_type_v3_Int32Range**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct xds_type_v3_Int32Range**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_v3_Int32Range* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_v3_Int32Range* sub = (struct xds_type_v3_Int32Range*)_upb_Message_New(&xds__type__v3__Int32Range_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.matcher.v3.DoubleRangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_DoubleRangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__DoubleRangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_DoubleRangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__DoubleRangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_DoubleRangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__DoubleRangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_serialize(const xds_type_matcher_v3_DoubleRangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__DoubleRangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_serialize_ex(const xds_type_matcher_v3_DoubleRangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__DoubleRangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_clear_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const* xds_type_matcher_v3_DoubleRangeMatcher_range_matchers(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_has_range_matchers(const xds_type_matcher_v3_DoubleRangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_DoubleRangeMatcher_range_matchers(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matcher_v3_DoubleRangeMatcher_mutable_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matcher_v3_DoubleRangeMatcher_resize_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_add_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher */
+
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher*)_upb_Message_New(&xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_v3_DoubleRange* const* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const struct xds_type_v3_DoubleRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
+  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
+  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (struct xds_type_v3_DoubleRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (struct xds_type_v3_DoubleRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_v3_DoubleRange* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_v3_DoubleRange* sub = (struct xds_type_v3_DoubleRange*)_upb_Message_New(&xds__type__v3__DoubleRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds__type__matcher__v3__Matcher__OnMatch_msg_init, arena);
+    if (sub) xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
new file mode 100644
index 0000000000000..dcbeb22e436ca
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
@@ -0,0 +1,157 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/range.upb_minitable.h"
+#include "xds/type/v3/range.upb_minitable.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = {
+  &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int64RangeMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = {
+  {.submsg = &xds__type__v3__Int64Range_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init = {
+  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = {
+  &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int32RangeMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = {
+  {.submsg = &xds__type__v3__Int32Range_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init = {
+  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = {
+  &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_DoubleRangeMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = {
+  {.submsg = &xds__type__v3__DoubleRange_msg_init},
+  {.submsg = &xds__type__matcher__v3__Matcher__OnMatch_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init = {
+  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0],
+  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
+    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[6] = {
+  &xds__type__matcher__v3__Int64RangeMatcher_msg_init,
+  &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init,
+  &xds__type__matcher__v3__Int32RangeMatcher_msg_init,
+  &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init,
+  &xds__type__matcher__v3__DoubleRangeMatcher_msg_init,
+  &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  6,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
new file mode 100644
index 0000000000000..6fee8eb6dea8e
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_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 xds__type__matcher__v3__Int64RangeMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
new file mode 100644
index 0000000000000..08c1f00d159af
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
@@ -0,0 +1,159 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/regex.upb_minitable.h"
+
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_RegexMatcher xds_type_matcher_v3_RegexMatcher;
+typedef struct xds_type_matcher_v3_RegexMatcher_GoogleRE2 xds_type_matcher_v3_RegexMatcher_GoogleRE2;
+
+
+
+/* xds.type.matcher.v3.RegexMatcher */
+
+UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_RegexMatcher*)_upb_Message_New(&xds__type__matcher__v3__RegexMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_RegexMatcher* ret = xds_type_matcher_v3_RegexMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__RegexMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_RegexMatcher* ret = xds_type_matcher_v3_RegexMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__RegexMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_serialize(const xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__RegexMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_serialize_ex(const xds_type_matcher_v3_RegexMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__RegexMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_RegexMatcher_engine_type_google_re2 = 1,
+  xds_type_matcher_v3_RegexMatcher_engine_type_NOT_SET = 0
+} xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases;
+UPB_INLINE xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases xds_type_matcher_v3_RegexMatcher_engine_type_case(const xds_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_RegexMatcher_clear_google_re2(xds_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_google_re2(const xds_type_matcher_v3_RegexMatcher* msg) {
+  const xds_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL;
+  const xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_RegexMatcher_has_google_re2(const xds_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_RegexMatcher_clear_regex(xds_type_matcher_v3_RegexMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_type_matcher_v3_RegexMatcher_regex(const xds_type_matcher_v3_RegexMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_google_re2(xds_type_matcher_v3_RegexMatcher *msg, xds_type_matcher_v3_RegexMatcher_GoogleRE2* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_mutable_google_re2(xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)xds_type_matcher_v3_RegexMatcher_google_re2(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, arena);
+    if (sub) xds_type_matcher_v3_RegexMatcher_set_google_re2(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_regex(xds_type_matcher_v3_RegexMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.type.matcher.v3.RegexMatcher.GoogleRE2 */
+
+UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret = xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret = xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize(const xds_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const xds_type_matcher_v3_RegexMatcher_GoogleRE2* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
new file mode 100644
index 0000000000000..195b8e0ca036c
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
@@ -0,0 +1,58 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/regex.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_RegexMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = {
+  {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = {
+  &xds_type_matcher_v3_RegexMatcher_submsgs[0],
+  &xds_type_matcher_v3_RegexMatcher__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pom_1bt_max64b},
+    {0x000800003f000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = {
+  NULL,
+  NULL,
+  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__type__matcher__v3__RegexMatcher_msg_init,
+  &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
new file mode 100644
index 0000000000000..826e3b04e0c3f
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_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 xds__type__matcher__v3__RegexMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
new file mode 100644
index 0000000000000..05581e7c7c4ae
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
@@ -0,0 +1,304 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/matcher/v3/string.upb_minitable.h"
+
+#include "xds/type/matcher/v3/regex.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_matcher_v3_StringMatcher xds_type_matcher_v3_StringMatcher;
+typedef struct xds_type_matcher_v3_ListStringMatcher xds_type_matcher_v3_ListStringMatcher;
+struct xds_type_matcher_v3_RegexMatcher;
+
+
+
+/* xds.type.matcher.v3.StringMatcher */
+
+UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds__type__matcher__v3__StringMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_StringMatcher* ret = xds_type_matcher_v3_StringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__StringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_StringMatcher* ret = xds_type_matcher_v3_StringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__StringMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_StringMatcher_serialize(const xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__StringMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_StringMatcher_serialize_ex(const xds_type_matcher_v3_StringMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__StringMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_matcher_v3_StringMatcher_match_pattern_exact = 1,
+  xds_type_matcher_v3_StringMatcher_match_pattern_prefix = 2,
+  xds_type_matcher_v3_StringMatcher_match_pattern_suffix = 3,
+  xds_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5,
+  xds_type_matcher_v3_StringMatcher_match_pattern_contains = 7,
+  xds_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0
+} xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases;
+UPB_INLINE xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases xds_type_matcher_v3_StringMatcher_match_pattern_case(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_exact(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_exact(const xds_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_exact(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_prefix(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_prefix(const xds_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_prefix(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_suffix(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_suffix(const xds_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_suffix(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_safe_regex(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_safe_regex(const xds_type_matcher_v3_StringMatcher* msg) {
+  const struct xds_type_matcher_v3_RegexMatcher* default_val = NULL;
+  const struct xds_type_matcher_v3_RegexMatcher* ret;
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_safe_regex(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_ignore_case(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_ignore_case(const xds_type_matcher_v3_StringMatcher* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_contains(xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_contains(const xds_type_matcher_v3_StringMatcher* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_contains(const xds_type_matcher_v3_StringMatcher* msg) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_exact(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_prefix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_suffix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_safe_regex(xds_type_matcher_v3_StringMatcher *msg, struct xds_type_matcher_v3_RegexMatcher* value) {
+  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_mutable_safe_regex(xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) {
+  struct xds_type_matcher_v3_RegexMatcher* sub = (struct xds_type_matcher_v3_RegexMatcher*)xds_type_matcher_v3_StringMatcher_safe_regex(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_matcher_v3_RegexMatcher*)_upb_Message_New(&xds__type__matcher__v3__RegexMatcher_msg_init, arena);
+    if (sub) xds_type_matcher_v3_StringMatcher_set_safe_regex(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_ignore_case(xds_type_matcher_v3_StringMatcher *msg, bool value) {
+  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_contains(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.type.matcher.v3.ListStringMatcher */
+
+UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_new(upb_Arena* arena) {
+  return (xds_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&xds__type__matcher__v3__ListStringMatcher_msg_init, arena);
+}
+UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_matcher_v3_ListStringMatcher* ret = xds_type_matcher_v3_ListStringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ListStringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_matcher_v3_ListStringMatcher* ret = xds_type_matcher_v3_ListStringMatcher_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__matcher__v3__ListStringMatcher_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_matcher_v3_ListStringMatcher_serialize(const xds_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ListStringMatcher_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_matcher_v3_ListStringMatcher_serialize_ex(const xds_type_matcher_v3_ListStringMatcher* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__matcher__v3__ListStringMatcher_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_matcher_v3_ListStringMatcher_clear_patterns(xds_type_matcher_v3_ListStringMatcher* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_matcher_v3_StringMatcher* const* xds_type_matcher_v3_ListStringMatcher_patterns(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const xds_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_upb_array(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool xds_type_matcher_v3_ListStringMatcher_has_patterns(const xds_type_matcher_v3_ListStringMatcher* msg) {
+  size_t size;
+  xds_type_matcher_v3_ListStringMatcher_patterns(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMatcher_mutable_patterns(xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (xds_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMatcher_resize_patterns(xds_type_matcher_v3_ListStringMatcher* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStringMatcher_add_patterns(xds_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds__type__matcher__v3__StringMatcher_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
new file mode 100644
index 0000000000000..c2adde689272d
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
@@ -0,0 +1,79 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/matcher/v3/string.upb_minitable.h"
+#include "xds/type/matcher/v3/regex.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_matcher_v3_StringMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__RegexMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = {
+  {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = {
+  &xds_type_matcher_v3_StringMatcher_submsgs[0],
+  &xds_type_matcher_v3_StringMatcher__fields[0],
+  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040100000a, &upb_pos_1bt},
+    {0x0008000402000012, &upb_pos_1bt},
+    {0x000800040300001a, &upb_pos_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800040500002a, &upb_pom_1bt_maxmaxb},
+    {0x000000003f000030, &upb_psb1_1bt},
+    {0x000800040700003a, &upb_pos_1bt},
+  })
+};
+
+static const upb_MiniTableSub xds_type_matcher_v3_ListStringMatcher_submsgs[1] = {
+  {.submsg = &xds__type__matcher__v3__StringMatcher_msg_init},
+};
+
+static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = {
+  &xds_type_matcher_v3_ListStringMatcher_submsgs[0],
+  &xds_type_matcher_v3_ListStringMatcher__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__type__matcher__v3__StringMatcher_msg_init,
+  &xds__type__matcher__v3__ListStringMatcher_msg_init,
+};
+
+const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
new file mode 100644
index 0000000000000..407e2d72d7450
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_STRING_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 xds__type__matcher__v3__StringMatcher_msg_init;
+extern const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init;
+
+extern const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h
new file mode 100644
index 0000000000000..8ac1f3c851c2e
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h
@@ -0,0 +1,233 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/v3/cel.upb_minitable.h"
+
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/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 xds_type_v3_CelExpression xds_type_v3_CelExpression;
+typedef struct xds_type_v3_CelExtractString xds_type_v3_CelExtractString;
+struct google_api_expr_v1alpha1_CheckedExpr;
+struct google_api_expr_v1alpha1_ParsedExpr;
+struct google_protobuf_StringValue;
+
+
+
+/* xds.type.v3.CelExpression */
+
+UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_new(upb_Arena* arena) {
+  return (xds_type_v3_CelExpression*)_upb_Message_New(&xds__type__v3__CelExpression_msg_init, arena);
+}
+UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_v3_CelExpression* ret = xds_type_v3_CelExpression_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__CelExpression_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_v3_CelExpression* ret = xds_type_v3_CelExpression_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__CelExpression_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_v3_CelExpression_serialize(const xds_type_v3_CelExpression* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__CelExpression_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_v3_CelExpression_serialize_ex(const xds_type_v3_CelExpression* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__CelExpression_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+typedef enum {
+  xds_type_v3_CelExpression_expr_specifier_parsed_expr = 1,
+  xds_type_v3_CelExpression_expr_specifier_checked_expr = 2,
+  xds_type_v3_CelExpression_expr_specifier_NOT_SET = 0
+} xds_type_v3_CelExpression_expr_specifier_oneofcases;
+UPB_INLINE xds_type_v3_CelExpression_expr_specifier_oneofcases xds_type_v3_CelExpression_expr_specifier_case(const xds_type_v3_CelExpression* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (xds_type_v3_CelExpression_expr_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
+}
+UPB_INLINE void xds_type_v3_CelExpression_clear_parsed_expr(xds_type_v3_CelExpression* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_parsed_expr(const xds_type_v3_CelExpression* msg) {
+  const struct google_api_expr_v1alpha1_ParsedExpr* default_val = NULL;
+  const struct google_api_expr_v1alpha1_ParsedExpr* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_v3_CelExpression_has_parsed_expr(const xds_type_v3_CelExpression* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_v3_CelExpression_clear_checked_expr(xds_type_v3_CelExpression* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_checked_expr(const xds_type_v3_CelExpression* msg) {
+  const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL;
+  const struct google_api_expr_v1alpha1_CheckedExpr* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_v3_CelExpression_has_checked_expr(const xds_type_v3_CelExpression* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_v3_CelExpression_set_parsed_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_ParsedExpr* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_mutable_parsed_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) {
+  struct google_api_expr_v1alpha1_ParsedExpr* sub = (struct google_api_expr_v1alpha1_ParsedExpr*)xds_type_v3_CelExpression_parsed_expr(msg);
+  if (sub == NULL) {
+    sub = (struct google_api_expr_v1alpha1_ParsedExpr*)_upb_Message_New(&google__api__expr__v1alpha1__ParsedExpr_msg_init, arena);
+    if (sub) xds_type_v3_CelExpression_set_parsed_expr(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_v3_CelExpression_set_checked_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_mutable_checked_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) {
+  struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)xds_type_v3_CelExpression_checked_expr(msg);
+  if (sub == NULL) {
+    sub = (struct google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google__api__expr__v1alpha1__CheckedExpr_msg_init, arena);
+    if (sub) xds_type_v3_CelExpression_set_checked_expr(msg, sub);
+  }
+  return sub;
+}
+
+/* xds.type.v3.CelExtractString */
+
+UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_new(upb_Arena* arena) {
+  return (xds_type_v3_CelExtractString*)_upb_Message_New(&xds__type__v3__CelExtractString_msg_init, arena);
+}
+UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_v3_CelExtractString* ret = xds_type_v3_CelExtractString_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__CelExtractString_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_v3_CelExtractString* ret = xds_type_v3_CelExtractString_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__CelExtractString_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_v3_CelExtractString_serialize(const xds_type_v3_CelExtractString* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__CelExtractString_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_v3_CelExtractString_serialize_ex(const xds_type_v3_CelExtractString* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__CelExtractString_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_v3_CelExtractString_clear_expr_extract(xds_type_v3_CelExtractString* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const xds_type_v3_CelExpression* xds_type_v3_CelExtractString_expr_extract(const xds_type_v3_CelExtractString* msg) {
+  const xds_type_v3_CelExpression* default_val = NULL;
+  const xds_type_v3_CelExpression* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_v3_CelExtractString_has_expr_extract(const xds_type_v3_CelExtractString* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void xds_type_v3_CelExtractString_clear_default_value(xds_type_v3_CelExtractString* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const struct google_protobuf_StringValue* xds_type_v3_CelExtractString_default_value(const xds_type_v3_CelExtractString* msg) {
+  const struct google_protobuf_StringValue* default_val = NULL;
+  const struct google_protobuf_StringValue* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool xds_type_v3_CelExtractString_has_default_value(const xds_type_v3_CelExtractString* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void xds_type_v3_CelExtractString_set_expr_extract(xds_type_v3_CelExtractString *msg, xds_type_v3_CelExpression* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutable_expr_extract(xds_type_v3_CelExtractString* msg, upb_Arena* arena) {
+  struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_v3_CelExtractString_expr_extract(msg);
+  if (sub == NULL) {
+    sub = (struct xds_type_v3_CelExpression*)_upb_Message_New(&xds__type__v3__CelExpression_msg_init, arena);
+    if (sub) xds_type_v3_CelExtractString_set_expr_extract(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void xds_type_v3_CelExtractString_set_default_value(xds_type_v3_CelExtractString *msg, struct google_protobuf_StringValue* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_mutable_default_value(xds_type_v3_CelExtractString* msg, upb_Arena* arena) {
+  struct google_protobuf_StringValue* sub = (struct google_protobuf_StringValue*)xds_type_v3_CelExtractString_default_value(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_StringValue*)_upb_Message_New(&google__protobuf__StringValue_msg_init, arena);
+    if (sub) xds_type_v3_CelExtractString_set_default_value(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
new file mode 100644
index 0000000000000..a066b7dfae200
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
@@ -0,0 +1,79 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/v3/cel.upb_minitable.h"
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_v3_CelExpression_submsgs[2] = {
+  {.submsg = &google__api__expr__v1alpha1__ParsedExpr_msg_init},
+  {.submsg = &google__api__expr__v1alpha1__CheckedExpr_msg_init},
+};
+
+static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = {
+  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__CelExpression_msg_init = {
+  &xds_type_v3_CelExpression_submsgs[0],
+  &xds_type_v3_CelExpression__fields[0],
+  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
+    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub xds_type_v3_CelExtractString_submsgs[2] = {
+  {.submsg = &xds__type__v3__CelExpression_msg_init},
+  {.submsg = &google__protobuf__StringValue_msg_init},
+};
+
+static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__CelExtractString_msg_init = {
+  &xds_type_v3_CelExtractString_submsgs[0],
+  &xds_type_v3_CelExtractString__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[2] = {
+  &xds__type__v3__CelExpression_msg_init,
+  &xds__type__v3__CelExtractString_msg_init,
+};
+
+const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  2,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
new file mode 100644
index 0000000000000..493050da9e4dc
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
@@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_V3_CEL_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 xds__type__v3__CelExpression_msg_init;
+extern const upb_MiniTable xds__type__v3__CelExtractString_msg_init;
+
+extern const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/v3/range.upb.h
new file mode 100644
index 0000000000000..a92474fb68951
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/range.upb.h
@@ -0,0 +1,235 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "xds/type/v3/range.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct xds_type_v3_Int64Range xds_type_v3_Int64Range;
+typedef struct xds_type_v3_Int32Range xds_type_v3_Int32Range;
+typedef struct xds_type_v3_DoubleRange xds_type_v3_DoubleRange;
+
+
+
+/* xds.type.v3.Int64Range */
+
+UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_new(upb_Arena* arena) {
+  return (xds_type_v3_Int64Range*)_upb_Message_New(&xds__type__v3__Int64Range_msg_init, arena);
+}
+UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_v3_Int64Range* ret = xds_type_v3_Int64Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__Int64Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_v3_Int64Range* ret = xds_type_v3_Int64Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__Int64Range_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_v3_Int64Range_serialize(const xds_type_v3_Int64Range* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__Int64Range_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_v3_Int64Range_serialize_ex(const xds_type_v3_Int64Range* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__Int64Range_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_v3_Int64Range_clear_start(xds_type_v3_Int64Range* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t xds_type_v3_Int64Range_start(const xds_type_v3_Int64Range* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_type_v3_Int64Range_clear_end(xds_type_v3_Int64Range* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t xds_type_v3_Int64Range_end(const xds_type_v3_Int64Range* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_type_v3_Int64Range_set_start(xds_type_v3_Int64Range *msg, int64_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_v3_Int64Range_set_end(xds_type_v3_Int64Range *msg, int64_t value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.type.v3.Int32Range */
+
+UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_new(upb_Arena* arena) {
+  return (xds_type_v3_Int32Range*)_upb_Message_New(&xds__type__v3__Int32Range_msg_init, arena);
+}
+UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_v3_Int32Range* ret = xds_type_v3_Int32Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__Int32Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_v3_Int32Range* ret = xds_type_v3_Int32Range_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__Int32Range_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_v3_Int32Range_serialize(const xds_type_v3_Int32Range* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__Int32Range_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_v3_Int32Range_serialize_ex(const xds_type_v3_Int32Range* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__Int32Range_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_v3_Int32Range_clear_start(xds_type_v3_Int32Range* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t xds_type_v3_Int32Range_start(const xds_type_v3_Int32Range* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_type_v3_Int32Range_clear_end(xds_type_v3_Int32Range* msg) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t xds_type_v3_Int32Range_end(const xds_type_v3_Int32Range* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_type_v3_Int32Range_set_start(xds_type_v3_Int32Range *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_v3_Int32Range_set_end(xds_type_v3_Int32Range *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* xds.type.v3.DoubleRange */
+
+UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_new(upb_Arena* arena) {
+  return (xds_type_v3_DoubleRange*)_upb_Message_New(&xds__type__v3__DoubleRange_msg_init, arena);
+}
+UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  xds_type_v3_DoubleRange* ret = xds_type_v3_DoubleRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__DoubleRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  xds_type_v3_DoubleRange* ret = xds_type_v3_DoubleRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &xds__type__v3__DoubleRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* xds_type_v3_DoubleRange_serialize(const xds_type_v3_DoubleRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__DoubleRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* xds_type_v3_DoubleRange_serialize_ex(const xds_type_v3_DoubleRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &xds__type__v3__DoubleRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void xds_type_v3_DoubleRange_clear_start(xds_type_v3_DoubleRange* msg) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double xds_type_v3_DoubleRange_start(const xds_type_v3_DoubleRange* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE void xds_type_v3_DoubleRange_clear_end(xds_type_v3_DoubleRange* msg) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double xds_type_v3_DoubleRange_end(const xds_type_v3_DoubleRange* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+
+UPB_INLINE void xds_type_v3_DoubleRange_set_start(xds_type_v3_DoubleRange *msg, double value) {
+  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, double value) {
+  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
new file mode 100644
index 0000000000000..04f33c8ba9e7b
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c
@@ -0,0 +1,82 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/v3/range.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableField xds_type_v3_Int64Range__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__Int64Range_msg_init = {
+  NULL,
+  &xds_type_v3_Int64Range__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv8_1bt},
+    {0x000800003f000010, &upb_psv8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_type_v3_Int32Range__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__Int32Range_msg_init = {
+  NULL,
+  &xds_type_v3_Int32Range__fields[0],
+  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000008, &upb_psv4_1bt},
+    {0x000400003f000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField xds_type_v3_DoubleRange__fields[2] = {
+  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__DoubleRange_msg_init = {
+  NULL,
+  &xds_type_v3_DoubleRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f000009, &upb_psf8_1bt},
+    {0x000800003f000011, &upb_psf8_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[3] = {
+  &xds__type__v3__Int64Range_msg_init,
+  &xds__type__v3__Int32Range_msg_init,
+  &xds__type__v3__DoubleRange_msg_init,
+};
+
+const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  3,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
new file mode 100644
index 0000000000000..be9c19771f7f6
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_V3_RANGE_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 xds__type__v3__Int64Range_msg_init;
+extern const upb_MiniTable xds__type__v3__Int32Range_msg_init;
+extern const upb_MiniTable xds__type__v3__DoubleRange_msg_init;
+
+extern const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
similarity index 85%
rename from src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h
rename to src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
index 6393a32bfab5a..4293d1aea90b8 100644
--- a/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/v3/typed_struct.proto
  *
@@ -10,7 +9,12 @@
 #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_
 
 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "xds/type/v3/typed_struct.upb_minitable.h"
+
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
@@ -18,21 +22,19 @@ extern "C" {
 #endif
 
 typedef struct xds_type_v3_TypedStruct xds_type_v3_TypedStruct;
-extern const upb_MiniTable xds_type_v3_TypedStruct_msg_init;
 struct google_protobuf_Struct;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
 
 
 
 /* xds.type.v3.TypedStruct */
 
 UPB_INLINE xds_type_v3_TypedStruct* xds_type_v3_TypedStruct_new(upb_Arena* arena) {
-  return (xds_type_v3_TypedStruct*)_upb_Message_New(&xds_type_v3_TypedStruct_msg_init, arena);
+  return (xds_type_v3_TypedStruct*)_upb_Message_New(&xds__type__v3__TypedStruct_msg_init, arena);
 }
 UPB_INLINE xds_type_v3_TypedStruct* xds_type_v3_TypedStruct_parse(const char* buf, size_t size, upb_Arena* arena) {
   xds_type_v3_TypedStruct* ret = xds_type_v3_TypedStruct_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_TypedStruct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &xds__type__v3__TypedStruct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -42,7 +44,7 @@ UPB_INLINE xds_type_v3_TypedStruct* xds_type_v3_TypedStruct_parse_ex(const char*
                            int options, upb_Arena* arena) {
   xds_type_v3_TypedStruct* ret = xds_type_v3_TypedStruct_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_TypedStruct_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &xds__type__v3__TypedStruct_msg_init, extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -50,13 +52,13 @@ UPB_INLINE xds_type_v3_TypedStruct* xds_type_v3_TypedStruct_parse_ex(const char*
 }
 UPB_INLINE char* xds_type_v3_TypedStruct_serialize(const xds_type_v3_TypedStruct* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_TypedStruct_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__v3__TypedStruct_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* xds_type_v3_TypedStruct_serialize_ex(const xds_type_v3_TypedStruct* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_TypedStruct_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &xds__type__v3__TypedStruct_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void xds_type_v3_TypedStruct_clear_type_url(xds_type_v3_TypedStruct* msg) {
@@ -97,14 +99,12 @@ UPB_INLINE void xds_type_v3_TypedStruct_set_value(xds_type_v3_TypedStruct *msg,
 UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value(xds_type_v3_TypedStruct* msg, upb_Arena* arena) {
   struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)xds_type_v3_TypedStruct_value(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
+    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google__protobuf__Struct_msg_init, arena);
     if (sub) xds_type_v3_TypedStruct_set_value(msg, sub);
   }
   return sub;
 }
 
-extern const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
new file mode 100644
index 0000000000000..2db979084f207
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/typed_struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "xds/type/v3/typed_struct.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub xds_type_v3_TypedStruct_submsgs[1] = {
+  {.submsg = &google__protobuf__Struct_msg_init},
+};
+
+static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = {
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable xds__type__v3__TypedStruct_msg_init = {
+  &xds_type_v3_TypedStruct_submsgs[0],
+  &xds_type_v3_TypedStruct__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_pss_1bt},
+    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[1] = {
+  &xds__type__v3__TypedStruct_msg_init,
+};
+
+const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
new file mode 100644
index 0000000000000..d3a98b59d948e
--- /dev/null
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/typed_struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_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 xds__type__v3__TypedStruct_msg_init;
+
+extern const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c
deleted file mode 100644
index ab7727246d25a..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/certs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/certs.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_Certificates_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_Certificate_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_Certificates_msg_init = {
-  &envoy_admin_v3_Certificates_submsgs[0],
-  &envoy_admin_v3_Certificates__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_Certificate_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_CertificateDetails_msg_init},
-  {.submsg = &envoy_admin_v3_CertificateDetails_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_Certificate_msg_init = {
-  &envoy_admin_v3_Certificate_submsgs[0],
-  &envoy_admin_v3_Certificate__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-    {0x000800003f010012, &upb_prm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_submsgs[4] = {
-  {.submsg = &envoy_admin_v3_SubjectAlternateName_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 56), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 64), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 72), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_CertificateDetails_msg_init = {
-  &envoy_admin_v3_CertificateDetails_submsgs[0],
-  &envoy_admin_v3_CertificateDetails__fields[0],
-  UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_prm_1bt_max64b},
-    {0x003000003f000020, &upb_psv8_1bt},
-    {0x003800000101002a, &upb_psm_1bt_maxmaxb},
-    {0x0040000002020032, &upb_psm_1bt_maxmaxb},
-    {0x004800000303003a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_CertificateDetails_OcspDetails_msg_init = {
-  &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0],
-  &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_SubjectAlternateName_msg_init = {
-  NULL,
-  &envoy_admin_v3_SubjectAlternateName__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x000800000300001a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_admin_v3_Certificates_msg_init,
-  &envoy_admin_v3_Certificate_msg_init,
-  &envoy_admin_v3_CertificateDetails_msg_init,
-  &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init,
-  &envoy_admin_v3_SubjectAlternateName_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c
deleted file mode 100644
index 7ed727982ba41..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/clusters.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/clusters.upb.h"
-#include "envoy/admin/v3/metrics.upb.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_Clusters_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_ClusterStatus_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_Clusters_msg_init = {
-  &envoy_admin_v3_Clusters_submsgs[0],
-  &envoy_admin_v3_Clusters__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ClusterStatus_submsgs[4] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_admin_v3_HostStatus_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 48), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(36, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ClusterStatus_msg_init = {
-  &envoy_admin_v3_ClusterStatus_submsgs[0],
-  &envoy_admin_v3_ClusterStatus__fields[0],
-  UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x002000003f010022, &upb_prm_1bt_max128b},
-    {0x002800000202002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000003030032, &upb_psm_1bt_maxmaxb},
-    {0x003800003f00003a, &upb_pss_1bt},
-    {0x004800003f000042, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_HostStatus_submsgs[6] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_admin_v3_SimpleMetric_msg_init},
-  {.submsg = &envoy_admin_v3_HostHealthStatus_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 40), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_HostStatus_msg_init = {
-  &envoy_admin_v3_HostStatus_submsgs[0],
-  &envoy_admin_v3_HostStatus__fields[0],
-  UPB_SIZE(48, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001800003f010012, &upb_prm_1bt_maxmaxb},
-    {0x002000000202001a, &upb_psm_1bt_max64b},
-    {0x0028000003030022, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x003000003f000032, &upb_pss_1bt},
-    {0x000800003f000038, &upb_psv4_1bt},
-    {0x0040000004040042, &upb_psm_1bt_maxmaxb},
-    {0x004800000505004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_admin_v3_HostHealthStatus__fields[8] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_HostHealthStatus_msg_init = {
-  NULL,
-  &envoy_admin_v3_HostHealthStatus__fields[0],
-  16, 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x000900003f000028, &upb_psb1_1bt},
-    {0x000a00003f000030, &upb_psb1_1bt},
-    {0x000b00003f000038, &upb_psb1_1bt},
-    {0x000c00003f000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &envoy_admin_v3_Clusters_msg_init,
-  &envoy_admin_v3_ClusterStatus_msg_init,
-  &envoy_admin_v3_HostStatus_msg_init,
-  &envoy_admin_v3_HostHealthStatus_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c
deleted file mode 100644
index 9e6d48e2b2907..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/config_dump.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/config_dump.upb.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_ConfigDump_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ConfigDump_msg_init = {
-  &envoy_admin_v3_ConfigDump_submsgs[0],
-  &envoy_admin_v3_ConfigDump__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_BootstrapConfigDump_msg_init = {
-  &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
-  &envoy_admin_v3_BootstrapConfigDump__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = {
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init},
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init},
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_submsgs[0],
-  &envoy_admin_v3_SecretsConfigDump__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-    {0x000800003f010012, &upb_prm_1bt_max128b},
-    {0x001000003f02001a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0030000002010022, &upb_psm_1bt_maxmaxb},
-    {0x003800000302002a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init = {
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_admin_v3_ConfigDump_msg_init,
-  &envoy_admin_v3_BootstrapConfigDump_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c
deleted file mode 100644
index 387d1ad678be4..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/config_dump_shared.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_UpdateFailureState_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init = {
-  &envoy_admin_v3_UpdateFailureState_submsgs[0],
-  &envoy_admin_v3_UpdateFailureState__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] = {
-  {1, UPB_SIZE(8, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_submsgs[0],
-  &envoy_admin_v3_ListenersConfigDump__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x001800003f01001a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
-  &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = {
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = {
-  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init = {
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
-  UPB_SIZE(32, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x003000000403002a, &upb_psm_1bt_max64b},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_submsgs[3] = {
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init},
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init},
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
-  {1, UPB_SIZE(12, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_submsgs[0],
-  &envoy_admin_v3_ClustersConfigDump__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x001800003f01001a, &upb_prm_1bt_max64b},
-    {0x002000003f020022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init = {
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init},
-  {.submsg = &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
-  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_submsgs[0],
-  &envoy_admin_v3_RoutesConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_prm_1bt_max64b},
-    {0x000800003f01001a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init = {
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init},
-  {.submsg = &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
-  &envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-    {0x000800003f010012, &upb_prm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
-    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init = {
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_prm_1bt_maxmaxb},
-    {0x0030000001010022, &upb_psm_1bt_maxmaxb},
-    {0x003800000202002a, &upb_psm_1bt_max64b},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init},
-  {.submsg = &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] = {
-  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
-  &envoy_admin_v3_EndpointsConfigDump__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_prm_1bt_max64b},
-    {0x000800003f01001a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init = {
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_EcdsConfigDump_msg_init = {
-  &envoy_admin_v3_EcdsConfigDump_submsgs[0],
-  &envoy_admin_v3_EcdsConfigDump__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init = {
-  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0],
-  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[19] = {
-  &envoy_admin_v3_UpdateFailureState_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init,
-  &envoy_admin_v3_EcdsConfigDump_msg_init,
-  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  19,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c
deleted file mode 100644
index 7970bd7c6416d..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/init_dump.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/init_dump.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_msg_init = {
-  &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0],
-  &envoy_admin_v3_UnreadyTargetsDumps__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init = {
-  NULL,
-  &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_UnreadyTargetsDumps_msg_init,
-  &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c
deleted file mode 100644
index 770aae84bf600..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/listeners.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/listeners.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_Listeners_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_ListenerStatus_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_Listeners_msg_init = {
-  &envoy_admin_v3_Listeners_submsgs[0],
-  &envoy_admin_v3_Listeners__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_ListenerStatus_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ListenerStatus_msg_init = {
-  &envoy_admin_v3_ListenerStatus_submsgs[0],
-  &envoy_admin_v3_ListenerStatus__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f01001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_Listeners_msg_init,
-  &envoy_admin_v3_ListenerStatus_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c
deleted file mode 100644
index ed8642320adbe..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/memory.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/memory.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_admin_v3_Memory__fields[6] = {
-  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_Memory_msg_init = {
-  NULL,
-  &envoy_admin_v3_Memory__fields[0],
-  48, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x001000003f000018, &upb_psv8_1bt},
-    {0x001800003f000020, &upb_psv8_1bt},
-    {0x002000003f000028, &upb_psv8_1bt},
-    {0x002800003f000030, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_Memory_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c
deleted file mode 100644
index cf78842429897..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/metrics.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/metrics.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_admin_v3_SimpleMetric__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init = {
-  NULL,
-  &envoy_admin_v3_SimpleMetric__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x001000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_SimpleMetric_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c
deleted file mode 100644
index 398803e9c2f8d..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/mutex_stats.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/mutex_stats.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_admin_v3_MutexStats__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_MutexStats_msg_init = {
-  NULL,
-  &envoy_admin_v3_MutexStats__fields[0],
-  24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x001000003f000018, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_MutexStats_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c
deleted file mode 100644
index 0373b230a9ecf..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/server_info.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/server_info.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_ServerInfo_submsgs[4] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_admin_v3_CommandLineOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
-  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 64), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_ServerInfo_msg_init = {
-  &envoy_admin_v3_ServerInfo_submsgs[0],
-  &envoy_admin_v3_ServerInfo__fields[0],
-  UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
-    {0x002800003f00002a, &upb_pss_1bt},
-    {0x0038000003020032, &upb_psm_1bt_maxmaxb},
-    {0x004000000403003a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = {
-  {1, UPB_SIZE(72, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(80, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(88, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 96, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(104, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(112, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(120, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(128, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(136, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(144, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(152, 208), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(16, 224), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(20, 232), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(24, 240), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(28, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(32, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(33, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(36, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(40, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(41, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(42, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(44, 248), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(48, 31), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(49, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(160, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(52, 36), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(56, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {35, UPB_SIZE(168, 272), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(60, 44), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {38, UPB_SIZE(68, 288), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_CommandLineOptions_msg_init = {
-  &envoy_admin_v3_CommandLineOptions_submsgs[0],
-  &envoy_admin_v3_CommandLineOptions__fields[0],
-  UPB_SIZE(176, 296), 34, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f000008, &upb_psv8_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x004000003f00001a, &upb_pss_1bt},
-    {0x005000003f000022, &upb_pss_1bt},
-    {0x000800003f000028, &upb_psb1_1bt},
-    {0x006000003f000032, &upb_pss_1bt},
-    {0x000c00003f000038, &upb_psv4_1bt},
-    {0x007000003f000042, &upb_pss_1bt},
-    {0x008000003f00004a, &upb_pss_1bt},
-    {0x009000003f000052, &upb_pss_1bt},
-    {0x00a000003f00005a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00b000003f00006a, &upb_pss_1bt},
-    {0x00c000003f000072, &upb_pss_1bt},
-    {0x00d000003f00007a, &upb_pss_1bt},
-    {0x00e0000001000182, &upb_psm_2bt_maxmaxb},
-    {0x00e800000201018a, &upb_psm_2bt_maxmaxb},
-    {0x00f0000003020192, &upb_psm_2bt_maxmaxb},
-    {0x001000003f000198, &upb_psv4_2bt},
-    {0x002c00003f0002a0, &upb_psv4_2bt},
-    {0x003000003f0002a8, &upb_psb1_2bt},
-    {0x001400003f0001b0, &upb_psb1_2bt},
-    {0x001500003f0001b8, &upb_psb1_2bt},
-    {0x001800003f0001c0, &upb_psv4_2bt},
-    {0x001c00003f0001c8, &upb_psb1_2bt},
-    {0x001d00003f0001d0, &upb_psb1_2bt},
-    {0x001e00003f0001d8, &upb_psb1_2bt},
-    {0x00f800003f0001e2, &upb_prs_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001f00003f0001f0, &upb_psb1_2bt},
-    {0x002000003f0001f8, &upb_psb1_2bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_ServerInfo_msg_init,
-  &envoy_admin_v3_CommandLineOptions_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c
deleted file mode 100644
index d12f40c66de83..0000000000000
--- a/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/admin/v3/tap.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/admin/v3/tap.upb.h"
-#include "envoy/config/tap/v3/common.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_admin_v3_TapRequest_submsgs[1] = {
-  {.submsg = &envoy_config_tap_v3_TapConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_admin_v3_TapRequest_msg_init = {
-  &envoy_admin_v3_TapRequest_submsgs[0],
-  &envoy_admin_v3_TapRequest__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_TapRequest_msg_init,
-};
-
-const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
deleted file mode 100644
index d35a0d96e06ed..0000000000000
--- a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/annotations/deprecation.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext = {
-  {189503207, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext = {
-  {157299826, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext = {
-  {70100853, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext = {
-  {181198657, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
-  {.submsg = NULL},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[4] = {
-  &envoy_annotations_disallowed_by_default_ext,
-  &envoy_annotations_deprecated_at_minor_version_ext,
-  &envoy_annotations_disallowed_by_default_enum_ext,
-  &envoy_annotations_deprecated_at_minor_version_enum_ext,
-};
-
-const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  extensions_layout,
-  0,
-  0,
-  4,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/annotations/resource.upb.c b/src/core/ext/upb-generated/envoy/annotations/resource.upb.c
deleted file mode 100644
index fc4c1167ff0ba..0000000000000
--- a/src/core/ext/upb-generated/envoy/annotations/resource.upb.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/annotations/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/annotations/resource.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_annotations_ResourceAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init = {
-  NULL,
-  &envoy_annotations_ResourceAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_annotations_ResourceAnnotation_msg_init,
-};
-
-extern const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;
-const upb_MiniTableExtension envoy_annotations_resource_ext = {
-  {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_ServiceOptions_msg_init,
-  {.submsg = &envoy_annotations_ResourceAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &envoy_annotations_resource_ext,
-};
-
-const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/annotations/resource.upb.h b/src/core/ext/upb-generated/envoy/annotations/resource.upb.h
deleted file mode 100644
index 5604387d2ee20..0000000000000
--- a/src/core/ext/upb-generated/envoy/annotations/resource.upb.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/annotations/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_annotations_ResourceAnnotation envoy_annotations_ResourceAnnotation;
-extern const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init;
-extern const upb_MiniTableExtension envoy_annotations_resource_ext;
-struct google_protobuf_ServiceOptions;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;
-
-
-
-/* envoy.annotations.ResourceAnnotation */
-
-UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_new(upb_Arena* arena) {
-  return (envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy_annotations_ResourceAnnotation_msg_init, arena);
-}
-UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize(const envoy_annotations_ResourceAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_annotations_ResourceAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize_ex(const envoy_annotations_ResourceAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_annotations_ResourceAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_annotations_ResourceAnnotation_clear_type(envoy_annotations_ResourceAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_annotations_ResourceAnnotation_type(const envoy_annotations_ResourceAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_annotations_ResourceAnnotation_set_type(envoy_annotations_ResourceAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool envoy_annotations_has_resource(const struct google_protobuf_ServiceOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &envoy_annotations_resource_ext);
-}
-UPB_INLINE void envoy_annotations_clear_resource(struct google_protobuf_ServiceOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &envoy_annotations_resource_ext);
-}
-UPB_INLINE const envoy_annotations_ResourceAnnotation* envoy_annotations_resource(const struct google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const envoy_annotations_ResourceAnnotation* default_val = NULL;
-  const envoy_annotations_ResourceAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOptions* msg, const envoy_annotations_ResourceAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
deleted file mode 100644
index e1b5468763c2a..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/data/accesslog/v3/accesslog.upb.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLog_submsgs[2] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init = {
-  &envoy_config_accesslog_v3_AccessLog_submsgs[0],
-  &envoy_config_accesslog_v3_AccessLog__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0020000404010022, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = {
-  {.submsg = &envoy_config_accesslog_v3_StatusCodeFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_DurationFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_TraceableFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_RuntimeFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AndFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_OrFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_HeaderFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_ExtensionFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_MetadataFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_LogTypeFilter_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__fields[13] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init = {
-  &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0],
-  &envoy_config_accesslog_v3_AccessLogFilter__fields[0],
-  UPB_SIZE(8, 16), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x000800000504002a, &upb_pom_1bt_max64b},
-    {0x0008000006050032, &upb_pom_1bt_max64b},
-    {0x000800000706003a, &upb_pom_1bt_max64b},
-    {0x0008000008070042, &upb_pom_1bt_max64b},
-    {0x000800000908004a, &upb_pom_1bt_max64b},
-    {0x000800000a090052, &upb_pom_1bt_max64b},
-    {0x000800000b0a005a, &upb_pom_1bt_max64b},
-    {0x000800000c0b0062, &upb_pom_1bt_max64b},
-    {0x000800000d0c006a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_RuntimeUInt32_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fields[2] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_ComparisonFilter_msg_init = {
-  &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0],
-  &envoy_config_accesslog_v3_ComparisonFilter__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_ComparisonFilter_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_StatusCodeFilter_msg_init = {
-  &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0],
-  &envoy_config_accesslog_v3_StatusCodeFilter__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_ComparisonFilter_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_DurationFilter_msg_init = {
-  &envoy_config_accesslog_v3_DurationFilter_submsgs[0],
-  &envoy_config_accesslog_v3_DurationFilter__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_TraceableFilter_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_RuntimeFilter_msg_init = {
-  &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0],
-  &envoy_config_accesslog_v3_RuntimeFilter__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_AndFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_AndFilter_msg_init = {
-  &envoy_config_accesslog_v3_AndFilter_submsgs[0],
-  &envoy_config_accesslog_v3_AndFilter__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_OrFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] = {
-  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_OrFilter_msg_init = {
-  &envoy_config_accesslog_v3_OrFilter_submsgs[0],
-  &envoy_config_accesslog_v3_OrFilter__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_HeaderFilter_msg_init = {
-  &envoy_config_accesslog_v3_HeaderFilter_submsgs[0],
-  &envoy_config_accesslog_v3_HeaderFilter__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_ResponseFlagFilter_msg_init = {
-  NULL,
-  &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prs_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_GrpcStatusFilter__fields[2] = {
-  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_GrpcStatusFilter_msg_init = {
-  NULL,
-  &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_ppv4_1bt},
-    {0x000000003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_MetadataFilter_msg_init = {
-  &envoy_config_accesslog_v3_MetadataFilter_submsgs[0],
-  &envoy_config_accesslog_v3_MetadataFilter__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[2] = {
-  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_LogTypeFilter_msg_init = {
-  NULL,
-  &envoy_config_accesslog_v3_LogTypeFilter__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_ppv4_1bt},
-    {0x000000003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_accesslog_v3_ExtensionFilter_msg_init = {
-  &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0],
-  &envoy_config_accesslog_v3_ExtensionFilter__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[16] = {
-  &envoy_config_accesslog_v3_AccessLog_msg_init,
-  &envoy_config_accesslog_v3_AccessLogFilter_msg_init,
-  &envoy_config_accesslog_v3_ComparisonFilter_msg_init,
-  &envoy_config_accesslog_v3_StatusCodeFilter_msg_init,
-  &envoy_config_accesslog_v3_DurationFilter_msg_init,
-  &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init,
-  &envoy_config_accesslog_v3_TraceableFilter_msg_init,
-  &envoy_config_accesslog_v3_RuntimeFilter_msg_init,
-  &envoy_config_accesslog_v3_AndFilter_msg_init,
-  &envoy_config_accesslog_v3_OrFilter_msg_init,
-  &envoy_config_accesslog_v3_HeaderFilter_msg_init,
-  &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init,
-  &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init,
-  &envoy_config_accesslog_v3_MetadataFilter_msg_init,
-  &envoy_config_accesslog_v3_LogTypeFilter_msg_init,
-  &envoy_config_accesslog_v3_ExtensionFilter_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  16,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
deleted file mode 100644
index a70b207759e2f..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
+++ /dev/null
@@ -1,1764 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_accesslog_v3_AccessLog envoy_config_accesslog_v3_AccessLog;
-typedef struct envoy_config_accesslog_v3_AccessLogFilter envoy_config_accesslog_v3_AccessLogFilter;
-typedef struct envoy_config_accesslog_v3_ComparisonFilter envoy_config_accesslog_v3_ComparisonFilter;
-typedef struct envoy_config_accesslog_v3_StatusCodeFilter envoy_config_accesslog_v3_StatusCodeFilter;
-typedef struct envoy_config_accesslog_v3_DurationFilter envoy_config_accesslog_v3_DurationFilter;
-typedef struct envoy_config_accesslog_v3_NotHealthCheckFilter envoy_config_accesslog_v3_NotHealthCheckFilter;
-typedef struct envoy_config_accesslog_v3_TraceableFilter envoy_config_accesslog_v3_TraceableFilter;
-typedef struct envoy_config_accesslog_v3_RuntimeFilter envoy_config_accesslog_v3_RuntimeFilter;
-typedef struct envoy_config_accesslog_v3_AndFilter envoy_config_accesslog_v3_AndFilter;
-typedef struct envoy_config_accesslog_v3_OrFilter envoy_config_accesslog_v3_OrFilter;
-typedef struct envoy_config_accesslog_v3_HeaderFilter envoy_config_accesslog_v3_HeaderFilter;
-typedef struct envoy_config_accesslog_v3_ResponseFlagFilter envoy_config_accesslog_v3_ResponseFlagFilter;
-typedef struct envoy_config_accesslog_v3_GrpcStatusFilter envoy_config_accesslog_v3_GrpcStatusFilter;
-typedef struct envoy_config_accesslog_v3_MetadataFilter envoy_config_accesslog_v3_MetadataFilter;
-typedef struct envoy_config_accesslog_v3_LogTypeFilter envoy_config_accesslog_v3_LogTypeFilter;
-typedef struct envoy_config_accesslog_v3_ExtensionFilter envoy_config_accesslog_v3_ExtensionFilter;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ComparisonFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_StatusCodeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_DurationFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_TraceableFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_RuntimeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_AndFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_OrFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_HeaderFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ResponseFlagFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_GrpcStatusFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_MetadataFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_LogTypeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ExtensionFilter_msg_init;
-struct envoy_config_core_v3_RuntimeUInt32;
-struct envoy_config_route_v3_HeaderMatcher;
-struct envoy_type_matcher_v3_MetadataMatcher;
-struct envoy_type_v3_FractionalPercent;
-struct google_protobuf_Any;
-struct google_protobuf_BoolValue;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-
-typedef enum {
-  envoy_config_accesslog_v3_ComparisonFilter_EQ = 0,
-  envoy_config_accesslog_v3_ComparisonFilter_GE = 1,
-  envoy_config_accesslog_v3_ComparisonFilter_LE = 2
-} envoy_config_accesslog_v3_ComparisonFilter_Op;
-
-typedef enum {
-  envoy_config_accesslog_v3_GrpcStatusFilter_OK = 0,
-  envoy_config_accesslog_v3_GrpcStatusFilter_CANCELED = 1,
-  envoy_config_accesslog_v3_GrpcStatusFilter_UNKNOWN = 2,
-  envoy_config_accesslog_v3_GrpcStatusFilter_INVALID_ARGUMENT = 3,
-  envoy_config_accesslog_v3_GrpcStatusFilter_DEADLINE_EXCEEDED = 4,
-  envoy_config_accesslog_v3_GrpcStatusFilter_NOT_FOUND = 5,
-  envoy_config_accesslog_v3_GrpcStatusFilter_ALREADY_EXISTS = 6,
-  envoy_config_accesslog_v3_GrpcStatusFilter_PERMISSION_DENIED = 7,
-  envoy_config_accesslog_v3_GrpcStatusFilter_RESOURCE_EXHAUSTED = 8,
-  envoy_config_accesslog_v3_GrpcStatusFilter_FAILED_PRECONDITION = 9,
-  envoy_config_accesslog_v3_GrpcStatusFilter_ABORTED = 10,
-  envoy_config_accesslog_v3_GrpcStatusFilter_OUT_OF_RANGE = 11,
-  envoy_config_accesslog_v3_GrpcStatusFilter_UNIMPLEMENTED = 12,
-  envoy_config_accesslog_v3_GrpcStatusFilter_INTERNAL = 13,
-  envoy_config_accesslog_v3_GrpcStatusFilter_UNAVAILABLE = 14,
-  envoy_config_accesslog_v3_GrpcStatusFilter_DATA_LOSS = 15,
-  envoy_config_accesslog_v3_GrpcStatusFilter_UNAUTHENTICATED = 16
-} envoy_config_accesslog_v3_GrpcStatusFilter_Status;
-
-
-
-/* envoy.config.accesslog.v3.AccessLog */
-
-UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize(const envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLog_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize_ex(const envoy_config_accesslog_v3_AccessLog* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLog_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_accesslog_v3_AccessLog_config_type_typed_config = 4,
-  envoy_config_accesslog_v3_AccessLog_config_type_NOT_SET = 0
-} envoy_config_accesslog_v3_AccessLog_config_type_oneofcases;
-UPB_INLINE envoy_config_accesslog_v3_AccessLog_config_type_oneofcases envoy_config_accesslog_v3_AccessLog_config_type_case(const envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_accesslog_v3_AccessLog_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_name(envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_accesslog_v3_AccessLog_name(const envoy_config_accesslog_v3_AccessLog* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_filter(envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_filter(const envoy_config_accesslog_v3_AccessLog* msg) {
-  const envoy_config_accesslog_v3_AccessLogFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_AccessLogFilter* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_filter(const envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_clear_typed_config(envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_typed_config(const envoy_config_accesslog_v3_AccessLog* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_typed_config(const envoy_config_accesslog_v3_AccessLog* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_name(envoy_config_accesslog_v3_AccessLog *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_filter(envoy_config_accesslog_v3_AccessLog *msg, envoy_config_accesslog_v3_AccessLogFilter* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_mutable_filter(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_config_accesslog_v3_AccessLog_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLog_set_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_typed_config(envoy_config_accesslog_v3_AccessLog *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutable_typed_config(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_AccessLog_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLog_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.AccessLogFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize(const envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize_ex(const envoy_config_accesslog_v3_AccessLogFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_status_code_filter = 1,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_duration_filter = 2,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_not_health_check_filter = 3,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_traceable_filter = 4,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_runtime_filter = 5,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_and_filter = 6,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_or_filter = 7,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_header_filter = 8,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_response_flag_filter = 9,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_grpc_status_filter = 10,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_extension_filter = 11,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_metadata_filter = 12,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_log_type_filter = 13,
-  envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_NOT_SET = 0
-} envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases;
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_case(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_accesslog_v3_AccessLogFilter_filter_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_StatusCodeFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_StatusCodeFilter* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_status_code_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_duration_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_DurationFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_DurationFilter* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_duration_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_NotHealthCheckFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_NotHealthCheckFilter* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_not_health_check_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_TraceableFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_TraceableFilter* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_traceable_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_RuntimeFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_RuntimeFilter* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_runtime_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_and_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_AndFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_AndFilter* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_and_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_or_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_OrFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_OrFilter* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_or_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_header_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_HeaderFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_HeaderFilter* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_header_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_ResponseFlagFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_ResponseFlagFilter* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_response_flag_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_GrpcStatusFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_GrpcStatusFilter* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_grpc_status_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_extension_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_ExtensionFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_ExtensionFilter* ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_extension_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_MetadataFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_MetadataFilter* ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_metadata_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_clear_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const envoy_config_accesslog_v3_LogTypeFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_LogTypeFilter* ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_log_type_filter(const envoy_config_accesslog_v3_AccessLogFilter* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_StatusCodeFilter* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_StatusCodeFilter* sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_StatusCodeFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_DurationFilter* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_DurationFilter* sub = (struct envoy_config_accesslog_v3_DurationFilter*)envoy_config_accesslog_v3_AccessLogFilter_duration_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy_config_accesslog_v3_DurationFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_NotHealthCheckFilter* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_NotHealthCheckFilter* sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_TraceableFilter* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_TraceableFilter* sub = (struct envoy_config_accesslog_v3_TraceableFilter*)envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy_config_accesslog_v3_TraceableFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_RuntimeFilter* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_RuntimeFilter* sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_RuntimeFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_AndFilter* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_AndFilter* sub = (struct envoy_config_accesslog_v3_AndFilter*)envoy_config_accesslog_v3_AccessLogFilter_and_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AndFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_OrFilter* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_OrFilter* sub = (struct envoy_config_accesslog_v3_OrFilter*)envoy_config_accesslog_v3_AccessLogFilter_or_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy_config_accesslog_v3_OrFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_HeaderFilter* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_HeaderFilter* sub = (struct envoy_config_accesslog_v3_HeaderFilter*)envoy_config_accesslog_v3_AccessLogFilter_header_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy_config_accesslog_v3_HeaderFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ResponseFlagFilter* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_ResponseFlagFilter* sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_GrpcStatusFilter* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_GrpcStatusFilter* sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ExtensionFilter* value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_ExtensionFilter* sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)envoy_config_accesslog_v3_AccessLogFilter_extension_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ExtensionFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_MetadataFilter* value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_MetadataFilter* sub = (struct envoy_config_accesslog_v3_MetadataFilter*)envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy_config_accesslog_v3_MetadataFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_LogTypeFilter* value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_LogTypeFilter* sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_LogTypeFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.ComparisonFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize(const envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize_ex(const envoy_config_accesslog_v3_ComparisonFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_clear_op(envoy_config_accesslog_v3_ComparisonFilter* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_accesslog_v3_ComparisonFilter_op(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_clear_value(envoy_config_accesslog_v3_ComparisonFilter* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_value(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
-  const struct envoy_config_core_v3_RuntimeUInt32* default_val = NULL;
-  const struct envoy_config_core_v3_RuntimeUInt32* ret;
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_ComparisonFilter_has_value(const envoy_config_accesslog_v3_ComparisonFilter* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_op(envoy_config_accesslog_v3_ComparisonFilter *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_value(envoy_config_accesslog_v3_ComparisonFilter *msg, struct envoy_config_core_v3_RuntimeUInt32* value) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_mutable_value(envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_RuntimeUInt32* sub = (struct envoy_config_core_v3_RuntimeUInt32*)envoy_config_accesslog_v3_ComparisonFilter_value(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy_config_core_v3_RuntimeUInt32_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_ComparisonFilter_set_value(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.StatusCodeFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_StatusCodeFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize(const envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize_ex(const envoy_config_accesslog_v3_StatusCodeFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_clear_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_comparison(const envoy_config_accesslog_v3_StatusCodeFilter* msg) {
-  const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_ComparisonFilter* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_StatusCodeFilter_has_comparison(const envoy_config_accesslog_v3_StatusCodeFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(envoy_config_accesslog_v3_StatusCodeFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_mutable_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_StatusCodeFilter_comparison(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.DurationFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy_config_accesslog_v3_DurationFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize(const envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_DurationFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize_ex(const envoy_config_accesslog_v3_DurationFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_DurationFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_clear_comparison(envoy_config_accesslog_v3_DurationFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_comparison(const envoy_config_accesslog_v3_DurationFilter* msg) {
-  const envoy_config_accesslog_v3_ComparisonFilter* default_val = NULL;
-  const envoy_config_accesslog_v3_ComparisonFilter* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_DurationFilter_has_comparison(const envoy_config_accesslog_v3_DurationFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_set_comparison(envoy_config_accesslog_v3_DurationFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_mutable_comparison(envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena) {
-  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_DurationFilter_comparison(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_DurationFilter_set_comparison(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.NotHealthCheckFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize_ex(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.config.accesslog.v3.TraceableFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy_config_accesslog_v3_TraceableFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize(const envoy_config_accesslog_v3_TraceableFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_TraceableFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize_ex(const envoy_config_accesslog_v3_TraceableFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_TraceableFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.config.accesslog.v3.RuntimeFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_RuntimeFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize(const envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize_ex(const envoy_config_accesslog_v3_RuntimeFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_runtime_key(envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_accesslog_v3_RuntimeFilter_runtime_key(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
-  const struct envoy_type_v3_FractionalPercent* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_has_percent_sampled(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_use_independent_randomness(const envoy_config_accesslog_v3_RuntimeFilter* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_runtime_key(envoy_config_accesslog_v3_RuntimeFilter *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter *msg, struct envoy_type_v3_FractionalPercent* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_mutable_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena) {
-  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.accesslog.v3.AndFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AndFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize(const envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AndFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize_ex(const envoy_config_accesslog_v3_AndFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AndFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_AndFilter_clear_filters(envoy_config_accesslog_v3_AndFilter* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_AndFilter_filters(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_accesslog_v3_AccessLogFilter* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_upb_array(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_accesslog_v3_AndFilter_filters_mutable_upb_array(const envoy_config_accesslog_v3_AndFilter* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_AndFilter_has_filters(const envoy_config_accesslog_v3_AndFilter* msg) {
-  size_t size;
-  envoy_config_accesslog_v3_AndFilter_filters(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_AndFilter_mutable_filters(envoy_config_accesslog_v3_AndFilter* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_accesslog_v3_AccessLogFilter**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_AndFilter_resize_filters(envoy_config_accesslog_v3_AndFilter* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_accesslog_v3_AccessLogFilter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AndFilter_add_filters(envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.OrFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy_config_accesslog_v3_OrFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize(const envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_OrFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize_ex(const envoy_config_accesslog_v3_OrFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_OrFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_OrFilter_clear_filters(envoy_config_accesslog_v3_OrFilter* msg) {
-  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_accesslog_v3_AccessLogFilter* const* envoy_config_accesslog_v3_OrFilter_filters(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_accesslog_v3_AccessLogFilter* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_upb_array(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_accesslog_v3_OrFilter_filters_mutable_upb_array(const envoy_config_accesslog_v3_OrFilter* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_OrFilter_has_filters(const envoy_config_accesslog_v3_OrFilter* msg) {
-  size_t size;
-  envoy_config_accesslog_v3_OrFilter_filters(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_OrFilter_mutable_filters(envoy_config_accesslog_v3_OrFilter* msg, size_t* size) {
-  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_accesslog_v3_AccessLogFilter**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter** envoy_config_accesslog_v3_OrFilter_resize_filters(envoy_config_accesslog_v3_OrFilter* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_accesslog_v3_AccessLogFilter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_OrFilter_add_filters(envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.HeaderFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy_config_accesslog_v3_HeaderFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize(const envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_HeaderFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize_ex(const envoy_config_accesslog_v3_HeaderFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_HeaderFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_clear_header(envoy_config_accesslog_v3_HeaderFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_header(const envoy_config_accesslog_v3_HeaderFilter* msg) {
-  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
-  const struct envoy_config_route_v3_HeaderMatcher* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_HeaderFilter_has_header(const envoy_config_accesslog_v3_HeaderFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_set_header(envoy_config_accesslog_v3_HeaderFilter *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_mutable_header(envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena) {
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_accesslog_v3_HeaderFilter_header(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_HeaderFilter_set_header(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.ResponseFlagFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize_ex(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_ResponseFlagFilter_clear_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_config_accesslog_v3_ResponseFlagFilter_flags(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_ResponseFlagFilter_flags_upb_array(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_accesslog_v3_ResponseFlagFilter_flags_mutable_upb_array(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_ResponseFlagFilter_has_flags(const envoy_config_accesslog_v3_ResponseFlagFilter* msg) {
-  size_t size;
-  envoy_config_accesslog_v3_ResponseFlagFilter_flags(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE upb_StringView* envoy_config_accesslog_v3_ResponseFlagFilter_mutable_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_config_accesslog_v3_ResponseFlagFilter_resize_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_ResponseFlagFilter_add_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* envoy.config.accesslog.v3.GrpcStatusFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize_ex(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_clear_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* envoy_config_accesslog_v3_GrpcStatusFilter_statuses(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_GrpcStatusFilter_statuses_upb_array(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_accesslog_v3_GrpcStatusFilter_statuses_mutable_upb_array(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_has_statuses(const envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
-  size_t size;
-  envoy_config_accesslog_v3_GrpcStatusFilter_statuses(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_clear_exclude(envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_exclude(const envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE int32_t* envoy_config_accesslog_v3_GrpcStatusFilter_mutable_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* envoy_config_accesslog_v3_GrpcStatusFilter_resize_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_add_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_set_exclude(envoy_config_accesslog_v3_GrpcStatusFilter *msg, bool value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.accesslog.v3.MetadataFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy_config_accesslog_v3_MetadataFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize(const envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_MetadataFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize_ex(const envoy_config_accesslog_v3_MetadataFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_MetadataFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_clear_matcher(envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_matcher(const envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_matcher(const envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_clear_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(const envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const struct google_protobuf_BoolValue* default_val = NULL;
-  const struct google_protobuf_BoolValue* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_match_if_key_not_found(const envoy_config_accesslog_v3_MetadataFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_matcher(envoy_config_accesslog_v3_MetadataFilter *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_mutable_matcher(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_accesslog_v3_MetadataFilter_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter *msg, struct google_protobuf_BoolValue* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_mutable_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
-  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.accesslog.v3.LogTypeFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_LogTypeFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize(const envoy_config_accesslog_v3_LogTypeFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize_ex(const envoy_config_accesslog_v3_LogTypeFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_clear_types(envoy_config_accesslog_v3_LogTypeFilter* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* envoy_config_accesslog_v3_LogTypeFilter_types(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_accesslog_v3_LogTypeFilter_types_upb_array(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_accesslog_v3_LogTypeFilter_types_mutable_upb_array(const envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_has_types(const envoy_config_accesslog_v3_LogTypeFilter* msg) {
-  size_t size;
-  envoy_config_accesslog_v3_LogTypeFilter_types(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_clear_exclude(envoy_config_accesslog_v3_LogTypeFilter* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_exclude(const envoy_config_accesslog_v3_LogTypeFilter* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE int32_t* envoy_config_accesslog_v3_LogTypeFilter_mutable_types(envoy_config_accesslog_v3_LogTypeFilter* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* envoy_config_accesslog_v3_LogTypeFilter_resize_types(envoy_config_accesslog_v3_LogTypeFilter* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_add_types(envoy_config_accesslog_v3_LogTypeFilter* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_set_exclude(envoy_config_accesslog_v3_LogTypeFilter *msg, bool value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.accesslog.v3.ExtensionFilter */
-
-UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ExtensionFilter_msg_init, arena);
-}
-UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize(const envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize_ex(const envoy_config_accesslog_v3_ExtensionFilter* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_accesslog_v3_ExtensionFilter_config_type_typed_config = 3,
-  envoy_config_accesslog_v3_ExtensionFilter_config_type_NOT_SET = 0
-} envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases;
-UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases envoy_config_accesslog_v3_ExtensionFilter_config_type_case(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_accesslog_v3_ExtensionFilter_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_clear_name(envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_accesslog_v3_ExtensionFilter_name(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_clear_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_typed_config(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_accesslog_v3_ExtensionFilter_has_typed_config(const envoy_config_accesslog_v3_ExtensionFilter* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_name(envoy_config_accesslog_v3_ExtensionFilter *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(envoy_config_accesslog_v3_ExtensionFilter *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_mutable_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_ExtensionFilter_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c
deleted file mode 100644
index ddabe9d62b030..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/bootstrap/v3/bootstrap.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/resolver.upb.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "envoy/config/listener/v3/listener.upb.h"
-#include "envoy/config/metrics/v3/stats.upb.h"
-#include "envoy/config/overload/v3/overload.upb.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[28] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_ClusterManager_msg_init},
-  {.submsg = &envoy_config_metrics_v3_StatsSink_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
-  {.submsg = &envoy_config_trace_v3_Tracing_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Admin_msg_init},
-  {.submsg = &envoy_config_metrics_v3_StatsConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-  {.submsg = &envoy_config_overload_v3_OverloadManager_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_LayeredRuntime_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdogs_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_FatalAction_msg_init},
-  {.submsg = &envoy_config_core_v3_DnsResolutionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[36] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(132, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 88), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(36, 96), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(40, 104), 9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(44, 112), 10, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(48, 120), 11, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(52, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(56, 128), 12, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(140, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(60, 152), 13, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(64, 5), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(68, 160), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(72, 168), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(76, 176), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(148, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(80, 200), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(84, 208), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(88, 216), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(92, 224), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {29, 3, UPB_SIZE(-97, -9), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(100, 232), 16, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(104, 240), 17, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(108, 248), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(156, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(112, 272), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {35, UPB_SIZE(116, 280), 19, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(120, 288), 20, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(124, 296), 21, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {38, UPB_SIZE(128, 304), 22, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap__fields[0],
-  UPB_SIZE(168, 312), 36, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0018000002010012, &upb_psm_1bt_max64b},
-    {0x002000000302001a, &upb_psm_1bt_max128b},
-    {0x0028000004030022, &upb_psm_1bt_max64b},
-    {0x003000003f00002a, &upb_pss_1bt},
-    {0x004000003f040032, &upb_prm_1bt_maxmaxb},
-    {0x004800000505003a, &upb_psm_1bt_maxmaxb},
-    {0x0050000006060042, &upb_psm_1bt_max128b},
-    {0x005800000707004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0060000008080062, &upb_psm_1bt_max128b},
-    {0x006800000909006a, &upb_psm_1bt_maxmaxb},
-    {0x007000000a0a0072, &upb_psm_1bt_maxmaxb},
-    {0x007800000b0b007a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000180, &upb_psb1_2bt},
-    {0x008000000c0c018a, &upb_psm_2bt_max64b},
-    {0x008800003f000192, &upb_pss_2bt},
-    {0x009800000d0d019a, &upb_psm_2bt_maxmaxb},
-    {0x000500003f0001a0, &upb_psb1_2bt},
-    {0x00a000003f0e01aa, &upb_prm_2bt_maxmaxb},
-    {0x00a800003f0f01b2, &upb_prm_2bt_maxmaxb},
-    {0x00b000000e1001ba, &upb_psm_2bt_maxmaxb},
-    {0x00b800003f0001c2, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00d000003f0001d2, &upb_prs_2bt},
-    {0x00d800000f1201da, &upb_psm_2bt_max64b},
-    {0x00e000003f1301e2, &upb_prm_2bt_max64b},
-    {0x000300081d0001e8, &upb_pob1_2bt},
-    {0x00e80000101401f2, &upb_psm_2bt_maxmaxb},
-    {0x00f00000111501fa, &upb_psm_2bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = {
-  {.submsg = &envoy_config_listener_v3_Listener_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x000800003f010012, &upb_prm_1bt_maxmaxb},
-    {0x001000003f02001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0],
-  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f00002a, &upb_pss_1bt},
-    {0x003000003f000032, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = {
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init = {
-  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0],
-  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Admin_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AccessLog_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Admin_msg_init = {
-  &envoy_config_bootstrap_v3_Admin_submsgs[0],
-  &envoy_config_bootstrap_v3_Admin__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x003000003f010022, &upb_prm_1bt_maxmaxb},
-    {0x003800003f02002a, &upb_prm_1bt_maxmaxb},
-    {0x000100003f000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = {
-  {.submsg = &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init},
-  {.submsg = &envoy_config_core_v3_BindConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields[4] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_msg_init = {
-  &envoy_config_bootstrap_v3_ClusterManager_submsgs[0],
-  &envoy_config_bootstrap_v3_ClusterManager__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_EventServiceConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init = {
-  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0],
-  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = {
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Watchdogs_msg_init = {
-  &envoy_config_bootstrap_v3_Watchdogs_submsgs[0],
-  &envoy_config_bootstrap_v3_Watchdogs__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x0010000002010012, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_msg_init = {
-  &envoy_config_bootstrap_v3_Watchdog_submsgs[0],
-  &envoy_config_bootstrap_v3_Watchdog__fields[0],
-  UPB_SIZE(32, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
-    {0x003800003f06003a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init = {
-  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0],
-  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_FatalAction_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_FatalAction_msg_init = {
-  &envoy_config_bootstrap_v3_FatalAction_submsgs[0],
-  &envoy_config_bootstrap_v3_FatalAction__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_Runtime_msg_init = {
-  &envoy_config_bootstrap_v3_Runtime_submsgs[0],
-  &envoy_config_bootstrap_v3_Runtime__fields[0],
-  UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_pss_1bt},
-    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_msg_init = {
-  &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0],
-  &envoy_config_bootstrap_v3_RuntimeLayer__fields[0],
-  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
-    {0x001800000301001a, &upb_pom_1bt_max64b},
-    {0x0018000004020022, &upb_pom_1bt_max64b},
-    {0x001800000503002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init = {
-  NULL,
-  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psb1_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-  })
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init = {
-  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0],
-  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = {
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_LayeredRuntime_msg_init = {
-  &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0],
-  &envoy_config_bootstrap_v3_LayeredRuntime__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_config_bootstrap_v3_CustomInlineHeader__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_bootstrap_v3_CustomInlineHeader_msg_init = {
-  NULL,
-  &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[20] = {
-  &envoy_config_bootstrap_v3_Bootstrap_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init,
-  &envoy_config_bootstrap_v3_Admin_msg_init,
-  &envoy_config_bootstrap_v3_ClusterManager_msg_init,
-  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init,
-  &envoy_config_bootstrap_v3_Watchdogs_msg_init,
-  &envoy_config_bootstrap_v3_Watchdog_msg_init,
-  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init,
-  &envoy_config_bootstrap_v3_FatalAction_msg_init,
-  &envoy_config_bootstrap_v3_Runtime_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init,
-  &envoy_config_bootstrap_v3_LayeredRuntime_msg_init,
-  &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  20,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
deleted file mode 100644
index 8b31e6b868acc..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/circuit_breaker.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = {
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[2] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init = {
-  &envoy_config_cluster_v3_CircuitBreakers_submsgs[0],
-  &envoy_config_cluster_v3_CircuitBreakers__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-    {0x000800003f010012, &upb_prm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[8] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 56), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init = {
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0],
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0],
-  UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x001800000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000003020022, &upb_psm_1bt_maxmaxb},
-    {0x002800000403002a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000030, &upb_psb1_1bt},
-    {0x003000000504003a, &upb_psm_1bt_maxmaxb},
-    {0x0038000006050042, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init = {
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0],
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_config_cluster_v3_CircuitBreakers_msg_init,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
deleted file mode 100644
index a0564595fc781..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
+++ /dev/null
@@ -1,730 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/cluster/v3/filter.upb.h"
-#include "envoy/config/cluster/v3/outlier_detection.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "envoy/config/core/v3/protocol.upb.h"
-#include "envoy/config/core/v3/resolver.upb.h"
-#include "envoy/config/endpoint/v3/endpoint.upb.h"
-#include "envoy/type/v3/percent.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 "xds/core/v3/collection_entry.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_cluster_v3_ClusterCollection_submsgs[1] = {
-  {.submsg = &xds_core_v3_CollectionEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_ClusterCollection_msg_init = {
-  &envoy_config_cluster_v3_ClusterCollection_submsgs[0],
-  &envoy_config_cluster_v3_ClusterCollection__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = {
-  {.submsg = &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_msg_init},
-  {.submsg = &envoy_config_core_v3_Http1ProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Http2ProtocolOptions_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_cluster_v3_OutlierDetection_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_BindConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TransportSocket_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_HttpProtocolOptions_msg_init},
-  {.submsg = &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Filter_msg_init},
-  {.submsg = &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init},
-  {.submsg = &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_TrackClusterStats_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_DnsResolutionConfig_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = {
-  {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_msg_init = {
-  &envoy_config_cluster_v3_Cluster_submsgs[0],
-  &envoy_config_cluster_v3_Cluster__fields[0],
-  UPB_SIZE(200, 344), 51, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f00000a, &upb_pss_1bt},
-    {0x0148001402000010, &upb_pov4_1bt},
-    {0x003000000100001a, &upb_psm_1bt_max64b},
-    {0x0038000002010022, &upb_psm_1bt_maxmaxb},
-    {0x004000000302002a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004800003f030042, &upb_prm_1bt_maxmaxb},
-    {0x005000000404004a, &upb_psm_1bt_maxmaxb},
-    {0x0058000005050052, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x006000000606006a, &upb_psm_1bt_maxmaxb},
-    {0x0068000007070072, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0070000008080182, &upb_psm_2bt_maxmaxb},
-    {0x000800003f000188, &upb_psv4_2bt},
-    {0x007800003f090192, &upb_prm_2bt_maxmaxb},
-    {0x00800000090a019a, &upb_psm_2bt_maxmaxb},
-    {0x008800000a0b01a2, &upb_psm_2bt_maxmaxb},
-    {0x009000000b0c01aa, &upb_psm_2bt_maxmaxb},
-    {0x009800000c0d01b2, &upb_psm_2bt_max64b},
-    {0x0150001c170e01ba, &upb_pom_2bt_max64b},
-    {0x00a000000d0f01c2, &upb_psm_2bt_maxmaxb},
-    {0x00a800000e1001ca, &upb_psm_2bt_maxmaxb},
-    {0x000c00003f0001d0, &upb_psv4_2bt},
-    {0x00b000000f1101da, &upb_psm_2bt_max64b},
-    {0x00b800003f0001e2, &upb_pss_2bt},
-    {0x00c80000101201ea, &upb_psm_2bt_maxmaxb},
-    {0x00d00000111301f2, &upb_psm_2bt_max64b},
-    {0x001000003f0001f8, &upb_psb1_2bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_core_v3_TransportSocket_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init = {
-  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterType__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init = {
-  &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[8] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0],
-  UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f01001a, &upb_prm_1bt_max64b},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x000900003f000028, &upb_psb1_1bt},
-    {0x000a00003f000030, &upb_psb1_1bt},
-    {0x000b00003f000038, &upb_psb1_1bt},
-    {0x000c00003f000040, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[4] = {
-  {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init = {
-  NULL,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prs_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x001000003f00001a, &upb_prs_1bt},
-    {0x000400003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeDouble_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = {
-  {.submsg = &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeDouble_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x0010000002010022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[3] = {
-  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000008, &upb_psb1_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthStatusSet_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[8] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0],
-  UPB_SIZE(32, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0030000402010012, &upb_pom_1bt_max64b},
-    {0x003000040302001a, &upb_pom_1bt_max64b},
-    {0x0018000002030022, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000028, &upb_psb1_1bt},
-    {0x000900003f000030, &upb_psb1_1bt},
-    {0x002000000304003a, &upb_psm_1bt_max64b},
-    {0x0028000004050042, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[2] = {
-  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init = {
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000008, &upb_psb1_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_RefreshRate_msg_init = {
-  &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = {
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init = {
-  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init = {
-  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0],
-  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = {
-  {.submsg = &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_msg_init = {
-  &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0],
-  &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[1] = {
-  {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init = {
-  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0],
-  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TcpKeepalive_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init = {
-  &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0],
-  &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_TrackClusterStats__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_TrackClusterStats_msg_init = {
-  NULL,
-  &envoy_config_cluster_v3_TrackClusterStats__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[24] = {
-  &envoy_config_cluster_v3_ClusterCollection_msg_init,
-  &envoy_config_cluster_v3_Cluster_msg_init,
-  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init,
-  &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init,
-  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init,
-  &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init,
-  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init,
-  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init,
-  &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init,
-  &envoy_config_cluster_v3_TrackClusterStats_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  24,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
deleted file mode 100644
index 5d6d4984ba9c6..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
+++ /dev/null
@@ -1,3918 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_cluster_v3_ClusterCollection envoy_config_cluster_v3_ClusterCollection;
-typedef struct envoy_config_cluster_v3_Cluster envoy_config_cluster_v3_Cluster;
-typedef struct envoy_config_cluster_v3_Cluster_TransportSocketMatch envoy_config_cluster_v3_Cluster_TransportSocketMatch;
-typedef struct envoy_config_cluster_v3_Cluster_CustomClusterType envoy_config_cluster_v3_Cluster_CustomClusterType;
-typedef struct envoy_config_cluster_v3_Cluster_EdsClusterConfig envoy_config_cluster_v3_Cluster_EdsClusterConfig;
-typedef struct envoy_config_cluster_v3_Cluster_LbSubsetConfig envoy_config_cluster_v3_Cluster_LbSubsetConfig;
-typedef struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector;
-typedef struct envoy_config_cluster_v3_Cluster_SlowStartConfig envoy_config_cluster_v3_Cluster_SlowStartConfig;
-typedef struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig envoy_config_cluster_v3_Cluster_RoundRobinLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig envoy_config_cluster_v3_Cluster_LeastRequestLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_RingHashLbConfig envoy_config_cluster_v3_Cluster_RingHashLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_MaglevLbConfig envoy_config_cluster_v3_Cluster_MaglevLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig envoy_config_cluster_v3_Cluster_OriginalDstLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig;
-typedef struct envoy_config_cluster_v3_Cluster_RefreshRate envoy_config_cluster_v3_Cluster_RefreshRate;
-typedef struct envoy_config_cluster_v3_Cluster_PreconnectPolicy envoy_config_cluster_v3_Cluster_PreconnectPolicy;
-typedef struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry;
-typedef struct envoy_config_cluster_v3_LoadBalancingPolicy envoy_config_cluster_v3_LoadBalancingPolicy;
-typedef struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy envoy_config_cluster_v3_LoadBalancingPolicy_Policy;
-typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions envoy_config_cluster_v3_UpstreamConnectionOptions;
-typedef struct envoy_config_cluster_v3_TrackClusterStats envoy_config_cluster_v3_TrackClusterStats;
-extern const upb_MiniTable envoy_config_cluster_v3_ClusterCollection_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_RefreshRate_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_TrackClusterStats_msg_init;
-struct envoy_config_cluster_v3_CircuitBreakers;
-struct envoy_config_cluster_v3_Filter;
-struct envoy_config_cluster_v3_OutlierDetection;
-struct envoy_config_core_v3_Address;
-struct envoy_config_core_v3_BindConfig;
-struct envoy_config_core_v3_ConfigSource;
-struct envoy_config_core_v3_DnsResolutionConfig;
-struct envoy_config_core_v3_HealthCheck;
-struct envoy_config_core_v3_HealthStatusSet;
-struct envoy_config_core_v3_Http1ProtocolOptions;
-struct envoy_config_core_v3_Http2ProtocolOptions;
-struct envoy_config_core_v3_HttpProtocolOptions;
-struct envoy_config_core_v3_Metadata;
-struct envoy_config_core_v3_RuntimeDouble;
-struct envoy_config_core_v3_TcpKeepalive;
-struct envoy_config_core_v3_TransportSocket;
-struct envoy_config_core_v3_TypedExtensionConfig;
-struct envoy_config_core_v3_UpstreamHttpProtocolOptions;
-struct envoy_config_endpoint_v3_ClusterLoadAssignment;
-struct envoy_type_v3_Percent;
-struct google_protobuf_Any;
-struct google_protobuf_BoolValue;
-struct google_protobuf_DoubleValue;
-struct google_protobuf_Duration;
-struct google_protobuf_Struct;
-struct google_protobuf_UInt32Value;
-struct google_protobuf_UInt64Value;
-struct xds_core_v3_CollectionEntry;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_DnsResolutionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthCheck_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HealthStatusSet_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_HttpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init;
-extern const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_DoubleValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
-extern const upb_MiniTable xds_core_v3_CollectionEntry_msg_init;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_USE_CONFIGURED_PROTOCOL = 0,
-  envoy_config_cluster_v3_Cluster_USE_DOWNSTREAM_PROTOCOL = 1
-} envoy_config_cluster_v3_Cluster_ClusterProtocolSelection;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_STATIC = 0,
-  envoy_config_cluster_v3_Cluster_STRICT_DNS = 1,
-  envoy_config_cluster_v3_Cluster_LOGICAL_DNS = 2,
-  envoy_config_cluster_v3_Cluster_EDS = 3,
-  envoy_config_cluster_v3_Cluster_ORIGINAL_DST = 4
-} envoy_config_cluster_v3_Cluster_DiscoveryType;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_AUTO = 0,
-  envoy_config_cluster_v3_Cluster_V4_ONLY = 1,
-  envoy_config_cluster_v3_Cluster_V6_ONLY = 2,
-  envoy_config_cluster_v3_Cluster_V4_PREFERRED = 3,
-  envoy_config_cluster_v3_Cluster_ALL = 4
-} envoy_config_cluster_v3_Cluster_DnsLookupFamily;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_ROUND_ROBIN = 0,
-  envoy_config_cluster_v3_Cluster_LEAST_REQUEST = 1,
-  envoy_config_cluster_v3_Cluster_RING_HASH = 2,
-  envoy_config_cluster_v3_Cluster_RANDOM = 3,
-  envoy_config_cluster_v3_Cluster_MAGLEV = 5,
-  envoy_config_cluster_v3_Cluster_CLUSTER_PROVIDED = 6,
-  envoy_config_cluster_v3_Cluster_LOAD_BALANCING_POLICY_CONFIG = 7
-} envoy_config_cluster_v3_Cluster_LbPolicy;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_NO_FALLBACK = 0,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_ANY_ENDPOINT = 1,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_DEFAULT_SUBSET = 2
-} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_METADATA_NO_FALLBACK = 0,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_FALLBACK_LIST = 1
-} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_NOT_DEFINED = 0,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_NO_FALLBACK = 1,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ANY_ENDPOINT = 2,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_DEFAULT_SUBSET = 3,
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_KEYS_SUBSET = 4
-} envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy;
-
-typedef enum {
-  envoy_config_cluster_v3_Cluster_RingHashLbConfig_XX_HASH = 0,
-  envoy_config_cluster_v3_Cluster_RingHashLbConfig_MURMUR_HASH_2 = 1
-} envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction;
-
-
-
-/* envoy.config.cluster.v3.ClusterCollection */
-
-UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_ClusterCollection*)_upb_Message_New(&envoy_config_cluster_v3_ClusterCollection_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_ClusterCollection* ret = envoy_config_cluster_v3_ClusterCollection_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_ClusterCollection* envoy_config_cluster_v3_ClusterCollection_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_ClusterCollection* ret = envoy_config_cluster_v3_ClusterCollection_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_ClusterCollection_serialize(const envoy_config_cluster_v3_ClusterCollection* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_ClusterCollection_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_ClusterCollection_serialize_ex(const envoy_config_cluster_v3_ClusterCollection* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_ClusterCollection_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_clear_entries(envoy_config_cluster_v3_ClusterCollection* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_entries(const envoy_config_cluster_v3_ClusterCollection* msg) {
-  const struct xds_core_v3_CollectionEntry* default_val = NULL;
-  const struct xds_core_v3_CollectionEntry* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_ClusterCollection_has_entries(const envoy_config_cluster_v3_ClusterCollection* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct xds_core_v3_CollectionEntry* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_mutable_entries(envoy_config_cluster_v3_ClusterCollection* msg, upb_Arena* arena) {
-  struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)envoy_config_cluster_v3_ClusterCollection_entries(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_CollectionEntry*)_upb_Message_New(&xds_core_v3_CollectionEntry_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_ClusterCollection_set_entries(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster* ret = envoy_config_cluster_v3_Cluster_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster* envoy_config_cluster_v3_Cluster_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster* ret = envoy_config_cluster_v3_Cluster_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_serialize(const envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_serialize_ex(const envoy_config_cluster_v3_Cluster* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_cluster_v3_Cluster_cluster_discovery_type_type = 2,
-  envoy_config_cluster_v3_Cluster_cluster_discovery_type_cluster_type = 38,
-  envoy_config_cluster_v3_Cluster_cluster_discovery_type_NOT_SET = 0
-} envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases;
-UPB_INLINE envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases envoy_config_cluster_v3_Cluster_cluster_discovery_type_case(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-typedef enum {
-  envoy_config_cluster_v3_Cluster_lb_config_ring_hash_lb_config = 23,
-  envoy_config_cluster_v3_Cluster_lb_config_maglev_lb_config = 52,
-  envoy_config_cluster_v3_Cluster_lb_config_original_dst_lb_config = 34,
-  envoy_config_cluster_v3_Cluster_lb_config_least_request_lb_config = 37,
-  envoy_config_cluster_v3_Cluster_lb_config_round_robin_lb_config = 56,
-  envoy_config_cluster_v3_Cluster_lb_config_NOT_SET = 0
-} envoy_config_cluster_v3_Cluster_lb_config_oneofcases;
-UPB_INLINE envoy_config_cluster_v3_Cluster_lb_config_oneofcases envoy_config_cluster_v3_Cluster_lb_config_case(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_Cluster_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_name(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_name(const envoy_config_cluster_v3_Cluster* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_type(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_type(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_eds_cluster_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_EdsClusterConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_eds_cluster_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_connect_timeout(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_connect_timeout(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_connect_timeout(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_per_connection_buffer_limit_bytes(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lb_policy(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_lb_policy(const envoy_config_cluster_v3_Cluster* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_health_checks(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_HealthCheck* const* envoy_config_cluster_v3_Cluster_health_checks(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_core_v3_HealthCheck* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_health_checks_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_health_checks(const envoy_config_cluster_v3_Cluster* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_health_checks(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_max_requests_per_connection(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_max_requests_per_connection(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_circuit_breakers(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_circuit_breakers(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_cluster_v3_CircuitBreakers* default_val = NULL;
-  const struct envoy_config_cluster_v3_CircuitBreakers* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_circuit_breakers(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_Http1ProtocolOptions* default_val = NULL;
-  const struct envoy_config_core_v3_Http1ProtocolOptions* ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_http2_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_Http2ProtocolOptions* default_val = NULL;
-  const struct envoy_config_core_v3_Http2ProtocolOptions* ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_http2_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_dns_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_lookup_family(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_dns_lookup_family(const envoy_config_cluster_v3_Cluster* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolvers(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* const* envoy_config_cluster_v3_Cluster_dns_resolvers(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_core_v3_Address* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_dns_resolvers_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_resolvers(const envoy_config_cluster_v3_Cluster* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_dns_resolvers(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_outlier_detection(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_outlier_detection(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_cluster_v3_OutlierDetection* default_val = NULL;
-  const struct envoy_config_cluster_v3_OutlierDetection* ret;
-  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_outlier_detection(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cleanup_interval(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_cleanup_interval(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cleanup_interval(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_upstream_bind_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_BindConfig* default_val = NULL;
-  const struct envoy_config_core_v3_BindConfig* ret;
-  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_bind_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lb_subset_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_lb_subset_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_LbSubsetConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret;
-  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lb_subset_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_RingHashLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret;
-  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_transport_socket(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_TransportSocket* default_val = NULL;
-  const struct envoy_config_core_v3_TransportSocket* ret;
-  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_transport_socket(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_metadata(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_metadata(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_Metadata* default_val = NULL;
-  const struct envoy_config_core_v3_Metadata* ret;
-  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_metadata(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_protocol_selection(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_protocol_selection(const envoy_config_cluster_v3_Cluster* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_common_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_common_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig* ret;
-  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_alt_stat_name(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_alt_stat_name(const envoy_config_cluster_v3_Cluster* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_common_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_HttpProtocolOptions* default_val = NULL;
-  const struct envoy_config_core_v3_HttpProtocolOptions* ret;
-  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_upstream_connection_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_UpstreamConnectionOptions* default_val = NULL;
-  const envoy_config_cluster_v3_UpstreamConnectionOptions* ret;
-  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_connection_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_close_connections_on_host_health_failure(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_ignore_health_on_host_removal(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_load_assignment(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_load_assignment(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_endpoint_v3_ClusterLoadAssignment* default_val = NULL;
-  const struct envoy_config_endpoint_v3_ClusterLoadAssignment* ret;
-  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_assignment(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret;
-  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_extension_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_size(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_get(const envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any** val) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_next(const envoy_config_cluster_v3_Cluster* msg, size_t* iter) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret;
-  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cluster_type(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_CustomClusterType* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_CustomClusterType* ret;
-  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cluster_type(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_respect_dns_ttl(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_respect_dns_ttl(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_filters(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_cluster_v3_Filter* const* envoy_config_cluster_v3_Cluster_filters(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_cluster_v3_Filter* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_filters_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_filters_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_filters(const envoy_config_cluster_v3_Cluster* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_filters(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_load_balancing_policy(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_LoadBalancingPolicy* default_val = NULL;
-  const envoy_config_cluster_v3_LoadBalancingPolicy* ret;
-  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_balancing_policy(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lrs_server(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_lrs_server(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_ConfigSource* default_val = NULL;
-  const struct envoy_config_core_v3_ConfigSource* ret;
-  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lrs_server(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const* envoy_config_cluster_v3_Cluster_transport_socket_matches(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_cluster_v3_Cluster_TransportSocketMatch* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_transport_socket_matches_mutable_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_transport_socket_matches(const envoy_config_cluster_v3_Cluster* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_transport_socket_matches(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_RefreshRate* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_RefreshRate* ret;
-  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_failure_refresh_rate(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_use_tcp_for_dns_lookups(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* default_val = NULL;
-  const struct envoy_config_core_v3_UpstreamHttpProtocolOptions* ret;
-  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_http_protocol_options(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_track_timeout_budgets(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_track_timeout_budgets(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_upstream_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_upstream_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_track_cluster_stats(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_TrackClusterStats* default_val = NULL;
-  const envoy_config_cluster_v3_TrackClusterStats* ret;
-  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_track_cluster_stats(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_preconnect_policy(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_preconnect_policy(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_PreconnectPolicy* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret;
-  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_preconnect_policy(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_connection_pool_per_downstream_connection(const envoy_config_cluster_v3_Cluster* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_MaglevLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret;
-  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_dns_resolution_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_DnsResolutionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_DnsResolutionConfig* ret;
-  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_dns_resolution_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct google_protobuf_BoolValue* default_val = NULL;
-  const struct google_protobuf_BoolValue* ret;
-  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_wait_for_warm_on_init(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_typed_dns_resolver_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret;
-  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(184, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_type(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_eds_cluster_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_EdsClusterConfig* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_mutable_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)envoy_config_cluster_v3_Cluster_eds_cluster_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_eds_cluster_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connect_timeout(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_connect_timeout(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_connect_timeout(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_connect_timeout(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_policy(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_mutable_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_core_v3_HealthCheck**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_resize_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_core_v3_HealthCheck**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_core_v3_HealthCheck* envoy_config_cluster_v3_Cluster_add_health_checks(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_core_v3_HealthCheck* sub = (struct envoy_config_core_v3_HealthCheck*)_upb_Message_New(&envoy_config_core_v3_HealthCheck_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(24, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_max_requests_per_connection(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_circuit_breakers(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(28, 88), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_mutable_circuit_breakers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_config_cluster_v3_Cluster_circuit_breakers(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_circuit_breakers(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(32, 96), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_config_cluster_v3_Cluster_http_protocol_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http1ProtocolOptions_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_http_protocol_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http2_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(36, 104), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_cluster_v3_Cluster_http2_protocol_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_Http2ProtocolOptions_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_http2_protocol_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {16, UPB_SIZE(40, 112), 8, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_dns_refresh_rate(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_lookup_family(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
-  const upb_MiniTableField field = {17, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_mutable_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_core_v3_Address**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_resize_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_core_v3_Address**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_cluster_v3_Cluster_add_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {18, UPB_SIZE(48, 120), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_outlier_detection(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_OutlierDetection* value) {
-  const upb_MiniTableField field = {19, UPB_SIZE(52, 128), 9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_mutable_outlier_detection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_OutlierDetection* sub = (struct envoy_config_cluster_v3_OutlierDetection*)envoy_config_cluster_v3_Cluster_outlier_detection(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy_config_cluster_v3_OutlierDetection_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_outlier_detection(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cleanup_interval(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {20, UPB_SIZE(56, 136), 10, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_cleanup_interval(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_cleanup_interval(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_cleanup_interval(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_bind_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_BindConfig* value) {
-  const upb_MiniTableField field = {21, UPB_SIZE(60, 144), 11, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_cluster_v3_Cluster_upstream_bind_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy_config_core_v3_BindConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_bind_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_subset_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LbSubsetConfig* value) {
-  const upb_MiniTableField field = {22, UPB_SIZE(64, 152), 12, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_mutable_lb_subset_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)envoy_config_cluster_v3_Cluster_lb_subset_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_lb_subset_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RingHashLbConfig* value) {
-  const upb_MiniTableField field = {23, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_mutable_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)envoy_config_cluster_v3_Cluster_ring_hash_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_transport_socket(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TransportSocket* value) {
-  const upb_MiniTableField field = {24, UPB_SIZE(68, 160), 13, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_mutable_transport_socket(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_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_config_cluster_v3_Cluster_set_transport_socket(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_metadata(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Metadata* value) {
-  const upb_MiniTableField field = {25, UPB_SIZE(72, 168), 14, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_mutable_metadata(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_cluster_v3_Cluster_metadata(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_metadata(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_protocol_selection(envoy_config_cluster_v3_Cluster *msg, int32_t value) {
-  const upb_MiniTableField field = {26, UPB_SIZE(76, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig* value) {
-  const upb_MiniTableField field = {27, UPB_SIZE(80, 176), 15, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_mutable_common_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_CommonLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)envoy_config_cluster_v3_Cluster_common_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_common_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_alt_stat_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) {
-  const upb_MiniTableField field = {28, UPB_SIZE(192, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) {
-  const upb_MiniTableField field = {29, UPB_SIZE(84, 200), 16, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_config_cluster_v3_Cluster_common_http_protocol_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HttpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_HttpProtocolOptions_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_connection_options(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_UpstreamConnectionOptions* value) {
-  const upb_MiniTableField field = {30, UPB_SIZE(88, 208), 17, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_UpstreamConnectionOptions* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)envoy_config_cluster_v3_Cluster_upstream_connection_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)_upb_Message_New(&envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_connection_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {31, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {32, UPB_SIZE(93, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_assignment(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_endpoint_v3_ClusterLoadAssignment* value) {
-  const upb_MiniTableField field = {33, UPB_SIZE(96, 216), 18, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_mutable_load_assignment(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_endpoint_v3_ClusterLoadAssignment* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)envoy_config_cluster_v3_Cluster_load_assignment(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)_upb_Message_New(&envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_load_assignment(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* value) {
-  const upb_MiniTableField field = {34, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_mutable_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)envoy_config_cluster_v3_Cluster_original_dst_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_clear(envoy_config_cluster_v3_Cluster* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_set(envoy_config_cluster_v3_Cluster* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_delete(envoy_config_cluster_v3_Cluster* msg, upb_StringView key) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* envoy_config_cluster_v3_Cluster_typed_extension_protocol_options_nextmutable(envoy_config_cluster_v3_Cluster* msg, size_t* iter) {
-  const upb_MiniTableField field = {36, UPB_SIZE(100, 224), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_least_request_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* value) {
-  const upb_MiniTableField field = {37, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_mutable_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)envoy_config_cluster_v3_Cluster_least_request_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_least_request_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cluster_type(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CustomClusterType* value) {
-  const upb_MiniTableField field = {38, UPB_SIZE(176, 328), UPB_SIZE(-105, -21), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_mutable_cluster_type(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_CustomClusterType* sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)envoy_config_cluster_v3_Cluster_cluster_type(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_cluster_type(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_respect_dns_ttl(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {39, UPB_SIZE(108, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_mutable_filters(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_cluster_v3_Filter**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_resize_filters(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_cluster_v3_Filter**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Cluster_add_filters(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {40, UPB_SIZE(112, 232), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_cluster_v3_Filter* sub = (struct envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy_config_cluster_v3_Filter_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_balancing_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_LoadBalancingPolicy* value) {
-  const upb_MiniTableField field = {41, UPB_SIZE(116, 240), 19, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_mutable_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_config_cluster_v3_Cluster_load_balancing_policy(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_load_balancing_policy(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lrs_server(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_ConfigSource* value) {
-  const upb_MiniTableField field = {42, UPB_SIZE(120, 248), 20, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_mutable_lrs_server(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_lrs_server(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_lrs_server(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_cluster_v3_Cluster_mutable_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, size_t* size) {
-  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_cluster_v3_Cluster_TransportSocketMatch**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch** envoy_config_cluster_v3_Cluster_resize_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_Cluster_TransportSocketMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_add_transport_socket_matches(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {43, UPB_SIZE(124, 256), 0, 28, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* sub = (struct envoy_config_cluster_v3_Cluster_TransportSocketMatch*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RefreshRate* value) {
-  const upb_MiniTableField field = {44, UPB_SIZE(128, 264), 21, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_mutable_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_RefreshRate* sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {45, UPB_SIZE(132, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) {
-  const upb_MiniTableField field = {46, UPB_SIZE(136, 272), 22, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)_upb_Message_New(&envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_timeout_budgets(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {47, UPB_SIZE(140, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {48, UPB_SIZE(144, 280), 23, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_upstream_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_upstream_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_cluster_stats(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_TrackClusterStats* value) {
-  const upb_MiniTableField field = {49, UPB_SIZE(148, 288), 24, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_mutable_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_TrackClusterStats* sub = (struct envoy_config_cluster_v3_TrackClusterStats*)envoy_config_cluster_v3_Cluster_track_cluster_stats(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_TrackClusterStats*)_upb_Message_New(&envoy_config_cluster_v3_TrackClusterStats_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_track_cluster_stats(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PreconnectPolicy* value) {
-  const upb_MiniTableField field = {50, UPB_SIZE(152, 296), 25, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_mutable_preconnect_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)envoy_config_cluster_v3_Cluster_preconnect_policy(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_preconnect_policy(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster *msg, bool value) {
-  const upb_MiniTableField field = {51, UPB_SIZE(156, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_maglev_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_MaglevLbConfig* value) {
-  const upb_MiniTableField field = {52, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_mutable_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)envoy_config_cluster_v3_Cluster_maglev_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_maglev_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_resolution_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) {
-  const upb_MiniTableField field = {53, UPB_SIZE(160, 304), 26, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_mutable_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_cluster_v3_Cluster_dns_resolution_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DnsResolutionConfig*)_upb_Message_New(&envoy_config_core_v3_DnsResolutionConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_dns_resolution_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_BoolValue* value) {
-  const upb_MiniTableField field = {54, UPB_SIZE(164, 312), 27, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mutable_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {55, UPB_SIZE(168, 320), 28, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* value) {
-  const upb_MiniTableField field = {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_mutable_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)envoy_config_cluster_v3_Cluster_round_robin_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.TransportSocketMatch */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_TransportSocketMatch*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_TransportSocketMatch* ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_TransportSocketMatch* ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_TransportSocketMatch_serialize(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_TransportSocketMatch_serialize_ex(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_TransportSocketMatch_name(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const struct google_protobuf_Struct* default_val = NULL;
-  const struct google_protobuf_Struct* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_match(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_clear_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_transport_socket(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const struct envoy_config_core_v3_TransportSocket* default_val = NULL;
-  const struct envoy_config_core_v3_TransportSocket* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_transport_socket(const envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct google_protobuf_Struct* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) {
-  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct envoy_config_core_v3_TransportSocket* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_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_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.CustomClusterType */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_CustomClusterType*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CustomClusterType* ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_CustomClusterType_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CustomClusterType* ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CustomClusterType_serialize(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CustomClusterType_serialize_ex(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_clear_name(envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_CustomClusterType_name(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_clear_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CustomClusterType_has_typed_config(const envoy_config_cluster_v3_Cluster_CustomClusterType* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_name(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_mutable_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.EdsClusterConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_EdsClusterConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_EdsClusterConfig* ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_clear_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
-  const struct envoy_config_core_v3_ConfigSource* default_val = NULL;
-  const struct envoy_config_core_v3_ConfigSource* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_EdsClusterConfig_has_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_clear_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name(const envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, struct envoy_config_core_v3_ConfigSource* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_mutable_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.cluster.v3.Cluster.LbSubsetConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const struct google_protobuf_Struct* default_val = NULL;
-  const struct google_protobuf_Struct* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_has_default_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_has_subset_selectors(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_subset_selectors(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_locality_weight_aware(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_scale_locality_weight(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_panic_mode_any(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_list_as_any(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_clear_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_metadata_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, struct google_protobuf_Struct* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector** envoy_config_cluster_v3_Cluster_LbSubsetConfig_resize_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_add_subset_selectors(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(18, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(19, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_serialize_ex(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_has_keys(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_keys(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_policy(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset_mutable_upb_array(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_has_fallback_keys_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  size_t size;
-  envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_fallback_keys_subset(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_clear_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_single_host_per_subset(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_resize_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_add_keys(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, int32_t value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_resize_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_add_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.cluster.v3.Cluster.SlowStartConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_SlowStartConfig* ret = envoy_config_cluster_v3_Cluster_SlowStartConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_SlowStartConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_SlowStartConfig* ret = envoy_config_cluster_v3_Cluster_SlowStartConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_SlowStartConfig_serialize(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_SlowStartConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_slow_start_window(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
-  const struct envoy_config_core_v3_RuntimeDouble* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_aggression(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_clear_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const struct envoy_type_v3_Percent* default_val = NULL;
-  const struct envoy_type_v3_Percent* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_min_weight_percent(const envoy_config_cluster_v3_Cluster_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy_config_core_v3_RuntimeDouble_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.RoundRobinLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret = envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret = envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_serialize(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_clear_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
-  const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_SlowStartConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_has_slow_start_config(const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.LeastRequestLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_serialize(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_choice_count(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
-  const struct envoy_config_core_v3_RuntimeDouble* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_active_request_bias(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_clear_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const envoy_config_cluster_v3_Cluster_SlowStartConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_SlowStartConfig* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_slow_start_config(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy_config_core_v3_RuntimeDouble_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.RingHashLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_RingHashLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RingHashLbConfig_serialize(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RingHashLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const struct google_protobuf_UInt64Value* default_val = NULL;
-  const struct google_protobuf_UInt64Value* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_minimum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_RingHashLbConfig_hash_function(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_clear_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const struct google_protobuf_UInt64Value* default_val = NULL;
-  const struct google_protobuf_UInt64Value* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_maximum_ring_size(const envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, int32_t value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.MaglevLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_MaglevLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_MaglevLbConfig_serialize(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_MaglevLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_clear_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
-  const struct google_protobuf_UInt64Value* default_val = NULL;
-  const struct google_protobuf_UInt64Value* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_MaglevLbConfig_has_table_size(const envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig *msg, struct google_protobuf_UInt64Value* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_mutable_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.OriginalDstLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_serialize(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_use_http_header(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_http_header_name(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_clear_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_has_upstream_port_override(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.CommonLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_CommonLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_zone_aware_lb_config = 2,
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_locality_weighted_lb_config = 3,
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_NOT_SET = 0
-} envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases;
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_case(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_config_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const struct envoy_type_v3_Percent* default_val = NULL;
-  const struct envoy_type_v3_Percent* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_healthy_panic_threshold(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_zone_aware_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_locality_weighted_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_update_merge_window(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ignore_new_hosts_until_first_hc(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_close_connections_on_host_set_change(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* default_val = NULL;
-  const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_consistent_hashing_lb_config(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_clear_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const struct envoy_config_core_v3_HealthStatusSet* default_val = NULL;
-  const struct envoy_config_core_v3_HealthStatusSet* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_override_host_status(const envoy_config_cluster_v3_Cluster_CommonLbConfig* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_type_v3_Percent* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 48), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 24), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(17, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 32), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_config_core_v3_HealthStatusSet* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_HealthStatusSet* sub = (struct envoy_config_core_v3_HealthStatusSet*)envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_HealthStatusSet*)_upb_Message_New(&envoy_config_core_v3_HealthStatusSet_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const struct envoy_type_v3_Percent* default_val = NULL;
-  const struct envoy_type_v3_Percent* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_has_routing_enabled(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const struct google_protobuf_UInt64Value* default_val = NULL;
-  const struct google_protobuf_UInt64Value* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_has_min_cluster_size(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_clear_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_fail_traffic_on_panic(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_serialize_ex(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_clear_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_use_hostname_for_hashing(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_clear_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_has_hash_balance_factor(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.RefreshRate */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_RefreshRate*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RefreshRate* ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_RefreshRate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_RefreshRate* ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RefreshRate_serialize(const envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_RefreshRate_serialize_ex(const envoy_config_cluster_v3_Cluster_RefreshRate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_clear_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_base_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_clear_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_max_interval(const envoy_config_cluster_v3_Cluster_RefreshRate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.PreconnectPolicy */
-
-UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Cluster_PreconnectPolicy*)_upb_Message_New(&envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_Cluster_PreconnectPolicy* ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize_ex(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_clear_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const struct google_protobuf_DoubleValue* default_val = NULL;
-  const struct google_protobuf_DoubleValue* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_clear_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const struct google_protobuf_DoubleValue* default_val = NULL;
-  const struct google_protobuf_DoubleValue* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) {
-  struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google_protobuf_DoubleValue_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy* msg, upb_Arena* arena) {
-  struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google_protobuf_DoubleValue_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry */
-
-UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_key(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_value(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
-  struct google_protobuf_Any* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_has_value(const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_set_value(envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry *msg, struct google_protobuf_Any* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(struct google_protobuf_Any*));
-}
-
-/* envoy.config.cluster.v3.LoadBalancingPolicy */
-
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_LoadBalancingPolicy*)_upb_Message_New(&envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_LoadBalancingPolicy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_LoadBalancingPolicy_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_LoadBalancingPolicy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_serialize_ex(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_clear_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const* envoy_config_cluster_v3_LoadBalancingPolicy_policies(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_upb_array(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_cluster_v3_LoadBalancingPolicy_policies_mutable_upb_array(const envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_has_policies(const envoy_config_cluster_v3_LoadBalancingPolicy* msg) {
-  size_t size;
-  envoy_config_cluster_v3_LoadBalancingPolicy_policies(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_cluster_v3_LoadBalancingPolicy_mutable_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy** envoy_config_cluster_v3_LoadBalancingPolicy_resize_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_add_policies(envoy_config_cluster_v3_LoadBalancingPolicy* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy*)_upb_Message_New(&envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.cluster.v3.LoadBalancingPolicy.Policy */
-
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_LoadBalancingPolicy_Policy*)_upb_Message_New(&envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_LoadBalancingPolicy_Policy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_LoadBalancingPolicy_Policy* ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_serialize_ex(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_clear_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_Policy_has_typed_extension_config(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_mutable_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.cluster.v3.UpstreamConnectionOptions */
-
-UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_UpstreamConnectionOptions*)_upb_Message_New(&envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_UpstreamConnectionOptions* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_UpstreamConnectionOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_UpstreamConnectionOptions* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_serialize(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_serialize_ex(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
-  const struct envoy_config_core_v3_TcpKeepalive* default_val = NULL;
-  const struct envoy_config_core_v3_TcpKeepalive* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_has_tcp_keepalive(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_set_local_interface_name_on_upstream_connections(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, struct envoy_config_core_v3_TcpKeepalive* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TcpKeepalive* sub = (struct envoy_config_core_v3_TcpKeepalive*)envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy_config_core_v3_TcpKeepalive_msg_init, arena);
-    if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.cluster.v3.TrackClusterStats */
-
-UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_TrackClusterStats*)_upb_Message_New(&envoy_config_cluster_v3_TrackClusterStats_msg_init, arena);
-}
-UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_cluster_v3_TrackClusterStats* ret = envoy_config_cluster_v3_TrackClusterStats_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_TrackClusterStats_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_cluster_v3_TrackClusterStats* ret = envoy_config_cluster_v3_TrackClusterStats_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_cluster_v3_TrackClusterStats_serialize(const envoy_config_cluster_v3_TrackClusterStats* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_TrackClusterStats_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_cluster_v3_TrackClusterStats_serialize_ex(const envoy_config_cluster_v3_TrackClusterStats* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_TrackClusterStats_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_clear_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_timeout_budgets(const envoy_config_cluster_v3_TrackClusterStats* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_clear_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats* msg) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_request_response_sizes(const envoy_config_cluster_v3_TrackClusterStats* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
deleted file mode 100644
index 534eacd550d9a..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/filter.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/filter.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_cluster_v3_Filter_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init = {
-  &envoy_config_cluster_v3_Filter_submsgs[0],
-  &envoy_config_cluster_v3_Filter__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_cluster_v3_Filter_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
deleted file mode 100644
index bbd3ee59b7c10..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/outlier_detection.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/outlier_detection.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[21] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[22] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(36, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(40, 80), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(44, 88), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(48, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(52, 96), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(56, 104), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(60, 112), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(64, 120), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(68, 128), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(72, 136), 17, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(76, 144), 18, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(80, 152), 19, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(84, 160), 20, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(88, 168), 21, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init = {
-  &envoy_config_cluster_v3_OutlierDetection_submsgs[0],
-  &envoy_config_cluster_v3_OutlierDetection__fields[0],
-  UPB_SIZE(96, 176), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
-    {0x003800000706003a, &upb_psm_1bt_maxmaxb},
-    {0x0040000008070042, &upb_psm_1bt_maxmaxb},
-    {0x004800000908004a, &upb_psm_1bt_maxmaxb},
-    {0x005000000a090052, &upb_psm_1bt_maxmaxb},
-    {0x005800000b0a005a, &upb_psm_1bt_maxmaxb},
-    {0x000300003f000060, &upb_psb1_1bt},
-    {0x006000000c0b006a, &upb_psm_1bt_maxmaxb},
-    {0x006800000d0c0072, &upb_psm_1bt_maxmaxb},
-    {0x007000000e0d007a, &upb_psm_1bt_maxmaxb},
-    {0x007800000f0e0182, &upb_psm_2bt_maxmaxb},
-    {0x00800000100f018a, &upb_psm_2bt_maxmaxb},
-    {0x0088000011100192, &upb_psm_2bt_maxmaxb},
-    {0x009000001211019a, &upb_psm_2bt_maxmaxb},
-    {0x00980000131201a2, &upb_psm_2bt_maxmaxb},
-    {0x00a00000141301aa, &upb_psm_2bt_maxmaxb},
-    {0x00a80000151401b2, &upb_psm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_cluster_v3_OutlierDetection_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c b/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c
deleted file mode 100644
index 7a7fc36292d2c..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/common/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/common/matcher/v3/matcher.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_submsgs[3] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3] = {
-  {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040100000a, &upb_pom_1bt_max64b},
-    {0x0010000402010012, &upb_pom_1bt_max64b},
-    {0x000800000102001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
-  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000402010012, &upb_pom_1bt_maxmaxb},
-    {0x001000040302001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000402010012, &upb_pom_1bt_max64b},
-    {0x001000040302001a, &upb_pom_1bt_max64b},
-    {0x0010000404030022, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init = {
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = {
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__fields[10] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init = {
-  &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0],
-  &envoy_config_common_matcher_v3_MatchPredicate__fields[0],
-  UPB_SIZE(8, 16), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004000020, &upb_pob1_1bt},
-    {0x000800000503002a, &upb_pom_1bt_max64b},
-    {0x0008000006040032, &upb_pom_1bt_max64b},
-    {0x000800000705003a, &upb_pom_1bt_max64b},
-    {0x0008000008060042, &upb_pom_1bt_max64b},
-    {0x000800000907004a, &upb_pom_1bt_max64b},
-    {0x000800000a080052, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init = {
-  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0],
-  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init = {
-  &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0],
-  &envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init = {
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0],
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init = {
-  NULL,
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pob_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[15] = {
-  &envoy_config_common_matcher_v3_Matcher_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init,
-  &envoy_config_common_matcher_v3_MatchPredicate_msg_init,
-  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init,
-  &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init,
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init,
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  15,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h b/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h
deleted file mode 100644
index 26088ce9b1495..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h
+++ /dev/null
@@ -1,1841 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/common/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
-#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_common_matcher_v3_Matcher envoy_config_common_matcher_v3_Matcher;
-typedef struct envoy_config_common_matcher_v3_Matcher_OnMatch envoy_config_common_matcher_v3_Matcher_OnMatch;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList envoy_config_common_matcher_v3_Matcher_MatcherList;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree envoy_config_common_matcher_v3_Matcher_MatcherTree;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap;
-typedef struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry;
-typedef struct envoy_config_common_matcher_v3_MatchPredicate envoy_config_common_matcher_v3_MatchPredicate;
-typedef struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet envoy_config_common_matcher_v3_MatchPredicate_MatchSet;
-typedef struct envoy_config_common_matcher_v3_HttpHeadersMatch envoy_config_common_matcher_v3_HttpHeadersMatch;
-typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch;
-typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init;
-struct envoy_config_core_v3_TypedExtensionConfig;
-struct envoy_config_route_v3_HeaderMatcher;
-struct envoy_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-
-
-
-/* envoy.config.common.matcher.v3.Matcher */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize(const envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_Matcher_matcher_type_matcher_list = 1,
-  envoy_config_common_matcher_v3_Matcher_matcher_type_matcher_tree = 2,
-  envoy_config_common_matcher_v3_Matcher_matcher_type_NOT_SET = 0
-} envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases envoy_config_common_matcher_v3_Matcher_matcher_type_case(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_matcher_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_matcher_list(envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_matcher_list(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_matcher_list(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_matcher_tree(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_matcher_tree(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_clear_on_no_match(envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_on_no_match(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_on_no_match(const envoy_config_common_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_list(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_mutable_matcher_list(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)envoy_config_common_matcher_v3_Matcher_matcher_list(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_list(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_tree(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_mutable_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherTree* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)envoy_config_common_matcher_v3_Matcher_matcher_tree(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_tree(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_on_no_match(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_mutable_on_no_match(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_on_no_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_set_on_no_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.OnMatch */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize_ex(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_matcher = 1,
-  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_action = 2,
-  envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_NOT_SET = 0
-} envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_case(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_OnMatch_on_match_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_clear_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const envoy_config_common_matcher_v3_Matcher* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_matcher(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_clear_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_action(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_action(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, envoy_config_common_matcher_v3_Matcher* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher* sub = (struct envoy_config_common_matcher_v3_Matcher*)envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_OnMatch_action(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherList */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_clear_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* const* envoy_config_common_matcher_v3_Matcher_MatcherList_matchers(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_has_matchers(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg) {
-  size_t size;
-  envoy_config_common_matcher_v3_Matcher_MatcherList_matchers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** envoy_config_common_matcher_v3_Matcher_MatcherList_mutable_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher** envoy_config_common_matcher_v3_Matcher_MatcherList_resize_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_add_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_single_predicate = 1,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_or_matcher = 2,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_and_matcher = 3,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_not_matcher = 4,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_NOT_SET = 0
-} envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_case(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_single_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_or_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_and_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_clear_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has_not_matcher(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_value_match = 2,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_custom_match = 3,
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_NOT_SET = 0
-} envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_case(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_input(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_value_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* const* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_has_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
-  size_t size;
-  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate** envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_resize_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_has_predicate(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const envoy_config_common_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_match(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherTree */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_exact_match_map = 2,
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_prefix_match_map = 3,
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_custom_match = 4,
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_NOT_SET = 0
-} envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_case(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_input(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_input(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_exact_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
-  const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_prefix_match_map(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_clear_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_custom_match(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_input(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap */
-
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_clear_map(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_size(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch** val) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_clear(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, envoy_config_common_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_delete(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
-}
-
-/* envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry */
-
-UPB_INLINE upb_StringView envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_key(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_value(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  envoy_config_common_matcher_v3_Matcher_OnMatch* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_has_value(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_value(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(envoy_config_common_matcher_v3_Matcher_OnMatch*));
-}
-
-/* envoy.config.common.matcher.v3.MatchPredicate */
-
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize(const envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_MatchPredicate_rule_or_match = 1,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_and_match = 2,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_not_match = 3,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_any_match = 4,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_headers_match = 5,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_trailers_match = 6,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_headers_match = 7,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_trailers_match = 8,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_request_generic_body_match = 9,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_http_response_generic_body_match = 10,
-  envoy_config_common_matcher_v3_MatchPredicate_rule_NOT_SET = 0
-} envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases envoy_config_common_matcher_v3_MatchPredicate_rule_case(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_MatchPredicate_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_or_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL;
-  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_or_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_and_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* default_val = NULL;
-  const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_and_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_not_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL;
-  const envoy_config_common_matcher_v3_MatchPredicate* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_not_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_any_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_any_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_any_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_headers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_trailers_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_request_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_clear_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* default_val = NULL;
-  const envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_generic_body_match(const envoy_config_common_matcher_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_or_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_or_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_or_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_and_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_and_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_and_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_not_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_mutable_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_common_matcher_v3_MatchPredicate_not_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_not_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_any_match(envoy_config_common_matcher_v3_MatchPredicate *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
-    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.MatchPredicate.MatchSet */
-
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_MatchSet_clear_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_MatchPredicate* const* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_common_matcher_v3_MatchPredicate* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_MatchSet_has_rules(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg) {
-  size_t size;
-  envoy_config_common_matcher_v3_MatchPredicate_MatchSet_rules(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_matcher_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_common_matcher_v3_MatchPredicate**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate** envoy_config_common_matcher_v3_MatchPredicate_MatchSet_resize_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_MatchPredicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_add_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.HttpHeadersMatch */
-
-UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpHeadersMatch_clear_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_common_matcher_v3_HttpHeadersMatch_headers(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpHeadersMatch_headers_mutable_upb_array(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_HttpHeadersMatch_has_headers(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg) {
-  size_t size;
-  envoy_config_common_matcher_v3_HttpHeadersMatch_headers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matcher_v3_HttpHeadersMatch_mutable_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_common_matcher_v3_HttpHeadersMatch_resize_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_common_matcher_v3_HttpHeadersMatch_add_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.HttpGenericBodyMatch */
-
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_config_common_matcher_v3_HttpGenericBodyMatch_bytes_limit(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_has_patterns(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
-  size_t size;
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_patterns(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch *msg, uint32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_resize_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_add_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch */
-
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_string_match = 1,
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_binary_match = 2,
-  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_NOT_SET = 0
-} envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases;
-UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_case(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_clear_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_string_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_has_string_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_clear_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_binary_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_has_binary_match(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
deleted file mode 100644
index 8ed19225bf8eb..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/address.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_Pipe__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Pipe_msg_init = {
-  NULL,
-  &envoy_config_core_v3_Pipe__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_EnvoyInternalAddress__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_EnvoyInternalAddress_msg_init = {
-  NULL,
-  &envoy_config_core_v3_EnvoyInternalAddress__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_SocketAddress__fields[6] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), -5, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init = {
-  NULL,
-  &envoy_config_core_v3_SocketAddress__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x002000003f000012, &upb_pss_1bt},
-    {0x0010000403000018, &upb_pov4_1bt},
-    {0x0010000404000022, &upb_pos_1bt},
-    {0x003000003f00002a, &upb_pss_1bt},
-    {0x000800003f000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_TcpKeepalive_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init = {
-  &envoy_config_core_v3_TcpKeepalive_submsgs[0],
-  &envoy_config_core_v3_TcpKeepalive__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOptionsOverride_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ExtraSourceAddress_msg_init = {
-  &envoy_config_core_v3_ExtraSourceAddress_submsgs[0],
-  &envoy_config_core_v3_ExtraSourceAddress__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[5] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_ExtraSourceAddress_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init = {
-  &envoy_config_core_v3_BindConfig_submsgs[0],
-  &envoy_config_core_v3_BindConfig__fields[0],
-  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f02001a, &upb_prm_1bt_maxmaxb},
-    {0x002000003f030022, &upb_prm_1bt_max128b},
-    {0x002800003f04002a, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Address_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_Pipe_msg_init},
-  {.submsg = &envoy_config_core_v3_EnvoyInternalAddress_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Address_msg_init = {
-  &envoy_config_core_v3_Address_submsgs[0],
-  &envoy_config_core_v3_Address__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max128b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_CidrRange_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init = {
-  &envoy_config_core_v3_CidrRange_submsgs[0],
-  &envoy_config_core_v3_CidrRange__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[8] = {
-  &envoy_config_core_v3_Pipe_msg_init,
-  &envoy_config_core_v3_EnvoyInternalAddress_msg_init,
-  &envoy_config_core_v3_SocketAddress_msg_init,
-  &envoy_config_core_v3_TcpKeepalive_msg_init,
-  &envoy_config_core_v3_ExtraSourceAddress_msg_init,
-  &envoy_config_core_v3_BindConfig_msg_init,
-  &envoy_config_core_v3_Address_msg_init,
-  &envoy_config_core_v3_CidrRange_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  8,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
deleted file mode 100644
index 4c539857e92a1..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/backoff.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/backoff.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_BackoffStrategy_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init = {
-  &envoy_config_core_v3_BackoffStrategy_submsgs[0],
-  &envoy_config_core_v3_BackoffStrategy__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_BackoffStrategy_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
deleted file mode 100644
index c764633f088c4..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/base.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/backoff.upb.h"
-#include "envoy/config/core/v3/http_uri.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "envoy/type/v3/semantic_version.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/core/v3/context_params.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_Locality__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Locality_msg_init = {
-  NULL,
-  &envoy_config_core_v3_Locality__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_BuildVersion_submsgs[2] = {
-  {.submsg = &envoy_type_v3_SemanticVersion_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_BuildVersion_msg_init = {
-  &envoy_config_core_v3_BuildVersion_submsgs[0],
-  &envoy_config_core_v3_BuildVersion__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_BuildVersion_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Extension_msg_init = {
-  &envoy_config_core_v3_Extension_submsgs[0],
-  &envoy_config_core_v3_Extension__fields[0],
-  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_pss_1bt},
-    {0x0038000001000022, &upb_psm_1bt_max64b},
-    {0x000100003f000028, &upb_psb1_1bt},
-    {0x004000003f000032, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Node_submsgs[6] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
-  {.submsg = &envoy_config_core_v3_BuildVersion_msg_init},
-  {.submsg = &envoy_config_core_v3_Extension_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Node_DynamicParametersEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = {
-  {1, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(48, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 64), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(32, 8), UPB_SIZE(-13, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 8), UPB_SIZE(-13, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(16, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(20, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(24, 104), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(28, 112), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Node_msg_init = {
-  &envoy_config_core_v3_Node_submsgs[0],
-  &envoy_config_core_v3_Node__fields[0],
-  UPB_SIZE(64, 120), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x002800003f000012, &upb_pss_1bt},
-    {0x003800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0040000002010022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004800003f000032, &upb_pss_1bt},
-    {0x000800040700003a, &upb_pos_1bt},
-    {0x0008000408020042, &upb_pom_1bt_max64b},
-    {0x005800003f03004a, &upb_prm_1bt_max128b},
-    {0x006000003f000052, &upb_prs_1bt},
-    {0x006800003f04005a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = {
-  {.submsg = &xds_core_v3_ContextParams_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Node_DynamicParametersEntry_msg_init = {
-  &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0],
-  &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Metadata_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Metadata_msg_init = {
-  &envoy_config_core_v3_Metadata_submsgs[0],
-  &envoy_config_core_v3_Metadata__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init = {
-  &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0],
-  &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init = {
-  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0],
-  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RuntimeUInt32__fields[2] = {
-  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init = {
-  NULL,
-  &envoy_config_core_v3_RuntimeUInt32__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x000800003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RuntimePercent_submsgs[1] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RuntimePercent_msg_init = {
-  &envoy_config_core_v3_RuntimePercent_submsgs[0],
-  &envoy_config_core_v3_RuntimePercent__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RuntimeDouble__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init = {
-  NULL,
-  &envoy_config_core_v3_RuntimeDouble__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RuntimeFeatureFlag_msg_init = {
-  &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0],
-  &envoy_config_core_v3_RuntimeFeatureFlag__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_QueryParameter__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_QueryParameter_msg_init = {
-  NULL,
-  &envoy_config_core_v3_QueryParameter__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HeaderValue__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HeaderValue_msg_init = {
-  NULL,
-  &envoy_config_core_v3_HeaderValue__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HeaderValueOption_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_HeaderValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init = {
-  &envoy_config_core_v3_HeaderValueOption_submsgs[0],
-  &envoy_config_core_v3_HeaderValueOption__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_max64b},
-    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HeaderMap_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_HeaderValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HeaderMap_msg_init = {
-  &envoy_config_core_v3_HeaderMap_submsgs[0],
-  &envoy_config_core_v3_HeaderMap__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_WatchedDirectory__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init = {
-  NULL,
-  &envoy_config_core_v3_WatchedDirectory__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[4] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_DataSource_msg_init = {
-  NULL,
-  &envoy_config_core_v3_DataSource__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pob_1bt},
-    {0x000800000300001a, &upb_pos_1bt},
-    {0x0008000004000022, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_BackoffStrategy_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RetryPolicy_msg_init = {
-  &envoy_config_core_v3_RetryPolicy_submsgs[0],
-  &envoy_config_core_v3_RetryPolicy__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_HttpUri_msg_init},
-  {.submsg = &envoy_config_core_v3_RetryPolicy_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RemoteDataSource_msg_init = {
-  &envoy_config_core_v3_RemoteDataSource_submsgs[0],
-  &envoy_config_core_v3_RemoteDataSource__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_AsyncDataSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_RemoteDataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_AsyncDataSource_msg_init = {
-  &envoy_config_core_v3_AsyncDataSource_submsgs[0],
-  &envoy_config_core_v3_AsyncDataSource__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_TransportSocket_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init = {
-  &envoy_config_core_v3_TransportSocket_submsgs[0],
-  &envoy_config_core_v3_TransportSocket__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RuntimeFractionalPercent_msg_init = {
-  &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0],
-  &envoy_config_core_v3_RuntimeFractionalPercent__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ControlPlane__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ControlPlane_msg_init = {
-  NULL,
-  &envoy_config_core_v3_ControlPlane__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[24] = {
-  &envoy_config_core_v3_Locality_msg_init,
-  &envoy_config_core_v3_BuildVersion_msg_init,
-  &envoy_config_core_v3_Extension_msg_init,
-  &envoy_config_core_v3_Node_msg_init,
-  &envoy_config_core_v3_Node_DynamicParametersEntry_msg_init,
-  &envoy_config_core_v3_Metadata_msg_init,
-  &envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init,
-  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init,
-  &envoy_config_core_v3_RuntimeUInt32_msg_init,
-  &envoy_config_core_v3_RuntimePercent_msg_init,
-  &envoy_config_core_v3_RuntimeDouble_msg_init,
-  &envoy_config_core_v3_RuntimeFeatureFlag_msg_init,
-  &envoy_config_core_v3_QueryParameter_msg_init,
-  &envoy_config_core_v3_HeaderValue_msg_init,
-  &envoy_config_core_v3_HeaderValueOption_msg_init,
-  &envoy_config_core_v3_HeaderMap_msg_init,
-  &envoy_config_core_v3_WatchedDirectory_msg_init,
-  &envoy_config_core_v3_DataSource_msg_init,
-  &envoy_config_core_v3_RetryPolicy_msg_init,
-  &envoy_config_core_v3_RemoteDataSource_msg_init,
-  &envoy_config_core_v3_AsyncDataSource_msg_init,
-  &envoy_config_core_v3_TransportSocket_msg_init,
-  &envoy_config_core_v3_RuntimeFractionalPercent_msg_init,
-  &envoy_config_core_v3_ControlPlane_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  24,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
deleted file mode 100644
index fc6fb270621d0..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/config_source.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/core/v3/authority.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_ApiConfigSource_submsgs[5] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RateLimitSettings_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(36, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init = {
-  &envoy_config_core_v3_ApiConfigSource_submsgs[0],
-  &envoy_config_core_v3_ApiConfigSource__fields[0],
-  UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x001000003f000012, &upb_prs_1bt},
-    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x002000003f010022, &upb_prm_1bt_maxmaxb},
-    {0x002800000202002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000003030032, &upb_psm_1bt_max64b},
-    {0x000800003f000038, &upb_psb1_1bt},
-    {0x000c00003f000040, &upb_psv4_1bt},
-    {0x003800003f04004a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_core_v3_AggregatedConfigSource_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SelfConfigSource_msg_init = {
-  NULL,
-  &envoy_config_core_v3_SelfConfigSource__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_RateLimitSettings_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_RateLimitSettings_msg_init = {
-  &envoy_config_core_v3_RateLimitSettings_submsgs[0],
-  &envoy_config_core_v3_RateLimitSettings__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_WatchedDirectory_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_PathConfigSource_msg_init = {
-  &envoy_config_core_v3_PathConfigSource_submsgs[0],
-  &envoy_config_core_v3_PathConfigSource__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_ConfigSource_submsgs[6] = {
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_AggregatedConfigSource_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_SelfConfigSource_msg_init},
-  {.submsg = &xds_core_v3_Authority_msg_init},
-  {.submsg = &envoy_config_core_v3_PathConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = {
-  {1, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 32), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init = {
-  &envoy_config_core_v3_ConfigSource_submsgs[0],
-  &envoy_config_core_v3_ConfigSource__fields[0],
-  UPB_SIZE(32, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040100000a, &upb_pos_1bt},
-    {0x0010000402000012, &upb_pom_1bt_max128b},
-    {0x001000040301001a, &upb_pom_1bt_max64b},
-    {0x0020000001020022, &upb_psm_1bt_maxmaxb},
-    {0x001000040503002a, &upb_pom_1bt_max64b},
-    {0x000800003f000030, &upb_psv4_1bt},
-    {0x002800003f04003a, &upb_prm_1bt_maxmaxb},
-    {0x0010000408050042, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init = {
-  &envoy_config_core_v3_ExtensionConfigSource_submsgs[0],
-  &envoy_config_core_v3_ExtensionConfigSource__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x001800003f000022, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_config_core_v3_ApiConfigSource_msg_init,
-  &envoy_config_core_v3_AggregatedConfigSource_msg_init,
-  &envoy_config_core_v3_SelfConfigSource_msg_init,
-  &envoy_config_core_v3_RateLimitSettings_msg_init,
-  &envoy_config_core_v3_PathConfigSource_msg_init,
-  &envoy_config_core_v3_ConfigSource_msg_init,
-  &envoy_config_core_v3_ExtensionConfigSource_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
deleted file mode 100644
index 5f9061379aa8b..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/event_service_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_EventServiceConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init = {
-  &envoy_config_core_v3_EventServiceConfig_submsgs[0],
-  &envoy_config_core_v3_EventServiceConfig__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_EventServiceConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
deleted file mode 100644
index a79e6d2a7578d..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init = {
-  &envoy_config_core_v3_TypedExtensionConfig_submsgs[0],
-  &envoy_config_core_v3_TypedExtensionConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_TypedExtensionConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
deleted file mode 100644
index c9603c6940336..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_core_v3_TypedExtensionConfig envoy_config_core_v3_TypedExtensionConfig;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-
-
-
-/* envoy.config.core.v3.TypedExtensionConfig */
-
-UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize(const envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize_ex(const envoy_config_core_v3_TypedExtensionConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TypedExtensionConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_clear_name(envoy_config_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_core_v3_TypedExtensionConfig_name(const envoy_config_core_v3_TypedExtensionConfig* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_clear_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_typed_config(const envoy_config_core_v3_TypedExtensionConfig* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_core_v3_TypedExtensionConfig_has_typed_config(const envoy_config_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_name(envoy_config_core_v3_TypedExtensionConfig *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_typed_config(envoy_config_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_mutable_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TypedExtensionConfig_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) envoy_config_core_v3_TypedExtensionConfig_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
deleted file mode 100644
index b1de078dbc714..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/grpc_method_list.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/grpc_method_list.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcMethodList_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcMethodList_Service_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcMethodList_msg_init = {
-  &envoy_config_core_v3_GrpcMethodList_submsgs[0],
-  &envoy_config_core_v3_GrpcMethodList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList_Service__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcMethodList_Service_msg_init = {
-  NULL,
-  &envoy_config_core_v3_GrpcMethodList_Service__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_core_v3_GrpcMethodList_msg_init,
-  &envoy_config_core_v3_GrpcMethodList_Service_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
deleted file mode 100644
index 2d3907c377baa..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/grpc_service.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/empty.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/sensitive.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[4] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[4] = {
-  {1, UPB_SIZE(16, 24), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 16), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init = {
-  &envoy_config_core_v3_GrpcService_submsgs[0],
-  &envoy_config_core_v3_GrpcService__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800040100000a, &upb_pom_1bt_max64b},
-    {0x0018000402010012, &upb_pom_1bt_max128b},
-    {0x000800000102001a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f03002a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_RetryPolicy_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init = {
-  &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0],
-  &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fields[8] = {
-  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 72), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 80), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 88), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0],
-  UPB_SIZE(48, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x002000003f01001a, &upb_prm_1bt_max64b},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x003800003f00002a, &upb_pss_1bt},
-    {0x0048000002020032, &upb_psm_1bt_maxmaxb},
-    {0x005000000303003a, &upb_psm_1bt_maxmaxb},
-    {0x0058000004040042, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init},
-  {.submsg = &google_protobuf_Empty_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = {
-  {.submsg = &google_protobuf_Empty_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[7] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0],
-  UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pom_1bt_maxmaxb},
-    {0x000800000300001a, &upb_pos_1bt},
-    {0x0008000004010022, &upb_pom_1bt_max64b},
-    {0x000800000502002a, &upb_pom_1bt_max64b},
-    {0x0008000006030032, &upb_pom_1bt_max64b},
-    {0x000800000704003a, &upb_pom_1bt_max192b},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init = {
-  NULL,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init = {
-  NULL,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[9] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(48, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(56, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(64, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init = {
-  NULL,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[0],
-  UPB_SIZE(72, 144), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_pss_1bt},
-    {0x003000003f000022, &upb_pss_1bt},
-    {0x004000003f00002a, &upb_pss_1bt},
-    {0x005000003f000032, &upb_pss_1bt},
-    {0x006000003f00003a, &upb_pss_1bt},
-    {0x007000003f000042, &upb_pss_1bt},
-    {0x008000003f00004a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init = {
-  NULL,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000010, &upb_pov8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msg_init = {
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0],
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[14] = {
-  &envoy_config_core_v3_GrpcService_msg_init,
-  &envoy_config_core_v3_GrpcService_EnvoyGrpc_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msg_init,
-  &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  14,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
deleted file mode 100644
index a586b80dfa579..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/health_check.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "envoy/type/v3/http.upb.h"
-#include "envoy/type/v3/range.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 "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_HealthStatusSet__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthStatusSet_msg_init = {
-  NULL,
-  &envoy_config_core_v3_HealthStatusSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_ppv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_submsgs[21] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_EventServiceConfig_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 56), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 64), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(32, 72), 8, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(84, 168), UPB_SIZE(-37, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(40, 80), 9, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(44, 88), 10, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(48, 96), 11, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(88, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(52, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(56, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(60, 120), 12, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(64, 128), 13, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(68, 136), 14, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(72, 144), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(76, 152), 16, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(80, 160), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_submsgs[0],
-  &envoy_config_core_v3_HealthCheck__fields[0],
-  UPB_SIZE(96, 176), 24, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
-    {0x002000000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000004030022, &upb_psm_1bt_maxmaxb},
-    {0x003000000504002a, &upb_psm_1bt_maxmaxb},
-    {0x0038000006050032, &upb_psm_1bt_maxmaxb},
-    {0x004000000706003a, &upb_psm_1bt_maxmaxb},
-    {0x00a8000408070042, &upb_pom_1bt_max128b},
-    {0x00a800040908004a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00a800040b09005a, &upb_pom_1bt_max64b},
-    {0x00480000080a0062, &upb_psm_1bt_maxmaxb},
-    {0x00a800040d0b006a, &upb_pom_1bt_max64b},
-    {0x00500000090c0072, &upb_psm_1bt_maxmaxb},
-    {0x005800000a0d007a, &upb_psm_1bt_maxmaxb},
-    {0x006000000b0e0182, &upb_psm_2bt_maxmaxb},
-    {0x006800003f00018a, &upb_pss_2bt},
-    {0x000800003f000190, &upb_psv4_2bt},
-    {0x000c00003f000198, &upb_psb1_2bt},
-    {0x007800000c0f01a2, &upb_psm_2bt_maxmaxb},
-    {0x008000000d1001aa, &upb_psm_2bt_max64b},
-    {0x008800000e1101b2, &upb_psm_2bt_maxmaxb},
-    {0x009000000f1201ba, &upb_psm_2bt_maxmaxb},
-    {0x00980000101301c2, &upb_psm_2bt_maxmaxb},
-    {0x00a000003f1401ca, &upb_prm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_Payload__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_Payload_msg_init = {
-  NULL,
-  &envoy_config_core_v3_HealthCheck_Payload__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pob_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = {
-  {.submsg = &envoy_config_core_v3_HealthCheck_Payload_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_Payload_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_type_v3_Int64Range_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_type_v3_Int64Range_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[12] = {
-  {1, UPB_SIZE(44, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(52, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(16, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(20, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(24, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(28, 88), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(32, 96), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(36, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(40, 104), 3, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0],
-  &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0],
-  UPB_SIZE(64, 112), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x002000003f000012, &upb_pss_1bt},
-    {0x003000000100001a, &upb_psm_1bt_max64b},
-    {0x003800003f010022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004000003f020032, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004800003f000042, &upb_prs_1bt},
-    {0x005000003f03004a, &upb_prm_1bt_maxmaxb},
-    {0x000400003f000050, &upb_psv4_1bt},
-    {0x005800000204005a, &upb_psm_1bt_maxmaxb},
-    {0x006000003f050062, &upb_prm_1bt_maxmaxb},
-    {0x000800003f000068, &upb_psv4_1bt},
-    {0x0068000003060072, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_HealthCheck_Payload_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_Payload_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0],
-  &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init = {
-  NULL,
-  &envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[3] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(0, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0],
-  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init = {
-  &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0],
-  &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TlsOptions__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HealthCheck_TlsOptions_msg_init = {
-  NULL,
-  &envoy_config_core_v3_HealthCheck_TlsOptions__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prs_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[9] = {
-  &envoy_config_core_v3_HealthStatusSet_msg_init,
-  &envoy_config_core_v3_HealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_Payload_msg_init,
-  &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msg_init,
-  &envoy_config_core_v3_HealthCheck_TlsOptions_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  9,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
deleted file mode 100644
index 9fa705715ae76..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/http_uri.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/http_uri.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_HttpUri_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = {
-  {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HttpUri_msg_init = {
-  &envoy_config_core_v3_HttpUri_submsgs[0],
-  &envoy_config_core_v3_HttpUri__fields[0],
-  UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0008000402000012, &upb_pos_1bt},
-    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_HttpUri_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
deleted file mode 100644
index 8e8a48c47651a..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/protocol.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/protocol.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTable envoy_config_core_v3_TcpProtocolOptions_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_QuicKeepAliveSettings_msg_init = {
-  &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0],
-  &envoy_config_core_v3_QuicKeepAliveSettings__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[5] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_QuicKeepAliveSettings_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_QuicProtocolOptions_msg_init = {
-  &envoy_config_core_v3_QuicProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_QuicProtocolOptions__fields[0],
-  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800000504002a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init = {
-  NULL,
-  &envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000800003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init = {
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0],
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x003000003f00002a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init = {
-  NULL,
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields[6] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_HttpProtocolOptions_msg_init = {
-  &envoy_config_core_v3_HttpProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_HttpProtocolOptions__fields[0],
-  UPB_SIZE(32, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0028000005040032, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__fields[10] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(17, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 5), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_Http1ProtocolOptions__fields[0],
-  UPB_SIZE(48, 56), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x001000003f00001a, &upb_pss_1bt},
-    {0x0020000002010022, &upb_psm_1bt_max64b},
-    {0x000200003f000028, &upb_psb1_1bt},
-    {0x000300003f000030, &upb_psb1_1bt},
-    {0x002800000302003a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000040, &upb_psb1_1bt},
-    {0x003000000403004a, &upb_psm_1bt_maxmaxb},
-    {0x000500003f000050, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init = {
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0],
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000008010042, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_KeepaliveSettings_submsgs[4] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_KeepaliveSettings_msg_init = {
-  &envoy_config_core_v3_KeepaliveSettings_submsgs[0],
-  &envoy_config_core_v3_KeepaliveSettings__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_KeepaliveSettings_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__fields[16] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(21, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(40, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(44, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(48, 80), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(52, 88), 10, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(56, 96), 11, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(60, 104), 12, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_Http2ProtocolOptions__fields[0],
-  UPB_SIZE(64, 112), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x000200003f000028, &upb_psb1_1bt},
-    {0x000300003f000030, &upb_psb1_1bt},
-    {0x002800000504003a, &upb_psm_1bt_maxmaxb},
-    {0x0030000006050042, &upb_psm_1bt_maxmaxb},
-    {0x003800000706004a, &upb_psm_1bt_maxmaxb},
-    {0x0040000008070052, &upb_psm_1bt_maxmaxb},
-    {0x004800000908005a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000060, &upb_psb1_1bt},
-    {0x005000003f09006a, &upb_prm_1bt_max64b},
-    {0x005800000a0a0072, &upb_psm_1bt_maxmaxb},
-    {0x006000000b0b007a, &upb_psm_1bt_max64b},
-    {0x006800000c0c0182, &upb_psm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init = {
-  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0],
-  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_Http2ProtocolOptions_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_GrpcProtocolOptions_msg_init = {
-  &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_GrpcProtocolOptions__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_QuicProtocolOptions_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_Http3ProtocolOptions_msg_init = {
-  &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0],
-  &envoy_config_core_v3_Http3ProtocolOptions__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000028, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SchemeHeaderTransformation_msg_init = {
-  NULL,
-  &envoy_config_core_v3_SchemeHeaderTransformation__fields[0],
-  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[16] = {
-  &envoy_config_core_v3_TcpProtocolOptions_msg_init,
-  &envoy_config_core_v3_QuicKeepAliveSettings_msg_init,
-  &envoy_config_core_v3_QuicProtocolOptions_msg_init,
-  &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init,
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_msg_init,
-  &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_msg_init,
-  &envoy_config_core_v3_HttpProtocolOptions_msg_init,
-  &envoy_config_core_v3_Http1ProtocolOptions_msg_init,
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msg_init,
-  &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msg_init,
-  &envoy_config_core_v3_KeepaliveSettings_msg_init,
-  &envoy_config_core_v3_Http2ProtocolOptions_msg_init,
-  &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msg_init,
-  &envoy_config_core_v3_GrpcProtocolOptions_msg_init,
-  &envoy_config_core_v3_Http3ProtocolOptions_msg_init,
-  &envoy_config_core_v3_SchemeHeaderTransformation_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  16,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
deleted file mode 100644
index ead1817f058d6..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/proxy_protocol.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/proxy_protocol.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init = {
-  NULL,
-  &envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_ppv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields[2] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_ProxyProtocolConfig_msg_init = {
-  &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0],
-  &envoy_config_core_v3_ProxyProtocolConfig__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_core_v3_ProxyProtocolPassThroughTLVs_msg_init,
-  &envoy_config_core_v3_ProxyProtocolConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
deleted file mode 100644
index a488ad6a9540f..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/resolver.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/resolver.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_DnsResolverOptions__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_DnsResolverOptions_msg_init = {
-  NULL,
-  &envoy_config_core_v3_DnsResolverOptions__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_DnsResolverOptions_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_DnsResolutionConfig_msg_init = {
-  &envoy_config_core_v3_DnsResolutionConfig_submsgs[0],
-  &envoy_config_core_v3_DnsResolutionConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_core_v3_DnsResolverOptions_msg_init,
-  &envoy_config_core_v3_DnsResolutionConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
deleted file mode 100644
index ca22482993b36..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/socket_option.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_core_v3_SocketOption__fields[6] = {
-  {1, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 40), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(24, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 8), -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init = {
-  NULL,
-  &envoy_config_core_v3_SocketOption__fields[0],
-  UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x002800003f000010, &upb_psv8_1bt},
-    {0x003000003f000018, &upb_psv8_1bt},
-    {0x0008000004000020, &upb_pov8_1bt},
-    {0x000800000500002a, &upb_pob_1bt},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SocketOptionsOverride_msg_init = {
-  &envoy_config_core_v3_SocketOptionsOverride_submsgs[0],
-  &envoy_config_core_v3_SocketOptionsOverride__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_core_v3_SocketOption_msg_init,
-  &envoy_config_core_v3_SocketOptionsOverride_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
deleted file mode 100644
index 26d52c3b59366..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/substitution_format_string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/substitution_format_string.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_SubstitutionFormatString_submsgs[3] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__fields[6] = {
-  {1, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 8), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 8), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(8, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_SubstitutionFormatString_msg_init = {
-  &envoy_config_core_v3_SubstitutionFormatString_submsgs[0],
-  &envoy_config_core_v3_SubstitutionFormatString__fields[0],
-  UPB_SIZE(32, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040100000a, &upb_pos_1bt},
-    {0x0008000402000012, &upb_pom_1bt_maxmaxb},
-    {0x000000003f000018, &upb_psb1_1bt},
-    {0x001800003f000022, &upb_pss_1bt},
-    {0x000800040501002a, &upb_pom_1bt_maxmaxb},
-    {0x002800003f020032, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_SubstitutionFormatString_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
deleted file mode 100644
index 72f3dbbc6e368..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/udp_socket_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/udp_socket_config.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_core_v3_UdpSocketConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_core_v3_UdpSocketConfig_msg_init = {
-  &envoy_config_core_v3_UdpSocketConfig_submsgs[0],
-  &envoy_config_core_v3_UdpSocketConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_UdpSocketConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
deleted file mode 100644
index 7c81be7a49839..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/endpoint/v3/endpoint.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/endpoint/v3/endpoint.upb.h"
-#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = {
-  {.submsg = &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__fields[4] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0],
-  &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0020000001010022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = {
-  {.submsg = &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[3] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0],
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x001000000101001a, &upb_psm_1bt_maxmaxb},
-    {0x0018000002020022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0],
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = {
-  {.submsg = &envoy_config_endpoint_v3_Endpoint_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msg_init = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0],
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msg_init,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msg_init,
-  &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
deleted file mode 100644
index 41c21b92059d1..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/endpoint/v3/endpoint_components.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_Endpoint_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_submsgs[0],
-  &envoy_config_endpoint_v3_Endpoint__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[4] = {
-  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0],
-  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000000100001a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init = {
-  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0],
-  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = {
-  {.submsg = &envoy_config_endpoint_v3_Endpoint_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] = {
-  {1, UPB_SIZE(20, 16), UPB_SIZE(-17, -9), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 16), UPB_SIZE(-17, -9), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_LbEndpoint_msg_init = {
-  &envoy_config_endpoint_v3_LbEndpoint_submsgs[0],
-  &envoy_config_endpoint_v3_LbEndpoint__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000080100000a, &upb_pom_1bt_max64b},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000002020022, &upb_psm_1bt_maxmaxb},
-    {0x001000080500002a, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init = {
-  &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0],
-  &envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[6] = {
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_LbEndpoint_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[7] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 40), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 48), UPB_SIZE(-25, -9), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 48), UPB_SIZE(-25, -9), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init = {
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0],
-  &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0],
-  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001800003f010012, &upb_prm_1bt_max64b},
-    {0x002000000202001a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x0028000003030032, &upb_psm_1bt_maxmaxb},
-    {0x003000080704003a, &upb_pom_1bt_max64b},
-    {0x0030000808050042, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = {
-  {.submsg = &envoy_config_endpoint_v3_LbEndpoint_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init = {
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0],
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_config_endpoint_v3_Endpoint_msg_init,
-  &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msg_init,
-  &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_msg_init,
-  &envoy_config_endpoint_v3_LbEndpoint_msg_init,
-  &envoy_config_endpoint_v3_LedsClusterLocalityConfig_msg_init,
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_msg_init,
-  &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
deleted file mode 100644
index f0ba27448da40..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/endpoint/v3/load_report.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/endpoint/v3/load_report.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[8] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(48, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init = {
-  &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0],
-  &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x001800003f000018, &upb_psv8_1bt},
-    {0x002000003f000020, &upb_psv8_1bt},
-    {0x002800003f01002a, &upb_prm_1bt_max64b},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x003000003f02003a, &upb_prm_1bt_max128b},
-    {0x003800003f000040, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__fields[7] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(40, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init = {
-  &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0],
-  &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0],
-  UPB_SIZE(48, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x001800003f000018, &upb_psv8_1bt},
-    {0x002000003f000020, &upb_psv8_1bt},
-    {0x002800003f01002a, &upb_prm_1bt_max64b},
-    {0x0030000002020032, &upb_psm_1bt_maxmaxb},
-    {0x003800003f000038, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init = {
-  NULL,
-  &envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x001800003f000019, &upb_psf8_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterStats_submsgs[3] = {
-  {.submsg = &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterStats_msg_init = {
-  &envoy_config_endpoint_v3_ClusterStats_submsgs[0],
-  &envoy_config_endpoint_v3_ClusterStats__fields[0],
-  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x002000003f000018, &upb_psv8_1bt},
-    {0x0028000001010022, &upb_psm_1bt_maxmaxb},
-    {0x003000003f02002a, &upb_prm_1bt_max64b},
-    {0x003800003f000032, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init = {
-  NULL,
-  &envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_config_endpoint_v3_UpstreamLocalityStats_msg_init,
-  &envoy_config_endpoint_v3_UpstreamEndpointStats_msg_init,
-  &envoy_config_endpoint_v3_EndpointLoadMetricStats_msg_init,
-  &envoy_config_endpoint_v3_ClusterStats_msg_init,
-  &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
deleted file mode 100644
index b1be60b5349d0..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/listener/v3/api_listener.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/listener/v3/api_listener.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_listener_v3_ApiListener_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_ApiListener_msg_init = {
-  &envoy_config_listener_v3_ApiListener_submsgs[0],
-  &envoy_config_listener_v3_ApiListener__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_listener_v3_ApiListener_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
deleted file mode 100644
index 62cbc8c1ca142..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/listener/v3/listener.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/listener/v3/listener.upb.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "envoy/config/listener/v3/api_listener.upb.h"
-#include "envoy/config/listener/v3/listener_components.upb.h"
-#include "envoy/config/listener/v3/udp_listener_config.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/collection_entry.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_listener_v3_AdditionalAddress_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOptionsOverride_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_AdditionalAddress_msg_init = {
-  &envoy_config_listener_v3_AdditionalAddress_submsgs[0],
-  &envoy_config_listener_v3_AdditionalAddress__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_ListenerCollection_submsgs[1] = {
-  {.submsg = &xds_core_v3_CollectionEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_ListenerCollection_msg_init = {
-  &envoy_config_listener_v3_ListenerCollection_submsgs[0],
-  &envoy_config_listener_v3_ListenerCollection__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_Listener_submsgs[24] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_listener_v3_FilterChain_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init},
-  {.submsg = &envoy_config_listener_v3_ListenerFilter_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_listener_v3_UdpListenerConfig_msg_init},
-  {.submsg = &envoy_config_listener_v3_ApiListener_msg_init},
-  {.submsg = &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AccessLog_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_listener_v3_FilterChain_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_msg_init},
-  {.submsg = &envoy_config_listener_v3_AdditionalAddress_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = {
-  {1, UPB_SIZE(124, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 56), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 64), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 72), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 80), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 88), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 96), 6, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(40, 104), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(44, 112), 8, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(48, 120), 0, 10, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(52, 128), 9, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(56, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(64, 136), 10, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(68, 144), 11, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(72, 152), 12, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(76, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(80, 160), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(84, 168), 13, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(88, 176), 14, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(92, 184), 15, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(120, 240), UPB_SIZE(-97, -17), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(132, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {29, UPB_SIZE(100, 208), 16, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(104, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(105, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(108, 216), 17, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(112, 224), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(116, 232), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_Listener_msg_init = {
-  &envoy_config_listener_v3_Listener_submsgs[0],
-  &envoy_config_listener_v3_Listener__fields[0],
-  UPB_SIZE(144, 248), 32, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0028000001000012, &upb_psm_1bt_maxmaxb},
-    {0x003000003f01001a, &upb_prm_1bt_maxmaxb},
-    {0x0038000002020022, &upb_psm_1bt_maxmaxb},
-    {0x004000000303002a, &upb_psm_1bt_maxmaxb},
-    {0x0048000004040032, &upb_psm_1bt_maxmaxb},
-    {0x005000000505003a, &upb_psm_1bt_max64b},
-    {0x000400003f000040, &upb_psv4_1bt},
-    {0x005800003f06004a, &upb_prm_1bt_maxmaxb},
-    {0x0060000006070052, &upb_psm_1bt_maxmaxb},
-    {0x006800000708005a, &upb_psm_1bt_maxmaxb},
-    {0x0070000008090062, &upb_psm_1bt_maxmaxb},
-    {0x007800003f0a006a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00800000090b007a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000180, &upb_psv4_2bt},
-    {0x000c00003f000188, &upb_psb1_2bt},
-    {0x008800000a0c0192, &upb_psm_2bt_maxmaxb},
-    {0x009000000b0d019a, &upb_psm_2bt_maxmaxb},
-    {0x009800000c0e01a2, &upb_psm_2bt_max64b},
-    {0x000d00003f0001a8, &upb_psb1_2bt},
-    {0x00a000003f0f01b2, &upb_prm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00a800000d1001c2, &upb_psm_2bt_maxmaxb},
-    {0x00b000000e1101ca, &upb_psm_2bt_maxmaxb},
-    {0x00b800000f1201d2, &upb_psm_2bt_maxmaxb},
-    {0x00f000101b1301da, &upb_pom_2bt_max64b},
-    {0x00c000003f0001e2, &upb_pss_2bt},
-    {0x00d00000101401ea, &upb_psm_2bt_maxmaxb},
-    {0x001400003f0001f0, &upb_psb1_2bt},
-    {0x001500003f0001f8, &upb_psb1_2bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_Listener_DeprecatedV1_msg_init = {
-  &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0],
-  &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = {
-  {.submsg = &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init = {
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0],
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_listener_v3_ListenerManager_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_listener_v3_ValidationListenerManager_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_listener_v3_ApiListenerManager_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[10] = {
-  &envoy_config_listener_v3_AdditionalAddress_msg_init,
-  &envoy_config_listener_v3_ListenerCollection_msg_init,
-  &envoy_config_listener_v3_Listener_msg_init,
-  &envoy_config_listener_v3_Listener_DeprecatedV1_msg_init,
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msg_init,
-  &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msg_init,
-  &envoy_config_listener_v3_Listener_InternalListenerConfig_msg_init,
-  &envoy_config_listener_v3_ListenerManager_msg_init,
-  &envoy_config_listener_v3_ValidationListenerManager_msg_init,
-  &envoy_config_listener_v3_ApiListenerManager_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  10,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
deleted file mode 100644
index bfda95582cac4..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/listener/v3/listener_components.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/listener/v3/listener_components.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/type/v3/range.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_listener_v3_Filter_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_config_core_v3_ExtensionConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_Filter_msg_init = {
-  &envoy_config_listener_v3_Filter_submsgs[0],
-  &envoy_config_listener_v3_Filter__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0018000004000022, &upb_pom_1bt_maxmaxb},
-    {0x001800000501002a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_FilterChainMatch_submsgs[5] = {
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__fields[11] = {
-  {3, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 48), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 56), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(24, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(28, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(36, 96), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_FilterChainMatch_msg_init = {
-  &envoy_config_listener_v3_FilterChainMatch_submsgs[0],
-  &envoy_config_listener_v3_FilterChainMatch__fields[0],
-  UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00001a, &upb_prm_1bt_maxmaxb},
-    {0x001000003f000022, &upb_pss_1bt},
-    {0x002000000101002a, &upb_psm_1bt_maxmaxb},
-    {0x002800003f020032, &upb_prm_1bt_maxmaxb},
-    {0x003000003f00003a, &upb_ppv4_1bt},
-    {0x0038000002030042, &upb_psm_1bt_maxmaxb},
-    {0x004000003f00004a, &upb_pss_1bt},
-    {0x005000003f000052, &upb_prs_1bt},
-    {0x005800003f00005a, &upb_prs_1bt},
-    {0x000400003f000060, &upb_psv4_1bt},
-    {0x006000003f04006a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_submsgs[7] = {
-  {.submsg = &envoy_config_listener_v3_FilterChainMatch_msg_init},
-  {.submsg = &envoy_config_listener_v3_Filter_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_core_v3_TransportSocket_msg_init},
-  {.submsg = &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 40), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 64), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 72), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_FilterChain_msg_init = {
-  &envoy_config_listener_v3_FilterChain_submsgs[0],
-  &envoy_config_listener_v3_FilterChain__fields[0],
-  UPB_SIZE(40, 80), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f01001a, &upb_prm_1bt_max64b},
-    {0x0018000002020022, &upb_psm_1bt_maxmaxb},
-    {0x002000000303002a, &upb_psm_1bt_maxmaxb},
-    {0x0028000004040032, &upb_psm_1bt_maxmaxb},
-    {0x003000003f00003a, &upb_pss_1bt},
-    {0x0040000005050042, &upb_psm_1bt_max64b},
-    {0x004800000606004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init = {
-  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0],
-  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = {
-  {.submsg = &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init},
-  {.submsg = &envoy_type_v3_Int32Range_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[5] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init = {
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0],
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0],
-  UPB_SIZE(8, 16), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004000020, &upb_pob1_1bt},
-    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = {
-  {.submsg = &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init = {
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0],
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilter_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init},
-  {.submsg = &envoy_config_core_v3_ExtensionConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[4] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_ListenerFilter_msg_init = {
-  &envoy_config_listener_v3_ListenerFilter_submsgs[0],
-  &envoy_config_listener_v3_ListenerFilter__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000040300001a, &upb_pom_1bt_maxmaxb},
-    {0x0018000001010022, &upb_psm_1bt_max64b},
-    {0x002000040502002a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_config_listener_v3_Filter_msg_init,
-  &envoy_config_listener_v3_FilterChainMatch_msg_init,
-  &envoy_config_listener_v3_FilterChain_msg_init,
-  &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msg_init,
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msg_init,
-  &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msg_init,
-  &envoy_config_listener_v3_ListenerFilter_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_listener_v3_listener_components_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c
deleted file mode 100644
index e011690a9996b..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/listener/v3/quic_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/listener/v3/quic_config.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/protocol.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[9] = {
-  {.submsg = &envoy_config_core_v3_QuicProtocolOptions_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeFeatureFlag_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[9] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 64), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(36, 72), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_QuicProtocolOptions_msg_init = {
-  &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0],
-  &envoy_config_listener_v3_QuicProtocolOptions__fields[0],
-  UPB_SIZE(40, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
-    {0x003800000706003a, &upb_psm_1bt_maxmaxb},
-    {0x0040000008070042, &upb_psm_1bt_maxmaxb},
-    {0x004800000908004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_listener_v3_QuicProtocolOptions_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
deleted file mode 100644
index 928ac12d778b2..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/listener/v3/udp_listener_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/listener/v3/udp_listener_config.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/udp_socket_config.upb.h"
-#include "envoy/config/listener/v3/quic_config.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_UdpSocketConfig_msg_init},
-  {.submsg = &envoy_config_listener_v3_QuicProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fields[3] = {
-  {5, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_listener_v3_UdpListenerConfig_msg_init = {
-  &envoy_config_listener_v3_UdpListenerConfig_submsgs[0],
-  &envoy_config_listener_v3_UdpListenerConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100002a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000201003a, &upb_psm_1bt_maxmaxb},
-    {0x0018000003020042, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_listener_v3_UdpListenerConfig_msg_init,
-  &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c b/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c
deleted file mode 100644
index 0b8294c13804e..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/metrics/v3/metrics_service.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/metrics/v3/metrics_service.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fields[5] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_MetricsServiceConfig_msg_init = {
-  &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0],
-  &envoy_config_metrics_v3_MetricsServiceConfig__fields[0],
-  UPB_SIZE(24, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x000c00003f000028, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_metrics_v3_MetricsServiceConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c b/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c
deleted file mode 100644
index 4f1b0888b3edc..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/metrics/v3/stats.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/metrics/v3/stats.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_metrics_v3_StatsSink_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_StatsSink_msg_init = {
-  &envoy_config_metrics_v3_StatsSink_submsgs[0],
-  &envoy_config_metrics_v3_StatsSink__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_metrics_v3_StatsConfig_submsgs[4] = {
-  {.submsg = &envoy_config_metrics_v3_TagSpecifier_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_metrics_v3_StatsMatcher_msg_init},
-  {.submsg = &envoy_config_metrics_v3_HistogramBucketSettings_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_StatsConfig_msg_init = {
-  &envoy_config_metrics_v3_StatsConfig_submsgs[0],
-  &envoy_config_metrics_v3_StatsConfig__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000202001a, &upb_psm_1bt_max64b},
-    {0x002000003f030022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_metrics_v3_StatsMatcher_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_ListStringMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_ListStringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_StatsMatcher_msg_init = {
-  &envoy_config_metrics_v3_StatsMatcher_submsgs[0],
-  &envoy_config_metrics_v3_StatsMatcher__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_pob1_1bt},
-    {0x0008000002000012, &upb_pom_1bt_maxmaxb},
-    {0x000800000301001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_TagSpecifier__fields[3] = {
-  {1, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_TagSpecifier_msg_init = {
-  NULL,
-  &envoy_config_metrics_v3_TagSpecifier__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x000800000300001a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_HistogramBucketSettings_msg_init = {
-  &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0],
-  &envoy_config_metrics_v3_HistogramBucketSettings__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_ppf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_metrics_v3_StatsdSink_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_StatsdSink_msg_init = {
-  &envoy_config_metrics_v3_StatsdSink_submsgs[0],
-  &envoy_config_metrics_v3_StatsdSink__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3] = {
-  {1, UPB_SIZE(12, 32), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 24), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_DogStatsdSink_msg_init = {
-  &envoy_config_metrics_v3_DogStatsdSink_submsgs[0],
-  &envoy_config_metrics_v3_DogStatsdSink__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000040100000a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00001a, &upb_pss_1bt},
-    {0x0018000001010022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_metrics_v3_HystrixSink__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_metrics_v3_HystrixSink_msg_init = {
-  NULL,
-  &envoy_config_metrics_v3_HystrixSink__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[8] = {
-  &envoy_config_metrics_v3_StatsSink_msg_init,
-  &envoy_config_metrics_v3_StatsConfig_msg_init,
-  &envoy_config_metrics_v3_StatsMatcher_msg_init,
-  &envoy_config_metrics_v3_TagSpecifier_msg_init,
-  &envoy_config_metrics_v3_HistogramBucketSettings_msg_init,
-  &envoy_config_metrics_v3_StatsdSink_msg_init,
-  &envoy_config_metrics_v3_DogStatsdSink_msg_init,
-  &envoy_config_metrics_v3_HystrixSink_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  8,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c b/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c
deleted file mode 100644
index 2ddcfa9e996aa..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/overload/v3/overload.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/overload/v3/overload.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_overload_v3_ResourceMonitor_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_ResourceMonitor_msg_init = {
-  &envoy_config_overload_v3_ResourceMonitor_submsgs[0],
-  &envoy_config_overload_v3_ResourceMonitor__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_ThresholdTrigger__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_ThresholdTrigger_msg_init = {
-  NULL,
-  &envoy_config_overload_v3_ThresholdTrigger__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_ScaledTrigger__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_ScaledTrigger_msg_init = {
-  NULL,
-  &envoy_config_overload_v3_ScaledTrigger__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-    {0x000800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_Trigger_submsgs[2] = {
-  {.submsg = &envoy_config_overload_v3_ThresholdTrigger_msg_init},
-  {.submsg = &envoy_config_overload_v3_ScaledTrigger_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_Trigger_msg_init = {
-  &envoy_config_overload_v3_Trigger_submsgs[0],
-  &envoy_config_overload_v3_Trigger__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_max64b},
-    {0x001800000301001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = {
-  {.submsg = &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init = {
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0],
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init = {
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0],
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0],
-  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x0008000402000012, &upb_pom_1bt_maxmaxb},
-    {0x000800040301001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_OverloadAction_submsgs[2] = {
-  {.submsg = &envoy_config_overload_v3_Trigger_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_OverloadAction_msg_init = {
-  &envoy_config_overload_v3_OverloadAction_submsgs[0],
-  &envoy_config_overload_v3_OverloadAction__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_LoadShedPoint_submsgs[1] = {
-  {.submsg = &envoy_config_overload_v3_Trigger_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_LoadShedPoint_msg_init = {
-  &envoy_config_overload_v3_LoadShedPoint_submsgs[0],
-  &envoy_config_overload_v3_LoadShedPoint__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_BufferFactoryConfig__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_BufferFactoryConfig_msg_init = {
-  NULL,
-  &envoy_config_overload_v3_BufferFactoryConfig__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_overload_v3_OverloadManager_submsgs[5] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_overload_v3_ResourceMonitor_msg_init},
-  {.submsg = &envoy_config_overload_v3_OverloadAction_msg_init},
-  {.submsg = &envoy_config_overload_v3_BufferFactoryConfig_msg_init},
-  {.submsg = &envoy_config_overload_v3_LoadShedPoint_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_overload_v3_OverloadManager_msg_init = {
-  &envoy_config_overload_v3_OverloadManager_submsgs[0],
-  &envoy_config_overload_v3_OverloadManager__fields[0],
-  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x001800003f02001a, &upb_prm_1bt_max64b},
-    {0x0020000002030022, &upb_psm_1bt_max64b},
-    {0x002800003f04002a, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[10] = {
-  &envoy_config_overload_v3_ResourceMonitor_msg_init,
-  &envoy_config_overload_v3_ThresholdTrigger_msg_init,
-  &envoy_config_overload_v3_ScaledTrigger_msg_init,
-  &envoy_config_overload_v3_Trigger_msg_init,
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msg_init,
-  &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msg_init,
-  &envoy_config_overload_v3_OverloadAction_msg_init,
-  &envoy_config_overload_v3_LoadShedPoint_msg_init,
-  &envoy_config_overload_v3_BufferFactoryConfig_msg_init,
-  &envoy_config_overload_v3_OverloadManager_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  10,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
deleted file mode 100644
index 977aeb71c712f..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/rbac/v3/rbac.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/type/matcher/v3/filter_state.upb.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-#include "envoy/type/matcher/v3/path.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "envoy/type/v3/range.upb.h"
-#include "google/api/expr/v1alpha1/checked.upb.h"
-#include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_submsgs[2] = {
-  {.submsg = &envoy_config_rbac_v3_RBAC_PoliciesEntry_msg_init},
-  {.submsg = &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_RBAC_msg_init = {
-  &envoy_config_rbac_v3_RBAC_submsgs[0],
-  &envoy_config_rbac_v3_RBAC__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000101001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = {
-  {.submsg = &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init = {
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0],
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init = {
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0],
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = {
-  {.submsg = &envoy_config_rbac_v3_Policy_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_RBAC_PoliciesEntry_msg_init = {
-  &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0],
-  &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Policy_submsgs[4] = {
-  {.submsg = &envoy_config_rbac_v3_Permission_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Principal_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_CheckedExpr_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Policy_msg_init = {
-  &envoy_config_rbac_v3_Policy_submsgs[0],
-  &envoy_config_rbac_v3_Policy__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x001800000102001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000002030022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = {
-  {.submsg = &envoy_config_rbac_v3_Permission_Set_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Permission_Set_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Permission_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_PathMatcher_msg_init},
-  {.submsg = &envoy_type_v3_Int32Range_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Permission_msg_init = {
-  &envoy_config_rbac_v3_Permission_submsgs[0],
-  &envoy_config_rbac_v3_Permission__fields[0],
-  UPB_SIZE(8, 16), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0008000003000018, &upb_pob1_1bt},
-    {0x0008000004020022, &upb_pom_1bt_maxmaxb},
-    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
-    {0x0008000006000030, &upb_pov4_1bt},
-    {0x000800000704003a, &upb_pom_1bt_maxmaxb},
-    {0x0008000008050042, &upb_pom_1bt_max64b},
-    {0x000800000906004a, &upb_pom_1bt_maxmaxb},
-    {0x000800000a070052, &upb_pom_1bt_maxmaxb},
-    {0x000800000b08005a, &upb_pom_1bt_maxmaxb},
-    {0x000800000c090062, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Permission_Set_submsgs[1] = {
-  {.submsg = &envoy_config_rbac_v3_Permission_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Permission_Set_msg_init = {
-  &envoy_config_rbac_v3_Permission_Set_submsgs[0],
-  &envoy_config_rbac_v3_Permission_Set__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Principal_submsgs[11] = {
-  {.submsg = &envoy_config_rbac_v3_Principal_Set_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Principal_Set_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Principal_Authenticated_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_msg_init},
-  {.submsg = &envoy_config_rbac_v3_Principal_msg_init},
-  {.submsg = &envoy_type_matcher_v3_PathMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &envoy_type_matcher_v3_FilterStateMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Principal_msg_init = {
-  &envoy_config_rbac_v3_Principal_submsgs[0],
-  &envoy_config_rbac_v3_Principal__fields[0],
-  UPB_SIZE(8, 16), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0008000003000018, &upb_pob1_1bt},
-    {0x0008000004020022, &upb_pom_1bt_max64b},
-    {0x000800000503002a, &upb_pom_1bt_maxmaxb},
-    {0x0008000006040032, &upb_pom_1bt_maxmaxb},
-    {0x000800000705003a, &upb_pom_1bt_maxmaxb},
-    {0x0008000008060042, &upb_pom_1bt_max64b},
-    {0x000800000907004a, &upb_pom_1bt_maxmaxb},
-    {0x000800000a080052, &upb_pom_1bt_maxmaxb},
-    {0x000800000b09005a, &upb_pom_1bt_maxmaxb},
-    {0x000800000c0a0062, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Set_submsgs[1] = {
-  {.submsg = &envoy_config_rbac_v3_Principal_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Principal_Set_msg_init = {
-  &envoy_config_rbac_v3_Principal_Set_submsgs[0],
-  &envoy_config_rbac_v3_Principal_Set__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fields[1] = {
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Principal_Authenticated_msg_init = {
-  &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0],
-  &envoy_config_rbac_v3_Principal_Authenticated__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_rbac_v3_Action__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_rbac_v3_Action_msg_init = {
-  NULL,
-  &envoy_config_rbac_v3_Action__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[11] = {
-  &envoy_config_rbac_v3_RBAC_msg_init,
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init,
-  &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init,
-  &envoy_config_rbac_v3_RBAC_PoliciesEntry_msg_init,
-  &envoy_config_rbac_v3_Policy_msg_init,
-  &envoy_config_rbac_v3_Permission_msg_init,
-  &envoy_config_rbac_v3_Permission_Set_msg_init,
-  &envoy_config_rbac_v3_Principal_msg_init,
-  &envoy_config_rbac_v3_Principal_Set_msg_init,
-  &envoy_config_rbac_v3_Principal_Authenticated_msg_init,
-  &envoy_config_rbac_v3_Action_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  11,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h
deleted file mode 100644
index 1e9909f7fc934..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h
+++ /dev/null
@@ -1,1709 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_rbac_v3_RBAC envoy_config_rbac_v3_RBAC;
-typedef struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions envoy_config_rbac_v3_RBAC_AuditLoggingOptions;
-typedef struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig;
-typedef struct envoy_config_rbac_v3_RBAC_PoliciesEntry envoy_config_rbac_v3_RBAC_PoliciesEntry;
-typedef struct envoy_config_rbac_v3_Policy envoy_config_rbac_v3_Policy;
-typedef struct envoy_config_rbac_v3_Permission envoy_config_rbac_v3_Permission;
-typedef struct envoy_config_rbac_v3_Permission_Set envoy_config_rbac_v3_Permission_Set;
-typedef struct envoy_config_rbac_v3_Principal envoy_config_rbac_v3_Principal;
-typedef struct envoy_config_rbac_v3_Principal_Set envoy_config_rbac_v3_Principal_Set;
-typedef struct envoy_config_rbac_v3_Principal_Authenticated envoy_config_rbac_v3_Principal_Authenticated;
-typedef struct envoy_config_rbac_v3_Action envoy_config_rbac_v3_Action;
-extern const upb_MiniTable envoy_config_rbac_v3_RBAC_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_RBAC_PoliciesEntry_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Policy_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Permission_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Permission_Set_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Principal_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Principal_Set_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Principal_Authenticated_msg_init;
-extern const upb_MiniTable envoy_config_rbac_v3_Action_msg_init;
-struct envoy_config_core_v3_CidrRange;
-struct envoy_config_core_v3_TypedExtensionConfig;
-struct envoy_config_route_v3_HeaderMatcher;
-struct envoy_type_matcher_v3_FilterStateMatcher;
-struct envoy_type_matcher_v3_MetadataMatcher;
-struct envoy_type_matcher_v3_PathMatcher;
-struct envoy_type_matcher_v3_StringMatcher;
-struct envoy_type_v3_Int32Range;
-struct google_api_expr_v1alpha1_CheckedExpr;
-struct google_api_expr_v1alpha1_Expr;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_FilterStateMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_PathMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_v3_Int32Range_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_Expr_msg_init;
-
-typedef enum {
-  envoy_config_rbac_v3_RBAC_ALLOW = 0,
-  envoy_config_rbac_v3_RBAC_DENY = 1,
-  envoy_config_rbac_v3_RBAC_LOG = 2
-} envoy_config_rbac_v3_RBAC_Action;
-
-typedef enum {
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_NONE = 0,
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_DENY = 1,
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_ALLOW = 2,
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_ON_DENY_AND_ALLOW = 3
-} envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditCondition;
-
-
-
-/* envoy.config.rbac.v3.RBAC */
-
-UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC* ret = envoy_config_rbac_v3_RBAC_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC* envoy_config_rbac_v3_RBAC_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC* ret = envoy_config_rbac_v3_RBAC_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_serialize(const envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_serialize_ex(const envoy_config_rbac_v3_RBAC* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_action(envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_rbac_v3_RBAC_action(const envoy_config_rbac_v3_RBAC* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_policies(envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_config_rbac_v3_RBAC_policies_size(const envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_get(const envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy** val) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_next(const envoy_config_rbac_v3_RBAC* msg, size_t* iter) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_clear_audit_logging_options(envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_audit_logging_options(const envoy_config_rbac_v3_RBAC* msg) {
-  const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* default_val = NULL;
-  const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_has_audit_logging_options(const envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_rbac_v3_RBAC_set_action(envoy_config_rbac_v3_RBAC *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_policies_clear(envoy_config_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_set(envoy_config_rbac_v3_RBAC* msg, upb_StringView key, envoy_config_rbac_v3_Policy* val, upb_Arena* a) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_policies_delete(envoy_config_rbac_v3_RBAC* msg, upb_StringView key) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_policies_nextmutable(envoy_config_rbac_v3_RBAC* msg, size_t* iter) {
-  const upb_MiniTableField field = {2, 8, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_config_rbac_v3_RBAC_PoliciesEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_set_audit_logging_options(envoy_config_rbac_v3_RBAC *msg, envoy_config_rbac_v3_RBAC_AuditLoggingOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_mutable_audit_logging_options(envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)envoy_config_rbac_v3_RBAC_audit_logging_options(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_RBAC_set_audit_logging_options(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.rbac.v3.RBAC.AuditLoggingOptions */
-
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_serialize(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_serialize_ex(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_clear_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_rbac_v3_RBAC_AuditLoggingOptions_audit_condition(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_clear_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* const* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_upb_array(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs_mutable_upb_array(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_has_logger_configs(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg) {
-  size_t size;
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_configs(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_set_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_mutable_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_resize_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_add_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig */
-
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* ret = envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_serialize(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_serialize_ex(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_clear_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_has_audit_logger(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_clear_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_is_optional(const envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_mutable_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, bool value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.rbac.v3.RBAC.PoliciesEntry */
-
-UPB_INLINE upb_StringView envoy_config_rbac_v3_RBAC_PoliciesEntry_key(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_RBAC_PoliciesEntry_value(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
-  envoy_config_rbac_v3_Policy* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_RBAC_PoliciesEntry_has_value(const envoy_config_rbac_v3_RBAC_PoliciesEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_rbac_v3_RBAC_PoliciesEntry_set_value(envoy_config_rbac_v3_RBAC_PoliciesEntry *msg, envoy_config_rbac_v3_Policy* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(envoy_config_rbac_v3_Policy*));
-}
-
-/* envoy.config.rbac.v3.Policy */
-
-UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Policy*)_upb_Message_New(&envoy_config_rbac_v3_Policy_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Policy* ret = envoy_config_rbac_v3_Policy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Policy* envoy_config_rbac_v3_Policy_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Policy* ret = envoy_config_rbac_v3_Policy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Policy_serialize(const envoy_config_rbac_v3_Policy* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Policy_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Policy_serialize_ex(const envoy_config_rbac_v3_Policy* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Policy_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_clear_permissions(envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Policy_permissions(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_rbac_v3_Permission* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_permissions_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_permissions_mutable_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Policy_has_permissions(const envoy_config_rbac_v3_Policy* msg) {
-  size_t size;
-  envoy_config_rbac_v3_Policy_permissions(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_clear_principals(envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Policy_principals(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_rbac_v3_Principal* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Policy_principals_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_rbac_v3_Policy_principals_mutable_upb_array(const envoy_config_rbac_v3_Policy* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Policy_has_principals(const envoy_config_rbac_v3_Policy* msg) {
-  size_t size;
-  envoy_config_rbac_v3_Policy_principals(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_clear_condition(envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_condition(const envoy_config_rbac_v3_Policy* msg) {
-  const struct google_api_expr_v1alpha1_Expr* default_val = NULL;
-  const struct google_api_expr_v1alpha1_Expr* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Policy_has_condition(const envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_clear_checked_condition(envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_checked_condition(const envoy_config_rbac_v3_Policy* msg) {
-  const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL;
-  const struct google_api_expr_v1alpha1_CheckedExpr* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Policy_has_checked_condition(const envoy_config_rbac_v3_Policy* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_mutable_permissions(envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_rbac_v3_Permission**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Policy_resize_permissions(envoy_config_rbac_v3_Policy* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Permission**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Policy_add_permissions(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy_config_rbac_v3_Permission_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_mutable_principals(envoy_config_rbac_v3_Policy* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_rbac_v3_Principal**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Policy_resize_principals(envoy_config_rbac_v3_Policy* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Principal**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Policy_add_principals(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy_config_rbac_v3_Principal_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_set_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_Expr* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mutable_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
-  struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)envoy_config_rbac_v3_Policy_condition(msg);
-  if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_Expr*)_upb_Message_New(&google_api_expr_v1alpha1_Expr_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Policy_set_condition(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Policy_set_checked_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_mutable_checked_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) {
-  struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)envoy_config_rbac_v3_Policy_checked_condition(msg);
-  if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google_api_expr_v1alpha1_CheckedExpr_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Policy_set_checked_condition(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Permission */
-
-UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy_config_rbac_v3_Permission_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Permission* ret = envoy_config_rbac_v3_Permission_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Permission* ret = envoy_config_rbac_v3_Permission_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Permission_serialize(const envoy_config_rbac_v3_Permission* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Permission_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Permission_serialize_ex(const envoy_config_rbac_v3_Permission* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Permission_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_rbac_v3_Permission_rule_and_rules = 1,
-  envoy_config_rbac_v3_Permission_rule_or_rules = 2,
-  envoy_config_rbac_v3_Permission_rule_any = 3,
-  envoy_config_rbac_v3_Permission_rule_header = 4,
-  envoy_config_rbac_v3_Permission_rule_url_path = 10,
-  envoy_config_rbac_v3_Permission_rule_destination_ip = 5,
-  envoy_config_rbac_v3_Permission_rule_destination_port = 6,
-  envoy_config_rbac_v3_Permission_rule_destination_port_range = 11,
-  envoy_config_rbac_v3_Permission_rule_metadata = 7,
-  envoy_config_rbac_v3_Permission_rule_not_rule = 8,
-  envoy_config_rbac_v3_Permission_rule_requested_server_name = 9,
-  envoy_config_rbac_v3_Permission_rule_matcher = 12,
-  envoy_config_rbac_v3_Permission_rule_NOT_SET = 0
-} envoy_config_rbac_v3_Permission_rule_oneofcases;
-UPB_INLINE envoy_config_rbac_v3_Permission_rule_oneofcases envoy_config_rbac_v3_Permission_rule_case(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Permission_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_and_rules(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_and_rules(const envoy_config_rbac_v3_Permission* msg) {
-  const envoy_config_rbac_v3_Permission_Set* default_val = NULL;
-  const envoy_config_rbac_v3_Permission_Set* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_and_rules(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_or_rules(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_or_rules(const envoy_config_rbac_v3_Permission* msg) {
-  const envoy_config_rbac_v3_Permission_Set* default_val = NULL;
-  const envoy_config_rbac_v3_Permission_Set* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_or_rules(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_any(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_any(const envoy_config_rbac_v3_Permission* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_any(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_header(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_header(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
-  const struct envoy_config_route_v3_HeaderMatcher* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_header(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_ip(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_destination_ip(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
-  const struct envoy_config_core_v3_CidrRange* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_ip(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_port(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_config_rbac_v3_Permission_destination_port(const envoy_config_rbac_v3_Permission* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_port(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_metadata(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_metadata(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_metadata(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_not_rule(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_not_rule(const envoy_config_rbac_v3_Permission* msg) {
-  const envoy_config_rbac_v3_Permission* default_val = NULL;
-  const envoy_config_rbac_v3_Permission* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_not_rule(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_requested_server_name(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_requested_server_name(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_requested_server_name(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_url_path(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_url_path(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_PathMatcher* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_url_path(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_destination_port_range(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_destination_port_range(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_type_v3_Int32Range* default_val = NULL;
-  const struct envoy_type_v3_Int32Range* ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_destination_port_range(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_clear_matcher(envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_matcher(const envoy_config_rbac_v3_Permission* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_has_matcher(const envoy_config_rbac_v3_Permission* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_and_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_and_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_and_rules(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy_config_rbac_v3_Permission_Set_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_and_rules(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_or_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_or_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_or_rules(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy_config_rbac_v3_Permission_Set_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_or_rules(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_any(envoy_config_rbac_v3_Permission *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_header(envoy_config_rbac_v3_Permission *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_mutable_header(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Permission_header(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_header(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_ip(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_CidrRange* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_mutable_destination_ip(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Permission_destination_ip(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_destination_ip(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port(envoy_config_rbac_v3_Permission *msg, uint32_t value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_metadata(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_mutable_metadata(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Permission_metadata(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_metadata(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_not_rule(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_mutable_not_rule(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)envoy_config_rbac_v3_Permission_not_rule(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy_config_rbac_v3_Permission_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_not_rule(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_requested_server_name(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_mutable_requested_server_name(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Permission_requested_server_name(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_requested_server_name(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_url_path(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_PathMatcher* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_mutable_url_path(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Permission_url_path(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy_type_matcher_v3_PathMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_url_path(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port_range(envoy_config_rbac_v3_Permission *msg, struct envoy_type_v3_Int32Range* value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_mutable_destination_port_range(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_rbac_v3_Permission_destination_port_range(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Int32Range*)_upb_Message_New(&envoy_type_v3_Int32Range_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_destination_port_range(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_set_matcher(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_matcher(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Permission_set_matcher(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Permission.Set */
-
-UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Permission_Set*)_upb_Message_New(&envoy_config_rbac_v3_Permission_Set_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Permission_Set* ret = envoy_config_rbac_v3_Permission_Set_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_Set_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Permission_Set* ret = envoy_config_rbac_v3_Permission_Set_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Permission_Set_serialize(const envoy_config_rbac_v3_Permission_Set* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Permission_Set_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Permission_Set_serialize_ex(const envoy_config_rbac_v3_Permission_Set* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Permission_Set_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_Permission_Set_clear_rules(envoy_config_rbac_v3_Permission_Set* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Permission* const* envoy_config_rbac_v3_Permission_Set_rules(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_rbac_v3_Permission* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_upb_array(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_rbac_v3_Permission_Set_rules_mutable_upb_array(const envoy_config_rbac_v3_Permission_Set* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Permission_Set_has_rules(const envoy_config_rbac_v3_Permission_Set* msg) {
-  size_t size;
-  envoy_config_rbac_v3_Permission_Set_rules(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set_mutable_rules(envoy_config_rbac_v3_Permission_Set* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_rbac_v3_Permission**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_rbac_v3_Permission** envoy_config_rbac_v3_Permission_Set_resize_rules(envoy_config_rbac_v3_Permission_Set* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Permission**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_Set_add_rules(envoy_config_rbac_v3_Permission_Set* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)_upb_Message_New(&envoy_config_rbac_v3_Permission_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Principal */
-
-UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy_config_rbac_v3_Principal_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal* ret = envoy_config_rbac_v3_Principal_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal* ret = envoy_config_rbac_v3_Principal_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_serialize(const envoy_config_rbac_v3_Principal* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_serialize_ex(const envoy_config_rbac_v3_Principal* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_rbac_v3_Principal_identifier_and_ids = 1,
-  envoy_config_rbac_v3_Principal_identifier_or_ids = 2,
-  envoy_config_rbac_v3_Principal_identifier_any = 3,
-  envoy_config_rbac_v3_Principal_identifier_authenticated = 4,
-  envoy_config_rbac_v3_Principal_identifier_source_ip = 5,
-  envoy_config_rbac_v3_Principal_identifier_direct_remote_ip = 10,
-  envoy_config_rbac_v3_Principal_identifier_remote_ip = 11,
-  envoy_config_rbac_v3_Principal_identifier_header = 6,
-  envoy_config_rbac_v3_Principal_identifier_url_path = 9,
-  envoy_config_rbac_v3_Principal_identifier_metadata = 7,
-  envoy_config_rbac_v3_Principal_identifier_filter_state = 12,
-  envoy_config_rbac_v3_Principal_identifier_not_id = 8,
-  envoy_config_rbac_v3_Principal_identifier_NOT_SET = 0
-} envoy_config_rbac_v3_Principal_identifier_oneofcases;
-UPB_INLINE envoy_config_rbac_v3_Principal_identifier_oneofcases envoy_config_rbac_v3_Principal_identifier_case(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Principal_identifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_and_ids(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_and_ids(const envoy_config_rbac_v3_Principal* msg) {
-  const envoy_config_rbac_v3_Principal_Set* default_val = NULL;
-  const envoy_config_rbac_v3_Principal_Set* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_and_ids(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_or_ids(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_or_ids(const envoy_config_rbac_v3_Principal* msg) {
-  const envoy_config_rbac_v3_Principal_Set* default_val = NULL;
-  const envoy_config_rbac_v3_Principal_Set* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_or_ids(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_any(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_any(const envoy_config_rbac_v3_Principal* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_any(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_authenticated(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_authenticated(const envoy_config_rbac_v3_Principal* msg) {
-  const envoy_config_rbac_v3_Principal_Authenticated* default_val = NULL;
-  const envoy_config_rbac_v3_Principal_Authenticated* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_authenticated(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_source_ip(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_source_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
-  const struct envoy_config_core_v3_CidrRange* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_source_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_header(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_header(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_config_route_v3_HeaderMatcher* default_val = NULL;
-  const struct envoy_config_route_v3_HeaderMatcher* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_header(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_metadata(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_metadata(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_type_matcher_v3_MetadataMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_MetadataMatcher* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_metadata(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_not_id(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_not_id(const envoy_config_rbac_v3_Principal* msg) {
-  const envoy_config_rbac_v3_Principal* default_val = NULL;
-  const envoy_config_rbac_v3_Principal* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_not_id(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_url_path(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_url_path(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_type_matcher_v3_PathMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_PathMatcher* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_url_path(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_direct_remote_ip(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_direct_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
-  const struct envoy_config_core_v3_CidrRange* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_direct_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_remote_ip(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_config_core_v3_CidrRange* default_val = NULL;
-  const struct envoy_config_core_v3_CidrRange* ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_remote_ip(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_clear_filter_state(envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_filter_state(const envoy_config_rbac_v3_Principal* msg) {
-  const struct envoy_type_matcher_v3_FilterStateMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_FilterStateMatcher* ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_has_filter_state(const envoy_config_rbac_v3_Principal* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_and_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_and_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_and_ids(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy_config_rbac_v3_Principal_Set_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_and_ids(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_or_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_or_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_or_ids(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy_config_rbac_v3_Principal_Set_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_or_ids(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_any(envoy_config_rbac_v3_Principal *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_authenticated(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Authenticated* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_mutable_authenticated(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Principal_Authenticated* sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)envoy_config_rbac_v3_Principal_authenticated(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)_upb_Message_New(&envoy_config_rbac_v3_Principal_Authenticated_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_authenticated(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_source_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_source_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_source_ip(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_source_ip(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_header(envoy_config_rbac_v3_Principal *msg, struct envoy_config_route_v3_HeaderMatcher* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_mutable_header(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Principal_header(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_header(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_metadata(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_mutable_metadata(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Principal_metadata(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_metadata(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_not_id(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_mutable_not_id(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)envoy_config_rbac_v3_Principal_not_id(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy_config_rbac_v3_Principal_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_not_id(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_url_path(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_PathMatcher* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_mutable_url_path(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Principal_url_path(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_PathMatcher*)_upb_Message_New(&envoy_type_matcher_v3_PathMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_url_path(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_direct_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_direct_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_direct_remote_ip(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_direct_remote_ip(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_remote_ip(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_remote_ip(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_set_filter_state(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_FilterStateMatcher* value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_mutable_filter_state(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_FilterStateMatcher* sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)envoy_config_rbac_v3_Principal_filter_state(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)_upb_Message_New(&envoy_type_matcher_v3_FilterStateMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_set_filter_state(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Principal.Set */
-
-UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Principal_Set*)_upb_Message_New(&envoy_config_rbac_v3_Principal_Set_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal_Set* ret = envoy_config_rbac_v3_Principal_Set_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_Set_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal_Set* ret = envoy_config_rbac_v3_Principal_Set_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_Set_serialize(const envoy_config_rbac_v3_Principal_Set* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_Set_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_Set_serialize_ex(const envoy_config_rbac_v3_Principal_Set* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_Set_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_Set_clear_ids(envoy_config_rbac_v3_Principal_Set* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_rbac_v3_Principal* const* envoy_config_rbac_v3_Principal_Set_ids(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_rbac_v3_Principal* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_upb_array(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_rbac_v3_Principal_Set_ids_mutable_upb_array(const envoy_config_rbac_v3_Principal_Set* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_Set_has_ids(const envoy_config_rbac_v3_Principal_Set* msg) {
-  size_t size;
-  envoy_config_rbac_v3_Principal_Set_ids(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_mutable_ids(envoy_config_rbac_v3_Principal_Set* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_rbac_v3_Principal**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_rbac_v3_Principal** envoy_config_rbac_v3_Principal_Set_resize_ids(envoy_config_rbac_v3_Principal_Set* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_rbac_v3_Principal**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_Set_add_ids(envoy_config_rbac_v3_Principal_Set* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)_upb_Message_New(&envoy_config_rbac_v3_Principal_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Principal.Authenticated */
-
-UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Principal_Authenticated*)_upb_Message_New(&envoy_config_rbac_v3_Principal_Authenticated_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal_Authenticated* ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_Authenticated_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Principal_Authenticated* ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_Authenticated_serialize(const envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_Authenticated_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Principal_Authenticated_serialize_ex(const envoy_config_rbac_v3_Principal_Authenticated* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Principal_Authenticated_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_clear_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_principal_name(const envoy_config_rbac_v3_Principal_Authenticated* msg) {
-  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_rbac_v3_Principal_Authenticated_has_principal_name(const envoy_config_rbac_v3_Principal_Authenticated* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(envoy_config_rbac_v3_Principal_Authenticated *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_mutable_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Principal_Authenticated_principal_name(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-    if (sub) envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.rbac.v3.Action */
-
-UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_new(upb_Arena* arena) {
-  return (envoy_config_rbac_v3_Action*)_upb_Message_New(&envoy_config_rbac_v3_Action_msg_init, arena);
-}
-UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_rbac_v3_Action* ret = envoy_config_rbac_v3_Action_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Action_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_rbac_v3_Action* envoy_config_rbac_v3_Action_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_rbac_v3_Action* ret = envoy_config_rbac_v3_Action_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_rbac_v3_Action_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Action_serialize(const envoy_config_rbac_v3_Action* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Action_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_rbac_v3_Action_serialize_ex(const envoy_config_rbac_v3_Action* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_rbac_v3_Action_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_rbac_v3_Action_clear_name(envoy_config_rbac_v3_Action* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_rbac_v3_Action_name(const envoy_config_rbac_v3_Action* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_rbac_v3_Action_clear_action(envoy_config_rbac_v3_Action* msg) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_rbac_v3_Action_action(const envoy_config_rbac_v3_Action* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_rbac_v3_Action_set_name(envoy_config_rbac_v3_Action *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Action *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
deleted file mode 100644
index 03cac318586b7..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/route/v3/route.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/route/v3/route.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_submsgs[9] = {
-  {.submsg = &envoy_config_route_v3_VirtualHost_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_Vhds_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration__fields[16] = {
-  {1, UPB_SIZE(60, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 80), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(40, 88), 3, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(44, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(48, 104), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(52, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(53, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(56, 112), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteConfiguration_msg_init = {
-  &envoy_config_route_v3_RouteConfiguration_submsgs[0],
-  &envoy_config_route_v3_RouteConfiguration__fields[0],
-  UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_prs_1bt},
-    {0x002800003f010022, &upb_prm_1bt_maxmaxb},
-    {0x003000003f00002a, &upb_prs_1bt},
-    {0x003800003f020032, &upb_prm_1bt_maxmaxb},
-    {0x004000000103003a, &upb_psm_1bt_maxmaxb},
-    {0x004800003f000042, &upb_prs_1bt},
-    {0x005000000204004a, &upb_psm_1bt_max64b},
-    {0x000100003f000050, &upb_psb1_1bt},
-    {0x005800000305005a, &upb_psm_1bt_maxmaxb},
-    {0x006000003f060062, &upb_prm_1bt_maxmaxb},
-    {0x006800003f07006a, &upb_prm_1bt_maxmaxb},
-    {0x000200003f000070, &upb_psb1_1bt},
-    {0x000300003f000078, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_msg_init = {
-  &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0],
-  &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_Vhds_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_Vhds__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_Vhds_msg_init = {
-  &envoy_config_route_v3_Vhds_submsgs[0],
-  &envoy_config_route_v3_Vhds__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_config_route_v3_RouteConfiguration_msg_init,
-  &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_msg_init,
-  &envoy_config_route_v3_Vhds_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
deleted file mode 100644
index d47644a1ed529..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
+++ /dev/null
@@ -1,1668 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/route/v3/route_components.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/proxy_protocol.upb.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-#include "envoy/type/matcher/v3/regex.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "envoy/type/metadata/v3/metadata.upb.h"
-#include "envoy/type/tracing/v3/custom_tag.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "envoy/type/v3/range.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_submsgs[13] = {
-  {.submsg = &envoy_config_route_v3_Route_msg_init},
-  {.submsg = &envoy_config_route_v3_VirtualCluster_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_route_v3_CorsPolicy_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_msg_init},
-  {.submsg = &envoy_config_route_v3_HedgePolicy_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_VirtualHost__fields[21] = {
-  {1, UPB_SIZE(84, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 72), 1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 80), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(40, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(44, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(48, 104), 0, 6, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(52, 112), 2, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(56, 120), 3, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(60, 128), 4, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(64, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(68, 136), 5, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(72, 144), 6, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(76, 152), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(80, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_VirtualHost_msg_init = {
-  &envoy_config_route_v3_VirtualHost_submsgs[0],
-  &envoy_config_route_v3_VirtualHost__fields[0],
-  UPB_SIZE(96, 160), 21, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x002000003f000012, &upb_prs_1bt},
-    {0x002800003f00001a, &upb_prm_1bt_max192b},
-    {0x000400003f000020, &upb_psv4_1bt},
-    {0x003000003f01002a, &upb_prm_1bt_max64b},
-    {0x003800003f020032, &upb_prm_1bt_max64b},
-    {0x004000003f03003a, &upb_prm_1bt_maxmaxb},
-    {0x0048000001040042, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x005000003f050052, &upb_prm_1bt_maxmaxb},
-    {0x005800003f00005a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x006000003f00006a, &upb_prs_1bt},
-    {0x000800003f000070, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0070000002070182, &upb_psm_2bt_max128b},
-    {0x007800000308018a, &upb_psm_2bt_max64b},
-    {0x0080000004090192, &upb_psm_2bt_maxmaxb},
-    {0x000900003f000198, &upb_psb1_2bt},
-    {0x00880000050a01a2, &upb_psm_2bt_maxmaxb},
-    {0x00900000060b01aa, &upb_psm_2bt_maxmaxb},
-    {0x009800003f0c01b2, &upb_prm_2bt_max64b},
-    {0x000a00003f0001b8, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msg_init = {
-  &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0],
-  &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_FilterAction_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_FilterAction__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_FilterAction_msg_init = {
-  &envoy_config_route_v3_FilterAction_submsgs[0],
-  &envoy_config_route_v3_FilterAction__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteList_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_Route_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteList_msg_init = {
-  &envoy_config_route_v3_RouteList_submsgs[0],
-  &envoy_config_route_v3_RouteList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max192b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_Route_submsgs[13] = {
-  {.submsg = &envoy_config_route_v3_RouteMatch_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_msg_init},
-  {.submsg = &envoy_config_route_v3_RedirectAction_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_route_v3_Decorator_msg_init},
-  {.submsg = &envoy_config_route_v3_DirectResponseAction_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_msg_init},
-  {.submsg = &envoy_config_route_v3_Tracing_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_route_v3_FilterAction_msg_init},
-  {.submsg = &envoy_config_route_v3_NonForwardingAction_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_Route__fields[17] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 16), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 24), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(16, 32), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(20, 40), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(28, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(32, 64), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(52, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(36, 88), 4, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(40, 96), 5, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(48, 120), UPB_SIZE(-45, -5), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_Route_msg_init = {
-  &envoy_config_route_v3_Route_submsgs[0],
-  &envoy_config_route_v3_Route__fields[0],
-  UPB_SIZE(72, 128), 17, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x0078000402010012, &upb_pom_1bt_max256b},
-    {0x007800040302001a, &upb_pom_1bt_max128b},
-    {0x0010000002030022, &upb_psm_1bt_maxmaxb},
-    {0x001800000304002a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x007800040705003a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f06004a, &upb_prm_1bt_maxmaxb},
-    {0x002800003f070052, &upb_prm_1bt_maxmaxb},
-    {0x003000003f00005a, &upb_prs_1bt},
-    {0x003800003f000062, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004800003f000072, &upb_pss_1bt},
-    {0x005800000409007a, &upb_psm_1bt_max64b},
-    {0x00600000050a0182, &upb_psm_2bt_maxmaxb},
-    {0x00780004110b018a, &upb_pom_2bt_max64b},
-    {0x00780004120c0192, &upb_pom_2bt_max64b},
-    {0x006800003f00019a, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_Route_TypedPerFilterConfigEntry_msg_init = {
-  &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0],
-  &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_submsgs[2] = {
-  {.submsg = &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_WeightedCluster__fields[4] = {
-  {1, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 48), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 8), UPB_SIZE(-13, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_WeightedCluster_msg_init = {
-  &envoy_config_route_v3_WeightedCluster_submsgs[0],
-  &envoy_config_route_v3_WeightedCluster__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_prm_1bt_max128b},
-    {0x002000003f000012, &upb_pss_1bt},
-    {0x003000000101001a, &upb_psm_1bt_maxmaxb},
-    {0x0008000404000022, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-  {.submsg = &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[10] = {
-  {1, UPB_SIZE(44, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(28, 88), 0, 4, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(52, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init = {
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0],
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0],
-  UPB_SIZE(64, 112), 10, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0028000001000012, &upb_psm_1bt_maxmaxb},
-    {0x003000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x003800003f020022, &upb_prm_1bt_maxmaxb},
-    {0x004000003f03002a, &upb_prm_1bt_maxmaxb},
-    {0x004800003f000032, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x005000003f00004a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040b00005a, &upb_pos_1bt},
-    {0x006000003f000062, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_msg_init = {
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0],
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_ClusterSpecifierPlugin__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_ClusterSpecifierPlugin_msg_init = {
-  &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0],
-  &envoy_config_route_v3_ClusterSpecifierPlugin__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_submsgs[10] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &envoy_config_route_v3_QueryParameterMatcher_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeFractionalPercent_msg_init},
-  {.submsg = &envoy_type_matcher_v3_RegexMatcher_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteMatch__fields[13] = {
-  {1, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(16, 48), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(20, 56), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(24, 64), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(28, 72), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(36, 8), UPB_SIZE(-33, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteMatch_msg_init = {
-  &envoy_config_route_v3_RouteMatch_submsgs[0],
-  &envoy_config_route_v3_RouteMatch__fields[0],
-  UPB_SIZE(48, 80), 13, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040100000a, &upb_pos_1bt},
-    {0x0008000402000012, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0018000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f010032, &upb_prm_1bt_max64b},
-    {0x002800003f02003a, &upb_prm_1bt_max64b},
-    {0x0030000002030042, &upb_psm_1bt_max64b},
-    {0x003800000304004a, &upb_psm_1bt_maxmaxb},
-    {0x000800040a050052, &upb_pom_1bt_maxmaxb},
-    {0x004000000406005a, &upb_psm_1bt_max64b},
-    {0x000800040c070062, &upb_pom_1bt_max64b},
-    {0x004800003f08006a, &upb_prm_1bt_maxmaxb},
-    {0x000800040e000072, &upb_pos_1bt},
-    {0x000800040f09007a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init = {
-  &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0],
-  &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[5] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeFractionalPercent_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeFractionalPercent_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[9] = {
-  {2, UPB_SIZE(28, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(52, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 72), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 104), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(12, 80), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(16, 88), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(20, 96), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_CorsPolicy_msg_init = {
-  &envoy_config_route_v3_CorsPolicy_submsgs[0],
-  &envoy_config_route_v3_CorsPolicy__fields[0],
-  UPB_SIZE(64, 112), 9, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x003800003f00002a, &upb_pss_1bt},
-    {0x0048000001000032, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x006800040901004a, &upb_pom_1bt_maxmaxb},
-    {0x0050000002020052, &upb_psm_1bt_maxmaxb},
-    {0x005800003f03005a, &upb_prm_1bt_maxmaxb},
-    {0x0060000003040062, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_submsgs[24] = {
-  {.submsg = &envoy_config_route_v3_WeightedCluster_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_msg_init},
-  {.submsg = &envoy_config_route_v3_CorsPolicy_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init},
-  {.submsg = &envoy_config_route_v3_HedgePolicy_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_config_route_v3_InternalRedirectPolicy_msg_init},
-  {.submsg = &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init},
-  {.submsg = &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction__fields[34] = {
-  {1, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 64), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(124, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(8, 88), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(12, 96), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(20, 104), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(24, 112), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(28, 120), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(32, 128), 5, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(36, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(40, 136), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(44, 144), 7, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(48, 152), 0, 11, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(52, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(56, 160), 8, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(60, 168), 9, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {29, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(64, 176), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(68, 184), 10, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(72, 192), 11, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(76, 200), 12, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(80, 208), 13, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {35, UPB_SIZE(108, 32), UPB_SIZE(-85, -17), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(88, 216), 14, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {38, UPB_SIZE(92, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(116, 48), UPB_SIZE(-97, -25), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(100, 224), 15, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(104, 232), 16, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_msg_init = {
-  &envoy_config_route_v3_RouteAction_submsgs[0],
-  &envoy_config_route_v3_RouteAction__fields[0],
-  UPB_SIZE(136, 240), 34, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003000180100000a, &upb_pos_1bt},
-    {0x0030001802000012, &upb_pos_1bt},
-    {0x003000180300001a, &upb_pom_1bt_max64b},
-    {0x0040000001010022, &upb_psm_1bt_maxmaxb},
-    {0x004800003f00002a, &upb_pss_1bt},
-    {0x0020001006000032, &upb_pos_1bt},
-    {0x002000100702003a, &upb_pom_1bt_maxmaxb},
-    {0x0058000002030042, &upb_psm_1bt_maxmaxb},
-    {0x006000000304004a, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000058, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x006800003f05006a, &upb_prm_1bt_max64b},
-    {0x0070000004060072, &upb_psm_1bt_maxmaxb},
-    {0x007800003f07007a, &upb_prm_1bt_max64b},
-    {0x00c000000b100282, &upb_psm_2bt_maxmaxb},
-    {0x008000000508018a, &upb_psm_2bt_max128b},
-    {0x00d000000d120292, &upb_psm_2bt_max64b},
-    {0x002000102313029a, &upb_pom_2bt_maxmaxb},
-    {0x000800003f0001a0, &upb_psv4_2bt},
-    {0x00300018250002aa, &upb_pos_2bt},
-    {0x001400003f0002b0, &upb_psb1_2bt},
-    {0x00880000060901ba, &upb_psm_2bt_maxmaxb},
-    {0x00900000070a01c2, &upb_psm_2bt_maxmaxb},
-    {0x009800003f0b01ca, &upb_prm_2bt_max64b},
-    {0x000c00003f0001d0, &upb_psv4_2bt},
-    {0x00a00000080c01da, &upb_psm_2bt_max64b},
-    {0x00a80000090d01e2, &upb_psm_2bt_maxmaxb},
-    {0x002000101d0001ea, &upb_pos_2bt},
-    {0x00b000003f0e01f2, &upb_prm_2bt_max64b},
-    {0x00b800000a0f01fa, &upb_psm_2bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_RuntimeFractionalPercent_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init = {
-  &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0],
-  &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
-    {0x002800003f00002a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = {
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy__fields[6] = {
-  {1, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 8, -5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_msg_init = {
-  &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0],
-  &envoy_config_route_v3_RouteAction_HashPolicy__fields[0],
-  16, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040100000a, &upb_pom_1bt_max64b},
-    {0x0008000402010012, &upb_pom_1bt_max64b},
-    {0x000800040302001a, &upb_pom_1bt_max64b},
-    {0x000000003f000020, &upb_psb1_1bt},
-    {0x000800040503002a, &upb_pom_1bt_max64b},
-    {0x0008000406040032, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init = {
-  &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0],
-  &envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init = {
-  &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0],
-  &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_pss_1bt},
-    {0x003000003f010022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init = {
-  &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0],
-  &envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ProxyProtocolConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init = {
-  &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0],
-  &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init = {
-  &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0],
-  &envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_submsgs[10] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy__fields[13] = {
-  {1, UPB_SIZE(48, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 56, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 64), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 72), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 80), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 88), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 96), 5, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(40, 104), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(44, 112), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_msg_init = {
-  &envoy_config_route_v3_RetryPolicy_submsgs[0],
-  &envoy_config_route_v3_RetryPolicy__fields[0],
-  UPB_SIZE(64, 120), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x003000003f03002a, &upb_prm_1bt_max64b},
-    {0x003800003f000030, &upb_psv8_1bt},
-    {0x004000003f00003a, &upb_ppv4_1bt},
-    {0x0048000004040042, &upb_psm_1bt_max64b},
-    {0x005000003f05004a, &upb_prm_1bt_max64b},
-    {0x005800003f060052, &upb_prm_1bt_max64b},
-    {0x006000000507005a, &upb_psm_1bt_max64b},
-    {0x006800003f080062, &upb_prm_1bt_maxmaxb},
-    {0x007000000609006a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryPriority__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init = {
-  &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0],
-  &envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init = {
-  &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0],
-  &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init = {
-  &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0],
-  &envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RetryPolicy_ResetHeader__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = {
-  {.submsg = &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init = {
-  &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0],
-  &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_HedgePolicy_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_HedgePolicy__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_HedgePolicy_msg_init = {
-  &envoy_config_route_v3_HedgePolicy_submsgs[0],
-  &envoy_config_route_v3_HedgePolicy__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RedirectAction_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RedirectAction__fields[9] = {
-  {1, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 40), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 24), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(28, 40), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 24), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 40), -17, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RedirectAction_msg_init = {
-  &envoy_config_route_v3_RedirectAction_submsgs[0],
-  &envoy_config_route_v3_RedirectAction__fields[0],
-  UPB_SIZE(48, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f00000a, &upb_pss_1bt},
-    {0x0028001002000012, &upb_pos_1bt},
-    {0x000000003f000018, &upb_psv4_1bt},
-    {0x0018000804000020, &upb_pob1_1bt},
-    {0x002800100500002a, &upb_pos_1bt},
-    {0x000400003f000030, &upb_psb1_1bt},
-    {0x001800080700003a, &upb_pos_1bt},
-    {0x000c00003f000040, &upb_psv4_1bt},
-    {0x002800100900004a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_DirectResponseAction_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_DirectResponseAction__fields[2] = {
-  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_DirectResponseAction_msg_init = {
-  &envoy_config_route_v3_DirectResponseAction_submsgs[0],
-  &envoy_config_route_v3_DirectResponseAction__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_route_v3_NonForwardingAction_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_Decorator_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_Decorator__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_Decorator_msg_init = {
-  &envoy_config_route_v3_Decorator_submsgs[0],
-  &envoy_config_route_v3_Decorator__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_Tracing_submsgs[4] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_type_tracing_v3_CustomTag_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_Tracing__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_Tracing_msg_init = {
-  &envoy_config_route_v3_Tracing_submsgs[0],
-  &envoy_config_route_v3_Tracing__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x002000003f030022, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_VirtualCluster_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_VirtualCluster__fields[2] = {
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_VirtualCluster_msg_init = {
-  &envoy_config_route_v3_VirtualCluster_submsgs[0],
-  &envoy_config_route_v3_VirtualCluster__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f000022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Override_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_msg_init = {
-  &envoy_config_route_v3_RateLimit_submsgs[0],
-  &envoy_config_route_v3_RateLimit__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f01001a, &upb_prm_1bt_max64b},
-    {0x0028000002020022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_submsgs[11] = {
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init},
-  {.submsg = &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action__fields[11] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 8), -1, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action__fields[0],
-  UPB_SIZE(8, 16), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x000800000504002a, &upb_pom_1bt_max64b},
-    {0x0008000006050032, &upb_pom_1bt_max64b},
-    {0x000800000706003a, &upb_pom_1bt_max64b},
-    {0x0008000008070042, &upb_pom_1bt_max64b},
-    {0x000800000908004a, &upb_pom_1bt_maxmaxb},
-    {0x000800000a090052, &upb_pom_1bt_max64b},
-    {0x000800000b0a005a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x000000003f000018, &upb_psb1_1bt},
-  })
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_GenericKey__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init = {
-  NULL,
-  &envoy_config_route_v3_RateLimit_Action_GenericKey__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f01001a, &upb_prm_1bt_max64b},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKey_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKey_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MetaData__fields[5] = {
-  {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_MetaData_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x0020000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002800003f00001a, &upb_pss_1bt},
-    {0x000400003f000020, &upb_psv4_1bt},
-    {0x000800003f000028, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_route_v3_QueryParameterMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init = {
-  &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f01001a, &upb_prm_1bt_max64b},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Override_msg_init = {
-  &envoy_config_route_v3_RateLimit_Override_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Override__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKey_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init = {
-  &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0],
-  &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_HeaderMatcher_submsgs[3] = {
-  {.submsg = &envoy_type_v3_Int64Range_msg_init},
-  {.submsg = &envoy_type_matcher_v3_RegexMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_HeaderMatcher__fields[11] = {
-  {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 16), -5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(12, 16), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(12, 16), -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init = {
-  &envoy_config_route_v3_HeaderMatcher_submsgs[0],
-  &envoy_config_route_v3_HeaderMatcher__fields[0],
-  UPB_SIZE(32, 48), 11, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000404000022, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000406000032, &upb_pom_1bt_maxmaxb},
-    {0x0010000407000038, &upb_pob1_1bt},
-    {0x000000003f000040, &upb_psb1_1bt},
-    {0x001000040900004a, &upb_pos_1bt},
-    {0x001000040a000052, &upb_pos_1bt},
-    {0x001000040b01005a, &upb_pom_1bt_maxmaxb},
-    {0x001000040c000062, &upb_pos_1bt},
-    {0x001000040d02006a, &upb_pom_1bt_maxmaxb},
-    {0x000800003f000070, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_QueryParameterMatcher__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 24), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_QueryParameterMatcher_msg_init = {
-  &envoy_config_route_v3_QueryParameterMatcher_submsgs[0],
-  &envoy_config_route_v3_QueryParameterMatcher__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000500002a, &upb_pom_1bt_maxmaxb},
-    {0x0018000006000030, &upb_pob1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_InternalRedirectPolicy__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_InternalRedirectPolicy_msg_init = {
-  &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0],
-  &envoy_config_route_v3_InternalRedirectPolicy__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_ppv4_1bt},
-    {0x001800003f01001a, &upb_prm_1bt_maxmaxb},
-    {0x000100003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_FilterConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_FilterConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_FilterConfig_msg_init = {
-  &envoy_config_route_v3_FilterConfig_submsgs[0],
-  &envoy_config_route_v3_FilterConfig__fields[0],
-  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000200003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[58] = {
-  &envoy_config_route_v3_VirtualHost_msg_init,
-  &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msg_init,
-  &envoy_config_route_v3_FilterAction_msg_init,
-  &envoy_config_route_v3_RouteList_msg_init,
-  &envoy_config_route_v3_Route_msg_init,
-  &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_msg_init,
-  &envoy_config_route_v3_WeightedCluster_msg_init,
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight_msg_init,
-  &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_msg_init,
-  &envoy_config_route_v3_ClusterSpecifierPlugin_msg_init,
-  &envoy_config_route_v3_RouteMatch_msg_init,
-  &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msg_init,
-  &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msg_init,
-  &envoy_config_route_v3_RouteMatch_ConnectMatcher_msg_init,
-  &envoy_config_route_v3_CorsPolicy_msg_init,
-  &envoy_config_route_v3_RouteAction_msg_init,
-  &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_Header_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msg_init,
-  &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msg_init,
-  &envoy_config_route_v3_RouteAction_UpgradeConfig_msg_init,
-  &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msg_init,
-  &envoy_config_route_v3_RouteAction_MaxStreamDuration_msg_init,
-  &envoy_config_route_v3_RetryPolicy_msg_init,
-  &envoy_config_route_v3_RetryPolicy_RetryPriority_msg_init,
-  &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msg_init,
-  &envoy_config_route_v3_RetryPolicy_RetryBackOff_msg_init,
-  &envoy_config_route_v3_RetryPolicy_ResetHeader_msg_init,
-  &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msg_init,
-  &envoy_config_route_v3_HedgePolicy_msg_init,
-  &envoy_config_route_v3_RedirectAction_msg_init,
-  &envoy_config_route_v3_DirectResponseAction_msg_init,
-  &envoy_config_route_v3_NonForwardingAction_msg_init,
-  &envoy_config_route_v3_Decorator_msg_init,
-  &envoy_config_route_v3_Tracing_msg_init,
-  &envoy_config_route_v3_VirtualCluster_msg_init,
-  &envoy_config_route_v3_RateLimit_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_SourceCluster_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_GenericKey_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_MetaData_msg_init,
-  &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_msg_init,
-  &envoy_config_route_v3_RateLimit_Override_msg_init,
-  &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msg_init,
-  &envoy_config_route_v3_HeaderMatcher_msg_init,
-  &envoy_config_route_v3_QueryParameterMatcher_msg_init,
-  &envoy_config_route_v3_InternalRedirectPolicy_msg_init,
-  &envoy_config_route_v3_FilterConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  58,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
deleted file mode 100644
index 18f1859d3de58..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/route/v3/scoped_route.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/route/v3/scoped_route.upb.h"
-#include "envoy/config/route/v3/route.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = {
-  {.submsg = &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteConfiguration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__fields[5] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_msg_init = {
-  &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0],
-  &envoy_config_route_v3_ScopedRouteConfiguration__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800000100001a, &upb_psm_1bt_max64b},
-    {0x000100003f000020, &upb_psb1_1bt},
-    {0x003000000201002a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init = {
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0],
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init = {
-  NULL,
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[0],
-  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_config_route_v3_ScopedRouteConfiguration_msg_init,
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key_msg_init,
-  &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c b/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c
deleted file mode 100644
index 132caeb6849aa..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/tap/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/tap/v3/common.upb.h"
-#include "envoy/config/common/matcher/v3/matcher.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_tap_v3_TapConfig_submsgs[4] = {
-  {.submsg = &envoy_config_tap_v3_MatchPredicate_msg_init},
-  {.submsg = &envoy_config_tap_v3_OutputConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeFractionalPercent_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_TapConfig_msg_init = {
-  &envoy_config_tap_v3_TapConfig_submsgs[0],
-  &envoy_config_tap_v3_TapConfig__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_submsgs[9] = {
-  {.submsg = &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_tap_v3_MatchPredicate_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init},
-  {.submsg = &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_MatchPredicate_msg_init = {
-  &envoy_config_tap_v3_MatchPredicate_submsgs[0],
-  &envoy_config_tap_v3_MatchPredicate__fields[0],
-  UPB_SIZE(8, 16), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004000020, &upb_pob1_1bt},
-    {0x000800000503002a, &upb_pom_1bt_max64b},
-    {0x0008000006040032, &upb_pom_1bt_max64b},
-    {0x000800000705003a, &upb_pom_1bt_max64b},
-    {0x0008000008060042, &upb_pom_1bt_max64b},
-    {0x000800000907004a, &upb_pom_1bt_max64b},
-    {0x000800000a080052, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = {
-  {.submsg = &envoy_config_tap_v3_MatchPredicate_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init = {
-  &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0],
-  &envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_HttpHeadersMatch_msg_init = {
-  &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0],
-  &envoy_config_tap_v3_HttpHeadersMatch__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = {
-  {.submsg = &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_HttpGenericBodyMatch_msg_init = {
-  &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0],
-  &envoy_config_tap_v3_HttpGenericBodyMatch__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init = {
-  NULL,
-  &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pob_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_OutputConfig_submsgs[3] = {
-  {.submsg = &envoy_config_tap_v3_OutputSink_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_OutputConfig_msg_init = {
-  &envoy_config_tap_v3_OutputConfig_submsgs[0],
-  &envoy_config_tap_v3_OutputConfig__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000202001a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_OutputSink_submsgs[4] = {
-  {.submsg = &envoy_config_tap_v3_StreamingAdminSink_msg_init},
-  {.submsg = &envoy_config_tap_v3_FilePerTapSink_msg_init},
-  {.submsg = &envoy_config_tap_v3_StreamingGrpcSink_msg_init},
-  {.submsg = &envoy_config_tap_v3_BufferedAdminSink_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[5] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_OutputSink_msg_init = {
-  &envoy_config_tap_v3_OutputSink_submsgs[0],
-  &envoy_config_tap_v3_OutputSink__fields[0],
-  16, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x0008000402000012, &upb_pom_1bt_max64b},
-    {0x000800040301001a, &upb_pom_1bt_max64b},
-    {0x0008000404020022, &upb_pom_1bt_max64b},
-    {0x000800040503002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_config_tap_v3_StreamingAdminSink_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_BufferedAdminSink_msg_init = {
-  &envoy_config_tap_v3_BufferedAdminSink_submsgs[0],
-  &envoy_config_tap_v3_BufferedAdminSink__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_FilePerTapSink__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_FilePerTapSink_msg_init = {
-  NULL,
-  &envoy_config_tap_v3_FilePerTapSink__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_tap_v3_StreamingGrpcSink_msg_init = {
-  &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0],
-  &envoy_config_tap_v3_StreamingGrpcSink__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[12] = {
-  &envoy_config_tap_v3_TapConfig_msg_init,
-  &envoy_config_tap_v3_MatchPredicate_msg_init,
-  &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init,
-  &envoy_config_tap_v3_HttpHeadersMatch_msg_init,
-  &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init,
-  &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init,
-  &envoy_config_tap_v3_OutputConfig_msg_init,
-  &envoy_config_tap_v3_OutputSink_msg_init,
-  &envoy_config_tap_v3_StreamingAdminSink_msg_init,
-  &envoy_config_tap_v3_BufferedAdminSink_msg_init,
-  &envoy_config_tap_v3_FilePerTapSink_msg_init,
-  &envoy_config_tap_v3_StreamingGrpcSink_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  12,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h b/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h
deleted file mode 100644
index cc955423943d3..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h
+++ /dev/null
@@ -1,1522 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/tap/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_config_tap_v3_TapConfig envoy_config_tap_v3_TapConfig;
-typedef struct envoy_config_tap_v3_MatchPredicate envoy_config_tap_v3_MatchPredicate;
-typedef struct envoy_config_tap_v3_MatchPredicate_MatchSet envoy_config_tap_v3_MatchPredicate_MatchSet;
-typedef struct envoy_config_tap_v3_HttpHeadersMatch envoy_config_tap_v3_HttpHeadersMatch;
-typedef struct envoy_config_tap_v3_HttpGenericBodyMatch envoy_config_tap_v3_HttpGenericBodyMatch;
-typedef struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch;
-typedef struct envoy_config_tap_v3_OutputConfig envoy_config_tap_v3_OutputConfig;
-typedef struct envoy_config_tap_v3_OutputSink envoy_config_tap_v3_OutputSink;
-typedef struct envoy_config_tap_v3_StreamingAdminSink envoy_config_tap_v3_StreamingAdminSink;
-typedef struct envoy_config_tap_v3_BufferedAdminSink envoy_config_tap_v3_BufferedAdminSink;
-typedef struct envoy_config_tap_v3_FilePerTapSink envoy_config_tap_v3_FilePerTapSink;
-typedef struct envoy_config_tap_v3_StreamingGrpcSink envoy_config_tap_v3_StreamingGrpcSink;
-extern const upb_MiniTable envoy_config_tap_v3_TapConfig_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_MatchPredicate_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_HttpHeadersMatch_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_HttpGenericBodyMatch_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_OutputConfig_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_OutputSink_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_StreamingAdminSink_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_BufferedAdminSink_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_FilePerTapSink_msg_init;
-extern const upb_MiniTable envoy_config_tap_v3_StreamingGrpcSink_msg_init;
-struct envoy_config_common_matcher_v3_MatchPredicate;
-struct envoy_config_core_v3_GrpcService;
-struct envoy_config_core_v3_RuntimeFractionalPercent;
-struct envoy_config_route_v3_HeaderMatcher;
-struct google_protobuf_Duration;
-struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeFractionalPercent_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-
-typedef enum {
-  envoy_config_tap_v3_OutputSink_JSON_BODY_AS_BYTES = 0,
-  envoy_config_tap_v3_OutputSink_JSON_BODY_AS_STRING = 1,
-  envoy_config_tap_v3_OutputSink_PROTO_BINARY = 2,
-  envoy_config_tap_v3_OutputSink_PROTO_BINARY_LENGTH_DELIMITED = 3,
-  envoy_config_tap_v3_OutputSink_PROTO_TEXT = 4
-} envoy_config_tap_v3_OutputSink_Format;
-
-
-
-/* envoy.config.tap.v3.TapConfig */
-
-UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy_config_tap_v3_TapConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_TapConfig* ret = envoy_config_tap_v3_TapConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_TapConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_TapConfig* envoy_config_tap_v3_TapConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_TapConfig* ret = envoy_config_tap_v3_TapConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_TapConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_TapConfig_serialize(const envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_TapConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_TapConfig_serialize_ex(const envoy_config_tap_v3_TapConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_TapConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_match_config(envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_match_config(const envoy_config_tap_v3_TapConfig* msg) {
-  const envoy_config_tap_v3_MatchPredicate* default_val = NULL;
-  const envoy_config_tap_v3_MatchPredicate* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match_config(const envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_output_config(envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_output_config(const envoy_config_tap_v3_TapConfig* msg) {
-  const envoy_config_tap_v3_OutputConfig* default_val = NULL;
-  const envoy_config_tap_v3_OutputConfig* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_output_config(const envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_tap_enabled(envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_tap_enabled(const envoy_config_tap_v3_TapConfig* msg) {
-  const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL;
-  const struct envoy_config_core_v3_RuntimeFractionalPercent* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_tap_enabled(const envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_clear_match(envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_match(const envoy_config_tap_v3_TapConfig* msg) {
-  const struct envoy_config_common_matcher_v3_MatchPredicate* default_val = NULL;
-  const struct envoy_config_common_matcher_v3_MatchPredicate* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match(const envoy_config_tap_v3_TapConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_MatchPredicate* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_msg_init, arena);
-    if (sub) envoy_config_tap_v3_TapConfig_set_match_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_set_output_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_OutputConfig* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_mutable_output_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_OutputConfig* sub = (struct envoy_config_tap_v3_OutputConfig*)envoy_config_tap_v3_TapConfig_output_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_OutputConfig*)_upb_Message_New(&envoy_config_tap_v3_OutputConfig_msg_init, arena);
-    if (sub) envoy_config_tap_v3_TapConfig_set_output_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_set_tap_enabled(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_mutable_tap_enabled(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_tap_v3_TapConfig_tap_enabled(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)_upb_Message_New(&envoy_config_core_v3_RuntimeFractionalPercent_msg_init, arena);
-    if (sub) envoy_config_tap_v3_TapConfig_set_tap_enabled(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_common_matcher_v3_MatchPredicate* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) {
-  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
-    if (sub) envoy_config_tap_v3_TapConfig_set_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.tap.v3.MatchPredicate */
-
-UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_MatchPredicate* ret = envoy_config_tap_v3_MatchPredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_MatchPredicate* ret = envoy_config_tap_v3_MatchPredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_MatchPredicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_serialize(const envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_MatchPredicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_serialize_ex(const envoy_config_tap_v3_MatchPredicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_MatchPredicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_tap_v3_MatchPredicate_rule_or_match = 1,
-  envoy_config_tap_v3_MatchPredicate_rule_and_match = 2,
-  envoy_config_tap_v3_MatchPredicate_rule_not_match = 3,
-  envoy_config_tap_v3_MatchPredicate_rule_any_match = 4,
-  envoy_config_tap_v3_MatchPredicate_rule_http_request_headers_match = 5,
-  envoy_config_tap_v3_MatchPredicate_rule_http_request_trailers_match = 6,
-  envoy_config_tap_v3_MatchPredicate_rule_http_response_headers_match = 7,
-  envoy_config_tap_v3_MatchPredicate_rule_http_response_trailers_match = 8,
-  envoy_config_tap_v3_MatchPredicate_rule_http_request_generic_body_match = 9,
-  envoy_config_tap_v3_MatchPredicate_rule_http_response_generic_body_match = 10,
-  envoy_config_tap_v3_MatchPredicate_rule_NOT_SET = 0
-} envoy_config_tap_v3_MatchPredicate_rule_oneofcases;
-UPB_INLINE envoy_config_tap_v3_MatchPredicate_rule_oneofcases envoy_config_tap_v3_MatchPredicate_rule_case(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_MatchPredicate_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_or_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_or_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL;
-  const envoy_config_tap_v3_MatchPredicate_MatchSet* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_or_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_and_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_and_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_MatchPredicate_MatchSet* default_val = NULL;
-  const envoy_config_tap_v3_MatchPredicate_MatchSet* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_and_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_not_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_not_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_MatchPredicate* default_val = NULL;
-  const envoy_config_tap_v3_MatchPredicate* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_not_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_any_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_any_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_any_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_request_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_response_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_headers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpHeadersMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpHeadersMatch* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_trailers_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpGenericBodyMatch* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_request_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_clear_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const envoy_config_tap_v3_HttpGenericBodyMatch* default_val = NULL;
-  const envoy_config_tap_v3_HttpGenericBodyMatch* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_generic_body_match(const envoy_config_tap_v3_MatchPredicate* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_or_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_or_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_or_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_or_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_and_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_and_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_and_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_and_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_not_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_mutable_not_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_MatchPredicate_not_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_not_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_any_match(envoy_config_tap_v3_MatchPredicate *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_headers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_headers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpHeadersMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(4, 8), -1, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, arena);
-    if (sub) envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.tap.v3.MatchPredicate.MatchSet */
-
-UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_MatchPredicate_MatchSet* ret = envoy_config_tap_v3_MatchPredicate_MatchSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_MatchSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_MatchPredicate_MatchSet* ret = envoy_config_tap_v3_MatchPredicate_MatchSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_MatchSet_serialize(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_MatchPredicate_MatchSet_serialize_ex(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_MatchPredicate_MatchSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_MatchPredicate_MatchSet_clear_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_MatchPredicate* const* envoy_config_tap_v3_MatchPredicate_MatchSet_rules(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_tap_v3_MatchPredicate* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_upb_array(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_tap_v3_MatchPredicate_MatchSet_rules_mutable_upb_array(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_MatchSet_has_rules(const envoy_config_tap_v3_MatchPredicate_MatchSet* msg) {
-  size_t size;
-  envoy_config_tap_v3_MatchPredicate_MatchSet_rules(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredicate_MatchSet_mutable_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_tap_v3_MatchPredicate**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_tap_v3_MatchPredicate** envoy_config_tap_v3_MatchPredicate_MatchSet_resize_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_MatchPredicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_MatchSet_add_rules(envoy_config_tap_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)_upb_Message_New(&envoy_config_tap_v3_MatchPredicate_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.tap.v3.HttpHeadersMatch */
-
-UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpHeadersMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpHeadersMatch* ret = envoy_config_tap_v3_HttpHeadersMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_HttpHeadersMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpHeadersMatch* ret = envoy_config_tap_v3_HttpHeadersMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpHeadersMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpHeadersMatch_serialize(const envoy_config_tap_v3_HttpHeadersMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpHeadersMatch_serialize_ex(const envoy_config_tap_v3_HttpHeadersMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpHeadersMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_HttpHeadersMatch_clear_headers(envoy_config_tap_v3_HttpHeadersMatch* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_config_tap_v3_HttpHeadersMatch_headers(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_upb_array(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpHeadersMatch_headers_mutable_upb_array(const envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_tap_v3_HttpHeadersMatch_has_headers(const envoy_config_tap_v3_HttpHeadersMatch* msg) {
-  size_t size;
-  envoy_config_tap_v3_HttpHeadersMatch_headers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_HttpHeadersMatch_mutable_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_config_tap_v3_HttpHeadersMatch_resize_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_tap_v3_HttpHeadersMatch_add_headers(envoy_config_tap_v3_HttpHeadersMatch* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.tap.v3.HttpGenericBodyMatch */
-
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpGenericBodyMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_HttpGenericBodyMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpGenericBodyMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_serialize(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_serialize_ex(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_clear_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_config_tap_v3_HttpGenericBodyMatch_bytes_limit(const envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_clear_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* const* envoy_config_tap_v3_HttpGenericBodyMatch_patterns(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_upb_array(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_mutable_upb_array(const envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_has_patterns(const envoy_config_tap_v3_HttpGenericBodyMatch* msg) {
-  size_t size;
-  envoy_config_tap_v3_HttpGenericBodyMatch_patterns(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch *msg, uint32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_resize_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_add_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch */
-
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_serialize(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_serialize_ex(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_string_match = 1,
-  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_binary_match = 2,
-  envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_NOT_SET = 0
-} envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases;
-UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_case(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_rule_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_clear_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_string_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_string_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_clear_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_binary_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_binary_match(const envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.tap.v3.OutputConfig */
-
-UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_OutputConfig*)_upb_Message_New(&envoy_config_tap_v3_OutputConfig_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_OutputConfig* ret = envoy_config_tap_v3_OutputConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_OutputConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_OutputConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_OutputConfig* ret = envoy_config_tap_v3_OutputConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_OutputConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_OutputConfig_serialize(const envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_OutputConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_OutputConfig_serialize_ex(const envoy_config_tap_v3_OutputConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_OutputConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_sinks(envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_OutputSink* const* envoy_config_tap_v3_OutputConfig_sinks(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_config_tap_v3_OutputSink* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_upb_array(const envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_config_tap_v3_OutputConfig_sinks_mutable_upb_array(const envoy_config_tap_v3_OutputConfig* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_sinks(const envoy_config_tap_v3_OutputConfig* msg) {
-  size_t size;
-  envoy_config_tap_v3_OutputConfig_sinks(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_max_buffered_rx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputConfig_has_max_buffered_tx_bytes(const envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_clear_streaming(envoy_config_tap_v3_OutputConfig* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputConfig_streaming(const envoy_config_tap_v3_OutputConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_mutable_sinks(envoy_config_tap_v3_OutputConfig* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_config_tap_v3_OutputSink**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_config_tap_v3_OutputSink** envoy_config_tap_v3_OutputConfig_resize_sinks(envoy_config_tap_v3_OutputConfig* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_OutputSink**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputConfig_add_sinks(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_tap_v3_OutputSink* sub = (struct envoy_config_tap_v3_OutputSink*)_upb_Message_New(&envoy_config_tap_v3_OutputSink_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_streaming(envoy_config_tap_v3_OutputConfig *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.tap.v3.OutputSink */
-
-UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_OutputSink*)_upb_Message_New(&envoy_config_tap_v3_OutputSink_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_OutputSink* ret = envoy_config_tap_v3_OutputSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_OutputSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputSink_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_OutputSink* ret = envoy_config_tap_v3_OutputSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_OutputSink_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_OutputSink_serialize(const envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_OutputSink_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_OutputSink_serialize_ex(const envoy_config_tap_v3_OutputSink* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_OutputSink_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_config_tap_v3_OutputSink_output_sink_type_streaming_admin = 2,
-  envoy_config_tap_v3_OutputSink_output_sink_type_file_per_tap = 3,
-  envoy_config_tap_v3_OutputSink_output_sink_type_streaming_grpc = 4,
-  envoy_config_tap_v3_OutputSink_output_sink_type_buffered_admin = 5,
-  envoy_config_tap_v3_OutputSink_output_sink_type_NOT_SET = 0
-} envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases;
-UPB_INLINE envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases envoy_config_tap_v3_OutputSink_output_sink_type_case(const envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_config_tap_v3_OutputSink_output_sink_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_format(envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_config_tap_v3_OutputSink_format(const envoy_config_tap_v3_OutputSink* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_streaming_admin(envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_streaming_admin(const envoy_config_tap_v3_OutputSink* msg) {
-  const envoy_config_tap_v3_StreamingAdminSink* default_val = NULL;
-  const envoy_config_tap_v3_StreamingAdminSink* ret;
-  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_streaming_admin(const envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_file_per_tap(envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_file_per_tap(const envoy_config_tap_v3_OutputSink* msg) {
-  const envoy_config_tap_v3_FilePerTapSink* default_val = NULL;
-  const envoy_config_tap_v3_FilePerTapSink* ret;
-  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_file_per_tap(const envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_streaming_grpc(envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_streaming_grpc(const envoy_config_tap_v3_OutputSink* msg) {
-  const envoy_config_tap_v3_StreamingGrpcSink* default_val = NULL;
-  const envoy_config_tap_v3_StreamingGrpcSink* ret;
-  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_streaming_grpc(const envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_clear_buffered_admin(envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_buffered_admin(const envoy_config_tap_v3_OutputSink* msg) {
-  const envoy_config_tap_v3_BufferedAdminSink* default_val = NULL;
-  const envoy_config_tap_v3_BufferedAdminSink* ret;
-  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_buffered_admin(const envoy_config_tap_v3_OutputSink* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_OutputSink_set_format(envoy_config_tap_v3_OutputSink *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingAdminSink* value) {
-  const upb_MiniTableField field = {2, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_mutable_streaming_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_StreamingAdminSink* sub = (struct envoy_config_tap_v3_StreamingAdminSink*)envoy_config_tap_v3_OutputSink_streaming_admin(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_StreamingAdminSink*)_upb_Message_New(&envoy_config_tap_v3_StreamingAdminSink_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputSink_set_streaming_admin(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_set_file_per_tap(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_FilePerTapSink* value) {
-  const upb_MiniTableField field = {3, 8, -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_mutable_file_per_tap(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_FilePerTapSink* sub = (struct envoy_config_tap_v3_FilePerTapSink*)envoy_config_tap_v3_OutputSink_file_per_tap(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_FilePerTapSink*)_upb_Message_New(&envoy_config_tap_v3_FilePerTapSink_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputSink_set_file_per_tap(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_grpc(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingGrpcSink* value) {
-  const upb_MiniTableField field = {4, 8, -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_mutable_streaming_grpc(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_StreamingGrpcSink* sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)envoy_config_tap_v3_OutputSink_streaming_grpc(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)_upb_Message_New(&envoy_config_tap_v3_StreamingGrpcSink_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputSink_set_streaming_grpc(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_config_tap_v3_OutputSink_set_buffered_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_BufferedAdminSink* value) {
-  const upb_MiniTableField field = {5, 8, -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_mutable_buffered_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) {
-  struct envoy_config_tap_v3_BufferedAdminSink* sub = (struct envoy_config_tap_v3_BufferedAdminSink*)envoy_config_tap_v3_OutputSink_buffered_admin(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_BufferedAdminSink*)_upb_Message_New(&envoy_config_tap_v3_BufferedAdminSink_msg_init, arena);
-    if (sub) envoy_config_tap_v3_OutputSink_set_buffered_admin(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.tap.v3.StreamingAdminSink */
-
-UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_StreamingAdminSink*)_upb_Message_New(&envoy_config_tap_v3_StreamingAdminSink_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_StreamingAdminSink* ret = envoy_config_tap_v3_StreamingAdminSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_StreamingAdminSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_StreamingAdminSink_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_StreamingAdminSink* ret = envoy_config_tap_v3_StreamingAdminSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_StreamingAdminSink_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_StreamingAdminSink_serialize(const envoy_config_tap_v3_StreamingAdminSink* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_StreamingAdminSink_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_StreamingAdminSink_serialize_ex(const envoy_config_tap_v3_StreamingAdminSink* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_StreamingAdminSink_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.config.tap.v3.BufferedAdminSink */
-
-UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_BufferedAdminSink*)_upb_Message_New(&envoy_config_tap_v3_BufferedAdminSink_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_BufferedAdminSink* ret = envoy_config_tap_v3_BufferedAdminSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_BufferedAdminSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_BufferedAdminSink_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_BufferedAdminSink* ret = envoy_config_tap_v3_BufferedAdminSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_BufferedAdminSink_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_BufferedAdminSink_serialize(const envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_BufferedAdminSink_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_BufferedAdminSink_serialize_ex(const envoy_config_tap_v3_BufferedAdminSink* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_BufferedAdminSink_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_clear_max_traces(envoy_config_tap_v3_BufferedAdminSink* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_config_tap_v3_BufferedAdminSink_max_traces(const envoy_config_tap_v3_BufferedAdminSink* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_clear_timeout(envoy_config_tap_v3_BufferedAdminSink* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_timeout(const envoy_config_tap_v3_BufferedAdminSink* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_BufferedAdminSink_has_timeout(const envoy_config_tap_v3_BufferedAdminSink* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_max_traces(envoy_config_tap_v3_BufferedAdminSink *msg, uint64_t value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_timeout(envoy_config_tap_v3_BufferedAdminSink *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_mutable_timeout(envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_tap_v3_BufferedAdminSink_timeout(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_config_tap_v3_BufferedAdminSink_set_timeout(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.config.tap.v3.FilePerTapSink */
-
-UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_FilePerTapSink*)_upb_Message_New(&envoy_config_tap_v3_FilePerTapSink_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_FilePerTapSink* ret = envoy_config_tap_v3_FilePerTapSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_FilePerTapSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_FilePerTapSink_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_FilePerTapSink* ret = envoy_config_tap_v3_FilePerTapSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_FilePerTapSink_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_FilePerTapSink_serialize(const envoy_config_tap_v3_FilePerTapSink* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_FilePerTapSink_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_FilePerTapSink_serialize_ex(const envoy_config_tap_v3_FilePerTapSink* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_FilePerTapSink_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_clear_path_prefix(envoy_config_tap_v3_FilePerTapSink* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_tap_v3_FilePerTapSink_path_prefix(const envoy_config_tap_v3_FilePerTapSink* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_set_path_prefix(envoy_config_tap_v3_FilePerTapSink *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.config.tap.v3.StreamingGrpcSink */
-
-UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_new(upb_Arena* arena) {
-  return (envoy_config_tap_v3_StreamingGrpcSink*)_upb_Message_New(&envoy_config_tap_v3_StreamingGrpcSink_msg_init, arena);
-}
-UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_config_tap_v3_StreamingGrpcSink* ret = envoy_config_tap_v3_StreamingGrpcSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_StreamingGrpcSink_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_StreamingGrpcSink_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_config_tap_v3_StreamingGrpcSink* ret = envoy_config_tap_v3_StreamingGrpcSink_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_tap_v3_StreamingGrpcSink_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_config_tap_v3_StreamingGrpcSink_serialize(const envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_StreamingGrpcSink_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_config_tap_v3_StreamingGrpcSink_serialize_ex(const envoy_config_tap_v3_StreamingGrpcSink* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_tap_v3_StreamingGrpcSink_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_clear_tap_id(envoy_config_tap_v3_StreamingGrpcSink* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_config_tap_v3_StreamingGrpcSink_tap_id(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_clear_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_grpc_service(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
-  const struct envoy_config_core_v3_GrpcService* default_val = NULL;
-  const struct envoy_config_core_v3_GrpcService* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_config_tap_v3_StreamingGrpcSink_has_grpc_service(const envoy_config_tap_v3_StreamingGrpcSink* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_tap_id(envoy_config_tap_v3_StreamingGrpcSink *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(envoy_config_tap_v3_StreamingGrpcSink *msg, struct envoy_config_core_v3_GrpcService* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_mutable_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_tap_v3_StreamingGrpcSink_grpc_service(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
-    if (sub) envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c
deleted file mode 100644
index f14ef29fa251c..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/datadog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/datadog.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_DatadogConfig_msg_init = {
-  NULL,
-  &envoy_config_trace_v3_DatadogConfig__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_DatadogConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c
deleted file mode 100644
index 038176ce2cef7..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/dynamic_ot.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/dynamic_ot.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_DynamicOtConfig_msg_init = {
-  &envoy_config_trace_v3_DynamicOtConfig_submsgs[0],
-  &envoy_config_trace_v3_DynamicOtConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_DynamicOtConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
deleted file mode 100644
index 5ab92061e7bb5..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/http_tracer.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_Tracing_submsgs[1] = {
-  {.submsg = &envoy_config_trace_v3_Tracing_Http_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_Tracing_msg_init = {
-  &envoy_config_trace_v3_Tracing_submsgs[0],
-  &envoy_config_trace_v3_Tracing__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_trace_v3_Tracing_Http_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_Tracing_Http_msg_init = {
-  &envoy_config_trace_v3_Tracing_Http_submsgs[0],
-  &envoy_config_trace_v3_Tracing_Http__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_trace_v3_Tracing_msg_init,
-  &envoy_config_trace_v3_Tracing_Http_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c
deleted file mode 100644
index b03c0a477ef0c..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/lightstep.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/lightstep.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_LightstepConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_LightstepConfig_msg_init = {
-  &envoy_config_trace_v3_LightstepConfig_submsgs[0],
-  &envoy_config_trace_v3_LightstepConfig__fields[0],
-  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_ppv4_1bt},
-    {0x0030000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_LightstepConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c
deleted file mode 100644
index 0da8d50b50b17..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/opencensus.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/opencensus.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "opencensus/proto/trace/v1/trace_config.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = {
-  {.submsg = &opencensus_proto_trace_v1_TraceConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[13] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(10, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 48), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(16, 56), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(20, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(56, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(24, 96), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(28, 104), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_OpenCensusConfig_msg_init = {
-  &envoy_config_trace_v3_OpenCensusConfig_submsgs[0],
-  &envoy_config_trace_v3_OpenCensusConfig__fields[0],
-  UPB_SIZE(64, 112), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000200003f000018, &upb_psb1_1bt},
-    {0x001000003f000022, &upb_pss_1bt},
-    {0x000300003f000028, &upb_psb1_1bt},
-    {0x002000003f000032, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003000003f000042, &upb_ppv4_1bt},
-    {0x003800003f00004a, &upb_ppv4_1bt},
-    {0x004000003f000052, &upb_pss_1bt},
-    {0x000400003f000058, &upb_psb1_1bt},
-    {0x005000003f000062, &upb_pss_1bt},
-    {0x006000000201006a, &upb_psm_1bt_maxmaxb},
-    {0x0068000003020072, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_OpenCensusConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c
deleted file mode 100644
index 26f26f98d4a1f..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/opentelemetry.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/opentelemetry.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_OpenTelemetryConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_OpenTelemetryConfig_msg_init = {
-  &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0],
-  &envoy_config_trace_v3_OpenTelemetryConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_OpenTelemetryConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c
deleted file mode 100644
index abe28f393cccc..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/service.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/service.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_TraceServiceConfig__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_TraceServiceConfig_msg_init = {
-  &envoy_config_trace_v3_TraceServiceConfig_submsgs[0],
-  &envoy_config_trace_v3_TraceServiceConfig__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_TraceServiceConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c
deleted file mode 100644
index 37dc3f2ccb8ec..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/skywalking.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/skywalking.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/sensitive.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-  {.submsg = &envoy_config_trace_v3_ClientConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_SkyWalkingConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_SkyWalkingConfig_msg_init = {
-  &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0],
-  &envoy_config_trace_v3_SkyWalkingConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_trace_v3_ClientConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_ClientConfig__fields[4] = {
-  {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_ClientConfig_msg_init = {
-  &envoy_config_trace_v3_ClientConfig_submsgs[0],
-  &envoy_config_trace_v3_ClientConfig__fields[0],
-  UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x002800003f000012, &upb_pss_1bt},
-    {0x000800040300001a, &upb_pos_1bt},
-    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_trace_v3_SkyWalkingConfig_msg_init,
-  &envoy_config_trace_v3_ClientConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c
deleted file mode 100644
index 20f705f3827c3..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/trace.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/trace.upb.h"
-#include "envoy/config/trace/v3/datadog.upb.h"
-#include "envoy/config/trace/v3/dynamic_ot.upb.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "envoy/config/trace/v3/lightstep.upb.h"
-#include "envoy/config/trace/v3/opencensus.upb.h"
-#include "envoy/config/trace/v3/opentelemetry.upb.h"
-#include "envoy/config/trace/v3/service.upb.h"
-#include "envoy/config/trace/v3/zipkin.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  NULL,
-  0,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h b/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h
deleted file mode 100644
index 159a92bbab69f..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/trace.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-/* Public Imports. */
-#include "envoy/config/trace/v3/datadog.upb.h"
-#include "envoy/config/trace/v3/dynamic_ot.upb.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "envoy/config/trace/v3/lightstep.upb.h"
-#include "envoy/config/trace/v3/opencensus.upb.h"
-#include "envoy/config/trace/v3/opentelemetry.upb.h"
-#include "envoy/config/trace/v3/service.upb.h"
-#include "envoy/config/trace/v3/zipkin.upb.h"
-
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-extern const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c
deleted file mode 100644
index f15b89f5e6832..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/xray.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/xray.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_XRayConfig__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_XRayConfig_msg_init = {
-  &envoy_config_trace_v3_XRayConfig_submsgs[0],
-  &envoy_config_trace_v3_XRayConfig__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_XRayConfig_SegmentFields__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init = {
-  &envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[0],
-  &envoy_config_trace_v3_XRayConfig_SegmentFields__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_config_trace_v3_XRayConfig_msg_init,
-  &envoy_config_trace_v3_XRayConfig_SegmentFields_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c
deleted file mode 100644
index 1a6f02fde80b3..0000000000000
--- a/src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/trace/v3/zipkin.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/config/trace/v3/zipkin.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_config_trace_v3_ZipkinConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_config_trace_v3_ZipkinConfig__fields[7] = {
-  {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 48), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_config_trace_v3_ZipkinConfig_msg_init = {
-  &envoy_config_trace_v3_ZipkinConfig_submsgs[0],
-  &envoy_config_trace_v3_ZipkinConfig__fields[0],
-  UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x002000003f000012, &upb_pss_1bt},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x0030000001000022, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000028, &upb_psv4_1bt},
-    {0x003800003f000032, &upb_pss_1bt},
-    {0x000800003f000038, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_trace_v3_ZipkinConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c b/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c
deleted file mode 100644
index fb5ff2e121270..0000000000000
--- a/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/data/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/data/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = {
-  {.submsg = &envoy_data_accesslog_v3_AccessLogCommon_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_ConnectionProperties_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_TCPAccessLogEntry__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init = {
-  &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0],
-  &envoy_data_accesslog_v3_TCPAccessLogEntry__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = {
-  {.submsg = &envoy_data_accesslog_v3_AccessLogCommon_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init = {
-  &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0],
-  &envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x001000000201001a, &upb_psm_1bt_max192b},
-    {0x0018000003020022, &upb_psm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_ConnectionProperties__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_ConnectionProperties_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_ConnectionProperties__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_TLSProperties_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_ResponseFlags_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon__fields[33] = {
-  {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_msg_init = {
-  &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0],
-  &envoy_data_accesslog_v3_AccessLogCommon__fields[0],
-  UPB_SIZE(184, 304), 33, kUpb_ExtMode_NonExtendable, 33, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f000009, &upb_psf8_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000003020022, &upb_psm_1bt_max128b},
-    {0x003000000403002a, &upb_psm_1bt_maxmaxb},
-    {0x0038000005040032, &upb_psm_1bt_maxmaxb},
-    {0x004000000605003a, &upb_psm_1bt_maxmaxb},
-    {0x0048000007060042, &upb_psm_1bt_maxmaxb},
-    {0x005000000807004a, &upb_psm_1bt_maxmaxb},
-    {0x0058000009080052, &upb_psm_1bt_maxmaxb},
-    {0x006000000a09005a, &upb_psm_1bt_maxmaxb},
-    {0x006800000b0a0062, &upb_psm_1bt_maxmaxb},
-    {0x007000000c0b006a, &upb_psm_1bt_maxmaxb},
-    {0x007800000d0c0072, &upb_psm_1bt_maxmaxb},
-    {0x008000003f00007a, &upb_pss_1bt},
-    {0x009000000e0d0182, &upb_psm_2bt_max64b},
-    {0x009800000f0e018a, &upb_psm_2bt_maxmaxb},
-    {0x00a000003f000192, &upb_pss_2bt},
-    {0x00b000003f00019a, &upb_pss_2bt},
-    {0x00c00000100f01a2, &upb_psm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00d80000111201ba, &upb_psm_2bt_maxmaxb},
-    {0x000400003f0001c0, &upb_psv4_2bt},
-    {0x00e000003f0001ca, &upb_pss_2bt},
-    {0x00f000003f0001d2, &upb_pss_2bt},
-    {0x000800003f0001d8, &upb_psb1_2bt},
-    {0x010000003f0001e2, &upb_pss_2bt},
-    {0x011000003f0001e8, &upb_psv8_2bt},
-    {0x011800003f0001f0, &upb_psv8_2bt},
-    {0x012000003f0001f8, &upb_psv8_2bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_msg_init = {
-  &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0],
-  &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = {
-  {.submsg = &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27] = {
-  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_ResponseFlags_msg_init = {
-  &envoy_data_accesslog_v3_ResponseFlags_submsgs[0],
-  &envoy_data_accesslog_v3_ResponseFlags__fields[0],
-  40, 27, kUpb_ExtMode_NonExtendable, 27, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000008, &upb_psb1_1bt},
-    {0x000200003f000010, &upb_psb1_1bt},
-    {0x000300003f000018, &upb_psb1_1bt},
-    {0x000400003f000020, &upb_psb1_1bt},
-    {0x000500003f000028, &upb_psb1_1bt},
-    {0x000600003f000030, &upb_psb1_1bt},
-    {0x000700003f000038, &upb_psb1_1bt},
-    {0x000800003f000040, &upb_psb1_1bt},
-    {0x000900003f000048, &upb_psb1_1bt},
-    {0x000a00003f000050, &upb_psb1_1bt},
-    {0x000b00003f000058, &upb_psb1_1bt},
-    {0x000c00003f000060, &upb_psb1_1bt},
-    {0x002000000100006a, &upb_psm_1bt_max64b},
-    {0x000d00003f000070, &upb_psb1_1bt},
-    {0x000e00003f000078, &upb_psb1_1bt},
-    {0x000f00003f000180, &upb_psb1_2bt},
-    {0x001000003f000188, &upb_psb1_2bt},
-    {0x001100003f000190, &upb_psb1_2bt},
-    {0x001200003f000198, &upb_psb1_2bt},
-    {0x001300003f0001a0, &upb_psb1_2bt},
-    {0x001400003f0001a8, &upb_psb1_2bt},
-    {0x001500003f0001b0, &upb_psb1_2bt},
-    {0x001600003f0001b8, &upb_psb1_2bt},
-    {0x001700003f0001c0, &upb_psb1_2bt},
-    {0x001800003f0001c8, &upb_psb1_2bt},
-    {0x001900003f0001d0, &upb_psb1_2bt},
-    {0x001a00003f0001d8, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties__fields[7] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_msg_init = {
-  &envoy_data_accesslog_v3_TLSProperties_submsgs[0],
-  &envoy_data_accesslog_v3_TLSProperties__fields[0],
-  UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x001000003f00001a, &upb_pss_1bt},
-    {0x0020000002010022, &upb_psm_1bt_max64b},
-    {0x002800000302002a, &upb_psm_1bt_max64b},
-    {0x003000003f000032, &upb_pss_1bt},
-    {0x004000003f00003a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = {
-  {.submsg = &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[2] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init = {
-  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0],
-  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties__fields[15] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPRequestProperties_msg_init = {
-  &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0],
-  &envoy_data_accesslog_v3_HTTPRequestProperties__fields[0],
-  UPB_SIZE(112, 184), 15, kUpb_ExtMode_NonExtendable, 15, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x0028000001000022, &upb_psm_1bt_maxmaxb},
-    {0x003000003f00002a, &upb_pss_1bt},
-    {0x004000003f000032, &upb_pss_1bt},
-    {0x005000003f00003a, &upb_pss_1bt},
-    {0x006000003f000042, &upb_pss_1bt},
-    {0x007000003f00004a, &upb_pss_1bt},
-    {0x008000003f000052, &upb_pss_1bt},
-    {0x009000003f000058, &upb_psv8_1bt},
-    {0x009800003f000060, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x00a800003f000070, &upb_psv8_1bt},
-    {0x00b000003f000078, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_msg_init},
-  {.submsg = &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties__fields[8] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_msg_init = {
-  &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0],
-  &envoy_data_accesslog_v3_HTTPResponseProperties__fields[0],
-  UPB_SIZE(56, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x001800003f000018, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003000003f000032, &upb_pss_1bt},
-    {0x004000003f000038, &upb_psv8_1bt},
-    {0x004800003f000040, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_msg_init = {
-  NULL,
-  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[16] = {
-  &envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init,
-  &envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init,
-  &envoy_data_accesslog_v3_ConnectionProperties_msg_init,
-  &envoy_data_accesslog_v3_AccessLogCommon_msg_init,
-  &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_msg_init,
-  &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_msg_init,
-  &envoy_data_accesslog_v3_ResponseFlags_msg_init,
-  &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init,
-  &envoy_data_accesslog_v3_TLSProperties_msg_init,
-  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init,
-  &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init,
-  &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init,
-  &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_msg_init,
-  &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init,
-  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_msg_init,
-  &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_msg_init,
-};
-
-const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  16,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h
deleted file mode 100644
index 910bfb7f42e73..0000000000000
--- a/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h
+++ /dev/null
@@ -1,2702 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/data/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_data_accesslog_v3_TCPAccessLogEntry envoy_data_accesslog_v3_TCPAccessLogEntry;
-typedef struct envoy_data_accesslog_v3_HTTPAccessLogEntry envoy_data_accesslog_v3_HTTPAccessLogEntry;
-typedef struct envoy_data_accesslog_v3_ConnectionProperties envoy_data_accesslog_v3_ConnectionProperties;
-typedef struct envoy_data_accesslog_v3_AccessLogCommon envoy_data_accesslog_v3_AccessLogCommon;
-typedef struct envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry;
-typedef struct envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry;
-typedef struct envoy_data_accesslog_v3_ResponseFlags envoy_data_accesslog_v3_ResponseFlags;
-typedef struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized envoy_data_accesslog_v3_ResponseFlags_Unauthorized;
-typedef struct envoy_data_accesslog_v3_TLSProperties envoy_data_accesslog_v3_TLSProperties;
-typedef struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties envoy_data_accesslog_v3_TLSProperties_CertificateProperties;
-typedef struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName;
-typedef struct envoy_data_accesslog_v3_HTTPRequestProperties envoy_data_accesslog_v3_HTTPRequestProperties;
-typedef struct envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry;
-typedef struct envoy_data_accesslog_v3_HTTPResponseProperties envoy_data_accesslog_v3_HTTPResponseProperties;
-typedef struct envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry;
-typedef struct envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry;
-extern const upb_MiniTable envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_ConnectionProperties_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_ResponseFlags_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPRequestProperties_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_msg_init;
-extern const upb_MiniTable envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_msg_init;
-struct envoy_config_core_v3_Address;
-struct envoy_config_core_v3_Metadata;
-struct google_protobuf_Any;
-struct google_protobuf_Duration;
-struct google_protobuf_Timestamp;
-struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Metadata_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-
-typedef enum {
-  envoy_data_accesslog_v3_NotSet = 0,
-  envoy_data_accesslog_v3_TcpUpstreamConnected = 1,
-  envoy_data_accesslog_v3_TcpPeriodic = 2,
-  envoy_data_accesslog_v3_TcpConnectionEnd = 3,
-  envoy_data_accesslog_v3_DownstreamStart = 4,
-  envoy_data_accesslog_v3_DownstreamPeriodic = 5,
-  envoy_data_accesslog_v3_DownstreamEnd = 6,
-  envoy_data_accesslog_v3_UpstreamPoolReady = 7,
-  envoy_data_accesslog_v3_UpstreamPeriodic = 8,
-  envoy_data_accesslog_v3_UpstreamEnd = 9,
-  envoy_data_accesslog_v3_DownstreamTunnelSuccessfullyEstablished = 10
-} envoy_data_accesslog_v3_AccessLogType;
-
-typedef enum {
-  envoy_data_accesslog_v3_HTTPAccessLogEntry_PROTOCOL_UNSPECIFIED = 0,
-  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP10 = 1,
-  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP11 = 2,
-  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP2 = 3,
-  envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTP3 = 4
-} envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion;
-
-typedef enum {
-  envoy_data_accesslog_v3_ResponseFlags_Unauthorized_REASON_UNSPECIFIED = 0,
-  envoy_data_accesslog_v3_ResponseFlags_Unauthorized_EXTERNAL_SERVICE = 1
-} envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason;
-
-typedef enum {
-  envoy_data_accesslog_v3_TLSProperties_VERSION_UNSPECIFIED = 0,
-  envoy_data_accesslog_v3_TLSProperties_TLSv1 = 1,
-  envoy_data_accesslog_v3_TLSProperties_TLSv1_1 = 2,
-  envoy_data_accesslog_v3_TLSProperties_TLSv1_2 = 3,
-  envoy_data_accesslog_v3_TLSProperties_TLSv1_3 = 4
-} envoy_data_accesslog_v3_TLSProperties_TLSVersion;
-
-
-
-/* envoy.data.accesslog.v3.TCPAccessLogEntry */
-
-UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_TCPAccessLogEntry*)_upb_Message_New(&envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TCPAccessLogEntry* ret = envoy_data_accesslog_v3_TCPAccessLogEntry_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_TCPAccessLogEntry* envoy_data_accesslog_v3_TCPAccessLogEntry_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TCPAccessLogEntry* ret = envoy_data_accesslog_v3_TCPAccessLogEntry_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TCPAccessLogEntry_serialize(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TCPAccessLogEntry_serialize_ex(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TCPAccessLogEntry_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_clear_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL;
-  const envoy_data_accesslog_v3_AccessLogCommon* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_common_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_clear_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const envoy_data_accesslog_v3_ConnectionProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_ConnectionProperties* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_connection_properties(const envoy_data_accesslog_v3_TCPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy_data_accesslog_v3_AccessLogCommon_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_ConnectionProperties* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_ConnectionProperties* sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)_upb_Message_New(&envoy_data_accesslog_v3_ConnectionProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.data.accesslog.v3.HTTPAccessLogEntry */
-
-UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_HTTPAccessLogEntry*)_upb_Message_New(&envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPAccessLogEntry* ret = envoy_data_accesslog_v3_HTTPAccessLogEntry_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPAccessLogEntry* envoy_data_accesslog_v3_HTTPAccessLogEntry_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPAccessLogEntry* ret = envoy_data_accesslog_v3_HTTPAccessLogEntry_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPAccessLogEntry_serialize(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPAccessLogEntry_serialize_ex(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPAccessLogEntry_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const envoy_data_accesslog_v3_AccessLogCommon* default_val = NULL;
-  const envoy_data_accesslog_v3_AccessLogCommon* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_common_properties(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_data_accesslog_v3_HTTPAccessLogEntry_protocol_version(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_request(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const envoy_data_accesslog_v3_HTTPRequestProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_HTTPRequestProperties* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_request(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_clear_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_response(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const envoy_data_accesslog_v3_HTTPResponseProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_HTTPResponseProperties* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_response(const envoy_data_accesslog_v3_HTTPAccessLogEntry* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy_data_accesslog_v3_AccessLogCommon_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, int32_t value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPRequestProperties* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_HTTPRequestProperties* sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_request(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)_upb_Message_New(&envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPResponseProperties* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_HTTPResponseProperties* sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_response(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)_upb_Message_New(&envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.data.accesslog.v3.ConnectionProperties */
-
-UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_ConnectionProperties*)_upb_Message_New(&envoy_data_accesslog_v3_ConnectionProperties_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ConnectionProperties* ret = envoy_data_accesslog_v3_ConnectionProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ConnectionProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_ConnectionProperties_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ConnectionProperties* ret = envoy_data_accesslog_v3_ConnectionProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ConnectionProperties_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ConnectionProperties_serialize(const envoy_data_accesslog_v3_ConnectionProperties* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ConnectionProperties_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ConnectionProperties_serialize_ex(const envoy_data_accesslog_v3_ConnectionProperties* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ConnectionProperties_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_clear_received_bytes(envoy_data_accesslog_v3_ConnectionProperties* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_received_bytes(const envoy_data_accesslog_v3_ConnectionProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_clear_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_sent_bytes(const envoy_data_accesslog_v3_ConnectionProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_received_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.AccessLogCommon */
-
-UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_AccessLogCommon*)_upb_Message_New(&envoy_data_accesslog_v3_AccessLogCommon_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_AccessLogCommon* ret = envoy_data_accesslog_v3_AccessLogCommon_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_AccessLogCommon_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_AccessLogCommon_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_AccessLogCommon* ret = envoy_data_accesslog_v3_AccessLogCommon_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_AccessLogCommon_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_AccessLogCommon_serialize(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_AccessLogCommon_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_AccessLogCommon_serialize_ex(const envoy_data_accesslog_v3_AccessLogCommon* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_AccessLogCommon_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_sample_rate(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double envoy_data_accesslog_v3_AccessLogCommon_sample_rate(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Address* default_val = NULL;
-  const struct envoy_config_core_v3_Address* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Address* default_val = NULL;
-  const struct envoy_config_core_v3_Address* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_tls_properties(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const envoy_data_accesslog_v3_TLSProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_TLSProperties* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_tls_properties(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_start_time(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Timestamp* default_val = NULL;
-  const struct google_protobuf_Timestamp* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_start_time(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_upstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_upstream_rx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_first_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_time_to_last_downstream_tx_byte(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Address* default_val = NULL;
-  const struct envoy_config_core_v3_Address* ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_upstream_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Address* default_val = NULL;
-  const struct envoy_config_core_v3_Address* ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_upstream_local_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_upstream_cluster(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_response_flags(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const envoy_data_accesslog_v3_ResponseFlags* default_val = NULL;
-  const envoy_data_accesslog_v3_ResponseFlags* ret;
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_response_flags(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_metadata(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Metadata* default_val = NULL;
-  const struct envoy_config_core_v3_Metadata* ret;
-  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_metadata(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_upstream_transport_failure_reason(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_route_name(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_route_name(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct envoy_config_core_v3_Address* default_val = NULL;
-  const struct envoy_config_core_v3_Address* ret;
-  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_downstream_direct_remote_address(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_filter_state_objects(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_size(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any** val) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_custom_tags(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_data_accesslog_v3_AccessLogCommon_custom_tags_size(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_get(const envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView* val) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, 0);
-}
-UPB_INLINE const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_next(const envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_duration(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_duration(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_has_duration(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_data_accesslog_v3_AccessLogCommon_upstream_request_attempt_count(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_connection_termination_details(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_stream_id(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_stream_id(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_intermediate_log_entry(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_downstream_transport_failure_reason(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_downstream_wire_bytes_sent(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_downstream_wire_bytes_received(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_upstream_wire_bytes_sent(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_AccessLogCommon_upstream_wire_bytes_received(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_clear_access_log_type(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_data_accesslog_v3_AccessLogCommon_access_log_type(const envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_sample_rate(envoy_data_accesslog_v3_AccessLogCommon *msg, double value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(96, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_TLSProperties* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_mutable_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_TLSProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties*)envoy_data_accesslog_v3_AccessLogCommon_tls_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_TLSProperties*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_start_time(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Timestamp* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_mutable_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_data_accesslog_v3_AccessLogCommon_start_time(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_start_time(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 7, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 8, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(40, 96), 10, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 11, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 12, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 13, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_ResponseFlags* value) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 144), 14, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_mutable_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_ResponseFlags* sub = (struct envoy_data_accesslog_v3_ResponseFlags*)envoy_data_accesslog_v3_AccessLogCommon_response_flags(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_ResponseFlags*)_upb_Message_New(&envoy_data_accesslog_v3_ResponseFlags_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_metadata(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Metadata* value) {
-  const upb_MiniTableField field = {17, UPB_SIZE(60, 152), 15, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_mutable_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_data_accesslog_v3_AccessLogCommon_metadata(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy_config_core_v3_Metadata_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_metadata(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {18, UPB_SIZE(112, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_route_name(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {19, UPB_SIZE(120, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) {
-  const upb_MiniTableField field = {20, UPB_SIZE(64, 192), 16, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_clear(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, struct google_protobuf_Any* val, upb_Arena* a) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_delete(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* envoy_data_accesslog_v3_AccessLogCommon_filter_state_objects_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
-  const upb_MiniTableField field = {21, UPB_SIZE(68, 200), 0, 16, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_custom_tags_clear(envoy_data_accesslog_v3_AccessLogCommon* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_set(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
-  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_custom_tags_delete(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_StringView key) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_accesslog_v3_AccessLogCommon_custom_tags_nextmutable(envoy_data_accesslog_v3_AccessLogCommon* msg, size_t* iter) {
-  const upb_MiniTableField field = {22, UPB_SIZE(72, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_duration(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {23, UPB_SIZE(76, 216), 17, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_duration(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_duration(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_AccessLogCommon_set_duration(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon *msg, uint32_t value) {
-  const upb_MiniTableField field = {24, UPB_SIZE(80, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {25, UPB_SIZE(128, 224), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_stream_id(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {26, UPB_SIZE(136, 240), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon *msg, bool value) {
-  const upb_MiniTableField field = {27, UPB_SIZE(84, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) {
-  const upb_MiniTableField field = {28, UPB_SIZE(144, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
-  const upb_MiniTableField field = {29, UPB_SIZE(152, 272), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
-  const upb_MiniTableField field = {30, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
-  const upb_MiniTableField field = {31, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) {
-  const upb_MiniTableField field = {32, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_access_log_type(envoy_data_accesslog_v3_AccessLogCommon *msg, int32_t value) {
-  const upb_MiniTableField field = {33, UPB_SIZE(88, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry */
-
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_key(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_value(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
-  struct google_protobuf_Any* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_has_value(const envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_set_value(envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry *msg, struct google_protobuf_Any* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(struct google_protobuf_Any*));
-}
-
-/* envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry */
-
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_key(const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_value(const envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_set_value(envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
-/* envoy.data.accesslog.v3.ResponseFlags */
-
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_ResponseFlags*)_upb_Message_New(&envoy_data_accesslog_v3_ResponseFlags_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ResponseFlags* ret = envoy_data_accesslog_v3_ResponseFlags_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ResponseFlags_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_ResponseFlags_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ResponseFlags* ret = envoy_data_accesslog_v3_ResponseFlags_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ResponseFlags_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_serialize(const envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ResponseFlags_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_serialize_ex(const envoy_data_accesslog_v3_ResponseFlags* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ResponseFlags_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_failed_local_healthcheck(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_healthy_upstream(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_request_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_local_reset(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_local_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_remote_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_connection_failure(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_connection_termination(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_overflow(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_route_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_route_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_delay_injected(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_delay_injected(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_fault_injected(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_fault_injected(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_rate_limited(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_rate_limited(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* default_val = NULL;
-  const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_has_unauthorized_details(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_rate_limit_service_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_connection_termination(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_retry_limit_exceeded(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_stream_idle_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_invalid_envoy_request_headers(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_protocol_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_max_stream_duration_reached(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_response_from_cache_filter(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_filter_config_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_duration_timeout(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_duration_timeout(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_upstream_protocol_error(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_no_cluster_found(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_overload_manager(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_overload_manager(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags* msg) {
-  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_dns_resolution_failure(const envoy_data_accesslog_v3_ResponseFlags* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {2, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {3, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_local_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {5, 5, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {6, 6, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {7, 7, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_route_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {9, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_delay_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {10, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_fault_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {11, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limited(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {12, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags *msg, envoy_data_accesslog_v3_ResponseFlags_Unauthorized* value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(16, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_mutable_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)_upb_Message_New(&envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(20, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {15, UPB_SIZE(21, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {16, UPB_SIZE(22, 15), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {17, UPB_SIZE(23, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {18, UPB_SIZE(24, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {19, UPB_SIZE(25, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {20, UPB_SIZE(26, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {21, UPB_SIZE(27, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {22, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_duration_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {23, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {24, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {25, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_overload_manager(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {26, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) {
-  const upb_MiniTableField field = {27, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.ResponseFlags.Unauthorized */
-
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)_upb_Message_New(&envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret = envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_ResponseFlags_Unauthorized* ret = envoy_data_accesslog_v3_ResponseFlags_Unauthorized_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_serialize(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_ResponseFlags_Unauthorized_serialize_ex(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_clear_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_data_accesslog_v3_ResponseFlags_Unauthorized_reason(const envoy_data_accesslog_v3_ResponseFlags_Unauthorized* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_set_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.TLSProperties */
-
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_TLSProperties*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties* ret = envoy_data_accesslog_v3_TLSProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_TLSProperties_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties* ret = envoy_data_accesslog_v3_TLSProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_serialize(const envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_serialize_ex(const envoy_data_accesslog_v3_TLSProperties* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_version(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_data_accesslog_v3_TLSProperties_tls_version(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_tls_cipher_suite(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_tls_sni_hostname(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_local_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* default_val = NULL;
-  const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_has_peer_certificate_properties(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_tls_session_id(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_tls_session_id(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_clear_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_ja3_fingerprint(const envoy_data_accesslog_v3_TLSProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_version(envoy_data_accesslog_v3_TLSProperties *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_mutable_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) {
-  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_session_id(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.TLSProperties.CertificateProperties */
-
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_serialize(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_serialize_ex(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_clear_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* const* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_upb_array(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name_mutable_upb_array(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_has_subject_alt_name(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
-  size_t size;
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject_alt_name(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_clear_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_subject(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName** envoy_data_accesslog_v3_TLSProperties_CertificateProperties_mutable_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName** envoy_data_accesslog_v3_TLSProperties_CertificateProperties_resize_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_add_subject_alt_name(envoy_data_accesslog_v3_TLSProperties_CertificateProperties* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName */
-
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName*)_upb_Message_New(&envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* ret = envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_serialize(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_serialize_ex(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_uri = 1,
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_dns = 2,
-  envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_NOT_SET = 0
-} envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases;
-UPB_INLINE envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_case(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_san_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_clear_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_uri(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_has_uri(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_clear_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_dns(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_has_dns(const envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.HTTPRequestProperties */
-
-UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_HTTPRequestProperties*)_upb_Message_New(&envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPRequestProperties* ret = envoy_data_accesslog_v3_HTTPRequestProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPRequestProperties_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPRequestProperties* ret = envoy_data_accesslog_v3_HTTPRequestProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPRequestProperties_serialize(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPRequestProperties_serialize_ex(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPRequestProperties_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_method(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_data_accesslog_v3_HTTPRequestProperties_request_method(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_scheme(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_scheme(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_authority(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_authority(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_port(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_has_port(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_path(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_path(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_user_agent(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_referer(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_referer(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_forwarded_for(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_id(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_request_id(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_original_path(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_original_path(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_bytes(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_request_body_bytes(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_request_headers(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_size(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_get(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView* val) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, 0);
-}
-UPB_INLINE const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_next(const envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_upstream_header_bytes_sent(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_clear_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_downstream_header_bytes_received(const envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_method(envoy_data_accesslog_v3_HTTPRequestProperties *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_scheme(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_authority(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_port(envoy_data_accesslog_v3_HTTPRequestProperties *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_mutable_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPRequestProperties_port(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_HTTPRequestProperties_set_port(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_referer(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(56, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_id(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(64, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_original_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(72, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(80, 144), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_clear(envoy_data_accesslog_v3_HTTPRequestProperties* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_set(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
-  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_delete(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_StringView key) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_nextmutable(envoy_data_accesslog_v3_HTTPRequestProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {13, UPB_SIZE(12, 160), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(96, 168), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {15, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry */
-
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_key(const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_value(const envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_set_value(envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
-/* envoy.data.accesslog.v3.HTTPResponseProperties */
-
-UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_new(upb_Arena* arena) {
-  return (envoy_data_accesslog_v3_HTTPResponseProperties*)_upb_Message_New(&envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, arena);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPResponseProperties* ret = envoy_data_accesslog_v3_HTTPResponseProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPResponseProperties_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_data_accesslog_v3_HTTPResponseProperties* ret = envoy_data_accesslog_v3_HTTPResponseProperties_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPResponseProperties_serialize(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_data_accesslog_v3_HTTPResponseProperties_serialize_ex(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_data_accesslog_v3_HTTPResponseProperties_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_response_code(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_has_response_code(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_bytes(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_response_body_bytes(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_headers(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_size(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, 0);
-}
-UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_trailers(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_size(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_get(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView* val) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, 0);
-}
-UPB_INLINE const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_next(const envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_response_code_details(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_upstream_header_bytes_received(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_clear_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_downstream_header_bytes_sent(const envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(envoy_data_accesslog_v3_HTTPResponseProperties *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_mutable_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPResponseProperties_response_code(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
-  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_delete(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_set(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key, upb_StringView val, upb_Arena* a) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, 0, a);
-  return _upb_Map_Insert(map, &key, 0, &val, 0, a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_delete(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_StringView key) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* envoy_data_accesslog_v3_HTTPResponseProperties_response_trailers_nextmutable(envoy_data_accesslog_v3_HTTPResponseProperties* msg, size_t* iter) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry*)_upb_map_next(map, iter);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry */
-
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_key(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_value(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_set_value(envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
-/* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry */
-
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_key(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE upb_StringView envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_value(const envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_value(msg, &ret, 0);
-  return ret;
-}
-
-UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_set_value(envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry *msg, upb_StringView value) {
-  _upb_msg_map_set_value(msg, &value, 0);
-}
-
-extern const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c
deleted file mode 100644
index dc4070a64d9ca..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/clusters/aggregate/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init = {
-  NULL,
-  &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prs_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
deleted file mode 100644
index b33444e2d4769..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/clusters/aggregate/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_clusters_aggregate_v3_ClusterConfig envoy_extensions_clusters_aggregate_v3_ClusterConfig;
-extern const upb_MiniTable envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init;
-
-
-
-/* envoy.extensions.clusters.aggregate.v3.ClusterConfig */
-
-UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_clusters_aggregate_v3_ClusterConfig*)_upb_Message_New(&envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_clusters_aggregate_v3_ClusterConfig* ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig* envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_clusters_aggregate_v3_ClusterConfig* ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize_ex(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_clusters_aggregate_v3_ClusterConfig_clear_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters_upb_array(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters_mutable_upb_array(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_has_clusters(const envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg) {
-  size_t size;
-  envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE upb_StringView* envoy_extensions_clusters_aggregate_v3_ClusterConfig_mutable_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_clusters_aggregate_v3_ClusterConfig_resize_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_add_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-extern const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c
deleted file mode 100644
index e2aaa3cfcbb93..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/common/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/common/fault/v3/fault.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultDelay__fields[3] = {
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init = {
-  &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0],
-  &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040300001a, &upb_pom_1bt_maxmaxb},
-    {0x0008000001010022, &upb_psm_1bt_maxmaxb},
-    {0x001000040502002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = {
-  {.submsg = &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init},
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[3] = {
-  {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init = {
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0],
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040100000a, &upb_pom_1bt_max64b},
-    {0x0008000001010012, &upb_psm_1bt_maxmaxb},
-    {0x001000040302001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init = {
-  NULL,
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-  })
-};
-
-const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init,
-  &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init,
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init,
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init,
-  &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h
deleted file mode 100644
index 74ee535ccd6fc..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/common/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_filters_common_fault_v3_FaultDelay envoy_extensions_filters_common_fault_v3_FaultDelay;
-typedef struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay;
-typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit;
-typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit;
-typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init;
-struct envoy_type_v3_FractionalPercent;
-struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-
-typedef enum {
-  envoy_extensions_filters_common_fault_v3_FaultDelay_FIXED = 0
-} envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType;
-
-
-
-/* envoy.extensions.filters.common.fault.v3.FaultDelay */
-
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_common_fault_v3_FaultDelay*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_fixed_delay = 3,
-  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_header_delay = 5,
-  envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_NOT_SET = 0
-} envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases;
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_case(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
-  const struct envoy_type_v3_FractionalPercent* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_clear_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* default_val = NULL;
-  const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct envoy_type_v3_FractionalPercent* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
-  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay */
-
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.extensions.filters.common.fault.v3.FaultRateLimit */
-
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_fixed_limit = 1,
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_header_limit = 3,
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_NOT_SET = 0
-} envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases;
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_case(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* default_val = NULL;
-  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
-  const struct envoy_type_v3_FractionalPercent* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_clear_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* default_val = NULL;
-  const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, struct envoy_type_v3_FractionalPercent* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
-  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, arena);
-    if (sub) envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit */
-
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_clear_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_limit_kbps(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_set_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, uint64_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit */
-
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize_ex(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c
deleted file mode 100644
index ef7a522870121..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/http/fault/v3/fault.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/extensions/filters/common/fault/v3/fault.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
-  {.submsg = &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_FaultAbort__fields[4] = {
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init = {
-  &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0],
-  &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000402000010, &upb_pov4_1bt},
-    {0x000800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0010000404010022, &upb_pom_1bt_max64b},
-    {0x0010000405000028, &upb_pov4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = {
-  {.submsg = &envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init},
-  {.submsg = &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init},
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_HTTPFault__fields[16] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init = {
-  &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0],
-  &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0],
-  UPB_SIZE(104, 192), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x002800003f020022, &upb_prm_1bt_maxmaxb},
-    {0x003000003f00002a, &upb_prs_1bt},
-    {0x0038000003030032, &upb_psm_1bt_maxmaxb},
-    {0x004000000404003a, &upb_psm_1bt_maxmaxb},
-    {0x004800003f000042, &upb_pss_1bt},
-    {0x005800003f00004a, &upb_pss_1bt},
-    {0x006800003f000052, &upb_pss_1bt},
-    {0x007800003f00005a, &upb_pss_1bt},
-    {0x008800003f000062, &upb_pss_1bt},
-    {0x009800003f00006a, &upb_pss_1bt},
-    {0x00a800003f000072, &upb_pss_1bt},
-    {0x000100003f000078, &upb_psb1_1bt},
-    {0x00b8000005050182, &upb_psm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init,
-  &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init,
-  &envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h
deleted file mode 100644
index d8aa3c3d2b580..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h
+++ /dev/null
@@ -1,656 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_filters_http_fault_v3_FaultAbort envoy_extensions_filters_http_fault_v3_FaultAbort;
-typedef struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort;
-typedef struct envoy_extensions_filters_http_fault_v3_HTTPFault envoy_extensions_filters_http_fault_v3_HTTPFault;
-extern const upb_MiniTable envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init;
-struct envoy_config_route_v3_HeaderMatcher;
-struct envoy_extensions_filters_common_fault_v3_FaultDelay;
-struct envoy_extensions_filters_common_fault_v3_FaultRateLimit;
-struct envoy_type_v3_FractionalPercent;
-struct google_protobuf_Struct;
-struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-
-
-
-/* envoy.extensions.filters.http.fault.v3.FaultAbort */
-
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_fault_v3_FaultAbort*)_upb_Message_New(&envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_FaultAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_FaultAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_serialize_ex(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_http_status = 2,
-  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_grpc_status = 5,
-  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_header_abort = 4,
-  envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_NOT_SET = 0
-} envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases;
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_case(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const struct envoy_type_v3_FractionalPercent* default_val = NULL;
-  const struct envoy_type_v3_FractionalPercent* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* default_val = NULL;
-  const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_clear_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  uint32_t default_val = (uint32_t)0u;
-  uint32_t ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, struct envoy_type_v3_FractionalPercent* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) {
-  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)_upb_Message_New(&envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort */
-
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)_upb_Message_New(&envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize_ex(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.extensions.filters.http.fault.v3.HTTPFault */
-
-UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_fault_v3_HTTPFault*)_upb_Message_New(&envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_HTTPFault* ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault* envoy_extensions_filters_http_fault_v3_HTTPFault_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_http_fault_v3_HTTPFault* ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_HTTPFault_serialize(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_http_fault_v3_HTTPFault_serialize_ex(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_fault_v3_HTTPFault_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const struct envoy_extensions_filters_common_fault_v3_FaultDelay* default_val = NULL;
-  const struct envoy_extensions_filters_common_fault_v3_FaultDelay* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const envoy_extensions_filters_http_fault_v3_FaultAbort* default_val = NULL;
-  const envoy_extensions_filters_http_fault_v3_FaultAbort* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_upstream_cluster(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_extensions_filters_http_fault_v3_HTTPFault_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_headers_mutable_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  size_t size;
-  envoy_extensions_filters_http_fault_v3_HTTPFault_headers(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes_mutable_upb_array(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_downstream_nodes(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  size_t size;
-  envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* default_val = NULL;
-  const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_delay_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_delay_duration_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_http_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_fault_v3_HTTPFault_abort_grpc_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_disable_downstream_cluster_stats(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_clear_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const struct google_protobuf_Struct* default_val = NULL;
-  const struct google_protobuf_Struct* ret;
-  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_filter_metadata(const envoy_extensions_filters_http_fault_v3_HTTPFault* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultDelay* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_delay(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_common_fault_v3_FaultDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)envoy_extensions_filters_http_fault_v3_HTTPFault_delay(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultDelay_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, envoy_extensions_filters_http_fault_v3_FaultAbort* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_abort(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_http_fault_v3_FaultAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)envoy_extensions_filters_http_fault_v3_HTTPFault_abort(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)_upb_Message_New(&envoy_extensions_filters_http_fault_v3_FaultAbort_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_resize_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_route_v3_HeaderMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_extensions_filters_http_fault_v3_HTTPFault_add_headers(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE upb_StringView* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_filters_http_fault_v3_HTTPFault_resize_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_add_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)_upb_Message_New(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(52, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(68, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(76, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(84, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(92, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, bool value) {
-  const upb_MiniTableField field = {15, UPB_SIZE(28, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_Struct* value) {
-  const upb_MiniTableField field = {16, UPB_SIZE(32, 184), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) {
-  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c
deleted file mode 100644
index 4fbd401656584..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/http/rbac/v3/rbac.upb.h"
-#include "envoy/config/rbac/v3/rbac.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = {
-  {.submsg = &envoy_config_rbac_v3_RBAC_msg_init},
-  {.submsg = &envoy_config_rbac_v3_RBAC_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_rbac_v3_RBAC_msg_init = {
-  &envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[0],
-  &envoy_extensions_filters_http_rbac_v3_RBAC__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x0028000003020022, &upb_psm_1bt_maxmaxb},
-    {0x003000000403002a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[1] = {
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init = {
-  &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0],
-  &envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init,
-  &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
deleted file mode 100644
index ccf7fb78971f2..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_filters_http_rbac_v3_RBAC envoy_extensions_filters_http_rbac_v3_RBAC;
-typedef struct envoy_extensions_filters_http_rbac_v3_RBACPerRoute envoy_extensions_filters_http_rbac_v3_RBACPerRoute;
-extern const upb_MiniTable envoy_extensions_filters_http_rbac_v3_RBAC_msg_init;
-extern const upb_MiniTable envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init;
-struct envoy_config_rbac_v3_RBAC;
-struct xds_type_matcher_v3_Matcher;
-extern const upb_MiniTable envoy_config_rbac_v3_RBAC_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_msg_init;
-
-
-
-/* envoy.extensions.filters.http.rbac.v3.RBAC */
-
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_rbac_v3_RBAC*)_upb_Message_New(&envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_http_rbac_v3_RBAC* ret = envoy_extensions_filters_http_rbac_v3_RBAC_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_http_rbac_v3_RBAC* ret = envoy_extensions_filters_http_rbac_v3_RBAC_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBAC_serialize(const envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBAC_serialize_ex(const envoy_extensions_filters_http_rbac_v3_RBAC* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const struct envoy_config_rbac_v3_RBAC* default_val = NULL;
-  const struct envoy_config_rbac_v3_RBAC* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const struct envoy_config_rbac_v3_RBAC* default_val = NULL;
-  const struct envoy_config_rbac_v3_RBAC* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_rules(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const struct xds_type_matcher_v3_Matcher* default_val = NULL;
-  const struct xds_type_matcher_v3_Matcher* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const struct xds_type_matcher_v3_Matcher* default_val = NULL;
-  const struct xds_type_matcher_v3_Matcher* ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_matcher(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_rules(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
-  struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_rbac_v3_RBAC*)_upb_Message_New(&envoy_config_rbac_v3_RBAC_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.filters.http.rbac.v3.RBACPerRoute */
-
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(upb_Arena* arena) {
-  return (envoy_extensions_filters_http_rbac_v3_RBACPerRoute*)_upb_Message_New(&envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_filters_http_rbac_v3_RBACPerRoute* ret = envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_filters_http_rbac_v3_RBACPerRoute* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_filters_http_rbac_v3_RBACPerRoute* ret = envoy_extensions_filters_http_rbac_v3_RBACPerRoute_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_serialize(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_serialize_ex(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_clear_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
-  const envoy_extensions_filters_http_rbac_v3_RBAC* default_val = NULL;
-  const envoy_extensions_filters_http_rbac_v3_RBAC* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBACPerRoute_has_rbac(const envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute *msg, envoy_extensions_filters_http_rbac_v3_RBAC* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_mutable_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena) {
-  struct envoy_extensions_filters_http_rbac_v3_RBAC* sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)_upb_Message_New(&envoy_extensions_filters_http_rbac_v3_RBAC_msg_init, arena);
-    if (sub) envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c
deleted file mode 100644
index 6035bc3c79347..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/router/v3/router.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/http/router/v3/router.upb.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_submsgs[4] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AccessLog_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init},
-  {.submsg = &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router__fields[9] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(25, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 40), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_router_v3_Router_msg_init = {
-  &envoy_extensions_filters_http_router_v3_Router_submsgs[0],
-  &envoy_extensions_filters_http_router_v3_Router__fields[0],
-  UPB_SIZE(40, 48), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x001000003f01001a, &upb_prm_1bt_maxmaxb},
-    {0x000200003f000020, &upb_psb1_1bt},
-    {0x001800003f00002a, &upb_prs_1bt},
-    {0x000300003f000030, &upb_psb1_1bt},
-    {0x000400003f000038, &upb_psb1_1bt},
-    {0x002000003f020042, &upb_prm_1bt_maxmaxb},
-    {0x002800000203004a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[2] = {
-  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init = {
-  &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0],
-  &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000008, &upb_psb1_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_extensions_filters_http_router_v3_Router_msg_init,
-  &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c
deleted file mode 100644
index 99e7d9499353b..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init = {
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0],
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init = {
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0],
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_pob1_1bt},
-    {0x0008000002000012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_msg_init,
-  &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3_stateful_session_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
deleted file mode 100644
index 3ecf604e99252..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
+++ /dev/null
@@ -1,680 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/protocol.upb.h"
-#include "envoy/config/core/v3/substitution_format_string.upb.h"
-#include "envoy/config/route/v3/route.upb.h"
-#include "envoy/config/route/v3/scoped_route.upb.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "envoy/type/http/v3/path_transformation.upb.h"
-#include "envoy/type/tracing/v3/custom_tag.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init},
-  {.submsg = &envoy_config_route_v3_RouteConfiguration_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init},
-  {.submsg = &envoy_config_core_v3_Http1ProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Http2ProtocolOptions_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AccessLog_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init},
-  {.submsg = &envoy_config_core_v3_HttpProtocolOptions_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Http3ProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_SchemeHeaderTransformation_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[54] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(200, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 72), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 80), 1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 88), 2, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 96), 3, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 104), 4, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(208, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(28, 128), 5, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(32, 136), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(36, 144), 6, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(40, 152), 7, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(44, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(48, 160), 8, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(52, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(56, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(60, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(61, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(216, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(64, 184), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(68, 192), 9, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(72, 200), 10, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(76, 208), 11, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {28, UPB_SIZE(80, 216), 12, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {29, UPB_SIZE(84, 224), 13, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {30, UPB_SIZE(88, 232), 14, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(192, 360), UPB_SIZE(-93, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {32, UPB_SIZE(96, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {33, UPB_SIZE(97, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(100, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {35, UPB_SIZE(104, 240), 15, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(108, 248), 16, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(112, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {38, UPB_SIZE(116, 256), 17, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(120, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(124, 264), 18, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(128, 272), 19, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {42, UPB_SIZE(196, 368), UPB_SIZE(-133, -41), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {43, UPB_SIZE(136, 280), 20, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(140, 288), 21, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(144, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {46, UPB_SIZE(148, 296), 0, 27, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {47, UPB_SIZE(152, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {48, UPB_SIZE(156, 304), 22, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {49, UPB_SIZE(160, 312), 23, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(164, 320), 24, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {51, UPB_SIZE(168, 49), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {52, UPB_SIZE(172, 328), 0, 31, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {53, UPB_SIZE(176, 336), 25, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {54, UPB_SIZE(180, 344), 26, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {55, UPB_SIZE(184, 50), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {56, UPB_SIZE(188, 352), 27, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0],
-  UPB_SIZE(224, 376), 54, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x003800003f000012, &upb_pss_1bt},
-    {0x016800180300001a, &upb_pom_1bt_max64b},
-    {0x0168001804010022, &upb_pom_1bt_maxmaxb},
-    {0x004800003f02002a, &upb_prm_1bt_max64b},
-    {0x0050000001030032, &upb_psm_1bt_maxmaxb},
-    {0x005800000204003a, &upb_psm_1bt_max64b},
-    {0x0060000003050042, &upb_psm_1bt_maxmaxb},
-    {0x006800000406004a, &upb_psm_1bt_maxmaxb},
-    {0x007000003f000052, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0080000005070062, &upb_psm_1bt_maxmaxb},
-    {0x008800003f08006a, &upb_prm_1bt_maxmaxb},
-    {0x0090000006090072, &upb_psm_1bt_maxmaxb},
-    {0x00980000070a007a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000180, &upb_psv4_2bt},
-    {0x00a00000080b018a, &upb_psm_2bt_max64b},
-    {0x000c00003f000190, &upb_psb1_2bt},
-    {0x001000003f000198, &upb_psv4_2bt},
-    {0x001400003f0001a0, &upb_psb1_2bt},
-    {0x001500003f0001a8, &upb_psb1_2bt},
-    {0x00a800003f0001b2, &upb_pss_2bt},
-    {0x00b800003f0c01ba, &upb_prm_2bt_max64b},
-    {0x00c00000090d01c2, &upb_psm_2bt_maxmaxb},
-    {0x00c800000a0e01ca, &upb_psm_2bt_max64b},
-    {0x00d000000b0f01d2, &upb_psm_2bt_maxmaxb},
-    {0x01180000141902da, &upb_psm_2bt_max64b},
-    {0x00d800000c1001e2, &upb_psm_2bt_maxmaxb},
-    {0x00e000000d1101ea, &upb_psm_2bt_maxmaxb},
-    {0x00e800000e1201f2, &upb_psm_2bt_maxmaxb},
-    {0x016800181f1301fa, &upb_pom_2bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[6] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_type_tracing_v3_CustomTag_msg_init},
-  {.submsg = &envoy_config_trace_v3_Tracing_Http_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[7] = {
-  {3, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[0],
-  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100001a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010022, &upb_psm_1bt_maxmaxb},
-    {0x001800000302002a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000030, &upb_psb1_1bt},
-    {0x002000000403003a, &upb_psm_1bt_maxmaxb},
-    {0x002800003f040042, &upb_prm_1bt_maxmaxb},
-    {0x003000000505004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000800003f000012, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(10, 3), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(11, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0],
-  16, 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x000200003f000020, &upb_psb1_1bt},
-    {0x000300003f000028, &upb_psb1_1bt},
-    {0x000400003f000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = {
-  {.submsg = &envoy_type_http_v3_PathTransformation_msg_init},
-  {.submsg = &envoy_type_http_v3_PathTransformation_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[6] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 2, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, 3, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 8, -5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init = {
-  NULL,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[0],
-  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000200003f000018, &upb_psb1_1bt},
-    {0x000300003f000020, &upb_psb1_1bt},
-    {0x0008000405000028, &upb_pob1_1bt},
-    {0x0008000406000032, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(9, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[0],
-  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x000200003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init},
-  {.submsg = &envoy_config_core_v3_SubstitutionFormatString_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_SubstitutionFormatString_msg_init},
-  {.submsg = &envoy_config_core_v3_HeaderValueOption_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[5] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0],
-  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800003f04002a, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_ScopedRouteConfiguration_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init},
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[5] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 40), UPB_SIZE(-13, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 40), UPB_SIZE(-13, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-    {0x0028000404020022, &upb_pom_1bt_max64b},
-    {0x002800040503002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[4] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), -1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 40), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0028000003000018, &upb_pov4_1bt},
-    {0x0028000004000022, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init = {
-  NULL,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_config_core_v3_ExtensionConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[4] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0018000004000022, &upb_pom_1bt_maxmaxb},
-    {0x001800000501002a, &upb_pom_1bt_maxmaxb},
-    {0x000400003f000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = {
-  {.submsg = &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0],
-  &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[21] = {
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msg_init,
-  &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  21,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c b/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c
deleted file mode 100644
index 21ce5d4a3d627..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h"
-#include "envoy/type/http/v3/cookie.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = {
-  {.submsg = &envoy_type_http_v3_Cookie_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init = {
-  &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0],
-  &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
deleted file mode 100644
index b41c708a67274..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState;
-extern const upb_MiniTable envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init;
-struct envoy_type_http_v3_Cookie;
-extern const upb_MiniTable envoy_type_http_v3_Cookie_msg_init;
-
-
-
-/* envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState */
-
-UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(upb_Arena* arena) {
-  return (envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState*)_upb_Message_New(&envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* ret = envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* ret = envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_serialize(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_serialize_ex(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_clear_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
-  const struct envoy_type_http_v3_Cookie* default_val = NULL;
-  const struct envoy_type_http_v3_Cookie* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_has_cookie(const envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState *msg, struct envoy_type_http_v3_Cookie* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_mutable_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena) {
-  struct envoy_type_http_v3_Cookie* sub = (struct envoy_type_http_v3_Cookie*)envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_http_v3_Cookie*)_upb_Message_New(&envoy_type_http_v3_Cookie_msg_init, arena);
-    if (sub) envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c
deleted file mode 100644
index d5e11ec9e33e8..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_FloatValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[6] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init = {
-  &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[0],
-  &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[0],
-  UPB_SIZE(32, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800000504002a, &upb_psm_1bt_maxmaxb},
-    {0x0030000006050032, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c
deleted file mode 100644
index f1f9690e2c12e..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/common/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/load_balancing_policies/common/v3/common.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = {
-  {.submsg = &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init},
-  {.submsg = &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init = {
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0],
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init = {
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0],
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeDouble_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init = {
-  &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0],
-  &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[2] = {
-  {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init = {
-  &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0],
-  &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000100003f000008, &upb_psb1_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init,
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init,
-  &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init,
-  &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init,
-  &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v3_common_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
deleted file mode 100644
index acc36507239d7..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/common/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig;
-typedef struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig;
-typedef struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig;
-typedef struct envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig;
-typedef struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init;
-extern const upb_MiniTable envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init;
-struct envoy_config_core_v3_RuntimeDouble;
-struct envoy_type_v3_Percent;
-struct google_protobuf_Duration;
-struct google_protobuf_UInt32Value;
-struct google_protobuf_UInt64Value;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable google_protobuf_UInt64Value_msg_init;
-
-
-
-/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig */
-
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_zone_aware_lb_config = 1,
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_locality_weighted_lb_config = 2,
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_NOT_SET = 0
-} envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases;
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_case(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_config_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_clear_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* default_val = NULL;
-  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_has_zone_aware_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_clear_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* default_val = NULL;
-  const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_has_locality_weighted_lb_config(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) {
-  struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) {
-  struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig */
-
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const struct envoy_type_v3_Percent* default_val = NULL;
-  const struct envoy_type_v3_Percent* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_has_routing_enabled(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const struct google_protobuf_UInt64Value* default_val = NULL;
-  const struct google_protobuf_UInt64Value* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_has_min_cluster_size(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_clear_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_fail_traffic_on_panic(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt64Value*)_upb_Message_New(&google_protobuf_UInt64Value_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig */
-
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig */
-
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* ret = envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* ret = envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_slow_start_window(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const struct envoy_config_core_v3_RuntimeDouble* default_val = NULL;
-  const struct envoy_config_core_v3_RuntimeDouble* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_aggression(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_clear_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const struct envoy_type_v3_Percent* default_val = NULL;
-  const struct envoy_type_v3_Percent* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_has_min_weight_percent(const envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeDouble*)_upb_Message_New(&envoy_config_core_v3_RuntimeDouble_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) {
-  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig */
-
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(upb_Arena* arena) {
-  return (envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)_upb_Message_New(&envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* ret = envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_serialize(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_serialize_ex(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_clear_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_use_hostname_for_hashing(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_clear_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_has_hash_balance_factor(const envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v3_common_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c
deleted file mode 100644
index a5cb51598edd0..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init = {
-  NULL,
-  &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_first_v3_pick_first_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c
deleted file mode 100644
index faa142386f476..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h"
-#include "envoy/extensions/load_balancing_policies/common/v3/common.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_msg_init},
-  {.submsg = &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[7] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 40), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 48), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init = {
-  &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0],
-  &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[0],
-  UPB_SIZE(32, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x001800000201001a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000020, &upb_psb1_1bt},
-    {0x002000000302002a, &upb_psm_1bt_maxmaxb},
-    {0x0028000004030032, &upb_psm_1bt_maxmaxb},
-    {0x003000000504003a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c b/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c
deleted file mode 100644
index dd45bf68c8b43..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = {
-  {.submsg = &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init = {
-  &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0],
-  &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_locality_v3_wrr_locality_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
deleted file mode 100644
index de732b036b725..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/cert.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/transport_sockets/tls/v3/cert.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  NULL,
-  0,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
deleted file mode 100644
index 6df3388495fff..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/cert.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-/* Public Imports. */
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
-
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
deleted file mode 100644
index 9bb9f012ee0dd..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/sensitive.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[5] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init = {
-  NULL,
-  &envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[0],
-  UPB_SIZE(24, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x000800003f00001a, &upb_prs_1bt},
-    {0x001000003f000022, &upb_prs_1bt},
-    {0x001800003f00002a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000300001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init},
-  {.submsg = &envoy_config_core_v3_WatchedDirectory_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[8] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0],
-  UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0020000004030022, &upb_psm_1bt_maxmaxb},
-    {0x002800003f04002a, &upb_prm_1bt_maxmaxb},
-    {0x0030000005050032, &upb_psm_1bt_max64b},
-    {0x003800000606003a, &upb_psm_1bt_maxmaxb},
-    {0x0040000007070042, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init = {
-  NULL,
-  &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[2] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[9] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_WatchedDirectory_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[14] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0],
-  UPB_SIZE(64, 104), 14, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001800003f000012, &upb_prs_1bt},
-    {0x002000003f00001a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0028000002010032, &upb_psm_1bt_maxmaxb},
-    {0x003000000302003a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000040, &upb_psb1_1bt},
-    {0x003800003f03004a, &upb_prm_1bt_maxmaxb},
-    {0x000400003f000050, &upb_psv4_1bt},
-    {0x004000000404005a, &upb_psm_1bt_maxmaxb},
-    {0x0048000005050062, &upb_psm_1bt_maxmaxb},
-    {0x005000000606006a, &upb_psm_1bt_max64b},
-    {0x000800003f000070, &upb_psb1_1bt},
-    {0x005800003f07007a, &upb_prm_1bt_max64b},
-    {0x0060000007080182, &upb_psm_2bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h
deleted file mode 100644
index 998ff5689710d..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h
+++ /dev/null
@@ -1,1471 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_extensions_transport_sockets_tls_v3_TlsParameters envoy_extensions_transport_sockets_tls_v3_TlsParameters;
-typedef struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider;
-typedef struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate envoy_extensions_transport_sockets_tls_v3_TlsCertificate;
-typedef struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys;
-typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance;
-typedef struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher;
-typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init;
-extern const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init;
-struct envoy_config_core_v3_DataSource;
-struct envoy_config_core_v3_TypedExtensionConfig;
-struct envoy_config_core_v3_WatchedDirectory;
-struct envoy_type_matcher_v3_StringMatcher;
-struct google_protobuf_Any;
-struct google_protobuf_BoolValue;
-struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_DataSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-
-typedef enum {
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_VERIFY_TRUST_CHAIN = 0,
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ACCEPT_UNTRUSTED = 1
-} envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification;
-
-typedef enum {
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SAN_TYPE_UNSPECIFIED = 0,
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_EMAIL = 1,
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_DNS = 2,
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_URI = 3,
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4
-} envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SanType;
-
-typedef enum {
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLS_AUTO = 0,
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_0 = 1,
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_1 = 2,
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_2 = 3,
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_TLSv1_3 = 4
-} envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol;
-
-
-
-/* envoy.extensions.transport_sockets.tls.v3.TlsParameters */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_TlsParameters*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters* ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters* ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsParameters_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsParameters_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_TlsParameters_tls_minimum_protocol_version(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_TlsParameters_tls_maximum_protocol_version(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_cipher_suites(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_cipher_suites(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_ecdh_curves(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_ecdh_curves(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_clear_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_has_signature_algorithms(const envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_TlsParameters_signature_algorithms(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_ecdh_curves(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_resize_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsParameters_add_signature_algorithms(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_serialize(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_typed_config = 3,
-  envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_NOT_SET = 0
-} envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases;
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_case(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_config_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_clear_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_provider_name(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_clear_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_has_typed_config(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.TlsCertificate */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsCertificate* ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsCertificate* ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_certificate_chain(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_private_key(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_password(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* default_val = NULL;
-  const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL;
-  const struct envoy_config_core_v3_WatchedDirectory* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_clear_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_pkcs12(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_core_v3_DataSource**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_resize_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_core_v3_DataSource**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_add_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_WatchedDirectory* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy_config_core_v3_WatchedDirectory_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(32, 64), 7, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_clear_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_has_keys(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_keys(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_mutable_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_config_core_v3_DataSource**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_resize_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_config_core_v3_DataSource**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_add_keys(envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret = envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret = envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_clear_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_instance_name(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_clear_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_certificate_name(const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* ret = envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* ret = envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_serialize(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_san_type(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
-  const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_has_matcher(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_mutable_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext */
-
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(upb_Arena* arena) {
-  return (envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, arena);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct google_protobuf_BoolValue* default_val = NULL;
-  const struct google_protobuf_BoolValue* ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct envoy_config_core_v3_DataSource* default_val = NULL;
-  const struct envoy_config_core_v3_DataSource* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_allow_expired_certificate(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct envoy_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trust_chain_verification(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct envoy_config_core_v3_WatchedDirectory* default_val = NULL;
-  const struct envoy_config_core_v3_WatchedDirectory* ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct envoy_config_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_custom_validator_config(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* default_val = NULL;
-  const envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_ca_certificate_provider_instance(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_only_verify_leaf_cert_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names_mutable_upb_array(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_typed_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  size_t size;
-  envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_typed_subject_alt_names(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_max_verify_depth(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_BoolValue* value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 40), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 48), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_DataSource*)_upb_Message_New(&envoy_config_core_v3_DataSource_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct envoy_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(28, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, int32_t value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_WatchedDirectory* value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 64), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy_config_core_v3_WatchedDirectory_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(44, 80), 6, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) {
-  const upb_MiniTableField field = {14, UPB_SIZE(48, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) {
-  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {15, UPB_SIZE(52, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* sub = (struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher*)_upb_Message_New(&envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {16, UPB_SIZE(56, 96), 7, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
deleted file mode 100644
index ba21b8e2988fc..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/secret.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-#include "udpa/annotations/sensitive.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Secret__fields[5] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_Secret_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_Secret__fields[0],
-  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
-    {0x001800000301001a, &upb_pom_1bt_maxmaxb},
-    {0x0018000004020022, &upb_pom_1bt_maxmaxb},
-    {0x001800000503002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
deleted file mode 100644
index a25d56d7d76e3..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/tls.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[2] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x0020000002010022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[9] = {
-  {1, UPB_SIZE(4, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 24), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(32, 56), UPB_SIZE(-21, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 48), 5, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0],
-  UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psm_1bt_max128b},
-    {0x0018000002010012, &upb_psm_1bt_maxmaxb},
-    {0x002000000302001a, &upb_psm_1bt_maxmaxb},
-    {0x0038000404030022, &upb_pom_1bt_maxmaxb},
-    {0x003800040504002a, &upb_pom_1bt_maxmaxb},
-    {0x0028000004050032, &upb_psm_1bt_maxmaxb},
-    {0x0038000407000038, &upb_pob1_1bt},
-    {0x000800003f000040, &upb_psv4_1bt},
-    {0x003000000506004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-  {.submsg = &envoy_config_core_v3_CidrRange_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[3] = {
-  {1, UPB_SIZE(8, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_maxmaxb},
-    {0x001800003f01001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[14] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(20, 40), 2, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(24, 48), 3, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(44, 80), UPB_SIZE(-29, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(32, 56), 4, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(36, 64), 5, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(40, 72), 6, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0],
-  UPB_SIZE(48, 88), 14, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
-    {0x005000040302001a, &upb_pom_1bt_maxmaxb},
-    {0x001800003f000022, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f030032, &upb_prm_1bt_maxmaxb},
-    {0x005000040704003a, &upb_pom_1bt_maxmaxb},
-    {0x0050000408050042, &upb_pom_1bt_max64b},
-    {0x002800000206004a, &upb_psm_1bt_max64b},
-    {0x005000040a070052, &upb_pom_1bt_max64b},
-    {0x003000000308005a, &upb_psm_1bt_max64b},
-    {0x005000040c090062, &upb_pom_1bt_max64b},
-    {0x00380000040a006a, &upb_psm_1bt_maxmaxb},
-    {0x00400000050b0072, &upb_psm_1bt_maxmaxb},
-    {0x00480000060c007a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init = {
-  NULL,
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800000302001a, &upb_psm_1bt_max64b},
-    {0x0020000004030022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c
deleted file mode 100644
index f3e5227a8d6fe..0000000000000
--- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = {
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-};
-
-static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init = {
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0],
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_msg_init,
-  &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_msg_init,
-};
-
-const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spiffe_validator_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
deleted file mode 100644
index 1e6b544b12d78..0000000000000
--- a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/service/discovery/v3/ads.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/service/discovery/v3/ads.upb.h"
-#include "envoy/service/discovery/v3/discovery.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTable envoy_service_discovery_v3_AdsDummy_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_service_discovery_v3_AdsDummy_msg_init,
-};
-
-const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h
deleted file mode 100644
index c4b3e2b476fe3..0000000000000
--- a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/service/discovery/v3/ads.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_service_discovery_v3_AdsDummy envoy_service_discovery_v3_AdsDummy;
-extern const upb_MiniTable envoy_service_discovery_v3_AdsDummy_msg_init;
-
-
-
-/* envoy.service.discovery.v3.AdsDummy */
-
-UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_new(upb_Arena* arena) {
-  return (envoy_service_discovery_v3_AdsDummy*)_upb_Message_New(&envoy_service_discovery_v3_AdsDummy_msg_init, arena);
-}
-UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_service_discovery_v3_AdsDummy* ret = envoy_service_discovery_v3_AdsDummy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_service_discovery_v3_AdsDummy* envoy_service_discovery_v3_AdsDummy_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_service_discovery_v3_AdsDummy* ret = envoy_service_discovery_v3_AdsDummy_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize(const envoy_service_discovery_v3_AdsDummy* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_AdsDummy_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize_ex(const envoy_service_discovery_v3_AdsDummy* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_service_discovery_v3_AdsDummy_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c b/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
deleted file mode 100644
index 47a9d5b253dc5..0000000000000
--- a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/service/discovery/v3/discovery.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/service/discovery/v3/discovery.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/rpc/status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_service_discovery_v3_ResourceLocator_submsgs[1] = {
-  {.submsg = &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_ResourceLocator_msg_init = {
-  &envoy_service_discovery_v3_ResourceLocator_submsgs[0],
-  &envoy_service_discovery_v3_ResourceLocator__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry_msg_init = {
-  NULL,
-  &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_ResourceName_submsgs[1] = {
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_ResourceName__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_ResourceName_msg_init = {
-  &envoy_service_discovery_v3_ResourceName_submsgs[0],
-  &envoy_service_discovery_v3_ResourceName__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &google_rpc_Status_msg_init},
-  {.submsg = &envoy_service_discovery_v3_ResourceLocator_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryRequest__fields[7] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 72), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DiscoveryRequest_msg_init = {
-  &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0],
-  &envoy_service_discovery_v3_DiscoveryRequest__fields[0],
-  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_prs_1bt},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x003800003f00002a, &upb_pss_1bt},
-    {0x0048000002010032, &upb_psm_1bt_maxmaxb},
-    {0x005000003f02003a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_config_core_v3_ControlPlane_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryResponse__fields[6] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 64), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DiscoveryResponse_msg_init = {
-  &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0],
-  &envoy_service_discovery_v3_DiscoveryResponse__fields[0],
-  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x002000003f000022, &upb_pss_1bt},
-    {0x003000003f00002a, &upb_pss_1bt},
-    {0x0040000001010032, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msg_init},
-  {.submsg = &google_rpc_Status_msg_init},
-  {.submsg = &envoy_service_discovery_v3_ResourceLocator_msg_init},
-  {.submsg = &envoy_service_discovery_v3_ResourceLocator_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[9] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 72), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 88), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init = {
-  &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0],
-  &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0],
-  UPB_SIZE(48, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_prs_1bt},
-    {0x002800003f000022, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f000032, &upb_pss_1bt},
-    {0x004800000202003a, &upb_psm_1bt_maxmaxb},
-    {0x005000003f030042, &upb_prm_1bt_max64b},
-    {0x005800003f04004a, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msg_init = {
-  NULL,
-  &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = {
-  {.submsg = &envoy_service_discovery_v3_Resource_msg_init},
-  {.submsg = &envoy_config_core_v3_ControlPlane_msg_init},
-  {.submsg = &envoy_service_discovery_v3_ResourceName_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[7] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(8, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 72), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init = {
-  &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0],
-  &envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0],
-  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f000022, &upb_pss_1bt},
-    {0x003000003f00002a, &upb_pss_1bt},
-    {0x004000003f000032, &upb_prs_1bt},
-    {0x004800000101003a, &upb_psm_1bt_maxmaxb},
-    {0x005000003f020042, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = {
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init},
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init},
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init},
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints__fields[4] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_msg_init = {
-  &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0],
-  &envoy_service_discovery_v3_DynamicParameterConstraints__fields[0],
-  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = {
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[3] = {
-  {1, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init = {
-  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0],
-  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x000800000300001a, &upb_pom_1bt_max64b},
-  })
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = {
-  {.submsg = &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init = {
-  &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0],
-  &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_discovery_v3_Resource_submsgs[5] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_service_discovery_v3_Resource_CacheControl_msg_init},
-  {.submsg = &envoy_service_discovery_v3_ResourceName_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_Resource__fields[8] = {
-  {1, UPB_SIZE(28, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 56), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 64), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 72), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 80), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_Resource_msg_init = {
-  &envoy_service_discovery_v3_Resource_submsgs[0],
-  &envoy_service_discovery_v3_Resource__fields[0],
-  UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_pss_1bt},
-    {0x003000003f000022, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0038000002010032, &upb_psm_1bt_maxmaxb},
-    {0x004000000302003a, &upb_psm_1bt_max64b},
-    {0x0048000004030042, &upb_psm_1bt_max64b},
-    {0x005000000504004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_service_discovery_v3_Resource_CacheControl__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_discovery_v3_Resource_CacheControl_msg_init = {
-  NULL,
-  &envoy_service_discovery_v3_Resource_CacheControl__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[14] = {
-  &envoy_service_discovery_v3_ResourceLocator_msg_init,
-  &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry_msg_init,
-  &envoy_service_discovery_v3_ResourceName_msg_init,
-  &envoy_service_discovery_v3_DiscoveryRequest_msg_init,
-  &envoy_service_discovery_v3_DiscoveryResponse_msg_init,
-  &envoy_service_discovery_v3_DeltaDiscoveryRequest_msg_init,
-  &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msg_init,
-  &envoy_service_discovery_v3_DeltaDiscoveryResponse_msg_init,
-  &envoy_service_discovery_v3_DynamicParameterConstraints_msg_init,
-  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_msg_init,
-  &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists_msg_init,
-  &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_msg_init,
-  &envoy_service_discovery_v3_Resource_msg_init,
-  &envoy_service_discovery_v3_Resource_CacheControl_msg_init,
-};
-
-const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  14,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c b/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
deleted file mode 100644
index 9d276e699b555..0000000000000
--- a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/service/load_stats/v3/lrs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/service/load_stats/v3/lrs.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/endpoint/v3/load_report.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterStats_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsRequest__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_load_stats_v3_LoadStatsRequest_msg_init = {
-  &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0],
-  &envoy_service_load_stats_v3_LoadStatsRequest__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsResponse__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(13, 2), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_load_stats_v3_LoadStatsResponse_msg_init = {
-  &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0],
-  &envoy_service_load_stats_v3_LoadStatsResponse__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prs_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-    {0x000200003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_service_load_stats_v3_LoadStatsRequest_msg_init,
-  &envoy_service_load_stats_v3_LoadStatsResponse_msg_init,
-};
-
-const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c b/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c
deleted file mode 100644
index 9dbe1f44bd93f..0000000000000
--- a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/service/status/v3/csds.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/service/status/v3/csds.upb.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/type/matcher/v3/node.upb.h"
-#include "google/api/annotations.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_service_status_v3_ClientStatusRequest_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_NodeMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_status_v3_ClientStatusRequest__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_status_v3_ClientStatusRequest_msg_init = {
-  &envoy_service_status_v3_ClientStatusRequest_submsgs[0],
-  &envoy_service_status_v3_ClientStatusRequest__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_status_v3_PerXdsConfig_submsgs[5] = {
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_msg_init},
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_msg_init},
-  {.submsg = &envoy_admin_v3_RoutesConfigDump_msg_init},
-  {.submsg = &envoy_admin_v3_ScopedRoutesConfigDump_msg_init},
-  {.submsg = &envoy_admin_v3_EndpointsConfigDump_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_status_v3_PerXdsConfig__fields[7] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), -5, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 16), -5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 16), -5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_status_v3_PerXdsConfig_msg_init = {
-  &envoy_service_status_v3_PerXdsConfig_submsgs[0],
-  &envoy_service_status_v3_PerXdsConfig__fields[0],
-  UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x0010000402000012, &upb_pom_1bt_maxmaxb},
-    {0x001000040301001a, &upb_pom_1bt_maxmaxb},
-    {0x0010000404020022, &upb_pom_1bt_maxmaxb},
-    {0x001000040503002a, &upb_pom_1bt_maxmaxb},
-    {0x0010000406040032, &upb_pom_1bt_maxmaxb},
-    {0x000800003f000038, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &envoy_service_status_v3_PerXdsConfig_msg_init},
-  {.submsg = &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_status_v3_ClientConfig__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_status_v3_ClientConfig_msg_init = {
-  &envoy_service_status_v3_ClientConfig_submsgs[0],
-  &envoy_service_status_v3_ClientConfig__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x001800003f02001a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[9] = {
-  {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(44, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 64), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 72), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 80), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(24, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init = {
-  &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0],
-  &envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0],
-  UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x002000003f000012, &upb_pss_1bt},
-    {0x003000003f00001a, &upb_pss_1bt},
-    {0x0040000001000022, &upb_psm_1bt_maxmaxb},
-    {0x004800000201002a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000030, &upb_psv4_1bt},
-    {0x000800003f000038, &upb_psv4_1bt},
-    {0x0050000003020042, &upb_psm_1bt_maxmaxb},
-    {0x000c00003f000048, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_service_status_v3_ClientStatusResponse_submsgs[1] = {
-  {.submsg = &envoy_service_status_v3_ClientConfig_msg_init},
-};
-
-static const upb_MiniTableField envoy_service_status_v3_ClientStatusResponse__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_service_status_v3_ClientStatusResponse_msg_init = {
-  &envoy_service_status_v3_ClientStatusResponse_submsgs[0],
-  &envoy_service_status_v3_ClientStatusResponse__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_service_status_v3_ClientStatusRequest_msg_init,
-  &envoy_service_status_v3_PerXdsConfig_msg_init,
-  &envoy_service_status_v3_ClientConfig_msg_init,
-  &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msg_init,
-  &envoy_service_status_v3_ClientStatusResponse_msg_init,
-};
-
-const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c b/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c
deleted file mode 100644
index 2e04080332068..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/http/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/http/v3/cookie.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_http_v3_Cookie_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_http_v3_Cookie__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_http_v3_Cookie_msg_init = {
-  &envoy_type_http_v3_Cookie_submsgs[0],
-  &envoy_type_http_v3_Cookie__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x002000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_http_v3_Cookie_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h b/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h
deleted file mode 100644
index b17f9d20a8b0b..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/http/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
-#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_http_v3_Cookie envoy_type_http_v3_Cookie;
-extern const upb_MiniTable envoy_type_http_v3_Cookie_msg_init;
-struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-
-
-
-/* envoy.type.http.v3.Cookie */
-
-UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_new(upb_Arena* arena) {
-  return (envoy_type_http_v3_Cookie*)_upb_Message_New(&envoy_type_http_v3_Cookie_msg_init, arena);
-}
-UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_http_v3_Cookie* ret = envoy_type_http_v3_Cookie_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_Cookie_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_http_v3_Cookie* envoy_type_http_v3_Cookie_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_http_v3_Cookie* ret = envoy_type_http_v3_Cookie_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_http_v3_Cookie_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_http_v3_Cookie_serialize(const envoy_type_http_v3_Cookie* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_Cookie_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_http_v3_Cookie_serialize_ex(const envoy_type_http_v3_Cookie* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_http_v3_Cookie_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_http_v3_Cookie_clear_name(envoy_type_http_v3_Cookie* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_name(const envoy_type_http_v3_Cookie* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_http_v3_Cookie_clear_ttl(envoy_type_http_v3_Cookie* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Duration* envoy_type_http_v3_Cookie_ttl(const envoy_type_http_v3_Cookie* msg) {
-  const struct google_protobuf_Duration* default_val = NULL;
-  const struct google_protobuf_Duration* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_http_v3_Cookie_has_ttl(const envoy_type_http_v3_Cookie* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_http_v3_Cookie_clear_path(envoy_type_http_v3_Cookie* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_path(const envoy_type_http_v3_Cookie* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_http_v3_Cookie_set_name(envoy_type_http_v3_Cookie *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_http_v3_Cookie_set_ttl(envoy_type_http_v3_Cookie *msg, struct google_protobuf_Duration* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_ttl(envoy_type_http_v3_Cookie* msg, upb_Arena* arena) {
-  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_http_v3_Cookie_ttl(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
-    if (sub) envoy_type_http_v3_Cookie_set_ttl(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c b/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c
deleted file mode 100644
index 9119b12f8e254..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/http/v3/path_transformation.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/http/v3/path_transformation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_submsgs[1] = {
-  {.submsg = &envoy_type_http_v3_PathTransformation_Operation_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_http_v3_PathTransformation__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_http_v3_PathTransformation_msg_init = {
-  &envoy_type_http_v3_PathTransformation_submsgs[0],
-  &envoy_type_http_v3_PathTransformation__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = {
-  {.submsg = &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init},
-  {.submsg = &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_http_v3_PathTransformation_Operation__fields[2] = {
-  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_msg_init = {
-  &envoy_type_http_v3_PathTransformation_Operation_submsgs[0],
-  &envoy_type_http_v3_PathTransformation_Operation__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000002000012, &upb_pom_1bt_max64b},
-    {0x000800000301001a, &upb_pom_1bt_max64b},
-  })
-};
-
-const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &envoy_type_http_v3_PathTransformation_msg_init,
-  &envoy_type_http_v3_PathTransformation_Operation_msg_init,
-  &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msg_init,
-  &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
deleted file mode 100644
index 00859f2f1eb19..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/filter_state.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/filter_state.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_FilterStateMatcher_msg_init = {
-  &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0],
-  &envoy_type_matcher_v3_FilterStateMatcher__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_matcher_v3_FilterStateMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
deleted file mode 100644
index b01deb7c1842b..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/http_inputs.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init,
-  &envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init,
-  &envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init,
-  &envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init,
-  &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h
deleted file mode 100644
index ed7f7517fed32..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_HttpRequestHeaderMatchInput envoy_type_matcher_v3_HttpRequestHeaderMatchInput;
-typedef struct envoy_type_matcher_v3_HttpRequestTrailerMatchInput envoy_type_matcher_v3_HttpRequestTrailerMatchInput;
-typedef struct envoy_type_matcher_v3_HttpResponseHeaderMatchInput envoy_type_matcher_v3_HttpResponseHeaderMatchInput;
-typedef struct envoy_type_matcher_v3_HttpResponseTrailerMatchInput envoy_type_matcher_v3_HttpResponseTrailerMatchInput;
-typedef struct envoy_type_matcher_v3_HttpRequestQueryParamMatchInput envoy_type_matcher_v3_HttpRequestQueryParamMatchInput;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init;
-
-
-
-/* envoy.type.matcher.v3.HttpRequestHeaderMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpRequestHeaderMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestHeaderMatchInput* ret = envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestHeaderMatchInput* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestHeaderMatchInput* ret = envoy_type_matcher_v3_HttpRequestHeaderMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestHeaderMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_clear_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestHeaderMatchInput_header_name(const envoy_type_matcher_v3_HttpRequestHeaderMatchInput* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.HttpRequestTrailerMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpRequestTrailerMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestTrailerMatchInput* ret = envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestTrailerMatchInput* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestTrailerMatchInput* ret = envoy_type_matcher_v3_HttpRequestTrailerMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestTrailerMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_clear_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestTrailerMatchInput_header_name(const envoy_type_matcher_v3_HttpRequestTrailerMatchInput* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.HttpResponseHeaderMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpResponseHeaderMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseHeaderMatchInput* ret = envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseHeaderMatchInput* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseHeaderMatchInput* ret = envoy_type_matcher_v3_HttpResponseHeaderMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseHeaderMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_clear_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseHeaderMatchInput_header_name(const envoy_type_matcher_v3_HttpResponseHeaderMatchInput* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.HttpResponseTrailerMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpResponseTrailerMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseTrailerMatchInput* ret = envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseTrailerMatchInput* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseTrailerMatchInput* ret = envoy_type_matcher_v3_HttpResponseTrailerMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseTrailerMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_clear_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseTrailerMatchInput_header_name(const envoy_type_matcher_v3_HttpResponseTrailerMatchInput* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.HttpRequestQueryParamMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpRequestQueryParamMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* ret = envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* ret = envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_serialize(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_clear_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_query_param(const envoy_type_matcher_v3_HttpRequestQueryParamMatchInput* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
deleted file mode 100644
index ce003207c64ef..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-#include "envoy/type/matcher/v3/value.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init},
-  {.submsg = &envoy_type_matcher_v3_ValueMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher__fields[4] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init = {
-  &envoy_type_matcher_v3_MetadataMatcher_submsgs[0],
-  &envoy_type_matcher_v3_MetadataMatcher__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000000101001a, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[0],
-  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_matcher_v3_MetadataMatcher_msg_init,
-  &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h
deleted file mode 100644
index 2792f3e57d0bd..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_MetadataMatcher envoy_type_matcher_v3_MetadataMatcher;
-typedef struct envoy_type_matcher_v3_MetadataMatcher_PathSegment envoy_type_matcher_v3_MetadataMatcher_PathSegment;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init;
-struct envoy_type_matcher_v3_ValueMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_msg_init;
-
-
-
-/* envoy.type.matcher.v3.MetadataMatcher */
-
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_MetadataMatcher* ret = envoy_type_matcher_v3_MetadataMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher* envoy_type_matcher_v3_MetadataMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_MetadataMatcher* ret = envoy_type_matcher_v3_MetadataMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_serialize(const envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_MetadataMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_serialize_ex(const envoy_type_matcher_v3_MetadataMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_MetadataMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_filter(envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_MetadataMatcher_filter(const envoy_type_matcher_v3_MetadataMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_path(envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const* envoy_type_matcher_v3_MetadataMatcher_path(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_type_matcher_v3_MetadataMatcher_PathSegment* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_upb_array(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_type_matcher_v3_MetadataMatcher_path_mutable_upb_array(const envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_has_path(const envoy_type_matcher_v3_MetadataMatcher* msg) {
-  size_t size;
-  envoy_type_matcher_v3_MetadataMatcher_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_value(envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_value(const envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_ValueMatcher* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_has_value(const envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_clear_invert(envoy_type_matcher_v3_MetadataMatcher* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_invert(const envoy_type_matcher_v3_MetadataMatcher* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_filter(envoy_type_matcher_v3_MetadataMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_mutable_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_type_matcher_v3_MetadataMatcher_PathSegment**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_resize_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_add_path(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* sub = (struct envoy_type_matcher_v3_MetadataMatcher_PathSegment*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_value(envoy_type_matcher_v3_MetadataMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_mutable_value(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_MetadataMatcher_value(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_MetadataMatcher_set_value(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_invert(envoy_type_matcher_v3_MetadataMatcher *msg, bool value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.MetadataMatcher.PathSegment */
-
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_MetadataMatcher_PathSegment* ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_MetadataMatcher_PathSegment* ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_PathSegment_serialize(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_MetadataMatcher_PathSegment_serialize_ex(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_key = 1,
-  envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_NOT_SET = 0
-} envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases;
-UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_case(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_MetadataMatcher_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_clear_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_MetadataMatcher_PathSegment_key(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_PathSegment_has_key(const envoy_type_matcher_v3_MetadataMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
deleted file mode 100644
index bf06f80b94400..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/node.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/node.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "envoy/type/matcher/v3/struct.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_NodeMatcher_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StructMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_NodeMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_NodeMatcher_msg_init = {
-  &envoy_type_matcher_v3_NodeMatcher_submsgs[0],
-  &envoy_type_matcher_v3_NodeMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f010012, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_matcher_v3_NodeMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
deleted file mode 100644
index fc0b51b521e48..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/number.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/number.upb.h"
-#include "envoy/type/v3/range.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_v3_DoubleRange_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_DoubleMatcher__fields[2] = {
-  {1, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_DoubleMatcher_msg_init = {
-  &envoy_type_matcher_v3_DoubleMatcher_submsgs[0],
-  &envoy_type_matcher_v3_DoubleMatcher__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002000011, &upb_pof8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_matcher_v3_DoubleMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
deleted file mode 100644
index b4837f5c20889..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/path.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/path.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_PathMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_PathMatcher__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_PathMatcher_msg_init = {
-  &envoy_type_matcher_v3_PathMatcher_submsgs[0],
-  &envoy_type_matcher_v3_PathMatcher__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_matcher_v3_PathMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
deleted file mode 100644
index 32d6b0075ef4e..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/regex.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_msg_init = {
-  &envoy_type_matcher_v3_RegexMatcher_submsgs[0],
-  &envoy_type_matcher_v3_RegexMatcher__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pom_1bt_max64b},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init = {
-  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0],
-  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_RegexMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init = {
-  &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0],
-  &envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_type_matcher_v3_RegexMatcher_msg_init,
-  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init,
-  &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h
deleted file mode 100644
index 5b698208d4754..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_RegexMatcher envoy_type_matcher_v3_RegexMatcher;
-typedef struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2 envoy_type_matcher_v3_RegexMatcher_GoogleRE2;
-typedef struct envoy_type_matcher_v3_RegexMatchAndSubstitute envoy_type_matcher_v3_RegexMatchAndSubstitute;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init;
-struct google_protobuf_UInt32Value;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-
-
-
-/* envoy.type.matcher.v3.RegexMatcher */
-
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatcher* ret = envoy_type_matcher_v3_RegexMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatcher* ret = envoy_type_matcher_v3_RegexMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_serialize(const envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_serialize_ex(const envoy_type_matcher_v3_RegexMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_matcher_v3_RegexMatcher_engine_type_google_re2 = 1,
-  envoy_type_matcher_v3_RegexMatcher_engine_type_NOT_SET = 0
-} envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases;
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases envoy_type_matcher_v3_RegexMatcher_engine_type_case(const envoy_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_RegexMatcher_engine_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_clear_google_re2(envoy_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_google_re2(const envoy_type_matcher_v3_RegexMatcher* msg) {
-  const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL;
-  const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_has_google_re2(const envoy_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_clear_regex(envoy_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatcher_regex(const envoy_type_matcher_v3_RegexMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_google_re2(envoy_type_matcher_v3_RegexMatcher *msg, envoy_type_matcher_v3_RegexMatcher_GoogleRE2* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_mutable_google_re2(envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)envoy_type_matcher_v3_RegexMatcher_google_re2(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_RegexMatcher_set_google_re2(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_regex(envoy_type_matcher_v3_RegexMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.RegexMatcher.GoogleRE2 */
-
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatcher_GoogleRE2* ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_serialize(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_clear_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
-  const struct google_protobuf_UInt32Value* default_val = NULL;
-  const struct google_protobuf_UInt32Value* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_GoogleRE2_has_max_program_size(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *msg, struct google_protobuf_UInt32Value* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_mutable_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena) {
-  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.type.matcher.v3.RegexMatchAndSubstitute */
-
-UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatchAndSubstitute* ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_type_matcher_v3_RegexMatchAndSubstitute_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_RegexMatchAndSubstitute* ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatchAndSubstitute_serialize(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_RegexMatchAndSubstitute_serialize_ex(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_clear_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
-  const envoy_type_matcher_v3_RegexMatcher* default_val = NULL;
-  const envoy_type_matcher_v3_RegexMatcher* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_RegexMatchAndSubstitute_has_pattern(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_clear_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatchAndSubstitute_substitution(const envoy_type_matcher_v3_RegexMatchAndSubstitute* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, envoy_type_matcher_v3_RegexMatcher* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_mutable_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
deleted file mode 100644
index 3fe5718cb4a78..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/status_code_input.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/status_code_input.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTable envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init,
-  &envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h
deleted file mode 100644
index 5d50a15409418..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/status_code_input.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput;
-typedef struct envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init;
-
-
-
-/* envoy.type.matcher.v3.HttpResponseStatusCodeMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseStatusCodeMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.type.matcher.v3.HttpResponseStatusCodeClassMatchInput */
-
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput*)_upb_Message_New(&envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* ret = envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_serialize(const envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_serialize_ex(const envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
deleted file mode 100644
index c45ff0f447548..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "envoy/type/matcher/v3/regex.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_RegexMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[6] = {
-  {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init = {
-  &envoy_type_matcher_v3_StringMatcher_submsgs[0],
-  &envoy_type_matcher_v3_StringMatcher__fields[0],
-  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040100000a, &upb_pos_1bt},
-    {0x0008000402000012, &upb_pos_1bt},
-    {0x000800040300001a, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040500002a, &upb_pom_1bt_maxmaxb},
-    {0x000000003f000030, &upb_psb1_1bt},
-    {0x000800040700003a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_ListStringMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_ListStringMatcher_msg_init = {
-  &envoy_type_matcher_v3_ListStringMatcher_submsgs[0],
-  &envoy_type_matcher_v3_ListStringMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_matcher_v3_StringMatcher_msg_init,
-  &envoy_type_matcher_v3_ListStringMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h
deleted file mode 100644
index d42daf67f49f3..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_StringMatcher envoy_type_matcher_v3_StringMatcher;
-typedef struct envoy_type_matcher_v3_ListStringMatcher envoy_type_matcher_v3_ListStringMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_ListStringMatcher_msg_init;
-struct envoy_type_matcher_v3_RegexMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_RegexMatcher_msg_init;
-
-
-
-/* envoy.type.matcher.v3.StringMatcher */
-
-UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_StringMatcher* ret = envoy_type_matcher_v3_StringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_StringMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_StringMatcher* ret = envoy_type_matcher_v3_StringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StringMatcher_serialize(const envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StringMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StringMatcher_serialize_ex(const envoy_type_matcher_v3_StringMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StringMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_matcher_v3_StringMatcher_match_pattern_exact = 1,
-  envoy_type_matcher_v3_StringMatcher_match_pattern_prefix = 2,
-  envoy_type_matcher_v3_StringMatcher_match_pattern_suffix = 3,
-  envoy_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5,
-  envoy_type_matcher_v3_StringMatcher_match_pattern_contains = 7,
-  envoy_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0
-} envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases;
-UPB_INLINE envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases envoy_type_matcher_v3_StringMatcher_match_pattern_case(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_exact(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_exact(const envoy_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_exact(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_prefix(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_prefix(const envoy_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_prefix(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_suffix(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_suffix(const envoy_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_suffix(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_safe_regex(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_safe_regex(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const struct envoy_type_matcher_v3_RegexMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_RegexMatcher* ret;
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_safe_regex(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_ignore_case(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_ignore_case(const envoy_type_matcher_v3_StringMatcher* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_contains(envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_StringMatcher_contains(const envoy_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_contains(const envoy_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_exact(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_prefix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_suffix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_safe_regex(envoy_type_matcher_v3_StringMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_mutable_safe_regex(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_StringMatcher_safe_regex(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_RegexMatcher*)_upb_Message_New(&envoy_type_matcher_v3_RegexMatcher_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_StringMatcher_set_safe_regex(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_ignore_case(envoy_type_matcher_v3_StringMatcher *msg, bool value) {
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_contains(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.matcher.v3.ListStringMatcher */
-
-UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ListStringMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_ListStringMatcher* ret = envoy_type_matcher_v3_ListStringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_ListStringMatcher* envoy_type_matcher_v3_ListStringMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_ListStringMatcher* ret = envoy_type_matcher_v3_ListStringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_ListStringMatcher_serialize(const envoy_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ListStringMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_ListStringMatcher_serialize_ex(const envoy_type_matcher_v3_ListStringMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_ListStringMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_ListStringMatcher_clear_patterns(envoy_type_matcher_v3_ListStringMatcher* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_matcher_v3_StringMatcher* const* envoy_type_matcher_v3_ListStringMatcher_patterns(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_upb_array(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(const envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_type_matcher_v3_ListStringMatcher_has_patterns(const envoy_type_matcher_v3_ListStringMatcher* msg) {
-  size_t size;
-  envoy_type_matcher_v3_ListStringMatcher_patterns(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStringMatcher_mutable_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_type_matcher_v3_StringMatcher** envoy_type_matcher_v3_ListStringMatcher_resize_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ListStringMatcher_add_patterns(envoy_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
deleted file mode 100644
index b76a31ada0888..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/struct.upb.h"
-#include "envoy/type/matcher/v3/value.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_StructMatcher_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init},
-  {.submsg = &envoy_type_matcher_v3_ValueMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher__fields[2] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_StructMatcher_msg_init = {
-  &envoy_type_matcher_v3_StructMatcher_submsgs[0],
-  &envoy_type_matcher_v3_StructMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x001000000101001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher_PathSegment__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init = {
-  NULL,
-  &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0],
-  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_matcher_v3_StructMatcher_msg_init,
-  &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h
deleted file mode 100644
index 649ea963938bc..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_matcher_v3_StructMatcher envoy_type_matcher_v3_StructMatcher;
-typedef struct envoy_type_matcher_v3_StructMatcher_PathSegment envoy_type_matcher_v3_StructMatcher_PathSegment;
-extern const upb_MiniTable envoy_type_matcher_v3_StructMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init;
-struct envoy_type_matcher_v3_ValueMatcher;
-extern const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_msg_init;
-
-
-
-/* envoy.type.matcher.v3.StructMatcher */
-
-UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_StructMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StructMatcher_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_StructMatcher* ret = envoy_type_matcher_v3_StructMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_StructMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_StructMatcher* ret = envoy_type_matcher_v3_StructMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_serialize(const envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StructMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_serialize_ex(const envoy_type_matcher_v3_StructMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StructMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_matcher_v3_StructMatcher_clear_path(envoy_type_matcher_v3_StructMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_matcher_v3_StructMatcher_PathSegment* const* envoy_type_matcher_v3_StructMatcher_path(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_type_matcher_v3_StructMatcher_PathSegment* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_type_matcher_v3_StructMatcher_path_upb_array(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_type_matcher_v3_StructMatcher_path_mutable_upb_array(const envoy_type_matcher_v3_StructMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_path(const envoy_type_matcher_v3_StructMatcher* msg) {
-  size_t size;
-  envoy_type_matcher_v3_StructMatcher_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void envoy_type_matcher_v3_StructMatcher_clear_value(envoy_type_matcher_v3_StructMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_value(const envoy_type_matcher_v3_StructMatcher* msg) {
-  const struct envoy_type_matcher_v3_ValueMatcher* default_val = NULL;
-  const struct envoy_type_matcher_v3_ValueMatcher* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_value(const envoy_type_matcher_v3_StructMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_mutable_path(envoy_type_matcher_v3_StructMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_type_matcher_v3_StructMatcher_PathSegment**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_resize_path(envoy_type_matcher_v3_StructMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_StructMatcher_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_add_path(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_type_matcher_v3_StructMatcher_PathSegment* sub = (struct envoy_type_matcher_v3_StructMatcher_PathSegment*)_upb_Message_New(&envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void envoy_type_matcher_v3_StructMatcher_set_value(envoy_type_matcher_v3_StructMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_mutable_value(envoy_type_matcher_v3_StructMatcher* msg, upb_Arena* arena) {
-  struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_StructMatcher_value(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_Message_New(&envoy_type_matcher_v3_ValueMatcher_msg_init, arena);
-    if (sub) envoy_type_matcher_v3_StructMatcher_set_value(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.type.matcher.v3.StructMatcher.PathSegment */
-
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_new(upb_Arena* arena) {
-  return (envoy_type_matcher_v3_StructMatcher_PathSegment*)_upb_Message_New(&envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, arena);
-}
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_matcher_v3_StructMatcher_PathSegment* ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_PathSegment_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_matcher_v3_StructMatcher_PathSegment* ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_PathSegment_serialize(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_matcher_v3_StructMatcher_PathSegment_serialize_ex(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_matcher_v3_StructMatcher_PathSegment_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_matcher_v3_StructMatcher_PathSegment_segment_key = 1,
-  envoy_type_matcher_v3_StructMatcher_PathSegment_segment_NOT_SET = 0
-} envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases;
-UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases envoy_type_matcher_v3_StructMatcher_PathSegment_segment_case(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_clear_key(envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_matcher_v3_StructMatcher_PathSegment_key(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_PathSegment_has_key(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
deleted file mode 100644
index 476f721e4477a..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/value.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/matcher/v3/value.upb.h"
-#include "envoy/type/matcher/v3/number.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_matcher_v3_ValueMatcher_submsgs[4] = {
-  {.submsg = &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init},
-  {.submsg = &envoy_type_matcher_v3_DoubleMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_type_matcher_v3_ListMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_ValueMatcher__fields[6] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_msg_init = {
-  &envoy_type_matcher_v3_ValueMatcher_submsgs[0],
-  &envoy_type_matcher_v3_ValueMatcher__fields[0],
-  UPB_SIZE(8, 16), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x000800000302001a, &upb_pom_1bt_maxmaxb},
-    {0x0008000004000020, &upb_pob1_1bt},
-    {0x0008000005000028, &upb_pob1_1bt},
-    {0x0008000006030032, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub envoy_type_matcher_v3_ListMatcher_submsgs[1] = {
-  {.submsg = &envoy_type_matcher_v3_ValueMatcher_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_ListMatcher__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_matcher_v3_ListMatcher_msg_init = {
-  &envoy_type_matcher_v3_ListMatcher_submsgs[0],
-  &envoy_type_matcher_v3_ListMatcher__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_type_matcher_v3_ValueMatcher_msg_init,
-  &envoy_type_matcher_v3_ValueMatcher_NullMatch_msg_init,
-  &envoy_type_matcher_v3_ListMatcher_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
deleted file mode 100644
index 874d5d5a6742e..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/metadata/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/metadata/v3/metadata.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKey_submsgs[1] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKey_msg_init = {
-  &envoy_type_metadata_v3_MetadataKey_submsgs[0],
-  &envoy_type_metadata_v3_MetadataKey__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey_PathSegment__fields[1] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init = {
-  NULL,
-  &envoy_type_metadata_v3_MetadataKey_PathSegment__fields[0],
-  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_metadata_v3_MetadataKind_submsgs[4] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKind_Request_msg_init},
-  {.submsg = &envoy_type_metadata_v3_MetadataKind_Route_msg_init},
-  {.submsg = &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init},
-  {.submsg = &envoy_type_metadata_v3_MetadataKind_Host_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_metadata_v3_MetadataKind__fields[4] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKind_msg_init = {
-  &envoy_type_metadata_v3_MetadataKind_submsgs[0],
-  &envoy_type_metadata_v3_MetadataKind__fields[0],
-  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Request_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Route_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Cluster_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Host_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[7] = {
-  &envoy_type_metadata_v3_MetadataKey_msg_init,
-  &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init,
-  &envoy_type_metadata_v3_MetadataKind_msg_init,
-  &envoy_type_metadata_v3_MetadataKind_Request_msg_init,
-  &envoy_type_metadata_v3_MetadataKind_Route_msg_init,
-  &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init,
-  &envoy_type_metadata_v3_MetadataKind_Host_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  7,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h
deleted file mode 100644
index 1f5ec3e3c268b..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/metadata/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
-#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_metadata_v3_MetadataKey envoy_type_metadata_v3_MetadataKey;
-typedef struct envoy_type_metadata_v3_MetadataKey_PathSegment envoy_type_metadata_v3_MetadataKey_PathSegment;
-typedef struct envoy_type_metadata_v3_MetadataKind envoy_type_metadata_v3_MetadataKind;
-typedef struct envoy_type_metadata_v3_MetadataKind_Request envoy_type_metadata_v3_MetadataKind_Request;
-typedef struct envoy_type_metadata_v3_MetadataKind_Route envoy_type_metadata_v3_MetadataKind_Route;
-typedef struct envoy_type_metadata_v3_MetadataKind_Cluster envoy_type_metadata_v3_MetadataKind_Cluster;
-typedef struct envoy_type_metadata_v3_MetadataKind_Host envoy_type_metadata_v3_MetadataKind_Host;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKey_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Request_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Route_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Cluster_msg_init;
-extern const upb_MiniTable envoy_type_metadata_v3_MetadataKind_Host_msg_init;
-
-
-
-/* envoy.type.metadata.v3.MetadataKey */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKey*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKey* ret = envoy_type_metadata_v3_MetadataKey_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey* envoy_type_metadata_v3_MetadataKey_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKey* ret = envoy_type_metadata_v3_MetadataKey_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_serialize(const envoy_type_metadata_v3_MetadataKey* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKey_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_serialize_ex(const envoy_type_metadata_v3_MetadataKey* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKey_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKey_clear_key(envoy_type_metadata_v3_MetadataKey* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_metadata_v3_MetadataKey_key(const envoy_type_metadata_v3_MetadataKey* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKey_clear_path(envoy_type_metadata_v3_MetadataKey* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_metadata_v3_MetadataKey_PathSegment* const* envoy_type_metadata_v3_MetadataKey_path(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const envoy_type_metadata_v3_MetadataKey_PathSegment* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _envoy_type_metadata_v3_MetadataKey_path_upb_array(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _envoy_type_metadata_v3_MetadataKey_path_mutable_upb_array(const envoy_type_metadata_v3_MetadataKey* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_has_path(const envoy_type_metadata_v3_MetadataKey* msg) {
-  size_t size;
-  envoy_type_metadata_v3_MetadataKey_path(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void envoy_type_metadata_v3_MetadataKey_set_key(envoy_type_metadata_v3_MetadataKey *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_mutable_path(envoy_type_metadata_v3_MetadataKey* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (envoy_type_metadata_v3_MetadataKey_PathSegment**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_resize_path(envoy_type_metadata_v3_MetadataKey* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_metadata_v3_MetadataKey_PathSegment**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_add_path(envoy_type_metadata_v3_MetadataKey* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct envoy_type_metadata_v3_MetadataKey_PathSegment* sub = (struct envoy_type_metadata_v3_MetadataKey_PathSegment*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* envoy.type.metadata.v3.MetadataKey.PathSegment */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKey_PathSegment*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKey_PathSegment* ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment* envoy_type_metadata_v3_MetadataKey_PathSegment_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKey_PathSegment* ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_PathSegment_serialize(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKey_PathSegment_serialize_ex(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKey_PathSegment_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_metadata_v3_MetadataKey_PathSegment_segment_key = 1,
-  envoy_type_metadata_v3_MetadataKey_PathSegment_segment_NOT_SET = 0
-} envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases;
-UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases envoy_type_metadata_v3_MetadataKey_PathSegment_segment_case(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (envoy_type_metadata_v3_MetadataKey_PathSegment_segment_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_clear_key(envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView envoy_type_metadata_v3_MetadataKey_PathSegment_key(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_PathSegment_has_key(const envoy_type_metadata_v3_MetadataKey_PathSegment* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_set_key(envoy_type_metadata_v3_MetadataKey_PathSegment *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.metadata.v3.MetadataKind */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKind*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind* ret = envoy_type_metadata_v3_MetadataKind_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind* envoy_type_metadata_v3_MetadataKind_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind* ret = envoy_type_metadata_v3_MetadataKind_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_serialize(const envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_serialize_ex(const envoy_type_metadata_v3_MetadataKind* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  envoy_type_metadata_v3_MetadataKind_kind_request = 1,
-  envoy_type_metadata_v3_MetadataKind_kind_route = 2,
-  envoy_type_metadata_v3_MetadataKind_kind_cluster = 3,
-  envoy_type_metadata_v3_MetadataKind_kind_host = 4,
-  envoy_type_metadata_v3_MetadataKind_kind_NOT_SET = 0
-} envoy_type_metadata_v3_MetadataKind_kind_oneofcases;
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_kind_oneofcases envoy_type_metadata_v3_MetadataKind_kind_case(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (envoy_type_metadata_v3_MetadataKind_kind_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_request(envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_request(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const envoy_type_metadata_v3_MetadataKind_Request* default_val = NULL;
-  const envoy_type_metadata_v3_MetadataKind_Request* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_request(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_route(envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_route(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const envoy_type_metadata_v3_MetadataKind_Route* default_val = NULL;
-  const envoy_type_metadata_v3_MetadataKind_Route* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_route(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_cluster(envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_cluster(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const envoy_type_metadata_v3_MetadataKind_Cluster* default_val = NULL;
-  const envoy_type_metadata_v3_MetadataKind_Cluster* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_cluster(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_clear_host(envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_host(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const envoy_type_metadata_v3_MetadataKind_Host* default_val = NULL;
-  const envoy_type_metadata_v3_MetadataKind_Host* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_host(const envoy_type_metadata_v3_MetadataKind* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_request(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Request* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_mutable_request(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
-  struct envoy_type_metadata_v3_MetadataKind_Request* sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)envoy_type_metadata_v3_MetadataKind_request(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Request_msg_init, arena);
-    if (sub) envoy_type_metadata_v3_MetadataKind_set_request(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_route(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Route* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_mutable_route(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
-  struct envoy_type_metadata_v3_MetadataKind_Route* sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)envoy_type_metadata_v3_MetadataKind_route(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Route_msg_init, arena);
-    if (sub) envoy_type_metadata_v3_MetadataKind_set_route(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_cluster(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Cluster* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_mutable_cluster(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
-  struct envoy_type_metadata_v3_MetadataKind_Cluster* sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)envoy_type_metadata_v3_MetadataKind_cluster(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, arena);
-    if (sub) envoy_type_metadata_v3_MetadataKind_set_cluster(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_host(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Host* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_mutable_host(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) {
-  struct envoy_type_metadata_v3_MetadataKind_Host* sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)envoy_type_metadata_v3_MetadataKind_host(msg);
-  if (sub == NULL) {
-    sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Host_msg_init, arena);
-    if (sub) envoy_type_metadata_v3_MetadataKind_set_host(msg, sub);
-  }
-  return sub;
-}
-
-/* envoy.type.metadata.v3.MetadataKind.Request */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKind_Request*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Request_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Request* ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_Request_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Request* ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Request_serialize(const envoy_type_metadata_v3_MetadataKind_Request* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Request_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Request_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Request* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Request_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.type.metadata.v3.MetadataKind.Route */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKind_Route*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Route_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Route* ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_Route_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Route* ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Route_serialize(const envoy_type_metadata_v3_MetadataKind_Route* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Route_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Route_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Route* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Route_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.type.metadata.v3.MetadataKind.Cluster */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKind_Cluster*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Cluster* ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_Cluster_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Cluster* ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Cluster_serialize(const envoy_type_metadata_v3_MetadataKind_Cluster* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Cluster_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Cluster* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Cluster_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-/* envoy.type.metadata.v3.MetadataKind.Host */
-
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_new(upb_Arena* arena) {
-  return (envoy_type_metadata_v3_MetadataKind_Host*)_upb_Message_New(&envoy_type_metadata_v3_MetadataKind_Host_msg_init, arena);
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Host* ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_Host_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_metadata_v3_MetadataKind_Host* ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize(const envoy_type_metadata_v3_MetadataKind_Host* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Host_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize_ex(const envoy_type_metadata_v3_MetadataKind_Host* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_metadata_v3_MetadataKind_Host_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c b/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
deleted file mode 100644
index 2704ba4a7c379..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/tracing/v3/custom_tag.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/tracing/v3/custom_tag.upb.h"
-#include "envoy/type/metadata/v3/metadata.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_submsgs[4] = {
-  {.submsg = &envoy_type_tracing_v3_CustomTag_Literal_msg_init},
-  {.submsg = &envoy_type_tracing_v3_CustomTag_Environment_msg_init},
-  {.submsg = &envoy_type_tracing_v3_CustomTag_Header_msg_init},
-  {.submsg = &envoy_type_tracing_v3_CustomTag_Metadata_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_tracing_v3_CustomTag__fields[5] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_tracing_v3_CustomTag_msg_init = {
-  &envoy_type_tracing_v3_CustomTag_submsgs[0],
-  &envoy_type_tracing_v3_CustomTag__fields[0],
-  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_max64b},
-    {0x001800000301001a, &upb_pom_1bt_max64b},
-    {0x0018000004020022, &upb_pom_1bt_max64b},
-    {0x001800000503002a, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Literal__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_tracing_v3_CustomTag_Literal_msg_init = {
-  NULL,
-  &envoy_type_tracing_v3_CustomTag_Literal__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Environment__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_tracing_v3_CustomTag_Environment_msg_init = {
-  NULL,
-  &envoy_type_tracing_v3_CustomTag_Environment__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Header__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_tracing_v3_CustomTag_Header_msg_init = {
-  NULL,
-  &envoy_type_tracing_v3_CustomTag_Header__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = {
-  {.submsg = &envoy_type_metadata_v3_MetadataKind_msg_init},
-  {.submsg = &envoy_type_metadata_v3_MetadataKey_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Metadata__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_tracing_v3_CustomTag_Metadata_msg_init = {
-  &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0],
-  &envoy_type_tracing_v3_CustomTag_Metadata__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[5] = {
-  &envoy_type_tracing_v3_CustomTag_msg_init,
-  &envoy_type_tracing_v3_CustomTag_Literal_msg_init,
-  &envoy_type_tracing_v3_CustomTag_Environment_msg_init,
-  &envoy_type_tracing_v3_CustomTag_Header_msg_init,
-  &envoy_type_tracing_v3_CustomTag_Metadata_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  5,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c b/src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
deleted file mode 100644
index cd224932c2a34..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/hash_policy.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/hash_policy.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_v3_HashPolicy_submsgs[2] = {
-  {.submsg = &envoy_type_v3_HashPolicy_SourceIp_msg_init},
-  {.submsg = &envoy_type_v3_HashPolicy_FilterState_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_v3_HashPolicy__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_HashPolicy_msg_init = {
-  &envoy_type_v3_HashPolicy_submsgs[0],
-  &envoy_type_v3_HashPolicy__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable envoy_type_v3_HashPolicy_SourceIp_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableField envoy_type_v3_HashPolicy_FilterState__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_HashPolicy_FilterState_msg_init = {
-  NULL,
-  &envoy_type_v3_HashPolicy_FilterState__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_type_v3_HashPolicy_msg_init,
-  &envoy_type_v3_HashPolicy_SourceIp_msg_init,
-  &envoy_type_v3_HashPolicy_FilterState_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/http.upb.c b/src/core/ext/upb-generated/envoy/type/v3/http.upb.c
deleted file mode 100644
index e50790dca9cdc..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/http.upb.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/http.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  NULL,
-  0,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/http.upb.h b/src/core/ext/upb-generated/envoy/type/v3/http.upb.h
deleted file mode 100644
index b65979dd647ea..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/http.upb.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
-  envoy_type_v3_HTTP1 = 0,
-  envoy_type_v3_HTTP2 = 1,
-  envoy_type_v3_HTTP3 = 2
-} envoy_type_v3_CodecClientType;
-
-
-
-extern const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c b/src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
deleted file mode 100644
index 0dbfb787eedaa..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/http_status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/http_status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_type_v3_HttpStatus__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_HttpStatus_msg_init = {
-  NULL,
-  &envoy_type_v3_HttpStatus__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_v3_HttpStatus_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c b/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
deleted file mode 100644
index f502132bdbd76..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/percent.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_type_v3_Percent__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_Percent_msg_init = {
-  NULL,
-  &envoy_type_v3_Percent__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-  })
-};
-
-static const upb_MiniTableField envoy_type_v3_FractionalPercent__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init = {
-  NULL,
-  &envoy_type_v3_FractionalPercent__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_v3_Percent_msg_init,
-  &envoy_type_v3_FractionalPercent_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/range.upb.c b/src/core/ext/upb-generated/envoy/type/v3/range.upb.c
deleted file mode 100644
index 1546baffaf994..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/range.upb.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/range.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_type_v3_Int64Range__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_Int64Range_msg_init = {
-  NULL,
-  &envoy_type_v3_Int64Range__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_v3_Int32Range__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_Int32Range_msg_init = {
-  NULL,
-  &envoy_type_v3_Int32Range__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField envoy_type_v3_DoubleRange__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_DoubleRange_msg_init = {
-  NULL,
-  &envoy_type_v3_DoubleRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-    {0x000800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &envoy_type_v3_Int64Range_msg_init,
-  &envoy_type_v3_Int32Range_msg_init,
-  &envoy_type_v3_DoubleRange_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/range.upb.h b/src/core/ext/upb-generated/envoy/type/v3/range.upb.h
deleted file mode 100644
index e6c85103cd085..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/range.upb.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct envoy_type_v3_Int64Range envoy_type_v3_Int64Range;
-typedef struct envoy_type_v3_Int32Range envoy_type_v3_Int32Range;
-typedef struct envoy_type_v3_DoubleRange envoy_type_v3_DoubleRange;
-extern const upb_MiniTable envoy_type_v3_Int64Range_msg_init;
-extern const upb_MiniTable envoy_type_v3_Int32Range_msg_init;
-extern const upb_MiniTable envoy_type_v3_DoubleRange_msg_init;
-
-
-
-/* envoy.type.v3.Int64Range */
-
-UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_new(upb_Arena* arena) {
-  return (envoy_type_v3_Int64Range*)_upb_Message_New(&envoy_type_v3_Int64Range_msg_init, arena);
-}
-UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_v3_Int64Range* ret = envoy_type_v3_Int64Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Int64Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_v3_Int64Range* envoy_type_v3_Int64Range_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_v3_Int64Range* ret = envoy_type_v3_Int64Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Int64Range_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_v3_Int64Range_serialize(const envoy_type_v3_Int64Range* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Int64Range_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_v3_Int64Range_serialize_ex(const envoy_type_v3_Int64Range* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Int64Range_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_v3_Int64Range_clear_start(envoy_type_v3_Int64Range* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t envoy_type_v3_Int64Range_start(const envoy_type_v3_Int64Range* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_v3_Int64Range_clear_end(envoy_type_v3_Int64Range* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t envoy_type_v3_Int64Range_end(const envoy_type_v3_Int64Range* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_v3_Int64Range_set_start(envoy_type_v3_Int64Range *msg, int64_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_v3_Int64Range_set_end(envoy_type_v3_Int64Range *msg, int64_t value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.v3.Int32Range */
-
-UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_new(upb_Arena* arena) {
-  return (envoy_type_v3_Int32Range*)_upb_Message_New(&envoy_type_v3_Int32Range_msg_init, arena);
-}
-UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_v3_Int32Range* ret = envoy_type_v3_Int32Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Int32Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_v3_Int32Range* envoy_type_v3_Int32Range_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_v3_Int32Range* ret = envoy_type_v3_Int32Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_Int32Range_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_v3_Int32Range_serialize(const envoy_type_v3_Int32Range* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Int32Range_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_v3_Int32Range_serialize_ex(const envoy_type_v3_Int32Range* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_Int32Range_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_v3_Int32Range_clear_start(envoy_type_v3_Int32Range* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_type_v3_Int32Range_start(const envoy_type_v3_Int32Range* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_v3_Int32Range_clear_end(envoy_type_v3_Int32Range* msg) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t envoy_type_v3_Int32Range_end(const envoy_type_v3_Int32Range* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_v3_Int32Range_set_start(envoy_type_v3_Int32Range *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_v3_Int32Range_set_end(envoy_type_v3_Int32Range *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* envoy.type.v3.DoubleRange */
-
-UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_new(upb_Arena* arena) {
-  return (envoy_type_v3_DoubleRange*)_upb_Message_New(&envoy_type_v3_DoubleRange_msg_init, arena);
-}
-UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  envoy_type_v3_DoubleRange* ret = envoy_type_v3_DoubleRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_DoubleRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE envoy_type_v3_DoubleRange* envoy_type_v3_DoubleRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  envoy_type_v3_DoubleRange* ret = envoy_type_v3_DoubleRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_type_v3_DoubleRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* envoy_type_v3_DoubleRange_serialize(const envoy_type_v3_DoubleRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_DoubleRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* envoy_type_v3_DoubleRange_serialize_ex(const envoy_type_v3_DoubleRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &envoy_type_v3_DoubleRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void envoy_type_v3_DoubleRange_clear_start(envoy_type_v3_DoubleRange* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double envoy_type_v3_DoubleRange_start(const envoy_type_v3_DoubleRange* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void envoy_type_v3_DoubleRange_clear_end(envoy_type_v3_DoubleRange* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double envoy_type_v3_DoubleRange_end(const envoy_type_v3_DoubleRange* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void envoy_type_v3_DoubleRange_set_start(envoy_type_v3_DoubleRange *msg, double value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg, double value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c b/src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
deleted file mode 100644
index ab441407a3165..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/ratelimit_strategy.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/ratelimit_strategy.upb.h"
-#include "envoy/type/v3/ratelimit_unit.upb.h"
-#include "envoy/type/v3/token_bucket.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_v3_RateLimitStrategy_submsgs[2] = {
-  {.submsg = &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init},
-  {.submsg = &envoy_type_v3_TokenBucket_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_v3_RateLimitStrategy__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_RateLimitStrategy_msg_init = {
-  &envoy_type_v3_RateLimitStrategy_submsgs[0],
-  &envoy_type_v3_RateLimitStrategy__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_pov4_1bt},
-    {0x0008000002000012, &upb_pom_1bt_max64b},
-    {0x000800000301001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableField envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init = {
-  NULL,
-  &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &envoy_type_v3_RateLimitStrategy_msg_init,
-  &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c b/src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
deleted file mode 100644
index 30ac5ed3ccb9b..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/ratelimit_unit.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/ratelimit_unit.upb.h"
-#include "udpa/annotations/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  NULL,
-  0,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c b/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
deleted file mode 100644
index 48b81763f453b..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/semantic_version.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/semantic_version.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField envoy_type_v3_SemanticVersion__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_SemanticVersion_msg_init = {
-  NULL,
-  &envoy_type_v3_SemanticVersion__fields[0],
-  16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x000800003f000018, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_v3_SemanticVersion_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c b/src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
deleted file mode 100644
index 5249f79fa1731..0000000000000
--- a/src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/token_bucket.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "envoy/type/v3/token_bucket.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub envoy_type_v3_TokenBucket_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField envoy_type_v3_TokenBucket__fields[3] = {
-  {1, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable envoy_type_v3_TokenBucket_msg_init = {
-  &envoy_type_v3_TokenBucket_submsgs[0],
-  &envoy_type_v3_TokenBucket__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x001000000201001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &envoy_type_v3_TokenBucket_msg_init,
-};
-
-const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/api/annotations.upb.c b/src/core/ext/upb-generated/google/api/annotations.upb.c
deleted file mode 100644
index 25ec71d257f0e..0000000000000
--- a/src/core/ext/upb-generated/google/api/annotations.upb.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/annotations.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/api/annotations.upb.h"
-#include "google/api/http.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-extern const upb_MiniTable google_api_HttpRule_msg_init;
-extern const upb_MiniTable google_protobuf_MethodOptions_msg_init;
-const upb_MiniTableExtension google_api_http_ext = {
-  {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MethodOptions_msg_init,
-  {.submsg = &google_api_HttpRule_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &google_api_http_ext,
-};
-
-const upb_MiniTableFile google_api_annotations_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  extensions_layout,
-  0,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c b/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
deleted file mode 100644
index e4672bdf5285f..0000000000000
--- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/expr/v1alpha1/checked.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/api/expr/v1alpha1/checked.upb.h"
-#include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "google/protobuf/empty.upb.h"
-#include "google/protobuf/struct.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = {
-  {.submsg = &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_SourceInfo_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[4] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_msg_init = {
-  &google_api_expr_v1alpha1_CheckedExpr_submsgs[0],
-  &google_api_expr_v1alpha1_CheckedExpr__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0018000001020022, &upb_psm_1bt_maxmaxb},
-    {0x002000000203002a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Reference_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_msg_init = {
-  &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0],
-  &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_msg_init = {
-  &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0],
-  &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Type_submsgs[7] = {
-  {.submsg = &google_protobuf_Empty_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_ListType_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_MapType_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_FunctionType_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-  {.submsg = &google_protobuf_Empty_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_AbstractType_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Type__fields[13] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 8), -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 8), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(4, 8), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(4, 8), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Type_msg_init = {
-  &google_api_expr_v1alpha1_Type_submsgs[0],
-  &google_api_expr_v1alpha1_Type__fields[0],
-  UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002000010, &upb_pov4_1bt},
-    {0x0008000003000018, &upb_pov4_1bt},
-    {0x0008000004000020, &upb_pov4_1bt},
-    {0x0008000005000028, &upb_pov4_1bt},
-    {0x0008000006010032, &upb_pom_1bt_max64b},
-    {0x000800000702003a, &upb_pom_1bt_max64b},
-    {0x0008000008030042, &upb_pom_1bt_max64b},
-    {0x000800000900004a, &upb_pos_1bt},
-    {0x000800000a000052, &upb_pos_1bt},
-    {0x000800000b04005a, &upb_pom_1bt_max64b},
-    {0x000800000c050062, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000e060072, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Type_ListType_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Type_ListType__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Type_ListType_msg_init = {
-  &google_api_expr_v1alpha1_Type_ListType_submsgs[0],
-  &google_api_expr_v1alpha1_Type_ListType__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Type_MapType_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Type_MapType__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Type_MapType_msg_init = {
-  &google_api_expr_v1alpha1_Type_MapType_submsgs[0],
-  &google_api_expr_v1alpha1_Type_MapType__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Type_FunctionType__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Type_FunctionType_msg_init = {
-  &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0],
-  &google_api_expr_v1alpha1_Type_FunctionType__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Type_AbstractType__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Type_AbstractType_msg_init = {
-  &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0],
-  &google_api_expr_v1alpha1_Type_AbstractType__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Decl__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Decl_msg_init = {
-  &google_api_expr_v1alpha1_Decl_submsgs[0],
-  &google_api_expr_v1alpha1_Decl__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pom_1bt_max64b},
-    {0x001800000301001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Constant_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Decl_IdentDecl__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Decl_IdentDecl_msg_init = {
-  &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0],
-  &google_api_expr_v1alpha1_Decl_IdentDecl__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x001800003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init = {
-  &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0],
-  &google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Type_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[6] = {
-  {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init = {
-  &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0],
-  &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000003f00001a, &upb_prs_1bt},
-    {0x0028000001010022, &upb_psm_1bt_max64b},
-    {0x000100003f000028, &upb_psb1_1bt},
-    {0x003000003f000032, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Reference_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Constant_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Reference__fields[3] = {
-  {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Reference_msg_init = {
-  &google_api_expr_v1alpha1_Reference_submsgs[0],
-  &google_api_expr_v1alpha1_Reference__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00001a, &upb_prs_1bt},
-    {0x0020000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[13] = {
-  &google_api_expr_v1alpha1_CheckedExpr_msg_init,
-  &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_msg_init,
-  &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_msg_init,
-  &google_api_expr_v1alpha1_Type_msg_init,
-  &google_api_expr_v1alpha1_Type_ListType_msg_init,
-  &google_api_expr_v1alpha1_Type_MapType_msg_init,
-  &google_api_expr_v1alpha1_Type_FunctionType_msg_init,
-  &google_api_expr_v1alpha1_Type_AbstractType_msg_init,
-  &google_api_expr_v1alpha1_Decl_msg_init,
-  &google_api_expr_v1alpha1_Decl_IdentDecl_msg_init,
-  &google_api_expr_v1alpha1_Decl_FunctionDecl_msg_init,
-  &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msg_init,
-  &google_api_expr_v1alpha1_Reference_msg_init,
-};
-
-const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  13,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c b/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
deleted file mode 100644
index cf60d4f4d6b16..0000000000000
--- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/expr/v1alpha1/syntax.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_SourceInfo_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_ParsedExpr__fields[2] = {
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_ParsedExpr_msg_init = {
-  &google_api_expr_v1alpha1_ParsedExpr_submsgs[0],
-  &google_api_expr_v1alpha1_ParsedExpr__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000012, &upb_psm_1bt_max64b},
-    {0x001000000201001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_submsgs[7] = {
-  {.submsg = &google_api_expr_v1alpha1_Constant_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_Ident_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_Select_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_Call_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_CreateList_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_Comprehension_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr__fields[8] = {
-  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 16), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 16), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 16), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 16), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 16), -1, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 16), -1, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 16), -1, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_msg_init = {
-  &google_api_expr_v1alpha1_Expr_submsgs[0],
-  &google_api_expr_v1alpha1_Expr__fields[0],
-  UPB_SIZE(16, 24), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x001000000300001a, &upb_pom_1bt_max64b},
-    {0x0010000004010022, &upb_pom_1bt_max64b},
-    {0x001000000502002a, &upb_pom_1bt_max64b},
-    {0x0010000006030032, &upb_pom_1bt_max64b},
-    {0x001000000704003a, &upb_pom_1bt_max64b},
-    {0x0010000008050042, &upb_pom_1bt_max64b},
-    {0x001000000906004a, &upb_pom_1bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Ident__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_Ident_msg_init = {
-  NULL,
-  &google_api_expr_v1alpha1_Expr_Ident__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Select_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Select__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_Select_msg_init = {
-  &google_api_expr_v1alpha1_Expr_Select_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_Select__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Call_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Call__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_Call_msg_init = {
-  &google_api_expr_v1alpha1_Expr_Call_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_Call__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f01001a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateList_msg_init = {
-  &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_CreateList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct__fields[2] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateStruct_msg_init = {
-  &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_CreateStruct__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[4] = {
-  {1, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 8), -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 8), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init = {
-  &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0],
-  UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f000008, &upb_psv8_1bt},
-    {0x0008000402000012, &upb_pos_1bt},
-    {0x000800040300001a, &upb_pom_1bt_max64b},
-    {0x0020000001010022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fields[7] = {
-  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 64), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 72), 5, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Expr_Comprehension_msg_init = {
-  &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0],
-  &google_api_expr_v1alpha1_Expr_Comprehension__fields[0],
-  UPB_SIZE(40, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x002000003f00001a, &upb_pss_1bt},
-    {0x0030000002010022, &upb_psm_1bt_max64b},
-    {0x003800000302002a, &upb_psm_1bt_max64b},
-    {0x0040000004030032, &upb_psm_1bt_max64b},
-    {0x004800000504003a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_Constant_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_Constant__fields[9] = {
-  {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 8, -1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, 8, -1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, 8, -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_Constant_msg_init = {
-  &google_api_expr_v1alpha1_Constant_submsgs[0],
-  &google_api_expr_v1alpha1_Constant__fields[0],
-  UPB_SIZE(16, 24), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_pov4_1bt},
-    {0x0008000002000010, &upb_pob1_1bt},
-    {0x0008000003000018, &upb_pov8_1bt},
-    {0x0008000004000020, &upb_pov8_1bt},
-    {0x0008000005000029, &upb_pof8_1bt},
-    {0x0008000006000032, &upb_pos_1bt},
-    {0x000800000700003a, &upb_pob_1bt},
-    {0x0008000008000042, &upb_pom_1bt_maxmaxb},
-    {0x000800000901004a, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[5] = {
-  {1, UPB_SIZE(12, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(0, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 40), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_msg_init = {
-  &google_api_expr_v1alpha1_SourceInfo_submsgs[0],
-  &google_api_expr_v1alpha1_SourceInfo__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_ppv4_1bt},
-  })
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msg_init = {
-  NULL,
-  &google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x001800003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = {
-  {.submsg = &google_api_expr_v1alpha1_Expr_msg_init},
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msg_init = {
-  &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0],
-  &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_api_expr_v1alpha1_SourcePosition__fields[4] = {
-  {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_expr_v1alpha1_SourcePosition_msg_init = {
-  NULL,
-  &google_api_expr_v1alpha1_SourcePosition__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x000800003f000020, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[14] = {
-  &google_api_expr_v1alpha1_ParsedExpr_msg_init,
-  &google_api_expr_v1alpha1_Expr_msg_init,
-  &google_api_expr_v1alpha1_Expr_Ident_msg_init,
-  &google_api_expr_v1alpha1_Expr_Select_msg_init,
-  &google_api_expr_v1alpha1_Expr_Call_msg_init,
-  &google_api_expr_v1alpha1_Expr_CreateList_msg_init,
-  &google_api_expr_v1alpha1_Expr_CreateStruct_msg_init,
-  &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msg_init,
-  &google_api_expr_v1alpha1_Expr_Comprehension_msg_init,
-  &google_api_expr_v1alpha1_Constant_msg_init,
-  &google_api_expr_v1alpha1_SourceInfo_msg_init,
-  &google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msg_init,
-  &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msg_init,
-  &google_api_expr_v1alpha1_SourcePosition_msg_init,
-};
-
-const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  14,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/api/http.upb.c b/src/core/ext/upb-generated/google/api/http.upb.c
deleted file mode 100644
index 1f687da44f99a..0000000000000
--- a/src/core/ext/upb-generated/google/api/http.upb.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/api/http.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_api_Http_submsgs[1] = {
-  {.submsg = &google_api_HttpRule_msg_init},
-};
-
-static const upb_MiniTableField google_api_Http__fields[2] = {
-  {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_Http_msg_init = {
-  &google_api_Http_submsgs[0],
-  &google_api_Http__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max128b},
-    {0x000000003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_api_HttpRule_submsgs[2] = {
-  {.submsg = &google_api_CustomHttpPattern_msg_init},
-  {.submsg = &google_api_HttpRule_msg_init},
-};
-
-static const upb_MiniTableField google_api_HttpRule__fields[10] = {
-  {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_HttpRule_msg_init = {
-  &google_api_HttpRule_submsgs[0],
-  &google_api_HttpRule__fields[0],
-  UPB_SIZE(40, 80), 10, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00000a, &upb_pss_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x000800000300001a, &upb_pos_1bt},
-    {0x0008000004000022, &upb_pos_1bt},
-    {0x000800000500002a, &upb_pos_1bt},
-    {0x0008000006000032, &upb_pos_1bt},
-    {0x002800003f00003a, &upb_pss_1bt},
-    {0x0008000008000042, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f01005a, &upb_prm_1bt_max128b},
-    {0x004000003f000062, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_api_CustomHttpPattern__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_CustomHttpPattern_msg_init = {
-  NULL,
-  &google_api_CustomHttpPattern__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &google_api_Http_msg_init,
-  &google_api_HttpRule_msg_init,
-  &google_api_CustomHttpPattern_msg_init,
-};
-
-const upb_MiniTableFile google_api_http_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/api/http.upb.h b/src/core/ext/upb-generated/google/api/http.upb.h
deleted file mode 100644
index 1060641130063..0000000000000
--- a/src/core/ext/upb-generated/google/api/http.upb.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_API_HTTP_PROTO_UPB_H_
-#define GOOGLE_API_HTTP_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_api_Http google_api_Http;
-typedef struct google_api_HttpRule google_api_HttpRule;
-typedef struct google_api_CustomHttpPattern google_api_CustomHttpPattern;
-extern const upb_MiniTable google_api_Http_msg_init;
-extern const upb_MiniTable google_api_HttpRule_msg_init;
-extern const upb_MiniTable google_api_CustomHttpPattern_msg_init;
-
-
-
-/* google.api.Http */
-
-UPB_INLINE google_api_Http* google_api_Http_new(upb_Arena* arena) {
-  return (google_api_Http*)_upb_Message_New(&google_api_Http_msg_init, arena);
-}
-UPB_INLINE google_api_Http* google_api_Http_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_api_Http* ret = google_api_Http_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_Http_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_api_Http* google_api_Http_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_api_Http* ret = google_api_Http_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_Http_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_api_Http_serialize(const google_api_Http* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_Http_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_api_Http_serialize_ex(const google_api_Http* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_Http_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_api_Http_clear_rules(google_api_Http* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_api_HttpRule* const* google_api_Http_rules(const google_api_Http* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_api_HttpRule* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_api_Http_rules_upb_array(const google_api_Http* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_api_Http_rules_mutable_upb_array(const google_api_Http* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_api_Http_has_rules(const google_api_Http* msg) {
-  size_t size;
-  google_api_Http_rules(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_api_Http_clear_fully_decode_reserved_expansion(google_api_Http* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_api_Http_fully_decode_reserved_expansion(const google_api_Http* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE google_api_HttpRule** google_api_Http_mutable_rules(google_api_Http* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_api_HttpRule**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_api_HttpRule** google_api_Http_resize_rules(google_api_Http* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_api_HttpRule**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_api_HttpRule* google_api_Http_add_rules(google_api_Http* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(0, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_api_HttpRule* sub = (struct google_api_HttpRule*)_upb_Message_New(&google_api_HttpRule_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_api_Http_set_fully_decode_reserved_expansion(google_api_Http *msg, bool value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.api.HttpRule */
-
-UPB_INLINE google_api_HttpRule* google_api_HttpRule_new(upb_Arena* arena) {
-  return (google_api_HttpRule*)_upb_Message_New(&google_api_HttpRule_msg_init, arena);
-}
-UPB_INLINE google_api_HttpRule* google_api_HttpRule_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_api_HttpRule* ret = google_api_HttpRule_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_HttpRule_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_api_HttpRule* google_api_HttpRule_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_api_HttpRule* ret = google_api_HttpRule_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_HttpRule_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_api_HttpRule_serialize(const google_api_HttpRule* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_HttpRule_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_api_HttpRule_serialize_ex(const google_api_HttpRule* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_HttpRule_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  google_api_HttpRule_pattern_get = 2,
-  google_api_HttpRule_pattern_put = 3,
-  google_api_HttpRule_pattern_post = 4,
-  google_api_HttpRule_pattern_delete = 5,
-  google_api_HttpRule_pattern_patch = 6,
-  google_api_HttpRule_pattern_custom = 8,
-  google_api_HttpRule_pattern_NOT_SET = 0
-} google_api_HttpRule_pattern_oneofcases;
-UPB_INLINE google_api_HttpRule_pattern_oneofcases google_api_HttpRule_pattern_case(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (google_api_HttpRule_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_selector(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_selector(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void google_api_HttpRule_clear_get(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_get(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_get(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_put(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_put(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_put(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_post(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_post(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_post(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_delete(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_delete(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_delete(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_patch(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_patch(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_patch(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_body(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_body(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void google_api_HttpRule_clear_custom(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_api_CustomHttpPattern* google_api_HttpRule_custom(const google_api_HttpRule* msg) {
-  const google_api_CustomHttpPattern* default_val = NULL;
-  const google_api_CustomHttpPattern* ret;
-  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_api_HttpRule_has_custom(const google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_api_HttpRule_clear_additional_bindings(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_api_HttpRule* const* google_api_HttpRule_additional_bindings(const google_api_HttpRule* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_api_HttpRule* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_api_HttpRule_additional_bindings_upb_array(const google_api_HttpRule* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_api_HttpRule_additional_bindings_mutable_upb_array(const google_api_HttpRule* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_api_HttpRule_has_additional_bindings(const google_api_HttpRule* msg) {
-  size_t size;
-  google_api_HttpRule_additional_bindings(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_api_HttpRule_clear_response_body(google_api_HttpRule* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_HttpRule_response_body(const google_api_HttpRule* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void google_api_HttpRule_set_selector(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_get(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_put(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_post(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_delete(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {5, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_patch(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_body(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_HttpRule_set_custom(google_api_HttpRule *msg, google_api_CustomHttpPattern* value) {
-  const upb_MiniTableField field = {8, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_api_CustomHttpPattern* google_api_HttpRule_mutable_custom(google_api_HttpRule* msg, upb_Arena* arena) {
-  struct google_api_CustomHttpPattern* sub = (struct google_api_CustomHttpPattern*)google_api_HttpRule_custom(msg);
-  if (sub == NULL) {
-    sub = (struct google_api_CustomHttpPattern*)_upb_Message_New(&google_api_CustomHttpPattern_msg_init, arena);
-    if (sub) google_api_HttpRule_set_custom(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_api_HttpRule** google_api_HttpRule_mutable_additional_bindings(google_api_HttpRule* msg, size_t* size) {
-  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_api_HttpRule**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_api_HttpRule** google_api_HttpRule_resize_additional_bindings(google_api_HttpRule* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_api_HttpRule**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_api_HttpRule* google_api_HttpRule_add_additional_bindings(google_api_HttpRule* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(4, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_api_HttpRule* sub = (struct google_api_HttpRule*)_upb_Message_New(&google_api_HttpRule_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_api_HttpRule_set_response_body(google_api_HttpRule *msg, upb_StringView value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(32, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.api.CustomHttpPattern */
-
-UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_new(upb_Arena* arena) {
-  return (google_api_CustomHttpPattern*)_upb_Message_New(&google_api_CustomHttpPattern_msg_init, arena);
-}
-UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_api_CustomHttpPattern* ret = google_api_CustomHttpPattern_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_CustomHttpPattern_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_api_CustomHttpPattern* google_api_CustomHttpPattern_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_api_CustomHttpPattern* ret = google_api_CustomHttpPattern_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_api_CustomHttpPattern_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_api_CustomHttpPattern_serialize(const google_api_CustomHttpPattern* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_CustomHttpPattern_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_api_CustomHttpPattern_serialize_ex(const google_api_CustomHttpPattern* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_api_CustomHttpPattern_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_api_CustomHttpPattern_clear_kind(google_api_CustomHttpPattern* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_CustomHttpPattern_kind(const google_api_CustomHttpPattern* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void google_api_CustomHttpPattern_clear_path(google_api_CustomHttpPattern* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_api_CustomHttpPattern_path(const google_api_CustomHttpPattern* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void google_api_CustomHttpPattern_set_kind(google_api_CustomHttpPattern *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPattern *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile google_api_http_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_API_HTTP_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/google/api/httpbody.upb.c b/src/core/ext/upb-generated/google/api/httpbody.upb.c
deleted file mode 100644
index 260b3b599c290..0000000000000
--- a/src/core/ext/upb-generated/google/api/httpbody.upb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/httpbody.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/api/httpbody.upb.h"
-#include "google/protobuf/any.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_api_HttpBody_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField google_api_HttpBody__fields[3] = {
-  {1, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(0, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_api_HttpBody_msg_init = {
-  &google_api_HttpBody_submsgs[0],
-  &google_api_HttpBody__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_psb_1bt},
-    {0x002000003f00001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_api_HttpBody_msg_init,
-};
-
-const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/any.upb.c b/src/core/ext/upb-generated/google/protobuf/any.upb.c
deleted file mode 100644
index ec35e6f231a6e..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/any.upb.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/any.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/any.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField google_protobuf_Any__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Any_msg_init = {
-  NULL,
-  &google_protobuf_Any__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_psb_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_protobuf_Any_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
deleted file mode 100644
index 24b4f8a6044af..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+++ /dev/null
@@ -1,1327 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
-  {.submsg = &google_protobuf_FileDescriptorProto_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init = {
-  &google_protobuf_FileDescriptorSet_submsgs[0],
-  &google_protobuf_FileDescriptorSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max192b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[6] = {
-  {.submsg = &google_protobuf_DescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_ServiceDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_FileOptions_msg_init},
-  {.submsg = &google_protobuf_SourceCodeInfo_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
-  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init = {
-  &google_protobuf_FileDescriptorProto_submsgs[0],
-  &google_protobuf_FileDescriptorProto__fields[0],
-  UPB_SIZE(72, 144), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_prs_1bt},
-    {0x003000003f000022, &upb_prm_1bt_max128b},
-    {0x003800003f01002a, &upb_prm_1bt_max64b},
-    {0x004000003f020032, &upb_prm_1bt_max64b},
-    {0x004800003f03003a, &upb_prm_1bt_max128b},
-    {0x0050000003040042, &upb_psm_1bt_max256b},
-    {0x005800000405004a, &upb_psm_1bt_max64b},
-    {0x006000003f000050, &upb_prv4_1bt},
-    {0x006800003f000058, &upb_prv4_1bt},
-    {0x0070000005000062, &upb_pss_1bt},
-    {0x008000000600006a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msg_init},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_MessageOptions_msg_init},
-  {.submsg = &google_protobuf_OneofDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_ReservedRange_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
-  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_msg_init = {
-  &google_protobuf_DescriptorProto_submsgs[0],
-  &google_protobuf_DescriptorProto__fields[0],
-  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x002000003f01001a, &upb_prm_1bt_max128b},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x003000003f03002a, &upb_prm_1bt_max64b},
-    {0x003800003f040032, &upb_prm_1bt_max128b},
-    {0x004000000205003a, &upb_psm_1bt_max64b},
-    {0x004800003f060042, &upb_prm_1bt_max64b},
-    {0x005000003f07004a, &upb_prm_1bt_max64b},
-    {0x005800003f000052, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init = {
-  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
-  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x001000000300001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init = {
-  NULL,
-  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_Declaration_msg_init},
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init = {
-  &google_protobuf_ExtensionRangeOptions_submsgs[0],
-  &google_protobuf_ExtensionRangeOptions__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000002010392, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f023eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init = {
-  NULL,
-  &google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0010000002000012, &upb_pss_1bt},
-    {0x002000000300001a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000004000028, &upb_psb1_1bt},
-    {0x0009000005000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_FieldOptions_msg_init},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
-  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init = {
-  &google_protobuf_FieldDescriptorProto_submsgs[0],
-  &google_protobuf_FieldDescriptorProto__fields[0],
-  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pss_1bt},
-    {0x0028000002000012, &upb_pss_1bt},
-    {0x0004000003000018, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0038000006000032, &upb_pss_1bt},
-    {0x004800000700003a, &upb_pss_1bt},
-    {0x0058000008000042, &upb_psm_1bt_max64b},
-    {0x0010000009000048, &upb_psv4_1bt},
-    {0x006000000a000052, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001400000b000188, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_OneofOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
-  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init = {
-  &google_protobuf_OneofDescriptorProto_submsgs[0],
-  &google_protobuf_OneofDescriptorProto__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_EnumValueDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumOptions_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
-  {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init = {
-  &google_protobuf_EnumDescriptorProto_submsgs[0],
-  &google_protobuf_EnumDescriptorProto__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x003000003f00002a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init = {
-  NULL,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_EnumValueOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init = {
-  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
-  &google_protobuf_EnumValueDescriptorProto__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0004000002000010, &upb_psv4_1bt},
-    {0x001800000300001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
-  {.submsg = &google_protobuf_MethodDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_ServiceOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init = {
-  &google_protobuf_ServiceDescriptorProto_submsgs[0],
-  &google_protobuf_ServiceDescriptorProto__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_MethodOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init = {
-  &google_protobuf_MethodDescriptorProto_submsgs[0],
-  &google_protobuf_MethodDescriptorProto__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x002800000300001a, &upb_pss_1bt},
-    {0x0038000004000022, &upb_psm_1bt_max64b},
-    {0x0001000005000028, &upb_psb1_1bt},
-    {0x0002000006000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileOptions__fields[22] = {
-  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileOptions_msg_init = {
-  &google_protobuf_FileOptions_submsgs[0],
-  &google_protobuf_FileOptions__fields[0],
-  UPB_SIZE(112, 200), 22, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0028000002000042, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000004000050, &upb_psb1_1bt},
-    {0x003800000500005a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0009000006000180, &upb_psb1_2bt},
-    {0x000a000007000188, &upb_psb1_2bt},
-    {0x000b000008000190, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000c0000090001a0, &upb_psb1_2bt},
-    {0x005800000e0002aa, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000d00000a0001b8, &upb_psb1_2bt},
-    {0x00780000100002c2, &upb_pss_2bt},
-    {0x00880000110002ca, &upb_pss_2bt},
-    {0x00100000120002d0, &upb_psb1_2bt},
-    {0x000e00000b0001d8, &upb_psb1_2bt},
-    {0x00980000130002e2, &upb_pss_2bt},
-    {0x00a80000140002ea, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000f00000c0001f8, &upb_psb1_2bt},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MessageOptions_msg_init = {
-  &google_protobuf_MessageOptions_submsgs[0],
-  &google_protobuf_MessageOptions__fields[0],
-  UPB_SIZE(16, 24), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0002000002000010, &upb_psb1_1bt},
-    {0x0003000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000004000038, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0005000005000058, &upb_psb1_1bt},
-    {0x0008000006000062, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = {
-  {.submsg = &google_protobuf_FieldOptions_EditionDefault_msg_init},
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_FieldOptions_CType_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = {
-  {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_msg_init = {
-  &google_protobuf_FieldOptions_submsgs[0],
-  &google_protobuf_FieldOptions__fields[0],
-  UPB_SIZE(40, 56), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000002000010, &upb_psb1_1bt},
-    {0x0009000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000a000004000028, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000006000050, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0011000007000078, &upb_psb1_1bt},
-    {0x0012000008000180, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f0001a2, &upb_prm_2bt_max64b},
-    {0x002800000a0101aa, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003000003f023eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_EditionDefault_msg_init = {
-  NULL,
-  &google_protobuf_FieldOptions_EditionDefault__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofOptions_msg_init = {
-  &google_protobuf_OneofOptions_submsgs[0],
-  &google_protobuf_OneofOptions__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
-  {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumOptions_msg_init = {
-  &google_protobuf_EnumOptions_submsgs[0],
-  &google_protobuf_EnumOptions__fields[0],
-  UPB_SIZE(16, 24), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000010, &upb_psb1_1bt},
-    {0x0002000002000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0003000003000030, &upb_psb1_1bt},
-    {0x000800000400003a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueOptions_msg_init = {
-  &google_protobuf_EnumValueOptions_submsgs[0],
-  &google_protobuf_EnumValueOptions__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0008000002000012, &upb_psm_1bt_max64b},
-    {0x0002000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
-  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceOptions_msg_init = {
-  &google_protobuf_ServiceOptions_submsgs[0],
-  &google_protobuf_ServiceOptions__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000288, &upb_psb1_2bt},
-    {0x0008000002000292, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
-  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodOptions_msg_init = {
-  &google_protobuf_MethodOptions_submsgs[0],
-  &google_protobuf_MethodOptions__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000288, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000300029a, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_NamePart_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_msg_init = {
-  &google_protobuf_UninterpretedOption_submsgs[0],
-  &google_protobuf_UninterpretedOption__fields[0],
-  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x001000000100001a, &upb_pss_1bt},
-    {0x0020000002000020, &upb_psv8_1bt},
-    {0x0028000003000028, &upb_psv8_1bt},
-    {0x0030000004000031, &upb_psf8_1bt},
-    {0x003800000500003a, &upb_psb_1bt},
-    {0x0048000006000042, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init = {
-  NULL,
-  &google_protobuf_UninterpretedOption_NamePart__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0001000002000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[7] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.subenum = &google_protobuf_FeatureSet_FieldPresence_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_EnumType_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_StringFieldValidation_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_JsonFormat_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FeatureSet__fields[7] = {
-  {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FeatureSet_msg_init = {
-  &google_protobuf_FeatureSet_submsgs[0],
-  &google_protobuf_FeatureSet__fields[0],
-  UPB_SIZE(32, 40), 7, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0020000007003eba, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_SourceCodeInfo_Location_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init = {
-  &google_protobuf_SourceCodeInfo_submsgs[0],
-  &google_protobuf_SourceCodeInfo__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init = {
-  NULL,
-  &google_protobuf_SourceCodeInfo_Location__fields[0],
-  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_ppv4_1bt},
-    {0x001000003f000012, &upb_ppv4_1bt},
-    {0x001800000100001a, &upb_pss_1bt},
-    {0x0028000002000022, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f000032, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init = {
-  &google_protobuf_GeneratedCodeInfo_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
-  {.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
-  {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init = {
-  &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
-  UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_ppv4_1bt},
-    {0x0018000001000012, &upb_pss_1bt},
-    {0x0004000002000018, &upb_psv4_1bt},
-    {0x0008000003000020, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[30] = {
-  &google_protobuf_FileDescriptorSet_msg_init,
-  &google_protobuf_FileDescriptorProto_msg_init,
-  &google_protobuf_DescriptorProto_msg_init,
-  &google_protobuf_DescriptorProto_ExtensionRange_msg_init,
-  &google_protobuf_DescriptorProto_ReservedRange_msg_init,
-  &google_protobuf_ExtensionRangeOptions_msg_init,
-  &google_protobuf_ExtensionRangeOptions_Declaration_msg_init,
-  &google_protobuf_FieldDescriptorProto_msg_init,
-  &google_protobuf_OneofDescriptorProto_msg_init,
-  &google_protobuf_EnumDescriptorProto_msg_init,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init,
-  &google_protobuf_EnumValueDescriptorProto_msg_init,
-  &google_protobuf_ServiceDescriptorProto_msg_init,
-  &google_protobuf_MethodDescriptorProto_msg_init,
-  &google_protobuf_FileOptions_msg_init,
-  &google_protobuf_MessageOptions_msg_init,
-  &google_protobuf_FieldOptions_msg_init,
-  &google_protobuf_FieldOptions_EditionDefault_msg_init,
-  &google_protobuf_OneofOptions_msg_init,
-  &google_protobuf_EnumOptions_msg_init,
-  &google_protobuf_EnumValueOptions_msg_init,
-  &google_protobuf_ServiceOptions_msg_init,
-  &google_protobuf_MethodOptions_msg_init,
-  &google_protobuf_UninterpretedOption_msg_init,
-  &google_protobuf_UninterpretedOption_NamePart_msg_init,
-  &google_protobuf_FeatureSet_msg_init,
-  &google_protobuf_SourceCodeInfo_msg_init,
-  &google_protobuf_SourceCodeInfo_Location_msg_init,
-  &google_protobuf_GeneratedCodeInfo_msg_init,
-  &google_protobuf_GeneratedCodeInfo_Annotation_msg_init,
-};
-
-const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
-    64,
-    0,
-    {
-        0x3,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
-    64,
-    0,
-    {
-        0xf,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_StringFieldValidation_enum_init = {
-    64,
-    0,
-    {
-        0xf,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
-    64,
-    0,
-    {
-        0xe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
-    64,
-    0,
-    {
-        0x7fffe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
-    64,
-    0,
-    {
-        0x3ff,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
-    64,
-    0,
-    {
-        0xe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-static const upb_MiniTableEnum *enums_layout[16] = {
-  &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
-  &google_protobuf_FeatureSet_EnumType_enum_init,
-  &google_protobuf_FeatureSet_FieldPresence_enum_init,
-  &google_protobuf_FeatureSet_JsonFormat_enum_init,
-  &google_protobuf_FeatureSet_MessageEncoding_enum_init,
-  &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
-  &google_protobuf_FeatureSet_StringFieldValidation_enum_init,
-  &google_protobuf_FieldDescriptorProto_Label_enum_init,
-  &google_protobuf_FieldDescriptorProto_Type_enum_init,
-  &google_protobuf_FieldOptions_CType_enum_init,
-  &google_protobuf_FieldOptions_JSType_enum_init,
-  &google_protobuf_FieldOptions_OptionRetention_enum_init,
-  &google_protobuf_FieldOptions_OptionTargetType_enum_init,
-  &google_protobuf_FileOptions_OptimizeMode_enum_init,
-  &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
-  &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
-};
-
-const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
-  messages_layout,
-  enums_layout,
-  NULL,
-  30,
-  16,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
deleted file mode 100644
index 80cf72e001f4c..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
+++ /dev/null
@@ -1,6236 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
-typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
-typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
-typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
-typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
-typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
-typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration;
-typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
-typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
-typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
-typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
-typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
-typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
-typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
-typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
-typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault;
-typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
-typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
-typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
-typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
-typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
-typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
-typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
-typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet;
-typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
-typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
-typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
-typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
-extern const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init;
-extern const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init;
-extern const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_EditionDefault_msg_init;
-extern const upb_MiniTable google_protobuf_OneofOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MethodOptions_msg_init;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_msg_init;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init;
-extern const upb_MiniTable google_protobuf_FeatureSet_msg_init;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init;
-
-typedef enum {
-  google_protobuf_ExtensionRangeOptions_DECLARATION = 0,
-  google_protobuf_ExtensionRangeOptions_UNVERIFIED = 1
-} google_protobuf_ExtensionRangeOptions_VerificationState;
-
-typedef enum {
-  google_protobuf_FeatureSet_ENUM_TYPE_UNKNOWN = 0,
-  google_protobuf_FeatureSet_OPEN = 1,
-  google_protobuf_FeatureSet_CLOSED = 2
-} google_protobuf_FeatureSet_EnumType;
-
-typedef enum {
-  google_protobuf_FeatureSet_FIELD_PRESENCE_UNKNOWN = 0,
-  google_protobuf_FeatureSet_EXPLICIT = 1,
-  google_protobuf_FeatureSet_IMPLICIT = 2,
-  google_protobuf_FeatureSet_LEGACY_REQUIRED = 3
-} google_protobuf_FeatureSet_FieldPresence;
-
-typedef enum {
-  google_protobuf_FeatureSet_JSON_FORMAT_UNKNOWN = 0,
-  google_protobuf_FeatureSet_ALLOW = 1,
-  google_protobuf_FeatureSet_LEGACY_BEST_EFFORT = 2
-} google_protobuf_FeatureSet_JsonFormat;
-
-typedef enum {
-  google_protobuf_FeatureSet_MESSAGE_ENCODING_UNKNOWN = 0,
-  google_protobuf_FeatureSet_LENGTH_PREFIXED = 1,
-  google_protobuf_FeatureSet_DELIMITED = 2
-} google_protobuf_FeatureSet_MessageEncoding;
-
-typedef enum {
-  google_protobuf_FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN = 0,
-  google_protobuf_FeatureSet_PACKED = 1,
-  google_protobuf_FeatureSet_EXPANDED = 2
-} google_protobuf_FeatureSet_RepeatedFieldEncoding;
-
-typedef enum {
-  google_protobuf_FeatureSet_STRING_FIELD_VALIDATION_UNKNOWN = 0,
-  google_protobuf_FeatureSet_MANDATORY = 1,
-  google_protobuf_FeatureSet_HINT = 2,
-  google_protobuf_FeatureSet_NONE = 3
-} google_protobuf_FeatureSet_StringFieldValidation;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
-  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
-  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
-} google_protobuf_FieldDescriptorProto_Label;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
-  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
-  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
-  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
-  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
-  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
-  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
-  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
-  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
-  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
-} google_protobuf_FieldDescriptorProto_Type;
-
-typedef enum {
-  google_protobuf_FieldOptions_STRING = 0,
-  google_protobuf_FieldOptions_CORD = 1,
-  google_protobuf_FieldOptions_STRING_PIECE = 2
-} google_protobuf_FieldOptions_CType;
-
-typedef enum {
-  google_protobuf_FieldOptions_JS_NORMAL = 0,
-  google_protobuf_FieldOptions_JS_STRING = 1,
-  google_protobuf_FieldOptions_JS_NUMBER = 2
-} google_protobuf_FieldOptions_JSType;
-
-typedef enum {
-  google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0,
-  google_protobuf_FieldOptions_RETENTION_RUNTIME = 1,
-  google_protobuf_FieldOptions_RETENTION_SOURCE = 2
-} google_protobuf_FieldOptions_OptionRetention;
-
-typedef enum {
-  google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0,
-  google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1,
-  google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2,
-  google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3,
-  google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4,
-  google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5,
-  google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6,
-  google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7,
-  google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8,
-  google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9
-} google_protobuf_FieldOptions_OptionTargetType;
-
-typedef enum {
-  google_protobuf_FileOptions_SPEED = 1,
-  google_protobuf_FileOptions_CODE_SIZE = 2,
-  google_protobuf_FileOptions_LITE_RUNTIME = 3
-} google_protobuf_FileOptions_OptimizeMode;
-
-typedef enum {
-  google_protobuf_GeneratedCodeInfo_Annotation_NONE = 0,
-  google_protobuf_GeneratedCodeInfo_Annotation_SET = 1,
-  google_protobuf_GeneratedCodeInfo_Annotation_ALIAS = 2
-} google_protobuf_GeneratedCodeInfo_Annotation_Semantic;
-
-typedef enum {
-  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
-  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
-  google_protobuf_MethodOptions_IDEMPOTENT = 2
-} google_protobuf_MethodOptions_IdempotencyLevel;
-
-
-extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_StringFieldValidation_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
-extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
-extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
-
-/* google.protobuf.FileDescriptorSet */
-
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google_protobuf_FileDescriptorSet_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorSet_file(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FileDescriptorProto */
-
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_message_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_enum_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_service(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_extension(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
-  const google_protobuf_FileOptions* default_val = NULL;
-  const google_protobuf_FileOptions* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  const google_protobuf_SourceCodeInfo* default_val = NULL;
-  const google_protobuf_SourceCodeInfo* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_public_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_weak_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_ServiceDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msg_init, arena);
-    if (sub) google_protobuf_FileDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msg_init, arena);
-    if (sub) google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.DescriptorProto */
-
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_field(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_nested_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_enum_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_extension_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_extension(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
-  const google_protobuf_MessageOptions* default_val = NULL;
-  const google_protobuf_MessageOptions* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_oneof_decl(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_reserved_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_reserved_name(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msg_init, arena);
-    if (sub) google_protobuf_DescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_OneofDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.DescriptorProto.ExtensionRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const google_protobuf_ExtensionRangeOptions* default_val = NULL;
-  const google_protobuf_ExtensionRangeOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
-  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msg_init, arena);
-    if (sub) google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.DescriptorProto.ReservedRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.ExtensionRangeOptions */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_declaration(const google_protobuf_ExtensionRangeOptions* msg) {
-  size_t size;
-  google_protobuf_ExtensionRangeOptions_declaration(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  size_t size;
-  google_protobuf_ExtensionRangeOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_ExtensionRangeOptions_Declaration* sub = (struct google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_Declaration_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_ExtensionRangeOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.ExtensionRangeOptions.Declaration */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_Declaration_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FieldDescriptorProto */
-
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
-  const google_protobuf_FieldOptions* default_val = NULL;
-  const google_protobuf_FieldOptions* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msg_init, arena);
-    if (sub) google_protobuf_FieldDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.OneofDescriptorProto */
-
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
-  const google_protobuf_OneofOptions* default_val = NULL;
-  const google_protobuf_OneofOptions* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msg_init, arena);
-    if (sub) google_protobuf_OneofDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.EnumDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_value(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
-  const google_protobuf_EnumOptions* default_val = NULL;
-  const google_protobuf_EnumOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_reserved_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_reserved_name(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumValueDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msg_init, arena);
-    if (sub) google_protobuf_EnumDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.EnumValueDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const google_protobuf_EnumValueOptions* default_val = NULL;
-  const google_protobuf_EnumValueOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msg_init, arena);
-    if (sub) google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.ServiceDescriptorProto */
-
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_ServiceDescriptorProto_method(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  const google_protobuf_ServiceOptions* default_val = NULL;
-  const google_protobuf_ServiceOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_MethodDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msg_init, arena);
-    if (sub) google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.MethodDescriptorProto */
-
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
-  const google_protobuf_MethodOptions* default_val = NULL;
-  const google_protobuf_MethodOptions* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msg_init, arena);
-    if (sub) google_protobuf_MethodDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FileOptions */
-
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  bool default_val = true;
-  bool ret;
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  size_t size;
-  google_protobuf_FileOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FileOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.MessageOptions */
-
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MessageOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MessageOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  size_t size;
-  google_protobuf_MessageOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_MessageOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FieldOptions */
-
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_targets(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_targets(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_edition_defaults(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_edition_defaults(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldOptions_EditionDefault* sub = (struct google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google_protobuf_FieldOptions_EditionDefault_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FieldOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FieldOptions.EditionDefault */
-
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google_protobuf_FieldOptions_EditionDefault_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_EditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_EditionDefault_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_EditionDefault_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_EditionDefault_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.OneofOptions */
-
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
-  return (google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  size_t size;
-  google_protobuf_OneofOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_OneofOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.EnumOptions */
-
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  size_t size;
-  google_protobuf_EnumOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_EnumOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.EnumValueOptions */
-
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  size_t size;
-  google_protobuf_EnumValueOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_EnumValueOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.ServiceOptions */
-
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  size_t size;
-  google_protobuf_ServiceOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_ServiceOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.MethodOptions */
-
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  size_t size;
-  google_protobuf_MethodOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_MethodOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.UninterpretedOption */
-
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
-  size_t size;
-  google_protobuf_UninterpretedOption_name(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.UninterpretedOption.NamePart */
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msg_init, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FeatureSet */
-
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* arena) {
-  return (google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FeatureSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FeatureSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FeatureSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FeatureSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_string_field_validation(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_string_field_validation(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_string_field_validation(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_raw_features(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSet_raw_features(const google_protobuf_FeatureSet* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_raw_features(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_string_field_validation(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_raw_features(google_protobuf_FeatureSet *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSet_mutable_raw_features(google_protobuf_FeatureSet* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSet_raw_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FeatureSet_set_raw_features(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo */
-
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msg_init, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_location(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_SourceCodeInfo_Location**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo.Location */
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msg_init, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_path(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_span(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_span(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_leading_detached_comments(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.GeneratedCodeInfo */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_msg_init, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  size_t size;
-  google_protobuf_GeneratedCodeInfo_annotation(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.GeneratedCodeInfo.Annotation */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msg_init, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  size_t size;
-  google_protobuf_GeneratedCodeInfo_Annotation_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
-
-/* Max size 32 is google.protobuf.FileOptions */
-/* Max size 64 is google.protobuf.FileOptions */
-#define _UPB_MAXOPT_SIZE UPB_SIZE(112, 200)
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/duration.upb.c b/src/core/ext/upb-generated/google/protobuf/duration.upb.c
deleted file mode 100644
index 2dbe91757872c..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/duration.upb.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/duration.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/duration.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField google_protobuf_Duration__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Duration_msg_init = {
-  NULL,
-  &google_protobuf_Duration__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_protobuf_Duration_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/empty.upb.c b/src/core/ext/upb-generated/google/protobuf/empty.upb.c
deleted file mode 100644
index d19652be9ec56..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/empty.upb.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/empty.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/empty.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTable google_protobuf_Empty_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_protobuf_Empty_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/empty.upb.h b/src/core/ext/upb-generated/google/protobuf/empty.upb.h
deleted file mode 100644
index 13862d744fa65..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/empty.upb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/empty.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_protobuf_Empty google_protobuf_Empty;
-extern const upb_MiniTable google_protobuf_Empty_msg_init;
-
-
-
-/* google.protobuf.Empty */
-
-UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_new(upb_Arena* arena) {
-  return (google_protobuf_Empty*)_upb_Message_New(&google_protobuf_Empty_msg_init, arena);
-}
-UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_Empty* ret = google_protobuf_Empty_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Empty_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_Empty* google_protobuf_Empty_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_Empty* ret = google_protobuf_Empty_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Empty_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_Empty_serialize(const google_protobuf_Empty* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Empty_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_Empty_serialize_ex(const google_protobuf_Empty* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Empty_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/struct.upb.c b/src/core/ext/upb-generated/google/protobuf/struct.upb.c
deleted file mode 100644
index 1468941fb0049..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/struct.upb.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/struct.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_protobuf_Struct_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_FieldsEntry_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_Struct__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Struct_msg_init = {
-  &google_protobuf_Struct_submsgs[0],
-  &google_protobuf_Struct__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub google_protobuf_Struct_FieldsEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Value_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_Struct_FieldsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Struct_FieldsEntry_msg_init = {
-  &google_protobuf_Struct_FieldsEntry_submsgs[0],
-  &google_protobuf_Struct_FieldsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_Value_submsgs[2] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &google_protobuf_ListValue_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_Value__fields[6] = {
-  {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Value_msg_init = {
-  &google_protobuf_Value_submsgs[0],
-  &google_protobuf_Value__fields[0],
-  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_pov4_1bt},
-    {0x0008000002000011, &upb_pof8_1bt},
-    {0x000800000300001a, &upb_pos_1bt},
-    {0x0008000004000020, &upb_pob1_1bt},
-    {0x000800000500002a, &upb_pom_1bt_max64b},
-    {0x0008000006010032, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ListValue_submsgs[1] = {
-  {.submsg = &google_protobuf_Value_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_ListValue__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ListValue_msg_init = {
-  &google_protobuf_ListValue_submsgs[0],
-  &google_protobuf_ListValue__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &google_protobuf_Struct_msg_init,
-  &google_protobuf_Struct_FieldsEntry_msg_init,
-  &google_protobuf_Value_msg_init,
-  &google_protobuf_ListValue_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/struct.upb.h b/src/core/ext/upb-generated/google/protobuf/struct.upb.h
deleted file mode 100644
index 515bd8e3b43ed..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/struct.upb.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_protobuf_Struct google_protobuf_Struct;
-typedef struct google_protobuf_Struct_FieldsEntry google_protobuf_Struct_FieldsEntry;
-typedef struct google_protobuf_Value google_protobuf_Value;
-typedef struct google_protobuf_ListValue google_protobuf_ListValue;
-extern const upb_MiniTable google_protobuf_Struct_msg_init;
-extern const upb_MiniTable google_protobuf_Struct_FieldsEntry_msg_init;
-extern const upb_MiniTable google_protobuf_Value_msg_init;
-extern const upb_MiniTable google_protobuf_ListValue_msg_init;
-
-typedef enum {
-  google_protobuf_NULL_VALUE = 0
-} google_protobuf_NullValue;
-
-
-
-/* google.protobuf.Struct */
-
-UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_new(upb_Arena* arena) {
-  return (google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
-}
-UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_Struct* ret = google_protobuf_Struct_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Struct_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_Struct* google_protobuf_Struct_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_Struct* ret = google_protobuf_Struct_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Struct_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_Struct_serialize(const google_protobuf_Struct* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Struct_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_Struct_serialize_ex(const google_protobuf_Struct* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Struct_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_Struct_clear_fields(google_protobuf_Struct* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t google_protobuf_Struct_fields_size(const google_protobuf_Struct* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool google_protobuf_Struct_fields_get(const google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value** val) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_next(const google_protobuf_Struct* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter);
-}
-
-UPB_INLINE void google_protobuf_Struct_fields_clear(google_protobuf_Struct* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool google_protobuf_Struct_fields_set(google_protobuf_Struct* msg, upb_StringView key, google_protobuf_Value* val, upb_Arena* a) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool google_protobuf_Struct_fields_delete(google_protobuf_Struct* msg, upb_StringView key) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE google_protobuf_Struct_FieldsEntry* google_protobuf_Struct_fields_nextmutable(google_protobuf_Struct* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (google_protobuf_Struct_FieldsEntry*)_upb_map_next(map, iter);
-}
-
-/* google.protobuf.Struct.FieldsEntry */
-
-UPB_INLINE upb_StringView google_protobuf_Struct_FieldsEntry_key(const google_protobuf_Struct_FieldsEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const google_protobuf_Value* google_protobuf_Struct_FieldsEntry_value(const google_protobuf_Struct_FieldsEntry* msg) {
-  google_protobuf_Value* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Struct_FieldsEntry_has_value(const google_protobuf_Struct_FieldsEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_Struct_FieldsEntry_set_value(google_protobuf_Struct_FieldsEntry *msg, google_protobuf_Value* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(google_protobuf_Value*));
-}
-
-/* google.protobuf.Value */
-
-UPB_INLINE google_protobuf_Value* google_protobuf_Value_new(upb_Arena* arena) {
-  return (google_protobuf_Value*)_upb_Message_New(&google_protobuf_Value_msg_init, arena);
-}
-UPB_INLINE google_protobuf_Value* google_protobuf_Value_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_Value* ret = google_protobuf_Value_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Value_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_Value* google_protobuf_Value_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_Value* ret = google_protobuf_Value_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_Value_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_Value_serialize(const google_protobuf_Value* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Value_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_Value_serialize_ex(const google_protobuf_Value* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_Value_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  google_protobuf_Value_kind_null_value = 1,
-  google_protobuf_Value_kind_number_value = 2,
-  google_protobuf_Value_kind_string_value = 3,
-  google_protobuf_Value_kind_bool_value = 4,
-  google_protobuf_Value_kind_struct_value = 5,
-  google_protobuf_Value_kind_list_value = 6,
-  google_protobuf_Value_kind_NOT_SET = 0
-} google_protobuf_Value_kind_oneofcases;
-UPB_INLINE google_protobuf_Value_kind_oneofcases google_protobuf_Value_kind_case(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return (google_protobuf_Value_kind_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_null_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_Value_null_value(const google_protobuf_Value* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_null_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_number_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double google_protobuf_Value_number_value(const google_protobuf_Value* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_number_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_string_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_Value_string_value(const google_protobuf_Value* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_string_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_bool_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_Value_bool_value(const google_protobuf_Value* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_bool_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_struct_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_Struct* google_protobuf_Value_struct_value(const google_protobuf_Value* msg) {
-  const google_protobuf_Struct* default_val = NULL;
-  const google_protobuf_Struct* ret;
-  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_struct_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_Value_clear_list_value(google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ListValue* google_protobuf_Value_list_value(const google_protobuf_Value* msg) {
-  const google_protobuf_ListValue* default_val = NULL;
-  const google_protobuf_ListValue* ret;
-  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_Value_has_list_value(const google_protobuf_Value* msg) {
-  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_Value_set_null_value(google_protobuf_Value *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 8, -1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_Value_set_number_value(google_protobuf_Value *msg, double value) {
-  const upb_MiniTableField field = {2, 8, -1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_Value_set_string_value(google_protobuf_Value *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_Value_set_bool_value(google_protobuf_Value *msg, bool value) {
-  const upb_MiniTableField field = {4, 8, -1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_Value_set_struct_value(google_protobuf_Value *msg, google_protobuf_Struct* value) {
-  const upb_MiniTableField field = {5, 8, -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_value(google_protobuf_Value* msg, upb_Arena* arena) {
-  struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)google_protobuf_Value_struct_value(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Struct*)_upb_Message_New(&google_protobuf_Struct_msg_init, arena);
-    if (sub) google_protobuf_Value_set_struct_value(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_Value_set_list_value(google_protobuf_Value *msg, google_protobuf_ListValue* value) {
-  const upb_MiniTableField field = {6, 8, -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_ListValue* google_protobuf_Value_mutable_list_value(google_protobuf_Value* msg, upb_Arena* arena) {
-  struct google_protobuf_ListValue* sub = (struct google_protobuf_ListValue*)google_protobuf_Value_list_value(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ListValue*)_upb_Message_New(&google_protobuf_ListValue_msg_init, arena);
-    if (sub) google_protobuf_Value_set_list_value(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.ListValue */
-
-UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_new(upb_Arena* arena) {
-  return (google_protobuf_ListValue*)_upb_Message_New(&google_protobuf_ListValue_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ListValue* ret = google_protobuf_ListValue_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ListValue_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ListValue* google_protobuf_ListValue_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ListValue* ret = google_protobuf_ListValue_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ListValue_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ListValue_serialize(const google_protobuf_ListValue* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ListValue_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ListValue_serialize_ex(const google_protobuf_ListValue* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ListValue_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ListValue_clear_values(google_protobuf_ListValue* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_Value* const* google_protobuf_ListValue_values(const google_protobuf_ListValue* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_Value* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ListValue_values_upb_array(const google_protobuf_ListValue* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ListValue_values_mutable_upb_array(const google_protobuf_ListValue* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ListValue_has_values(const google_protobuf_ListValue* msg) {
-  size_t size;
-  google_protobuf_ListValue_values(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_mutable_values(google_protobuf_ListValue* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_Value**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_Value** google_protobuf_ListValue_resize_values(google_protobuf_ListValue* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_Value**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_Value* google_protobuf_ListValue_add_values(google_protobuf_ListValue* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_Value* sub = (struct google_protobuf_Value*)_upb_Message_New(&google_protobuf_Value_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-extern const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c b/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
deleted file mode 100644
index 8232b8be4e0ed..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/timestamp.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/timestamp.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField google_protobuf_Timestamp__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Timestamp_msg_init = {
-  NULL,
-  &google_protobuf_Timestamp__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv8_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_protobuf_Timestamp_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c b/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
deleted file mode 100644
index 21826cdff5236..0000000000000
--- a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/wrappers.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/wrappers.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField google_protobuf_DoubleValue__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DoubleValue_msg_init = {
-  NULL,
-  &google_protobuf_DoubleValue__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_FloatValue__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FloatValue_msg_init = {
-  NULL,
-  &google_protobuf_FloatValue__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000d, &upb_psf4_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_Int64Value__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Int64Value_msg_init = {
-  NULL,
-  &google_protobuf_Int64Value__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_UInt64Value__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UInt64Value_msg_init = {
-  NULL,
-  &google_protobuf_UInt64Value__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_Int32Value__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_Int32Value_msg_init = {
-  NULL,
-  &google_protobuf_Int32Value__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_UInt32Value__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UInt32Value_msg_init = {
-  NULL,
-  &google_protobuf_UInt32Value__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_BoolValue__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_BoolValue_msg_init = {
-  NULL,
-  &google_protobuf_BoolValue__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_StringValue__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_StringValue_msg_init = {
-  NULL,
-  &google_protobuf_StringValue__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_BytesValue__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_BytesValue_msg_init = {
-  NULL,
-  &google_protobuf_BytesValue__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_psb_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[9] = {
-  &google_protobuf_DoubleValue_msg_init,
-  &google_protobuf_FloatValue_msg_init,
-  &google_protobuf_Int64Value_msg_init,
-  &google_protobuf_UInt64Value_msg_init,
-  &google_protobuf_Int32Value_msg_init,
-  &google_protobuf_UInt32Value_msg_init,
-  &google_protobuf_BoolValue_msg_init,
-  &google_protobuf_StringValue_msg_init,
-  &google_protobuf_BytesValue_msg_init,
-};
-
-const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  9,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/rpc/status.upb.c b/src/core/ext/upb-generated/google/rpc/status.upb.c
deleted file mode 100644
index 517b927e69789..0000000000000
--- a/src/core/ext/upb-generated/google/rpc/status.upb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/rpc/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/rpc/status.upb.h"
-#include "google/protobuf/any.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_rpc_Status_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField google_rpc_Status__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_rpc_Status_msg_init = {
-  &google_rpc_Status_submsgs[0],
-  &google_rpc_Status__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x001800003f00001a, &upb_prm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &google_rpc_Status_msg_init,
-};
-
-const upb_MiniTableFile google_rpc_status_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/google/rpc/status.upb.h b/src/core/ext/upb-generated/google/rpc/status.upb.h
deleted file mode 100644
index 1da71c4bdb1b3..0000000000000
--- a/src/core/ext/upb-generated/google/rpc/status.upb.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/rpc/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_
-#define GOOGLE_RPC_STATUS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_rpc_Status google_rpc_Status;
-extern const upb_MiniTable google_rpc_Status_msg_init;
-struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-
-
-
-/* google.rpc.Status */
-
-UPB_INLINE google_rpc_Status* google_rpc_Status_new(upb_Arena* arena) {
-  return (google_rpc_Status*)_upb_Message_New(&google_rpc_Status_msg_init, arena);
-}
-UPB_INLINE google_rpc_Status* google_rpc_Status_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_rpc_Status* ret = google_rpc_Status_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_rpc_Status_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_rpc_Status* google_rpc_Status_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_rpc_Status* ret = google_rpc_Status_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_rpc_Status_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_rpc_Status_serialize(const google_rpc_Status* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_rpc_Status_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_rpc_Status_serialize_ex(const google_rpc_Status* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_rpc_Status_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_rpc_Status_clear_code(google_rpc_Status* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_rpc_Status_code(const google_rpc_Status* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void google_rpc_Status_clear_message(google_rpc_Status* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_rpc_Status_message(const google_rpc_Status* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void google_rpc_Status_clear_details(google_rpc_Status* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* const* google_rpc_Status_details(const google_rpc_Status* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct google_protobuf_Any* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_rpc_Status_details_upb_array(const google_rpc_Status* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_rpc_Status_details_mutable_upb_array(const google_rpc_Status* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_rpc_Status_has_details(const google_rpc_Status* msg) {
-  size_t size;
-  google_rpc_Status_details(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_rpc_Status_set_code(google_rpc_Status *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_rpc_Status_set_message(google_rpc_Status *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any** google_rpc_Status_mutable_details(google_rpc_Status* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct google_protobuf_Any**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct google_protobuf_Any** google_rpc_Status_resize_details(google_rpc_Status* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct google_protobuf_Any**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_Any* google_rpc_Status_add_details(google_rpc_Status* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-extern const upb_MiniTableFile google_rpc_status_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_RPC_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c b/src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c
deleted file mode 100644
index a0cf1ec30e568..0000000000000
--- a/src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     opencensus/proto/trace/v1/trace_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "opencensus/proto/trace/v1/trace_config.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub opencensus_proto_trace_v1_TraceConfig_submsgs[3] = {
-  {.submsg = &opencensus_proto_trace_v1_ProbabilitySampler_msg_init},
-  {.submsg = &opencensus_proto_trace_v1_ConstantSampler_msg_init},
-  {.submsg = &opencensus_proto_trace_v1_RateLimitingSampler_msg_init},
-};
-
-static const upb_MiniTableField opencensus_proto_trace_v1_TraceConfig__fields[7] = {
-  {1, UPB_SIZE(4, 40), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 40), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable opencensus_proto_trace_v1_TraceConfig_msg_init = {
-  &opencensus_proto_trace_v1_TraceConfig_submsgs[0],
-  &opencensus_proto_trace_v1_TraceConfig__fields[0],
-  UPB_SIZE(40, 48), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002800000100000a, &upb_pom_1bt_max64b},
-    {0x0028000002010012, &upb_pom_1bt_max64b},
-    {0x002800000302001a, &upb_pom_1bt_max64b},
-    {0x000800003f000020, &upb_psv8_1bt},
-    {0x001000003f000028, &upb_psv8_1bt},
-    {0x001800003f000030, &upb_psv8_1bt},
-    {0x002000003f000038, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTableField opencensus_proto_trace_v1_ProbabilitySampler__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable opencensus_proto_trace_v1_ProbabilitySampler_msg_init = {
-  NULL,
-  &opencensus_proto_trace_v1_ProbabilitySampler__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-  })
-};
-
-static const upb_MiniTableField opencensus_proto_trace_v1_ConstantSampler__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable opencensus_proto_trace_v1_ConstantSampler_msg_init = {
-  NULL,
-  &opencensus_proto_trace_v1_ConstantSampler__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableField opencensus_proto_trace_v1_RateLimitingSampler__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable opencensus_proto_trace_v1_RateLimitingSampler_msg_init = {
-  NULL,
-  &opencensus_proto_trace_v1_RateLimitingSampler__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &opencensus_proto_trace_v1_TraceConfig_msg_init,
-  &opencensus_proto_trace_v1_ProbabilitySampler_msg_init,
-  &opencensus_proto_trace_v1_ConstantSampler_msg_init,
-  &opencensus_proto_trace_v1_RateLimitingSampler_msg_init,
-};
-
-const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
deleted file mode 100644
index 8aec86dd1a9aa..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/gcp/altscontext.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/gcp/altscontext.upb.h"
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub grpc_gcp_AltsContext_submsgs[2] = {
-  {.submsg = &grpc_gcp_RpcProtocolVersions_msg_init},
-  {.submsg = &grpc_gcp_AltsContext_PeerAttributesEntry_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_AltsContext__fields[7] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(8, 72), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 80), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_AltsContext_msg_init = {
-  &grpc_gcp_AltsContext_submsgs[0],
-  &grpc_gcp_AltsContext__fields[0],
-  UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x000400003f000018, &upb_psv4_1bt},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x003800003f00002a, &upb_pss_1bt},
-    {0x0048000001000032, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_gcp_AltsContext_PeerAttributesEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_AltsContext_PeerAttributesEntry_msg_init = {
-  NULL,
-  &grpc_gcp_AltsContext_PeerAttributesEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &grpc_gcp_AltsContext_msg_init,
-  &grpc_gcp_AltsContext_PeerAttributesEntry_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
deleted file mode 100644
index 18e2847a67cb7..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/gcp/handshaker.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/gcp/handshaker.upb.h"
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField grpc_gcp_Endpoint__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_Endpoint_msg_init = {
-  NULL,
-  &grpc_gcp_Endpoint__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x000400003f000018, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_Identity_submsgs[1] = {
-  {.submsg = &grpc_gcp_Identity_AttributesEntry_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_Identity__fields[3] = {
-  {1, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 8, -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_Identity_msg_init = {
-  &grpc_gcp_Identity_submsgs[0],
-  &grpc_gcp_Identity__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pos_1bt},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_gcp_Identity_AttributesEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_Identity_AttributesEntry_msg_init = {
-  NULL,
-  &grpc_gcp_Identity_AttributesEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_StartClientHandshakeReq_submsgs[5] = {
-  {.submsg = &grpc_gcp_Identity_msg_init},
-  {.submsg = &grpc_gcp_Identity_msg_init},
-  {.submsg = &grpc_gcp_Endpoint_msg_init},
-  {.submsg = &grpc_gcp_Endpoint_msg_init},
-  {.submsg = &grpc_gcp_RpcProtocolVersions_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = {
-  {1, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(20, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 80), 4, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 8), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_StartClientHandshakeReq_msg_init = {
-  &grpc_gcp_StartClientHandshakeReq_submsgs[0],
-  &grpc_gcp_StartClientHandshakeReq__fields[0],
-  UPB_SIZE(48, 88), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400003f000008, &upb_psv4_1bt},
-    {0x001000003f000012, &upb_prs_1bt},
-    {0x001800003f00001a, &upb_prs_1bt},
-    {0x002000003f000022, &upb_prm_1bt_max64b},
-    {0x002800000101002a, &upb_psm_1bt_max64b},
-    {0x0030000002020032, &upb_psm_1bt_max64b},
-    {0x003800000303003a, &upb_psm_1bt_max64b},
-    {0x004000003f000042, &upb_pss_1bt},
-    {0x005000000404004a, &upb_psm_1bt_maxmaxb},
-    {0x000800003f000050, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_ServerHandshakeParameters_submsgs[1] = {
-  {.submsg = &grpc_gcp_Identity_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_ServerHandshakeParameters__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_ServerHandshakeParameters_msg_init = {
-  &grpc_gcp_ServerHandshakeParameters_submsgs[0],
-  &grpc_gcp_ServerHandshakeParameters__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prs_1bt},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_submsgs[4] = {
-  {.submsg = &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_msg_init},
-  {.submsg = &grpc_gcp_Endpoint_msg_init},
-  {.submsg = &grpc_gcp_Endpoint_msg_init},
-  {.submsg = &grpc_gcp_RpcProtocolVersions_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 2, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_StartServerHandshakeReq_msg_init = {
-  &grpc_gcp_StartServerHandshakeReq_submsgs[0],
-  &grpc_gcp_StartServerHandshakeReq__fields[0],
-  UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f00001a, &upb_psb_1bt},
-    {0x0028000001010022, &upb_psm_1bt_max64b},
-    {0x003000000202002a, &upb_psm_1bt_max64b},
-    {0x0038000003030032, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000038, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = {
-  {.submsg = &grpc_gcp_ServerHandshakeParameters_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_msg_init = {
-  &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0],
-  &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000008, &upb_psv4_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_gcp_NextHandshakeMessageReq__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_NextHandshakeMessageReq_msg_init = {
-  NULL,
-  &grpc_gcp_NextHandshakeMessageReq__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_psb_1bt},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_HandshakerReq_submsgs[3] = {
-  {.submsg = &grpc_gcp_StartClientHandshakeReq_msg_init},
-  {.submsg = &grpc_gcp_StartServerHandshakeReq_msg_init},
-  {.submsg = &grpc_gcp_NextHandshakeMessageReq_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_HandshakerReq__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_HandshakerReq_msg_init = {
-  &grpc_gcp_HandshakerReq_submsgs[0],
-  &grpc_gcp_HandshakerReq__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max128b},
-    {0x0008000002010012, &upb_pom_1bt_max128b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_HandshakerResult_submsgs[3] = {
-  {.submsg = &grpc_gcp_Identity_msg_init},
-  {.submsg = &grpc_gcp_Identity_msg_init},
-  {.submsg = &grpc_gcp_RpcProtocolVersions_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = {
-  {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 40, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 64), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 72), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(20, 4), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_HandshakerResult_msg_init = {
-  &grpc_gcp_HandshakerResult_submsgs[0],
-  &grpc_gcp_HandshakerResult__fields[0],
-  UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_psb_1bt},
-    {0x0038000001000022, &upb_psm_1bt_max64b},
-    {0x004000000201002a, &upb_psm_1bt_max64b},
-    {0x000100003f000030, &upb_psb1_1bt},
-    {0x004800000302003a, &upb_psm_1bt_maxmaxb},
-    {0x000400003f000040, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_gcp_HandshakerStatus__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_HandshakerStatus_msg_init = {
-  NULL,
-  &grpc_gcp_HandshakerStatus__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_gcp_HandshakerResp_submsgs[2] = {
-  {.submsg = &grpc_gcp_HandshakerResult_msg_init},
-  {.submsg = &grpc_gcp_HandshakerStatus_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_HandshakerResp__fields[4] = {
-  {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_HandshakerResp_msg_init = {
-  &grpc_gcp_HandshakerResp_submsgs[0],
-  &grpc_gcp_HandshakerResp__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_psb_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x001800000100001a, &upb_psm_1bt_max128b},
-    {0x0020000002010022, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[12] = {
-  &grpc_gcp_Endpoint_msg_init,
-  &grpc_gcp_Identity_msg_init,
-  &grpc_gcp_Identity_AttributesEntry_msg_init,
-  &grpc_gcp_StartClientHandshakeReq_msg_init,
-  &grpc_gcp_ServerHandshakeParameters_msg_init,
-  &grpc_gcp_StartServerHandshakeReq_msg_init,
-  &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_msg_init,
-  &grpc_gcp_NextHandshakeMessageReq_msg_init,
-  &grpc_gcp_HandshakerReq_msg_init,
-  &grpc_gcp_HandshakerResult_msg_init,
-  &grpc_gcp_HandshakerStatus_msg_init,
-  &grpc_gcp_HandshakerResp_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  12,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
deleted file mode 100644
index 1d17e290818ca..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/gcp/transport_security_common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub grpc_gcp_RpcProtocolVersions_submsgs[2] = {
-  {.submsg = &grpc_gcp_RpcProtocolVersions_Version_msg_init},
-  {.submsg = &grpc_gcp_RpcProtocolVersions_Version_msg_init},
-};
-
-static const upb_MiniTableField grpc_gcp_RpcProtocolVersions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_RpcProtocolVersions_msg_init = {
-  &grpc_gcp_RpcProtocolVersions_submsgs[0],
-  &grpc_gcp_RpcProtocolVersions__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_gcp_RpcProtocolVersions_Version__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_gcp_RpcProtocolVersions_Version_msg_init = {
-  NULL,
-  &grpc_gcp_RpcProtocolVersions_Version__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &grpc_gcp_RpcProtocolVersions_msg_init,
-  &grpc_gcp_RpcProtocolVersions_Version_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c b/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
deleted file mode 100644
index 7c74ff85765e2..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/health/v1/health.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/health/v1/health.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField grpc_health_v1_HealthCheckRequest__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_health_v1_HealthCheckRequest_msg_init = {
-  NULL,
-  &grpc_health_v1_HealthCheckRequest__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField grpc_health_v1_HealthCheckResponse__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_health_v1_HealthCheckResponse_msg_init = {
-  NULL,
-  &grpc_health_v1_HealthCheckResponse__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &grpc_health_v1_HealthCheckRequest_msg_init,
-  &grpc_health_v1_HealthCheckResponse_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c b/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
deleted file mode 100644
index ada09758b56c4..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/lb/v1/load_balancer.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/lb/v1/load_balancer.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub grpc_lb_v1_LoadBalanceRequest_submsgs[2] = {
-  {.submsg = &grpc_lb_v1_InitialLoadBalanceRequest_msg_init},
-  {.submsg = &grpc_lb_v1_ClientStats_msg_init},
-};
-
-static const upb_MiniTableField grpc_lb_v1_LoadBalanceRequest__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_LoadBalanceRequest_msg_init = {
-  &grpc_lb_v1_LoadBalanceRequest_submsgs[0],
-  &grpc_lb_v1_LoadBalanceRequest__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceRequest__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_InitialLoadBalanceRequest_msg_init = {
-  NULL,
-  &grpc_lb_v1_InitialLoadBalanceRequest__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField grpc_lb_v1_ClientStatsPerToken__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_ClientStatsPerToken_msg_init = {
-  NULL,
-  &grpc_lb_v1_ClientStatsPerToken__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lb_v1_ClientStats_submsgs[2] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &grpc_lb_v1_ClientStatsPerToken_msg_init},
-};
-
-static const upb_MiniTableField grpc_lb_v1_ClientStats__fields[6] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(8, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_ClientStats_msg_init = {
-  &grpc_lb_v1_ClientStats_submsgs[0],
-  &grpc_lb_v1_ClientStats__fields[0],
-  UPB_SIZE(48, 56), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000010, &upb_psv8_1bt},
-    {0x001800003f000018, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f000030, &upb_psv8_1bt},
-    {0x002800003f000038, &upb_psv8_1bt},
-    {0x003000003f010042, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lb_v1_LoadBalanceResponse_submsgs[3] = {
-  {.submsg = &grpc_lb_v1_InitialLoadBalanceResponse_msg_init},
-  {.submsg = &grpc_lb_v1_ServerList_msg_init},
-  {.submsg = &grpc_lb_v1_FallbackResponse_msg_init},
-};
-
-static const upb_MiniTableField grpc_lb_v1_LoadBalanceResponse__fields[3] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_LoadBalanceResponse_msg_init = {
-  &grpc_lb_v1_LoadBalanceResponse_submsgs[0],
-  &grpc_lb_v1_LoadBalanceResponse__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-  })
-};
-
-const upb_MiniTable grpc_lb_v1_FallbackResponse_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceResponse__fields[1] = {
-  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_InitialLoadBalanceResponse_msg_init = {
-  &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0],
-  &grpc_lb_v1_InitialLoadBalanceResponse__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lb_v1_ServerList_submsgs[1] = {
-  {.submsg = &grpc_lb_v1_Server_msg_init},
-};
-
-static const upb_MiniTableField grpc_lb_v1_ServerList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_ServerList_msg_init = {
-  &grpc_lb_v1_ServerList_submsgs[0],
-  &grpc_lb_v1_ServerList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField grpc_lb_v1_Server__fields[4] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, 4, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lb_v1_Server_msg_init = {
-  NULL,
-  &grpc_lb_v1_Server__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_psb_1bt},
-    {0x000000003f000010, &upb_psv4_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x000400003f000020, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[9] = {
-  &grpc_lb_v1_LoadBalanceRequest_msg_init,
-  &grpc_lb_v1_InitialLoadBalanceRequest_msg_init,
-  &grpc_lb_v1_ClientStatsPerToken_msg_init,
-  &grpc_lb_v1_ClientStats_msg_init,
-  &grpc_lb_v1_LoadBalanceResponse_msg_init,
-  &grpc_lb_v1_FallbackResponse_msg_init,
-  &grpc_lb_v1_InitialLoadBalanceResponse_msg_init,
-  &grpc_lb_v1_ServerList_msg_init,
-  &grpc_lb_v1_Server_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  9,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c b/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
deleted file mode 100644
index 3c5231498778e..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/lookup/v1/rls.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/lookup/v1/rls.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub grpc_lookup_v1_RouteLookupRequest_submsgs[1] = {
-  {.submsg = &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_msg_init},
-};
-
-static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest__fields[4] = {
-  {3, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(0, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 0), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_RouteLookupRequest_msg_init = {
-  &grpc_lookup_v1_RouteLookupRequest_submsgs[0],
-  &grpc_lookup_v1_RouteLookupRequest__fields[0],
-  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00001a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000028, &upb_psv4_1bt},
-    {0x002000003f000032, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_msg_init = {
-  NULL,
-  &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_RouteLookupResponse__fields[2] = {
-  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_RouteLookupResponse_msg_init = {
-  NULL,
-  &grpc_lookup_v1_RouteLookupResponse__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_pss_1bt},
-    {0x001000003f00001a, &upb_prs_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &grpc_lookup_v1_RouteLookupRequest_msg_init,
-  &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry_msg_init,
-  &grpc_lookup_v1_RouteLookupResponse_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c b/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c
deleted file mode 100644
index 9ef5f59f3cf69..0000000000000
--- a/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     src/proto/grpc/lookup/v1/rls_config.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "src/proto/grpc/lookup/v1/rls_config.upb.h"
-#include "google/protobuf/duration.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField grpc_lookup_v1_NameMatcher__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(0, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_NameMatcher_msg_init = {
-  NULL,
-  &grpc_lookup_v1_NameMatcher__fields[0],
-  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prs_1bt},
-    {0x000000003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = {
-  {.submsg = &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init},
-  {.submsg = &grpc_lookup_v1_NameMatcher_msg_init},
-  {.submsg = &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init},
-  {.submsg = &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_msg_init},
-};
-
-static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 0, 3, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_msg_init = {
-  &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0],
-  &grpc_lookup_v1_GrpcKeyBuilder__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x001800000102001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_Name__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init = {
-  NULL,
-  &grpc_lookup_v1_GrpcKeyBuilder_Name__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[3] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init = {
-  NULL,
-  &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000003f00001a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_msg_init = {
-  NULL,
-  &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = {
-  {.submsg = &grpc_lookup_v1_NameMatcher_msg_init},
-  {.submsg = &grpc_lookup_v1_NameMatcher_msg_init},
-  {.submsg = &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_msg_init},
-};
-
-static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder__fields[5] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_HttpKeyBuilder_msg_init = {
-  &grpc_lookup_v1_HttpKeyBuilder_submsgs[0],
-  &grpc_lookup_v1_HttpKeyBuilder__fields[0],
-  UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prs_1bt},
-    {0x000800003f000012, &upb_prs_1bt},
-    {0x001000003f00001a, &upb_prm_1bt_max64b},
-    {0x001800003f010022, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_msg_init = {
-  NULL,
-  &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lookup_v1_RouteLookupConfig_submsgs[5] = {
-  {.submsg = &grpc_lookup_v1_HttpKeyBuilder_msg_init},
-  {.submsg = &grpc_lookup_v1_GrpcKeyBuilder_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField grpc_lookup_v1_RouteLookupConfig__fields[9] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 2, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(48, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_RouteLookupConfig_msg_init = {
-  &grpc_lookup_v1_RouteLookupConfig_submsgs[0],
-  &grpc_lookup_v1_RouteLookupConfig__fields[0],
-  UPB_SIZE(56, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_max64b},
-    {0x001000003f010012, &upb_prm_1bt_max64b},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x0028000001020022, &upb_psm_1bt_maxmaxb},
-    {0x003000000203002a, &upb_psm_1bt_maxmaxb},
-    {0x0038000003040032, &upb_psm_1bt_maxmaxb},
-    {0x004000003f000038, &upb_psv8_1bt},
-    {0x004800003f000042, &upb_prs_1bt},
-    {0x005000003f00004a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = {
-  {.submsg = &grpc_lookup_v1_RouteLookupConfig_msg_init},
-};
-
-static const upb_MiniTableField grpc_lookup_v1_RouteLookupClusterSpecifier__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init = {
-  &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0],
-  &grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[9] = {
-  &grpc_lookup_v1_NameMatcher_msg_init,
-  &grpc_lookup_v1_GrpcKeyBuilder_msg_init,
-  &grpc_lookup_v1_GrpcKeyBuilder_Name_msg_init,
-  &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_msg_init,
-  &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry_msg_init,
-  &grpc_lookup_v1_HttpKeyBuilder_msg_init,
-  &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry_msg_init,
-  &grpc_lookup_v1_RouteLookupConfig_msg_init,
-  &grpc_lookup_v1_RouteLookupClusterSpecifier_msg_init,
-};
-
-const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  9,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
deleted file mode 100644
index de34a1dee989a..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField udpa_annotations_MigrateAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_MigrateAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_MigrateAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField udpa_annotations_FieldMigrateAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_FieldMigrateAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_FieldMigrateAnnotation__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField udpa_annotations_FileMigrateAnnotation__fields[1] = {
-  {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_FileMigrateAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_FileMigrateAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &udpa_annotations_MigrateAnnotation_msg_init,
-  &udpa_annotations_FieldMigrateAnnotation_msg_init,
-  &udpa_annotations_FileMigrateAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable udpa_annotations_FieldMigrateAnnotation_msg_init;
-extern const upb_MiniTable udpa_annotations_FileMigrateAnnotation_msg_init;
-extern const upb_MiniTable udpa_annotations_MigrateAnnotation_msg_init;
-const upb_MiniTableExtension udpa_annotations_message_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = &udpa_annotations_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension udpa_annotations_field_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &udpa_annotations_FieldMigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumOptions_msg_init,
-  {.submsg = &udpa_annotations_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
-  {.submsg = &udpa_annotations_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension udpa_annotations_file_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FileOptions_msg_init,
-  {.submsg = &udpa_annotations_FileMigrateAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[5] = {
-  &udpa_annotations_message_migrate_ext,
-  &udpa_annotations_field_migrate_ext,
-  &udpa_annotations_enum_migrate_ext,
-  &udpa_annotations_enum_value_migrate_ext,
-  &udpa_annotations_file_migrate_ext,
-};
-
-const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  3,
-  0,
-  5,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
deleted file mode 100644
index 33f040b1bb8d6..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct udpa_annotations_MigrateAnnotation udpa_annotations_MigrateAnnotation;
-typedef struct udpa_annotations_FieldMigrateAnnotation udpa_annotations_FieldMigrateAnnotation;
-typedef struct udpa_annotations_FileMigrateAnnotation udpa_annotations_FileMigrateAnnotation;
-extern const upb_MiniTable udpa_annotations_MigrateAnnotation_msg_init;
-extern const upb_MiniTable udpa_annotations_FieldMigrateAnnotation_msg_init;
-extern const upb_MiniTable udpa_annotations_FileMigrateAnnotation_msg_init;
-extern const upb_MiniTableExtension udpa_annotations_message_migrate_ext;
-extern const upb_MiniTableExtension udpa_annotations_field_migrate_ext;
-extern const upb_MiniTableExtension udpa_annotations_enum_migrate_ext;
-extern const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext;
-extern const upb_MiniTableExtension udpa_annotations_file_migrate_ext;
-struct google_protobuf_EnumOptions;
-struct google_protobuf_EnumValueOptions;
-struct google_protobuf_FieldOptions;
-struct google_protobuf_FileOptions;
-struct google_protobuf_MessageOptions;
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-
-
-
-/* udpa.annotations.MigrateAnnotation */
-
-UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa_annotations_MigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_MigrateAnnotation* ret = udpa_annotations_MigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_MigrateAnnotation* udpa_annotations_MigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_MigrateAnnotation* ret = udpa_annotations_MigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_MigrateAnnotation_serialize(const udpa_annotations_MigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_MigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_MigrateAnnotation_serialize_ex(const udpa_annotations_MigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_MigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_MigrateAnnotation_clear_rename(udpa_annotations_MigrateAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView udpa_annotations_MigrateAnnotation_rename(const udpa_annotations_MigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_MigrateAnnotation_set_rename(udpa_annotations_MigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* udpa.annotations.FieldMigrateAnnotation */
-
-UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_FieldMigrateAnnotation*)_upb_Message_New(&udpa_annotations_FieldMigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_FieldMigrateAnnotation* ret = udpa_annotations_FieldMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_FieldMigrateAnnotation* udpa_annotations_FieldMigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_FieldMigrateAnnotation* ret = udpa_annotations_FieldMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_FieldMigrateAnnotation_serialize(const udpa_annotations_FieldMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FieldMigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_FieldMigrateAnnotation_serialize_ex(const udpa_annotations_FieldMigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FieldMigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_clear_rename(udpa_annotations_FieldMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_rename(const udpa_annotations_FieldMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_clear_oneof_promotion(udpa_annotations_FieldMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_oneof_promotion(const udpa_annotations_FieldMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_rename(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_oneof_promotion(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* udpa.annotations.FileMigrateAnnotation */
-
-UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_FileMigrateAnnotation*)_upb_Message_New(&udpa_annotations_FileMigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_FileMigrateAnnotation* ret = udpa_annotations_FileMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_FileMigrateAnnotation* udpa_annotations_FileMigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_FileMigrateAnnotation* ret = udpa_annotations_FileMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_FileMigrateAnnotation_serialize(const udpa_annotations_FileMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FileMigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_FileMigrateAnnotation_serialize_ex(const udpa_annotations_FileMigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FileMigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_FileMigrateAnnotation_clear_move_to_package(udpa_annotations_FileMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView udpa_annotations_FileMigrateAnnotation_move_to_package(const udpa_annotations_FileMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_FileMigrateAnnotation_set_move_to_package(udpa_annotations_FileMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool udpa_annotations_has_message_migrate(const struct google_protobuf_MessageOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_message_migrate_ext);
-}
-UPB_INLINE void udpa_annotations_clear_message_migrate(struct google_protobuf_MessageOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_message_migrate_ext);
-}
-UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_message_migrate(const struct google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_MigrateAnnotation* default_val = NULL;
-  const udpa_annotations_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_MessageOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool udpa_annotations_has_field_migrate(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_field_migrate_ext);
-}
-UPB_INLINE void udpa_annotations_clear_field_migrate(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_field_migrate_ext);
-}
-UPB_INLINE const udpa_annotations_FieldMigrateAnnotation* udpa_annotations_field_migrate(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_FieldMigrateAnnotation* default_val = NULL;
-  const udpa_annotations_FieldMigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldOptions* msg, const udpa_annotations_FieldMigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool udpa_annotations_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_enum_migrate_ext);
-}
-UPB_INLINE void udpa_annotations_clear_enum_migrate(struct google_protobuf_EnumOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_enum_migrate_ext);
-}
-UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_MigrateAnnotation* default_val = NULL;
-  const udpa_annotations_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool udpa_annotations_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_enum_value_migrate_ext);
-}
-UPB_INLINE void udpa_annotations_clear_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_enum_value_migrate_ext);
-}
-UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_MigrateAnnotation* default_val = NULL;
-  const udpa_annotations_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, const udpa_annotations_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool udpa_annotations_has_file_migrate(const struct google_protobuf_FileOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_file_migrate_ext);
-}
-UPB_INLINE void udpa_annotations_clear_file_migrate(struct google_protobuf_FileOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_file_migrate_ext);
-}
-UPB_INLINE const udpa_annotations_FileMigrateAnnotation* udpa_annotations_file_migrate(const struct google_protobuf_FileOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_FileMigrateAnnotation* default_val = NULL;
-  const udpa_annotations_FileMigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOptions* msg, const udpa_annotations_FileMigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/udpa/annotations/security.upb.c b/src/core/ext/upb-generated/udpa/annotations/security.upb.c
deleted file mode 100644
index 90b3dfc5e71c2..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/security.upb.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField udpa_annotations_FieldSecurityAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_FieldSecurityAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_FieldSecurityAnnotation__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &udpa_annotations_FieldSecurityAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable udpa_annotations_FieldSecurityAnnotation_msg_init;
-const upb_MiniTableExtension udpa_annotations_security_ext = {
-  {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &udpa_annotations_FieldSecurityAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &udpa_annotations_security_ext,
-};
-
-const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/security.upb.h b/src/core/ext/upb-generated/udpa/annotations/security.upb.h
deleted file mode 100644
index 907be461bc619..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/security.upb.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct udpa_annotations_FieldSecurityAnnotation udpa_annotations_FieldSecurityAnnotation;
-extern const upb_MiniTable udpa_annotations_FieldSecurityAnnotation_msg_init;
-extern const upb_MiniTableExtension udpa_annotations_security_ext;
-struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-
-
-
-/* udpa.annotations.FieldSecurityAnnotation */
-
-UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_FieldSecurityAnnotation*)_upb_Message_New(&udpa_annotations_FieldSecurityAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_FieldSecurityAnnotation* ret = udpa_annotations_FieldSecurityAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_FieldSecurityAnnotation* udpa_annotations_FieldSecurityAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_FieldSecurityAnnotation* ret = udpa_annotations_FieldSecurityAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_FieldSecurityAnnotation_serialize(const udpa_annotations_FieldSecurityAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FieldSecurityAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_FieldSecurityAnnotation_serialize_ex(const udpa_annotations_FieldSecurityAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_FieldSecurityAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_clear_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted_downstream(const udpa_annotations_FieldSecurityAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_clear_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation* msg) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted_upstream(const udpa_annotations_FieldSecurityAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool udpa_annotations_has_security(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_security_ext);
-}
-UPB_INLINE void udpa_annotations_clear_security(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_security_ext);
-}
-UPB_INLINE const udpa_annotations_FieldSecurityAnnotation* udpa_annotations_security(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_FieldSecurityAnnotation* default_val = NULL;
-  const udpa_annotations_FieldSecurityAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOptions* msg, const udpa_annotations_FieldSecurityAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
deleted file mode 100644
index 3faf26298bfef..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "udpa/annotations/sensitive.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-const upb_MiniTableExtension udpa_annotations_sensitive_ext = {
-  {76569463, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = NULL},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &udpa_annotations_sensitive_ext,
-};
-
-const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  extensions_layout,
-  0,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
deleted file mode 100644
index b67ff2ff22971..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const upb_MiniTableExtension udpa_annotations_sensitive_ext;
-struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-
-
-UPB_INLINE bool udpa_annotations_has_sensitive(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_sensitive_ext);
-}
-UPB_INLINE void udpa_annotations_clear_sensitive(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_sensitive_ext);
-}
-UPB_INLINE bool udpa_annotations_sensitive(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_sensitive_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
-  bool default_val = false;
-  bool ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptions* msg, bool val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_sensitive_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/udpa/annotations/status.upb.c b/src/core/ext/upb-generated/udpa/annotations/status.upb.c
deleted file mode 100644
index 4c1e902e8743b..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/status.upb.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "udpa/annotations/status.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField udpa_annotations_StatusAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_StatusAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_StatusAnnotation__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &udpa_annotations_StatusAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable udpa_annotations_StatusAnnotation_msg_init;
-const upb_MiniTableExtension udpa_annotations_file_status_ext = {
-  {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FileOptions_msg_init,
-  {.submsg = &udpa_annotations_StatusAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &udpa_annotations_file_status_ext,
-};
-
-const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/status.upb.h b/src/core/ext/upb-generated/udpa/annotations/status.upb.h
deleted file mode 100644
index acb9c449b21af..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/status.upb.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct udpa_annotations_StatusAnnotation udpa_annotations_StatusAnnotation;
-extern const upb_MiniTable udpa_annotations_StatusAnnotation_msg_init;
-extern const upb_MiniTableExtension udpa_annotations_file_status_ext;
-struct google_protobuf_FileOptions;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-
-typedef enum {
-  udpa_annotations_UNKNOWN = 0,
-  udpa_annotations_FROZEN = 1,
-  udpa_annotations_ACTIVE = 2,
-  udpa_annotations_NEXT_MAJOR_VERSION_CANDIDATE = 3
-} udpa_annotations_PackageVersionStatus;
-
-
-
-/* udpa.annotations.StatusAnnotation */
-
-UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_StatusAnnotation*)_upb_Message_New(&udpa_annotations_StatusAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_StatusAnnotation* ret = udpa_annotations_StatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_StatusAnnotation* udpa_annotations_StatusAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_StatusAnnotation* ret = udpa_annotations_StatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_StatusAnnotation_serialize(const udpa_annotations_StatusAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_StatusAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_StatusAnnotation_serialize_ex(const udpa_annotations_StatusAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_StatusAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_StatusAnnotation_clear_work_in_progress(udpa_annotations_StatusAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool udpa_annotations_StatusAnnotation_work_in_progress(const udpa_annotations_StatusAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_StatusAnnotation_clear_package_version_status(udpa_annotations_StatusAnnotation* msg) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t udpa_annotations_StatusAnnotation_package_version_status(const udpa_annotations_StatusAnnotation* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_StatusAnnotation_set_work_in_progress(udpa_annotations_StatusAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void udpa_annotations_StatusAnnotation_set_package_version_status(udpa_annotations_StatusAnnotation *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool udpa_annotations_has_file_status(const struct google_protobuf_FileOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_file_status_ext);
-}
-UPB_INLINE void udpa_annotations_clear_file_status(struct google_protobuf_FileOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_file_status_ext);
-}
-UPB_INLINE const udpa_annotations_StatusAnnotation* udpa_annotations_file_status(const struct google_protobuf_FileOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_StatusAnnotation* default_val = NULL;
-  const udpa_annotations_StatusAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOptions* msg, const udpa_annotations_StatusAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
deleted file mode 100644
index 14b5e306f8bb9..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField udpa_annotations_VersioningAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable udpa_annotations_VersioningAnnotation_msg_init = {
-  NULL,
-  &udpa_annotations_VersioningAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &udpa_annotations_VersioningAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable udpa_annotations_VersioningAnnotation_msg_init;
-const upb_MiniTableExtension udpa_annotations_versioning_ext = {
-  {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = &udpa_annotations_VersioningAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &udpa_annotations_versioning_ext,
-};
-
-const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
deleted file mode 100644
index bf466cfbae03a..0000000000000
--- a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct udpa_annotations_VersioningAnnotation udpa_annotations_VersioningAnnotation;
-extern const upb_MiniTable udpa_annotations_VersioningAnnotation_msg_init;
-extern const upb_MiniTableExtension udpa_annotations_versioning_ext;
-struct google_protobuf_MessageOptions;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-
-
-
-/* udpa.annotations.VersioningAnnotation */
-
-UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_new(upb_Arena* arena) {
-  return (udpa_annotations_VersioningAnnotation*)_upb_Message_New(&udpa_annotations_VersioningAnnotation_msg_init, arena);
-}
-UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  udpa_annotations_VersioningAnnotation* ret = udpa_annotations_VersioningAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE udpa_annotations_VersioningAnnotation* udpa_annotations_VersioningAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  udpa_annotations_VersioningAnnotation* ret = udpa_annotations_VersioningAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* udpa_annotations_VersioningAnnotation_serialize(const udpa_annotations_VersioningAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_VersioningAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* udpa_annotations_VersioningAnnotation_serialize_ex(const udpa_annotations_VersioningAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &udpa_annotations_VersioningAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void udpa_annotations_VersioningAnnotation_clear_previous_message_type(udpa_annotations_VersioningAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView udpa_annotations_VersioningAnnotation_previous_message_type(const udpa_annotations_VersioningAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void udpa_annotations_VersioningAnnotation_set_previous_message_type(udpa_annotations_VersioningAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool udpa_annotations_has_versioning(const struct google_protobuf_MessageOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &udpa_annotations_versioning_ext);
-}
-UPB_INLINE void udpa_annotations_clear_versioning(struct google_protobuf_MessageOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &udpa_annotations_versioning_ext);
-}
-UPB_INLINE const udpa_annotations_VersioningAnnotation* udpa_annotations_versioning(const struct google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const udpa_annotations_VersioningAnnotation* default_val = NULL;
-  const udpa_annotations_VersioningAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOptions* msg, const udpa_annotations_VersioningAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/validate/validate.upb.c b/src/core/ext/upb-generated/validate/validate.upb.c
deleted file mode 100644
index c2a19de697b02..0000000000000
--- a/src/core/ext/upb-generated/validate/validate.upb.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     validate/validate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "validate/validate.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub validate_FieldRules_submsgs[22] = {
-  {.submsg = &validate_FloatRules_msg_init},
-  {.submsg = &validate_DoubleRules_msg_init},
-  {.submsg = &validate_Int32Rules_msg_init},
-  {.submsg = &validate_Int64Rules_msg_init},
-  {.submsg = &validate_UInt32Rules_msg_init},
-  {.submsg = &validate_UInt64Rules_msg_init},
-  {.submsg = &validate_SInt32Rules_msg_init},
-  {.submsg = &validate_SInt64Rules_msg_init},
-  {.submsg = &validate_Fixed32Rules_msg_init},
-  {.submsg = &validate_Fixed64Rules_msg_init},
-  {.submsg = &validate_SFixed32Rules_msg_init},
-  {.submsg = &validate_SFixed64Rules_msg_init},
-  {.submsg = &validate_BoolRules_msg_init},
-  {.submsg = &validate_StringRules_msg_init},
-  {.submsg = &validate_BytesRules_msg_init},
-  {.submsg = &validate_EnumRules_msg_init},
-  {.submsg = &validate_MessageRules_msg_init},
-  {.submsg = &validate_RepeatedRules_msg_init},
-  {.submsg = &validate_MapRules_msg_init},
-  {.submsg = &validate_AnyRules_msg_init},
-  {.submsg = &validate_DurationRules_msg_init},
-  {.submsg = &validate_TimestampRules_msg_init},
-};
-
-static const upb_MiniTableField validate_FieldRules__fields[22] = {
-  {1, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(4, 8), 1, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_FieldRules_msg_init = {
-  &validate_FieldRules_submsgs[0],
-  &validate_FieldRules__fields[0],
-  UPB_SIZE(16, 24), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040100000a, &upb_pom_1bt_max64b},
-    {0x0010000402010012, &upb_pom_1bt_max128b},
-    {0x001000040302001a, &upb_pom_1bt_max64b},
-    {0x0010000404030022, &upb_pom_1bt_max128b},
-    {0x001000040504002a, &upb_pom_1bt_max64b},
-    {0x0010000406050032, &upb_pom_1bt_max128b},
-    {0x001000040706003a, &upb_pom_1bt_max64b},
-    {0x0010000408070042, &upb_pom_1bt_max128b},
-    {0x001000040908004a, &upb_pom_1bt_max64b},
-    {0x001000040a090052, &upb_pom_1bt_max128b},
-    {0x001000040b0a005a, &upb_pom_1bt_max64b},
-    {0x001000040c0b0062, &upb_pom_1bt_max128b},
-    {0x001000040d0c006a, &upb_pom_1bt_max64b},
-    {0x001000040e0d0072, &upb_pom_1bt_max192b},
-    {0x001000040f0e007a, &upb_pom_1bt_max192b},
-    {0x00100004100f0182, &upb_pom_2bt_max64b},
-    {0x000800000110018a, &upb_psm_2bt_max64b},
-    {0x0010000412110192, &upb_pom_2bt_max64b},
-    {0x001000041312019a, &upb_pom_2bt_max64b},
-    {0x00100004141301a2, &upb_pom_2bt_max64b},
-    {0x00100004151401aa, &upb_pom_2bt_max128b},
-    {0x00100004161501b2, &upb_pom_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_FloatRules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_FloatRules_msg_init = {
-  NULL,
-  &validate_FloatRules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400000100000d, &upb_psf4_1bt},
-    {0x0008000002000015, &upb_psf4_1bt},
-    {0x000c00000300001d, &upb_psf4_1bt},
-    {0x0010000004000025, &upb_psf4_1bt},
-    {0x001400000500002d, &upb_psf4_1bt},
-    {0x002000003f000035, &upb_prf4_1bt},
-    {0x002800003f00003d, &upb_prf4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_DoubleRules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_DoubleRules_msg_init = {
-  NULL,
-  &validate_DoubleRules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000009, &upb_psf8_1bt},
-    {0x0010000002000011, &upb_psf8_1bt},
-    {0x0018000003000019, &upb_psf8_1bt},
-    {0x0020000004000021, &upb_psf8_1bt},
-    {0x0028000005000029, &upb_psf8_1bt},
-    {0x003000003f000031, &upb_prf8_1bt},
-    {0x003800003f000039, &upb_prf8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_Int32Rules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_Int32Rules_msg_init = {
-  NULL,
-  &validate_Int32Rules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x000c000003000018, &upb_psv4_1bt},
-    {0x0010000004000020, &upb_psv4_1bt},
-    {0x0014000005000028, &upb_psv4_1bt},
-    {0x002000003f000030, &upb_prv4_1bt},
-    {0x002800003f000038, &upb_prv4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_Int64Rules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_Int64Rules_msg_init = {
-  NULL,
-  &validate_Int64Rules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_psv8_1bt},
-    {0x0010000002000010, &upb_psv8_1bt},
-    {0x0018000003000018, &upb_psv8_1bt},
-    {0x0020000004000020, &upb_psv8_1bt},
-    {0x0028000005000028, &upb_psv8_1bt},
-    {0x003000003f000030, &upb_prv8_1bt},
-    {0x003800003f000038, &upb_prv8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_UInt32Rules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_UInt32Rules_msg_init = {
-  NULL,
-  &validate_UInt32Rules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x000c000003000018, &upb_psv4_1bt},
-    {0x0010000004000020, &upb_psv4_1bt},
-    {0x0014000005000028, &upb_psv4_1bt},
-    {0x002000003f000030, &upb_prv4_1bt},
-    {0x002800003f000038, &upb_prv4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_UInt64Rules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_UInt64Rules_msg_init = {
-  NULL,
-  &validate_UInt64Rules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_psv8_1bt},
-    {0x0010000002000010, &upb_psv8_1bt},
-    {0x0018000003000018, &upb_psv8_1bt},
-    {0x0020000004000020, &upb_psv8_1bt},
-    {0x0028000005000028, &upb_psv8_1bt},
-    {0x003000003f000030, &upb_prv8_1bt},
-    {0x003800003f000038, &upb_prv8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_SInt32Rules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_SInt32Rules_msg_init = {
-  NULL,
-  &validate_SInt32Rules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psz4_1bt},
-    {0x0008000002000010, &upb_psz4_1bt},
-    {0x000c000003000018, &upb_psz4_1bt},
-    {0x0010000004000020, &upb_psz4_1bt},
-    {0x0014000005000028, &upb_psz4_1bt},
-    {0x002000003f000030, &upb_prz4_1bt},
-    {0x002800003f000038, &upb_prz4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_SInt64Rules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_SInt64Rules_msg_init = {
-  NULL,
-  &validate_SInt64Rules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_psz8_1bt},
-    {0x0010000002000010, &upb_psz8_1bt},
-    {0x0018000003000018, &upb_psz8_1bt},
-    {0x0020000004000020, &upb_psz8_1bt},
-    {0x0028000005000028, &upb_psz8_1bt},
-    {0x003000003f000030, &upb_prz8_1bt},
-    {0x003800003f000038, &upb_prz8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_Fixed32Rules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_Fixed32Rules_msg_init = {
-  NULL,
-  &validate_Fixed32Rules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400000100000d, &upb_psf4_1bt},
-    {0x0008000002000015, &upb_psf4_1bt},
-    {0x000c00000300001d, &upb_psf4_1bt},
-    {0x0010000004000025, &upb_psf4_1bt},
-    {0x001400000500002d, &upb_psf4_1bt},
-    {0x002000003f000035, &upb_prf4_1bt},
-    {0x002800003f00003d, &upb_prf4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_Fixed64Rules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_Fixed64Rules_msg_init = {
-  NULL,
-  &validate_Fixed64Rules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000009, &upb_psf8_1bt},
-    {0x0010000002000011, &upb_psf8_1bt},
-    {0x0018000003000019, &upb_psf8_1bt},
-    {0x0020000004000021, &upb_psf8_1bt},
-    {0x0028000005000029, &upb_psf8_1bt},
-    {0x003000003f000031, &upb_prf8_1bt},
-    {0x003800003f000039, &upb_prf8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_SFixed32Rules__fields[8] = {
-  {1, 4, 1, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(24, 32), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(28, 40), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(32, 24), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_SFixed32Rules_msg_init = {
-  NULL,
-  &validate_SFixed32Rules__fields[0],
-  UPB_SIZE(40, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000400000100000d, &upb_psf4_1bt},
-    {0x0008000002000015, &upb_psf4_1bt},
-    {0x000c00000300001d, &upb_psf4_1bt},
-    {0x0010000004000025, &upb_psf4_1bt},
-    {0x001400000500002d, &upb_psf4_1bt},
-    {0x002000003f000035, &upb_prf4_1bt},
-    {0x002800003f00003d, &upb_prf4_1bt},
-    {0x0018000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_SFixed64Rules__fields[8] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 24), 3, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(40, 32), 4, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(48, 40), 5, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(4, 48), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(8, 56), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(12, 1), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_SFixed64Rules_msg_init = {
-  NULL,
-  &validate_SFixed64Rules__fields[0],
-  UPB_SIZE(56, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000009, &upb_psf8_1bt},
-    {0x0010000002000011, &upb_psf8_1bt},
-    {0x0018000003000019, &upb_psf8_1bt},
-    {0x0020000004000021, &upb_psf8_1bt},
-    {0x0028000005000029, &upb_psf8_1bt},
-    {0x003000003f000031, &upb_prf8_1bt},
-    {0x003800003f000039, &upb_prf8_1bt},
-    {0x0001000006000040, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_BoolRules__fields[1] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_BoolRules_msg_init = {
-  NULL,
-  &validate_BoolRules__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableSub validate_StringRules_submsgs[1] = {
-  {.subenum = &validate_KnownRegex_enum_init},
-};
-
-static const upb_MiniTableField validate_StringRules__fields[26] = {
-  {1, UPB_SIZE(24, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 32, 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 40, 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, 48, 4, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, 56, 5, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, 64, 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(72, 80), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(80, 96), 8, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(88, 112), 9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(4, 128), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(8, 136), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {19, UPB_SIZE(96, 144), 10, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(104, 152), 11, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {22, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(112, 160), 12, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {24, UPB_SIZE(20, 12), UPB_SIZE(-13, -5), 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {25, UPB_SIZE(16, 8), 13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {26, UPB_SIZE(17, 9), 14, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_StringRules_msg_init = {
-  &validate_StringRules_submsgs[0],
-  &validate_StringRules__fields[0],
-  UPB_SIZE(120, 176), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_pss_1bt},
-    {0x0020000002000010, &upb_psv8_1bt},
-    {0x0028000003000018, &upb_psv8_1bt},
-    {0x0030000004000020, &upb_psv8_1bt},
-    {0x0038000005000028, &upb_psv8_1bt},
-    {0x0040000006000032, &upb_pss_1bt},
-    {0x005000000700003a, &upb_pss_1bt},
-    {0x0060000008000042, &upb_pss_1bt},
-    {0x007000000900004a, &upb_pss_1bt},
-    {0x008000003f000052, &upb_prs_1bt},
-    {0x008800003f00005a, &upb_prs_1bt},
-    {0x000c00040c000060, &upb_pob1_1bt},
-    {0x000c00040d000068, &upb_pob1_1bt},
-    {0x000c00040e000070, &upb_pob1_1bt},
-    {0x000c00040f000078, &upb_pob1_1bt},
-    {0x000c000410000180, &upb_pob1_2bt},
-    {0x000c000411000188, &upb_pob1_2bt},
-    {0x000c000412000190, &upb_pob1_2bt},
-    {0x009000000a000198, &upb_psv8_2bt},
-    {0x009800000b0001a0, &upb_psv8_2bt},
-    {0x000c0004150001a8, &upb_pob1_2bt},
-    {0x000c0004160001b0, &upb_pob1_2bt},
-    {0x00a000000c0001ba, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000d0001c8, &upb_psb1_2bt},
-    {0x000900000e0001d0, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_BytesRules__fields[14] = {
-  {1, UPB_SIZE(20, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 32, 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 40, 3, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, 48, 4, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(56, 64), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(64, 80), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(72, 96), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(4, 112), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(8, 120), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {12, 2, UPB_SIZE(-13, -5), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(80, 128), 8, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {14, UPB_SIZE(16, 8), 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_BytesRules_msg_init = {
-  NULL,
-  &validate_BytesRules__fields[0],
-  UPB_SIZE(88, 136), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000000100000a, &upb_psb_1bt},
-    {0x0020000002000010, &upb_psv8_1bt},
-    {0x0028000003000018, &upb_psv8_1bt},
-    {0x0030000004000022, &upb_pss_1bt},
-    {0x004000000500002a, &upb_psb_1bt},
-    {0x0050000006000032, &upb_psb_1bt},
-    {0x006000000700003a, &upb_psb_1bt},
-    {0x007000003f000042, &upb_prb_1bt},
-    {0x007800003f00004a, &upb_prb_1bt},
-    {0x000200040a000050, &upb_pob1_1bt},
-    {0x000200040b000058, &upb_pob1_1bt},
-    {0x000200040c000060, &upb_pob1_1bt},
-    {0x0080000008000068, &upb_psv8_1bt},
-    {0x0008000009000070, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_EnumRules__fields[4] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_EnumRules_msg_init = {
-  NULL,
-  &validate_EnumRules__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psb1_1bt},
-    {0x001000003f000018, &upb_prv4_1bt},
-    {0x001800003f000020, &upb_prv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_MessageRules__fields[2] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_MessageRules_msg_init = {
-  NULL,
-  &validate_MessageRules__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0002000002000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub validate_RepeatedRules_submsgs[1] = {
-  {.submsg = &validate_FieldRules_msg_init},
-};
-
-static const upb_MiniTableField validate_RepeatedRules__fields[5] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 1, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 2), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_RepeatedRules_msg_init = {
-  &validate_RepeatedRules_submsgs[0],
-  &validate_RepeatedRules__fields[0],
-  32, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_psv8_1bt},
-    {0x0010000002000010, &upb_psv8_1bt},
-    {0x0001000003000018, &upb_psb1_1bt},
-    {0x0018000004000022, &upb_psm_1bt_max64b},
-    {0x0002000005000028, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub validate_MapRules_submsgs[2] = {
-  {.submsg = &validate_FieldRules_msg_init},
-  {.submsg = &validate_FieldRules_msg_init},
-};
-
-static const upb_MiniTableField validate_MapRules__fields[6] = {
-  {1, UPB_SIZE(16, 8), 1, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 16), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, 1, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 24), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 32), 5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_MapRules_msg_init = {
-  &validate_MapRules_submsgs[0],
-  &validate_MapRules__fields[0],
-  UPB_SIZE(32, 40), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000001000008, &upb_psv8_1bt},
-    {0x0010000002000010, &upb_psv8_1bt},
-    {0x0001000003000018, &upb_psb1_1bt},
-    {0x0018000004000022, &upb_psm_1bt_max64b},
-    {0x002000000501002a, &upb_psm_1bt_max64b},
-    {0x0002000006000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField validate_AnyRules__fields[3] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_AnyRules_msg_init = {
-  NULL,
-  &validate_AnyRules__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x000800003f000012, &upb_prs_1bt},
-    {0x001000003f00001a, &upb_prs_1bt},
-  })
-};
-
-static const upb_MiniTableSub validate_DurationRules_submsgs[7] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField validate_DurationRules__fields[8] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 3, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 4, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 40), 6, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 48), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 56), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_DurationRules_msg_init = {
-  &validate_DurationRules_submsgs[0],
-  &validate_DurationRules__fields[0],
-  UPB_SIZE(32, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0008000002000012, &upb_psm_1bt_maxmaxb},
-    {0x001000000301001a, &upb_psm_1bt_maxmaxb},
-    {0x0018000004020022, &upb_psm_1bt_maxmaxb},
-    {0x002000000503002a, &upb_psm_1bt_maxmaxb},
-    {0x0028000006040032, &upb_psm_1bt_maxmaxb},
-    {0x003000003f05003a, &upb_prm_1bt_maxmaxb},
-    {0x003800003f060042, &upb_prm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub validate_TimestampRules_submsgs[6] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField validate_TimestampRules__fields[9] = {
-  {1, 2, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 3, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 24), 4, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 32), 5, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 40), 6, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 3), 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(25, 4), 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 48), 9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable validate_TimestampRules_msg_init = {
-  &validate_TimestampRules_submsgs[0],
-  &validate_TimestampRules__fields[0],
-  UPB_SIZE(32, 56), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0002000001000008, &upb_psb1_1bt},
-    {0x0008000002000012, &upb_psm_1bt_maxmaxb},
-    {0x001000000301001a, &upb_psm_1bt_maxmaxb},
-    {0x0018000004020022, &upb_psm_1bt_maxmaxb},
-    {0x002000000503002a, &upb_psm_1bt_maxmaxb},
-    {0x0028000006040032, &upb_psm_1bt_maxmaxb},
-    {0x0003000007000038, &upb_psb1_1bt},
-    {0x0004000008000040, &upb_psb1_1bt},
-    {0x003000000905004a, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[23] = {
-  &validate_FieldRules_msg_init,
-  &validate_FloatRules_msg_init,
-  &validate_DoubleRules_msg_init,
-  &validate_Int32Rules_msg_init,
-  &validate_Int64Rules_msg_init,
-  &validate_UInt32Rules_msg_init,
-  &validate_UInt64Rules_msg_init,
-  &validate_SInt32Rules_msg_init,
-  &validate_SInt64Rules_msg_init,
-  &validate_Fixed32Rules_msg_init,
-  &validate_Fixed64Rules_msg_init,
-  &validate_SFixed32Rules_msg_init,
-  &validate_SFixed64Rules_msg_init,
-  &validate_BoolRules_msg_init,
-  &validate_StringRules_msg_init,
-  &validate_BytesRules_msg_init,
-  &validate_EnumRules_msg_init,
-  &validate_MessageRules_msg_init,
-  &validate_RepeatedRules_msg_init,
-  &validate_MapRules_msg_init,
-  &validate_AnyRules_msg_init,
-  &validate_DurationRules_msg_init,
-  &validate_TimestampRules_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable google_protobuf_OneofOptions_msg_init;
-extern const upb_MiniTable validate_FieldRules_msg_init;
-const upb_MiniTableExtension validate_disabled_ext = {
-  {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension validate_ignored_ext = {
-  {1072, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension validate_required_ext = {
-  {1071, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_OneofOptions_msg_init,
-  {.submsg = NULL},
-
-};
-const upb_MiniTableExtension validate_rules_ext = {
-  {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &validate_FieldRules_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[4] = {
-  &validate_disabled_ext,
-  &validate_ignored_ext,
-  &validate_required_ext,
-  &validate_rules_ext,
-};
-
-const upb_MiniTableEnum validate_KnownRegex_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-static const upb_MiniTableEnum *enums_layout[1] = {
-  &validate_KnownRegex_enum_init,
-};
-
-const upb_MiniTableFile validate_validate_proto_upb_file_layout = {
-  messages_layout,
-  enums_layout,
-  extensions_layout,
-  23,
-  1,
-  4,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c b/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
deleted file mode 100644
index 2835c5dfe88ac..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/annotations/v3/migrate.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_annotations_v3_MigrateAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_MigrateAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_MigrateAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTableField xds_annotations_v3_FieldMigrateAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_FieldMigrateAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_FieldMigrateAnnotation__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_annotations_v3_FileMigrateAnnotation__fields[1] = {
-  {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_FileMigrateAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_FileMigrateAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &xds_annotations_v3_MigrateAnnotation_msg_init,
-  &xds_annotations_v3_FieldMigrateAnnotation_msg_init,
-  &xds_annotations_v3_FileMigrateAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FieldMigrateAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FileMigrateAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_MigrateAnnotation_msg_init;
-const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = &xds_annotations_v3_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &xds_annotations_v3_FieldMigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumOptions_msg_init,
-  {.submsg = &xds_annotations_v3_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
-  {.submsg = &xds_annotations_v3_MigrateAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FileOptions_msg_init,
-  {.submsg = &xds_annotations_v3_FileMigrateAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[5] = {
-  &xds_annotations_v3_message_migrate_ext,
-  &xds_annotations_v3_field_migrate_ext,
-  &xds_annotations_v3_enum_migrate_ext,
-  &xds_annotations_v3_enum_value_migrate_ext,
-  &xds_annotations_v3_file_migrate_ext,
-};
-
-const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  3,
-  0,
-  5,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h b/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h
deleted file mode 100644
index 27dc4bd69394d..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_annotations_v3_MigrateAnnotation xds_annotations_v3_MigrateAnnotation;
-typedef struct xds_annotations_v3_FieldMigrateAnnotation xds_annotations_v3_FieldMigrateAnnotation;
-typedef struct xds_annotations_v3_FileMigrateAnnotation xds_annotations_v3_FileMigrateAnnotation;
-extern const upb_MiniTable xds_annotations_v3_MigrateAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FieldMigrateAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FileMigrateAnnotation_msg_init;
-extern const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext;
-struct google_protobuf_EnumOptions;
-struct google_protobuf_EnumValueOptions;
-struct google_protobuf_FieldOptions;
-struct google_protobuf_FileOptions;
-struct google_protobuf_MessageOptions;
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-
-
-
-/* xds.annotations.v3.MigrateAnnotation */
-
-UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds_annotations_v3_MigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_MigrateAnnotation* ret = xds_annotations_v3_MigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_MigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_MigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_MigrateAnnotation* ret = xds_annotations_v3_MigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_MigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_MigrateAnnotation_serialize(const xds_annotations_v3_MigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_MigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_MigrateAnnotation_serialize_ex(const xds_annotations_v3_MigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_MigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_MigrateAnnotation_clear_rename(xds_annotations_v3_MigrateAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_annotations_v3_MigrateAnnotation_rename(const xds_annotations_v3_MigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_MigrateAnnotation_set_rename(xds_annotations_v3_MigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.annotations.v3.FieldMigrateAnnotation */
-
-UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_FieldMigrateAnnotation*)_upb_Message_New(&xds_annotations_v3_FieldMigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_FieldMigrateAnnotation* ret = xds_annotations_v3_FieldMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_FieldMigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_FieldMigrateAnnotation* ret = xds_annotations_v3_FieldMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldMigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_FieldMigrateAnnotation_serialize(const xds_annotations_v3_FieldMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldMigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_FieldMigrateAnnotation_serialize_ex(const xds_annotations_v3_FieldMigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldMigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_clear_rename(xds_annotations_v3_FieldMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_rename(const xds_annotations_v3_FieldMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_clear_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_oneof_promotion(const xds_annotations_v3_FieldMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_rename(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.annotations.v3.FileMigrateAnnotation */
-
-UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_FileMigrateAnnotation*)_upb_Message_New(&xds_annotations_v3_FileMigrateAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_FileMigrateAnnotation* ret = xds_annotations_v3_FileMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FileMigrateAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_FileMigrateAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_FileMigrateAnnotation* ret = xds_annotations_v3_FileMigrateAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FileMigrateAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_FileMigrateAnnotation_serialize(const xds_annotations_v3_FileMigrateAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FileMigrateAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_FileMigrateAnnotation_serialize_ex(const xds_annotations_v3_FileMigrateAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FileMigrateAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_clear_move_to_package(xds_annotations_v3_FileMigrateAnnotation* msg) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_annotations_v3_FileMigrateAnnotation_move_to_package(const xds_annotations_v3_FileMigrateAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_set_move_to_package(xds_annotations_v3_FileMigrateAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool xds_annotations_v3_has_message_migrate(const struct google_protobuf_MessageOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_message_migrate_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_message_migrate(struct google_protobuf_MessageOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_message_migrate_ext);
-}
-UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_message_migrate(const struct google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
-  const xds_annotations_v3_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_field_migrate(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_field_migrate_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_field_migrate(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_field_migrate_ext);
-}
-UPB_INLINE const xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_field_migrate(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_FieldMigrateAnnotation* default_val = NULL;
-  const xds_annotations_v3_FieldMigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldMigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_enum_migrate_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_enum_migrate(struct google_protobuf_EnumOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_enum_migrate_ext);
-}
-UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
-  const xds_annotations_v3_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_enum_value_migrate_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_enum_value_migrate_ext);
-}
-UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
-  const xds_annotations_v3_MigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, const xds_annotations_v3_MigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_file_migrate(const struct google_protobuf_FileOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_file_migrate_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_file_migrate(struct google_protobuf_FileOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_file_migrate_ext);
-}
-UPB_INLINE const xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_file_migrate(const struct google_protobuf_FileOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_FileMigrateAnnotation* default_val = NULL;
-  const xds_annotations_v3_FileMigrateAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileOptions* msg, const xds_annotations_v3_FileMigrateAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/security.upb.c b/src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
deleted file mode 100644
index 8809908bf5a0e..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/security.upb.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/annotations/v3/security.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_annotations_v3_FieldSecurityAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_FieldSecurityAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_FieldSecurityAnnotation__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000100003f000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_annotations_v3_FieldSecurityAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FieldSecurityAnnotation_msg_init;
-const upb_MiniTableExtension xds_annotations_v3_security_ext = {
-  {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &xds_annotations_v3_FieldSecurityAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &xds_annotations_v3_security_ext,
-};
-
-const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/security.upb.h b/src/core/ext/upb-generated/xds/annotations/v3/security.upb.h
deleted file mode 100644
index 888948c85912b..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/security.upb.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_annotations_v3_FieldSecurityAnnotation xds_annotations_v3_FieldSecurityAnnotation;
-extern const upb_MiniTable xds_annotations_v3_FieldSecurityAnnotation_msg_init;
-extern const upb_MiniTableExtension xds_annotations_v3_security_ext;
-struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-
-
-
-/* xds.annotations.v3.FieldSecurityAnnotation */
-
-UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_FieldSecurityAnnotation*)_upb_Message_New(&xds_annotations_v3_FieldSecurityAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_FieldSecurityAnnotation* ret = xds_annotations_v3_FieldSecurityAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldSecurityAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_FieldSecurityAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_FieldSecurityAnnotation* ret = xds_annotations_v3_FieldSecurityAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldSecurityAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_FieldSecurityAnnotation_serialize(const xds_annotations_v3_FieldSecurityAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldSecurityAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_FieldSecurityAnnotation_serialize_ex(const xds_annotations_v3_FieldSecurityAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldSecurityAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_clear_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrusted_downstream(const xds_annotations_v3_FieldSecurityAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_clear_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation* msg) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrusted_upstream(const xds_annotations_v3_FieldSecurityAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool xds_annotations_v3_has_security(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_security_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_security(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_security_ext);
-}
-UPB_INLINE const xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_security(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_FieldSecurityAnnotation* default_val = NULL;
-  const xds_annotations_v3_FieldSecurityAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldSecurityAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c b/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
deleted file mode 100644
index da27e92d75aa1..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/annotations/v3/sensitive.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-const upb_MiniTableExtension xds_annotations_v3_sensitive_ext = {
-  {61008053, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = NULL},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &xds_annotations_v3_sensitive_ext,
-};
-
-const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layout = {
-  NULL,
-  NULL,
-  extensions_layout,
-  0,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h b/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h
deleted file mode 100644
index f3f0e31e26de3..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const upb_MiniTableExtension xds_annotations_v3_sensitive_ext;
-struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-
-
-UPB_INLINE bool xds_annotations_v3_has_sensitive(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_sensitive_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_sensitive(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_sensitive_ext);
-}
-UPB_INLINE bool xds_annotations_v3_sensitive(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_sensitive_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
-  bool default_val = false;
-  bool ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOptions* msg, bool val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_sensitive_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_1Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/status.upb.c b/src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
deleted file mode 100644
index 7499e5d85ade9..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/status.upb.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_annotations_v3_FileStatusAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_FileStatusAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_FileStatusAnnotation__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableField xds_annotations_v3_MessageStatusAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_MessageStatusAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_MessageStatusAnnotation__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableField xds_annotations_v3_FieldStatusAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_FieldStatusAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_FieldStatusAnnotation__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTableField xds_annotations_v3_StatusAnnotation__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_StatusAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_StatusAnnotation__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psb1_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &xds_annotations_v3_FileStatusAnnotation_msg_init,
-  &xds_annotations_v3_MessageStatusAnnotation_msg_init,
-  &xds_annotations_v3_FieldStatusAnnotation_msg_init,
-  &xds_annotations_v3_StatusAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FieldStatusAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FileStatusAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_MessageStatusAnnotation_msg_init;
-const upb_MiniTableExtension xds_annotations_v3_file_status_ext = {
-  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FileOptions_msg_init,
-  {.submsg = &xds_annotations_v3_FileStatusAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_message_status_ext = {
-  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = &xds_annotations_v3_MessageStatusAnnotation_msg_init},
-
-};
-const upb_MiniTableExtension xds_annotations_v3_field_status_ext = {
-  {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
-  {.submsg = &xds_annotations_v3_FieldStatusAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[3] = {
-  &xds_annotations_v3_file_status_ext,
-  &xds_annotations_v3_message_status_ext,
-  &xds_annotations_v3_field_status_ext,
-};
-
-const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  4,
-  0,
-  3,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/status.upb.h b/src/core/ext/upb-generated/xds/annotations/v3/status.upb.h
deleted file mode 100644
index 995e2d7b120b2..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/status.upb.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_annotations_v3_FileStatusAnnotation xds_annotations_v3_FileStatusAnnotation;
-typedef struct xds_annotations_v3_MessageStatusAnnotation xds_annotations_v3_MessageStatusAnnotation;
-typedef struct xds_annotations_v3_FieldStatusAnnotation xds_annotations_v3_FieldStatusAnnotation;
-typedef struct xds_annotations_v3_StatusAnnotation xds_annotations_v3_StatusAnnotation;
-extern const upb_MiniTable xds_annotations_v3_FileStatusAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_MessageStatusAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_FieldStatusAnnotation_msg_init;
-extern const upb_MiniTable xds_annotations_v3_StatusAnnotation_msg_init;
-extern const upb_MiniTableExtension xds_annotations_v3_file_status_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_message_status_ext;
-extern const upb_MiniTableExtension xds_annotations_v3_field_status_ext;
-struct google_protobuf_FieldOptions;
-struct google_protobuf_FileOptions;
-struct google_protobuf_MessageOptions;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-
-typedef enum {
-  xds_annotations_v3_UNKNOWN = 0,
-  xds_annotations_v3_FROZEN = 1,
-  xds_annotations_v3_ACTIVE = 2,
-  xds_annotations_v3_NEXT_MAJOR_VERSION_CANDIDATE = 3
-} xds_annotations_v3_PackageVersionStatus;
-
-
-
-/* xds.annotations.v3.FileStatusAnnotation */
-
-UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_FileStatusAnnotation*)_upb_Message_New(&xds_annotations_v3_FileStatusAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_FileStatusAnnotation* ret = xds_annotations_v3_FileStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FileStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_FileStatusAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_FileStatusAnnotation* ret = xds_annotations_v3_FileStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FileStatusAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_FileStatusAnnotation_serialize(const xds_annotations_v3_FileStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FileStatusAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_FileStatusAnnotation_serialize_ex(const xds_annotations_v3_FileStatusAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FileStatusAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_clear_work_in_progress(xds_annotations_v3_FileStatusAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_FileStatusAnnotation_work_in_progress(const xds_annotations_v3_FileStatusAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_set_work_in_progress(xds_annotations_v3_FileStatusAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.annotations.v3.MessageStatusAnnotation */
-
-UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_MessageStatusAnnotation*)_upb_Message_New(&xds_annotations_v3_MessageStatusAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_MessageStatusAnnotation* ret = xds_annotations_v3_MessageStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_MessageStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_MessageStatusAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_MessageStatusAnnotation* ret = xds_annotations_v3_MessageStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_MessageStatusAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_MessageStatusAnnotation_serialize(const xds_annotations_v3_MessageStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_MessageStatusAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_MessageStatusAnnotation_serialize_ex(const xds_annotations_v3_MessageStatusAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_MessageStatusAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_clear_work_in_progress(xds_annotations_v3_MessageStatusAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_MessageStatusAnnotation_work_in_progress(const xds_annotations_v3_MessageStatusAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_set_work_in_progress(xds_annotations_v3_MessageStatusAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.annotations.v3.FieldStatusAnnotation */
-
-UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_FieldStatusAnnotation*)_upb_Message_New(&xds_annotations_v3_FieldStatusAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_FieldStatusAnnotation* ret = xds_annotations_v3_FieldStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldStatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_FieldStatusAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_FieldStatusAnnotation* ret = xds_annotations_v3_FieldStatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_FieldStatusAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_FieldStatusAnnotation_serialize(const xds_annotations_v3_FieldStatusAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldStatusAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_FieldStatusAnnotation_serialize_ex(const xds_annotations_v3_FieldStatusAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_FieldStatusAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_clear_work_in_progress(xds_annotations_v3_FieldStatusAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_FieldStatusAnnotation_work_in_progress(const xds_annotations_v3_FieldStatusAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_set_work_in_progress(xds_annotations_v3_FieldStatusAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.annotations.v3.StatusAnnotation */
-
-UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_StatusAnnotation*)_upb_Message_New(&xds_annotations_v3_StatusAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_StatusAnnotation* ret = xds_annotations_v3_StatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_StatusAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_StatusAnnotation* xds_annotations_v3_StatusAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_StatusAnnotation* ret = xds_annotations_v3_StatusAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_StatusAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_StatusAnnotation_serialize(const xds_annotations_v3_StatusAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_StatusAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_StatusAnnotation_serialize_ex(const xds_annotations_v3_StatusAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_StatusAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_StatusAnnotation_clear_work_in_progress(xds_annotations_v3_StatusAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_annotations_v3_StatusAnnotation_work_in_progress(const xds_annotations_v3_StatusAnnotation* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_StatusAnnotation_clear_package_version_status(xds_annotations_v3_StatusAnnotation* msg) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t xds_annotations_v3_StatusAnnotation_package_version_status(const xds_annotations_v3_StatusAnnotation* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_work_in_progress(xds_annotations_v3_StatusAnnotation *msg, bool value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_package_version_status(xds_annotations_v3_StatusAnnotation *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool xds_annotations_v3_has_file_status(const struct google_protobuf_FileOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_file_status_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_file_status(struct google_protobuf_FileOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_file_status_ext);
-}
-UPB_INLINE const xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_file_status(const struct google_protobuf_FileOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_FileStatusAnnotation* default_val = NULL;
-  const xds_annotations_v3_FileStatusAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOptions* msg, const xds_annotations_v3_FileStatusAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_message_status(const struct google_protobuf_MessageOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_message_status_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_message_status(struct google_protobuf_MessageOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_message_status_ext);
-}
-UPB_INLINE const xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_message_status(const struct google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_MessageStatusAnnotation* default_val = NULL;
-  const xds_annotations_v3_MessageStatusAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_MessageStatusAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-UPB_INLINE bool xds_annotations_v3_has_field_status(const struct google_protobuf_FieldOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_field_status_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_field_status(struct google_protobuf_FieldOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_field_status_ext);
-}
-UPB_INLINE const xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_field_status(const struct google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_FieldStatusAnnotation* default_val = NULL;
-  const xds_annotations_v3_FieldStatusAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_FieldOptions* msg, const xds_annotations_v3_FieldStatusAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c b/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
deleted file mode 100644
index 6611200f87c35..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/annotations/v3/versioning.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_annotations_v3_VersioningAnnotation__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_annotations_v3_VersioningAnnotation_msg_init = {
-  NULL,
-  &xds_annotations_v3_VersioningAnnotation__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_annotations_v3_VersioningAnnotation_msg_init,
-};
-
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable xds_annotations_v3_VersioningAnnotation_msg_init;
-const upb_MiniTableExtension xds_annotations_v3_versioning_ext = {
-  {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_MessageOptions_msg_init,
-  {.submsg = &xds_annotations_v3_VersioningAnnotation_msg_init},
-
-};
-
-static const upb_MiniTableExtension *extensions_layout[1] = {
-  &xds_annotations_v3_versioning_ext,
-};
-
-const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  extensions_layout,
-  1,
-  0,
-  1,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h b/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h
deleted file mode 100644
index eacdd9725660a..0000000000000
--- a/src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_annotations_v3_VersioningAnnotation xds_annotations_v3_VersioningAnnotation;
-extern const upb_MiniTable xds_annotations_v3_VersioningAnnotation_msg_init;
-extern const upb_MiniTableExtension xds_annotations_v3_versioning_ext;
-struct google_protobuf_MessageOptions;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-
-
-
-/* xds.annotations.v3.VersioningAnnotation */
-
-UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_new(upb_Arena* arena) {
-  return (xds_annotations_v3_VersioningAnnotation*)_upb_Message_New(&xds_annotations_v3_VersioningAnnotation_msg_init, arena);
-}
-UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_annotations_v3_VersioningAnnotation* ret = xds_annotations_v3_VersioningAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_VersioningAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_VersioningAnnotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_annotations_v3_VersioningAnnotation* ret = xds_annotations_v3_VersioningAnnotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_annotations_v3_VersioningAnnotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_annotations_v3_VersioningAnnotation_serialize(const xds_annotations_v3_VersioningAnnotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_VersioningAnnotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_annotations_v3_VersioningAnnotation_serialize_ex(const xds_annotations_v3_VersioningAnnotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_annotations_v3_VersioningAnnotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_annotations_v3_VersioningAnnotation_clear_previous_message_type(xds_annotations_v3_VersioningAnnotation* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_annotations_v3_VersioningAnnotation_previous_message_type(const xds_annotations_v3_VersioningAnnotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_annotations_v3_VersioningAnnotation_set_previous_message_type(xds_annotations_v3_VersioningAnnotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-UPB_INLINE bool xds_annotations_v3_has_versioning(const struct google_protobuf_MessageOptions* msg) {
-  return _upb_Message_HasExtensionField(msg, &xds_annotations_v3_versioning_ext);
-}
-UPB_INLINE void xds_annotations_v3_clear_versioning(struct google_protobuf_MessageOptions* msg) {
-  _upb_Message_ClearExtensionField(msg, &xds_annotations_v3_versioning_ext);
-}
-UPB_INLINE const xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_versioning(const struct google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  const xds_annotations_v3_VersioningAnnotation* default_val = NULL;
-  const xds_annotations_v3_VersioningAnnotation* ret;
-  _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_MessageOptions* msg, const xds_annotations_v3_VersioningAnnotation* val, upb_Arena* arena) {
-  const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
-  UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-  UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-  UPB_ASSERT(ok);
-}
-extern const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/authority.upb.c b/src/core/ext/upb-generated/xds/core/v3/authority.upb.c
deleted file mode 100644
index 2826940c56a5b..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/authority.upb.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/authority.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/authority.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_core_v3_Authority__fields[1] = {
-  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_Authority_msg_init = {
-  NULL,
-  &xds_core_v3_Authority__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_pss_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_core_v3_Authority_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/cidr.upb.c b/src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
deleted file mode 100644
index efb8ebf3e0bae..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/cidr.upb.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/cidr.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/cidr.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_CidrRange_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_CidrRange__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_CidrRange_msg_init = {
-  &xds_core_v3_CidrRange_submsgs[0],
-  &xds_core_v3_CidrRange__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_core_v3_CidrRange_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c b/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
deleted file mode 100644
index 7d3e965ce226e..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/collection_entry.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/collection_entry.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/resource_locator.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_CollectionEntry_submsgs[2] = {
-  {.submsg = &xds_core_v3_ResourceLocator_msg_init},
-  {.submsg = &xds_core_v3_CollectionEntry_InlineEntry_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_CollectionEntry__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_CollectionEntry_msg_init = {
-  &xds_core_v3_CollectionEntry_submsgs[0],
-  &xds_core_v3_CollectionEntry__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_CollectionEntry_InlineEntry__fields[3] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_CollectionEntry_InlineEntry_msg_init = {
-  &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0],
-  &xds_core_v3_CollectionEntry_InlineEntry__fields[0],
-  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800000100001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_core_v3_CollectionEntry_msg_init,
-  &xds_core_v3_CollectionEntry_InlineEntry_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c b/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
deleted file mode 100644
index 350882584d8e0..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/context_params.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/context_params.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_ContextParams_submsgs[1] = {
-  {.submsg = &xds_core_v3_ContextParams_ParamsEntry_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_ContextParams__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_ContextParams_msg_init = {
-  &xds_core_v3_ContextParams_submsgs[0],
-  &xds_core_v3_ContextParams__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableField xds_core_v3_ContextParams_ParamsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_ContextParams_ParamsEntry_msg_init = {
-  NULL,
-  &xds_core_v3_ContextParams_ParamsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_core_v3_ContextParams_msg_init,
-  &xds_core_v3_ContextParams_ParamsEntry_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/extension.upb.c b/src/core/ext/upb-generated/xds/core/v3/extension.upb.c
deleted file mode 100644
index e646513c44167..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/extension.upb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/extension.upb.h"
-#include "validate/validate.upb.h"
-#include "google/protobuf/any.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_TypedExtensionConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_TypedExtensionConfig__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_TypedExtensionConfig_msg_init = {
-  &xds_core_v3_TypedExtensionConfig_submsgs[0],
-  &xds_core_v3_TypedExtensionConfig__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_core_v3_TypedExtensionConfig_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/extension.upb.h b/src/core/ext/upb-generated/xds/core/v3/extension.upb.h
deleted file mode 100644
index f6e805f5d76bb..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/extension.upb.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
-#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_core_v3_TypedExtensionConfig xds_core_v3_TypedExtensionConfig;
-extern const upb_MiniTable xds_core_v3_TypedExtensionConfig_msg_init;
-struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-
-
-
-/* xds.core.v3.TypedExtensionConfig */
-
-UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_new(upb_Arena* arena) {
-  return (xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-}
-UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_core_v3_TypedExtensionConfig* ret = xds_core_v3_TypedExtensionConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_core_v3_TypedExtensionConfig* xds_core_v3_TypedExtensionConfig_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_core_v3_TypedExtensionConfig* ret = xds_core_v3_TypedExtensionConfig_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_TypedExtensionConfig_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_core_v3_TypedExtensionConfig_serialize(const xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_core_v3_TypedExtensionConfig_serialize_ex(const xds_core_v3_TypedExtensionConfig* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_TypedExtensionConfig_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_core_v3_TypedExtensionConfig_clear_name(xds_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_core_v3_TypedExtensionConfig_name(const xds_core_v3_TypedExtensionConfig* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_core_v3_TypedExtensionConfig_clear_typed_config(xds_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_typed_config(const xds_core_v3_TypedExtensionConfig* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_core_v3_TypedExtensionConfig_has_typed_config(const xds_core_v3_TypedExtensionConfig* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_name(xds_core_v3_TypedExtensionConfig *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_typed_config(xds_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_typed_config(xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_TypedExtensionConfig_typed_config(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) xds_core_v3_TypedExtensionConfig_set_typed_config(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource.upb.c
deleted file mode 100644
index 55b1c52f7becb..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/resource.upb.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/resource.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/resource_name.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_Resource_submsgs[2] = {
-  {.submsg = &xds_core_v3_ResourceName_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_Resource__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_Resource_msg_init = {
-  &xds_core_v3_Resource_submsgs[0],
-  &xds_core_v3_Resource__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_pss_1bt},
-    {0x002000000201001a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_core_v3_Resource_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource.upb.h b/src/core/ext/upb-generated/xds/core/v3/resource.upb.h
deleted file mode 100644
index 0a9d107a92278..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/resource.upb.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
-#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_core_v3_Resource xds_core_v3_Resource;
-extern const upb_MiniTable xds_core_v3_Resource_msg_init;
-struct google_protobuf_Any;
-struct xds_core_v3_ResourceName;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable xds_core_v3_ResourceName_msg_init;
-
-
-
-/* xds.core.v3.Resource */
-
-UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_new(upb_Arena* arena) {
-  return (xds_core_v3_Resource*)_upb_Message_New(&xds_core_v3_Resource_msg_init, arena);
-}
-UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_core_v3_Resource* ret = xds_core_v3_Resource_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_Resource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_core_v3_Resource* xds_core_v3_Resource_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_core_v3_Resource* ret = xds_core_v3_Resource_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_core_v3_Resource_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_core_v3_Resource_serialize(const xds_core_v3_Resource* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_Resource_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_core_v3_Resource_serialize_ex(const xds_core_v3_Resource* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_core_v3_Resource_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_core_v3_Resource_clear_name(xds_core_v3_Resource* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_ResourceName* xds_core_v3_Resource_name(const xds_core_v3_Resource* msg) {
-  const struct xds_core_v3_ResourceName* default_val = NULL;
-  const struct xds_core_v3_ResourceName* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_core_v3_Resource_has_name(const xds_core_v3_Resource* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_core_v3_Resource_clear_version(xds_core_v3_Resource* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_core_v3_Resource_version(const xds_core_v3_Resource* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_core_v3_Resource_clear_resource(xds_core_v3_Resource* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_Any* xds_core_v3_Resource_resource(const xds_core_v3_Resource* msg) {
-  const struct google_protobuf_Any* default_val = NULL;
-  const struct google_protobuf_Any* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_core_v3_Resource_has_resource(const xds_core_v3_Resource* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_core_v3_Resource_set_name(xds_core_v3_Resource *msg, struct xds_core_v3_ResourceName* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xds_core_v3_Resource* msg, upb_Arena* arena) {
-  struct xds_core_v3_ResourceName* sub = (struct xds_core_v3_ResourceName*)xds_core_v3_Resource_name(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_ResourceName*)_upb_Message_New(&xds_core_v3_ResourceName_msg_init, arena);
-    if (sub) xds_core_v3_Resource_set_name(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_core_v3_Resource_set_resource(xds_core_v3_Resource *msg, struct google_protobuf_Any* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds_core_v3_Resource* msg, upb_Arena* arena) {
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_Resource_resource(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
-    if (sub) xds_core_v3_Resource_set_resource(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
deleted file mode 100644
index dafeae2e37a2a..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource_locator.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/resource_locator.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/context_params.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_ResourceLocator_submsgs[2] = {
-  {.submsg = &xds_core_v3_ContextParams_msg_init},
-  {.submsg = &xds_core_v3_ResourceLocator_Directive_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 64), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(8, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_ResourceLocator_msg_init = {
-  &xds_core_v3_ResourceLocator_submsgs[0],
-  &xds_core_v3_ResourceLocator__fields[0],
-  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x001800003f00001a, &upb_pss_1bt},
-    {0x002800003f000022, &upb_pss_1bt},
-    {0x004000040500002a, &upb_pom_1bt_maxmaxb},
-    {0x003800003f010032, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_core_v3_ResourceLocator_Directive_submsgs[1] = {
-  {.submsg = &xds_core_v3_ResourceLocator_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_ResourceLocator_Directive_msg_init = {
-  &xds_core_v3_ResourceLocator_Directive_submsgs[0],
-  &xds_core_v3_ResourceLocator_Directive__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max128b},
-    {0x0008000002000012, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_core_v3_ResourceLocator_msg_init,
-  &xds_core_v3_ResourceLocator_Directive_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
deleted file mode 100644
index 70e32a9a90067..0000000000000
--- a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource_name.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/core/v3/resource_name.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/context_params.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_core_v3_ResourceName_submsgs[1] = {
-  {.submsg = &xds_core_v3_ContextParams_msg_init},
-};
-
-static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_core_v3_ResourceName_msg_init = {
-  &xds_core_v3_ResourceName_submsgs[0],
-  &xds_core_v3_ResourceName__fields[0],
-  UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_pss_1bt},
-    {0x0038000001000022, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_core_v3_ResourceName_msg_init,
-};
-
-const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c b/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
deleted file mode 100644
index 0cb42db5b1cca..0000000000000
--- a/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/data/orca/v3/orca_load_report.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_data_orca_v3_OrcaLoadReport_submsgs[3] = {
-  {.submsg = &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_msg_init},
-  {.submsg = &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_msg_init},
-  {.submsg = &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_msg_init},
-};
-
-static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = {
-  {1, UPB_SIZE(16, 0), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(24, 8), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(32, 16), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(0, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(4, 32), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 40, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, 48, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(8, 56), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(56, 64), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_msg_init = {
-  &xds_data_orca_v3_OrcaLoadReport_submsgs[0],
-  &xds_data_orca_v3_OrcaLoadReport__fields[0],
-  UPB_SIZE(64, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-    {0x000800003f000011, &upb_psf8_1bt},
-    {0x001000003f000018, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002800003f000031, &upb_psf8_1bt},
-    {0x003000003f000039, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x004000003f000049, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_msg_init = {
-  NULL,
-  &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_msg_init = {
-  NULL,
-  &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_msg_init = {
-  NULL,
-  &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x001800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[4] = {
-  &xds_data_orca_v3_OrcaLoadReport_msg_init,
-  &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_msg_init,
-  &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_msg_init,
-  &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_msg_init,
-};
-
-const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  4,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c b/src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
deleted file mode 100644
index 968c037df8864..0000000000000
--- a/src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/service/orca/v3/orca.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/service/orca/v3/orca.upb.h"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-#include "google/protobuf/duration.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-};
-
-static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_service_orca_v3_OrcaLoadReportRequest_msg_init = {
-  &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0],
-  &xds_service_orca_v3_OrcaLoadReportRequest__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x001000003f000012, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_service_orca_v3_OrcaLoadReportRequest_msg_init,
-};
-
-const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
deleted file mode 100644
index 103b1a266868c..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/cel.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/type/v3/cel.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_CelMatcher_submsgs[1] = {
-  {.submsg = &xds_type_v3_CelExpression_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[1] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_CelMatcher_msg_init = {
-  &xds_type_matcher_v3_CelMatcher_submsgs[0],
-  &xds_type_matcher_v3_CelMatcher__fields[0],
-  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_type_matcher_v3_CelMatcher_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h
deleted file mode 100644
index 3d3fcccb128c5..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_CelMatcher xds_type_matcher_v3_CelMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_CelMatcher_msg_init;
-struct xds_type_v3_CelExpression;
-extern const upb_MiniTable xds_type_v3_CelExpression_msg_init;
-
-
-
-/* xds.type.matcher.v3.CelMatcher */
-
-UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_CelMatcher*)_upb_Message_New(&xds_type_matcher_v3_CelMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_CelMatcher* ret = xds_type_matcher_v3_CelMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_CelMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_CelMatcher* xds_type_matcher_v3_CelMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_CelMatcher* ret = xds_type_matcher_v3_CelMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_CelMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_CelMatcher_serialize(const xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_CelMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_CelMatcher_serialize_ex(const xds_type_matcher_v3_CelMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_CelMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_CelMatcher_clear_expr_match(xds_type_matcher_v3_CelMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_expr_match(const xds_type_matcher_v3_CelMatcher* msg) {
-  const struct xds_type_v3_CelExpression* default_val = NULL;
-  const struct xds_type_v3_CelExpression* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_CelMatcher_has_expr_match(const xds_type_matcher_v3_CelMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_expr_match(xds_type_matcher_v3_CelMatcher *msg, struct xds_type_v3_CelExpression* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_mutable_expr_match(xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena) {
-  struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_matcher_v3_CelMatcher_expr_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_v3_CelExpression*)_upb_Message_New(&xds_type_v3_CelExpression_msg_init, arena);
-    if (sub) xds_type_matcher_v3_CelMatcher_set_expr_match(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
deleted file mode 100644
index 6f224e2b14f70..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/domain.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/domain.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_ServerNameMatcher_msg_init = {
-  &xds_type_matcher_v3_ServerNameMatcher_submsgs[0],
-  &xds_type_matcher_v3_ServerNameMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init = {
-  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0],
-  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prs_1bt},
-    {0x0010000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_type_matcher_v3_ServerNameMatcher_msg_init,
-  &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
deleted file mode 100644
index b55b8cf407ac0..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/http_inputs.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const upb_MiniTable xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h
deleted file mode 100644
index 925f2d9cea0a7..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_HttpAttributesCelMatchInput xds_type_matcher_v3_HttpAttributesCelMatchInput;
-extern const upb_MiniTable xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init;
-
-
-
-/* xds.type.matcher.v3.HttpAttributesCelMatchInput */
-
-UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_HttpAttributesCelMatchInput*)_upb_Message_New(&xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_HttpAttributesCelMatchInput* ret = xds_type_matcher_v3_HttpAttributesCelMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_HttpAttributesCelMatchInput* xds_type_matcher_v3_HttpAttributesCelMatchInput_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_HttpAttributesCelMatchInput* ret = xds_type_matcher_v3_HttpAttributesCelMatchInput_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize(const xds_type_matcher_v3_HttpAttributesCelMatchInput* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize_ex(const xds_type_matcher_v3_HttpAttributesCelMatchInput* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_HttpAttributesCelMatchInput_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
deleted file mode 100644
index 2e096f949e379..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/ip.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/ip.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/cidr.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_IPMatcher_msg_init = {
-  &xds_type_matcher_v3_IPMatcher_submsgs[0],
-  &xds_type_matcher_v3_IPMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = {
-  {.submsg = &xds_core_v3_CidrRange_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init = {
-  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x000100003f000018, &upb_psb1_1bt},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_type_matcher_v3_IPMatcher_msg_init,
-  &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
deleted file mode 100644
index f4ffac4268a64..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "xds/core/v3/extension.upb.h"
-#include "xds/type/matcher/v3/string.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_submsgs[3] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherTree_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = {
-  {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_msg_init = {
-  &xds_type_matcher_v3_Matcher_submsgs[0],
-  &xds_type_matcher_v3_Matcher__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000040100000a, &upb_pom_1bt_max64b},
-    {0x0010000402010012, &upb_pom_1bt_max64b},
-    {0x000800000102001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_msg_init},
-  {.submsg = &xds_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_OnMatch_msg_init = {
-  &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0],
-  &xds_type_matcher_v3_Matcher_OnMatch__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
-  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_max64b},
-    {0x0008000002010012, &upb_pom_1bt_max64b},
-    {0x000800000302001a, &upb_pom_1bt_max64b},
-    {0x0008000004030022, &upb_pom_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
-  {.submsg = &xds_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &xds_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &xds_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000402010012, &upb_pom_1bt_maxmaxb},
-    {0x001000040302001a, &upb_pom_1bt_maxmaxb},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
-  {.submsg = &xds_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &xds_core_v3_TypedExtensionConfig_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[4] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherTree__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_maxmaxb},
-    {0x0010000402010012, &upb_pom_1bt_max64b},
-    {0x001000040302001a, &upb_pom_1bt_max64b},
-    {0x0010000404030022, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init = {
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[10] = {
-  &xds_type_matcher_v3_Matcher_msg_init,
-  &xds_type_matcher_v3_Matcher_OnMatch_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherList_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherTree_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init,
-  &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  10,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h
deleted file mode 100644
index 1c3282577dc6d..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h
+++ /dev/null
@@ -1,1114 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_Matcher xds_type_matcher_v3_Matcher;
-typedef struct xds_type_matcher_v3_Matcher_OnMatch xds_type_matcher_v3_Matcher_OnMatch;
-typedef struct xds_type_matcher_v3_Matcher_MatcherList xds_type_matcher_v3_Matcher_MatcherList;
-typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate xds_type_matcher_v3_Matcher_MatcherList_Predicate;
-typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate;
-typedef struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList;
-typedef struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher;
-typedef struct xds_type_matcher_v3_Matcher_MatcherTree xds_type_matcher_v3_Matcher_MatcherTree;
-typedef struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap xds_type_matcher_v3_Matcher_MatcherTree_MatchMap;
-typedef struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_OnMatch_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init;
-struct xds_core_v3_TypedExtensionConfig;
-struct xds_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable xds_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_StringMatcher_msg_init;
-
-
-
-/* xds.type.matcher.v3.Matcher */
-
-UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher* ret = xds_type_matcher_v3_Matcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher* ret = xds_type_matcher_v3_Matcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_serialize(const xds_type_matcher_v3_Matcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_serialize_ex(const xds_type_matcher_v3_Matcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_Matcher_matcher_type_matcher_list = 1,
-  xds_type_matcher_v3_Matcher_matcher_type_matcher_tree = 2,
-  xds_type_matcher_v3_Matcher_matcher_type_NOT_SET = 0
-} xds_type_matcher_v3_Matcher_matcher_type_oneofcases;
-UPB_INLINE xds_type_matcher_v3_Matcher_matcher_type_oneofcases xds_type_matcher_v3_Matcher_matcher_type_case(const xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_matcher_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_clear_matcher_list(xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_matcher_list(const xds_type_matcher_v3_Matcher* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_has_matcher_list(const xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_clear_matcher_tree(xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_matcher_tree(const xds_type_matcher_v3_Matcher* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherTree* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherTree* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_has_matcher_tree(const xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_clear_on_no_match(xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_on_no_match(const xds_type_matcher_v3_Matcher* msg) {
-  const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_has_on_no_match(const xds_type_matcher_v3_Matcher* msg) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_list(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherList* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_mutable_matcher_list(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)xds_type_matcher_v3_Matcher_matcher_list(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_set_matcher_list(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_tree(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherTree* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -5, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_mutable_matcher_tree(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherTree* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)xds_type_matcher_v3_Matcher_matcher_tree(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherTree_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_set_matcher_tree(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_set_on_no_match(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_mutable_on_no_match(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_on_no_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_set_on_no_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.OnMatch */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_OnMatch* ret = xds_type_matcher_v3_Matcher_OnMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_OnMatch_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_OnMatch* ret = xds_type_matcher_v3_Matcher_OnMatch_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_OnMatch_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_OnMatch_serialize(const xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_OnMatch_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_OnMatch_serialize_ex(const xds_type_matcher_v3_Matcher_OnMatch* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_OnMatch_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_Matcher_OnMatch_on_match_matcher = 1,
-  xds_type_matcher_v3_Matcher_OnMatch_on_match_action = 2,
-  xds_type_matcher_v3_Matcher_OnMatch_on_match_NOT_SET = 0
-} xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases;
-UPB_INLINE xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases xds_type_matcher_v3_Matcher_OnMatch_on_match_case(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_OnMatch_on_match_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_clear_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_matcher(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const xds_type_matcher_v3_Matcher* default_val = NULL;
-  const xds_type_matcher_v3_Matcher* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_matcher(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_clear_action(xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_action(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct xds_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_action(const xds_type_matcher_v3_Matcher_OnMatch* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_matcher(xds_type_matcher_v3_Matcher_OnMatch *msg, xds_type_matcher_v3_Matcher* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_mutable_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)xds_type_matcher_v3_Matcher_OnMatch_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_OnMatch_set_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_action(xds_type_matcher_v3_Matcher_OnMatch *msg, struct xds_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_mutable_action(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
-  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_OnMatch_action(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_OnMatch_set_action(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherList */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList* ret = xds_type_matcher_v3_Matcher_MatcherList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_MatcherList_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList* ret = xds_type_matcher_v3_Matcher_MatcherList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_serialize(const xds_type_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_clear_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const* xds_type_matcher_v3_Matcher_MatcherList_matchers(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_upb_array(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_matchers_mutable_upb_array(const xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_has_matchers(const xds_type_matcher_v3_Matcher_MatcherList* msg) {
-  size_t size;
-  xds_type_matcher_v3_Matcher_MatcherList_matchers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_matcher_v3_Matcher_MatcherList_mutable_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher** xds_type_matcher_v3_Matcher_MatcherList_resize_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_add_matchers(xds_type_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherList.Predicate */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_single_predicate = 1,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_or_matcher = 2,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_and_matcher = 3,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_not_matcher = 4,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_NOT_SET = 0
-} xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases;
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_case(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_match_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_single_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_or_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_and_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_clear_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_not_matcher(const xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_value_match = 2,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_custom_match = 3,
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_NOT_SET = 0
-} xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases;
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_case(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_matcher_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct xds_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_input(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct xds_type_matcher_v3_StringMatcher* default_val = NULL;
-  const struct xds_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_value_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_clear_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct xds_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_has_custom_match(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds_type_matcher_v3_StringMatcher_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
-  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_clear_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_Matcher_MatcherList_Predicate* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_upb_array(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate_mutable_upb_array(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_has_predicate(const xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
-  size_t size;
-  xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_predicate(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_Matcher_MatcherList_Predicate**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_Predicate** xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_resize_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_MatcherList_Predicate**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_add_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherList_Predicate* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_predicate(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_match(const xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherTree */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherTree_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherTree* ret = xds_type_matcher_v3_Matcher_MatcherTree_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_MatcherTree_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherTree* ret = xds_type_matcher_v3_Matcher_MatcherTree_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherTree_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_serialize(const xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherTree_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherTree* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherTree_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_exact_match_map = 2,
-  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_prefix_match_map = 3,
-  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_custom_match = 4,
-  xds_type_matcher_v3_Matcher_MatcherTree_tree_type_NOT_SET = 0
-} xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases;
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases xds_type_matcher_v3_Matcher_MatcherTree_tree_type_case(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Matcher_MatcherTree_tree_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_input(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_input(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct xds_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_input(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_exact_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* default_val = NULL;
-  const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_prefix_match_map(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_clear_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_custom_match(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const struct xds_core_v3_TypedExtensionConfig* default_val = NULL;
-  const struct xds_core_v3_TypedExtensionConfig* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_custom_match(const xds_type_matcher_v3_Matcher_MatcherTree* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_input(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_input(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_input(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_input(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
-  struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_custom_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds_core_v3_TypedExtensionConfig_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherTree.MatchMap */
-
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret = xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* ret = xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_serialize(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_serialize_ex(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_clear_map(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE size_t xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_size(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  return map ? _upb_Map_Size(map) : 0;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_get(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch** val) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Get(map, &key, 0, val, sizeof(*val));
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_next(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Map* map = upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_clear(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_set(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key, xds_type_matcher_v3_Matcher_OnMatch* val, upb_Arena* a) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, 0, sizeof(val), a);
-  return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_delete(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_StringView key) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return false;
-  return _upb_Map_Delete(map, &key, 0, NULL);
-}
-UPB_INLINE xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_map_nextmutable(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* msg, size_t* iter) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-  if (!map) return NULL;
-  return (xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry*)_upb_map_next(map, iter);
-}
-
-/* xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry */
-
-UPB_INLINE upb_StringView xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_key(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  upb_StringView ret;
-  _upb_msg_map_key(msg, &ret, 0);
-  return ret;
-}
-UPB_INLINE const xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_value(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  xds_type_matcher_v3_Matcher_OnMatch* ret;
-  _upb_msg_map_value(msg, &ret, sizeof(ret));
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_has_value(const xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_value(xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry *msg, xds_type_matcher_v3_Matcher_OnMatch* value) {
-  _upb_msg_map_set_value(msg, &value, sizeof(xds_type_matcher_v3_Matcher_OnMatch*));
-}
-
-extern const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
deleted file mode 100644
index 5010b44f51087..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/range.upb.h"
-#include "xds/type/v3/range.upb.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Int64RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_Int64RangeMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = {
-  {.submsg = &xds_type_v3_Int64Range_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Int32RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_Int32RangeMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = {
-  {.submsg = &xds_type_v3_Int32Range_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_DoubleRangeMatcher_msg_init = {
-  &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_DoubleRangeMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = {
-  {.submsg = &xds_type_v3_DoubleRange_msg_init},
-  {.submsg = &xds_type_matcher_v3_Matcher_OnMatch_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init = {
-  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0],
-  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_prm_1bt_maxmaxb},
-    {0x0010000001010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[6] = {
-  &xds_type_matcher_v3_Int64RangeMatcher_msg_init,
-  &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init,
-  &xds_type_matcher_v3_Int32RangeMatcher_msg_init,
-  &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init,
-  &xds_type_matcher_v3_DoubleRangeMatcher_msg_init,
-  &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  6,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h
deleted file mode 100644
index 6f6bff626ea77..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h
+++ /dev/null
@@ -1,732 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_Int64RangeMatcher xds_type_matcher_v3_Int64RangeMatcher;
-typedef struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher;
-typedef struct xds_type_matcher_v3_Int32RangeMatcher xds_type_matcher_v3_Int32RangeMatcher;
-typedef struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher;
-typedef struct xds_type_matcher_v3_DoubleRangeMatcher xds_type_matcher_v3_DoubleRangeMatcher;
-typedef struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_Int64RangeMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Int32RangeMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_DoubleRangeMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init;
-struct xds_type_matcher_v3_Matcher_OnMatch;
-struct xds_type_v3_DoubleRange;
-struct xds_type_v3_Int32Range;
-struct xds_type_v3_Int64Range;
-extern const upb_MiniTable xds_type_matcher_v3_Matcher_OnMatch_msg_init;
-extern const upb_MiniTable xds_type_v3_DoubleRange_msg_init;
-extern const upb_MiniTable xds_type_v3_Int32Range_msg_init;
-extern const upb_MiniTable xds_type_v3_Int64Range_msg_init;
-
-
-
-/* xds.type.matcher.v3.Int64RangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Int64RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int64RangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Int64RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int64RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Int64RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int64RangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_serialize(const xds_type_matcher_v3_Int64RangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int64RangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int64RangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int64RangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_clear_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int64RangeMatcher_range_matchers(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_has_range_matchers(const xds_type_matcher_v3_Int64RangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_Int64RangeMatcher_range_matchers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int64RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int64RangeMatcher_resize_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int64RangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_v3_Int64Range* const* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct xds_type_v3_Int64Range* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_ranges(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
-  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct xds_type_v3_Int64Range**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct xds_type_v3_Int64Range** xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct xds_type_v3_Int64Range**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_v3_Int64Range* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_v3_Int64Range* sub = (struct xds_type_v3_Int64Range*)_upb_Message_New(&xds_type_v3_Int64Range_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.Int32RangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Int32RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int32RangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Int32RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int32RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Int32RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int32RangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_serialize(const xds_type_matcher_v3_Int32RangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int32RangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int32RangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int32RangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_clear_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const* xds_type_matcher_v3_Int32RangeMatcher_range_matchers(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_has_range_matchers(const xds_type_matcher_v3_Int32RangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_Int32RangeMatcher_range_matchers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int32RangeMatcher_mutable_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher** xds_type_matcher_v3_Int32RangeMatcher_resize_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_add_range_matchers(xds_type_matcher_v3_Int32RangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_v3_Int32Range* const* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct xds_type_v3_Int32Range* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_ranges(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
-  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct xds_type_v3_Int32Range**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct xds_type_v3_Int32Range** xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct xds_type_v3_Int32Range**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_v3_Int32Range* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_v3_Int32Range* sub = (struct xds_type_v3_Int32Range*)_upb_Message_New(&xds_type_v3_Int32Range_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.matcher.v3.DoubleRangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_DoubleRangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_DoubleRangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_DoubleRangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_DoubleRangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_DoubleRangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_DoubleRangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_serialize(const xds_type_matcher_v3_DoubleRangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_DoubleRangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_serialize_ex(const xds_type_matcher_v3_DoubleRangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_DoubleRangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_clear_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const* xds_type_matcher_v3_DoubleRangeMatcher_range_matchers(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_range_matchers_mutable_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_has_range_matchers(const xds_type_matcher_v3_DoubleRangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_DoubleRangeMatcher_range_matchers(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matcher_v3_DoubleRangeMatcher_mutable_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher** xds_type_matcher_v3_DoubleRangeMatcher_resize_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_add_range_matchers(xds_type_matcher_v3_DoubleRangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* sub = (struct xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher */
-
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher*)_upb_Message_New(&xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* ret = xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_serialize(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_serialize_ex(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_clear_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_v3_DoubleRange* const* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct xds_type_v3_DoubleRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges_mutable_upb_array(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_has_ranges(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_ranges(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_clear_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
-  const struct xds_type_matcher_v3_Matcher_OnMatch* default_val = NULL;
-  const struct xds_type_matcher_v3_Matcher_OnMatch* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_has_on_match(const xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct xds_type_v3_DoubleRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct xds_type_v3_DoubleRange** xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_resize_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct xds_type_v3_DoubleRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_v3_DoubleRange* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_add_ranges(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_v3_DoubleRange* sub = (struct xds_type_v3_DoubleRange*)_upb_Message_New(&xds_type_v3_DoubleRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&xds_type_matcher_v3_Matcher_OnMatch_msg_init, arena);
-    if (sub) xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
deleted file mode 100644
index e739f09d49a7f..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/regex.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_RegexMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = {
-  {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_RegexMatcher_msg_init = {
-  &xds_type_matcher_v3_RegexMatcher_submsgs[0],
-  &xds_type_matcher_v3_RegexMatcher__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pom_1bt_max64b},
-    {0x000800003f000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-const upb_MiniTable xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init = {
-  NULL,
-  NULL,
-  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_type_matcher_v3_RegexMatcher_msg_init,
-  &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h
deleted file mode 100644
index 2fd4083a4997f..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_RegexMatcher xds_type_matcher_v3_RegexMatcher;
-typedef struct xds_type_matcher_v3_RegexMatcher_GoogleRE2 xds_type_matcher_v3_RegexMatcher_GoogleRE2;
-extern const upb_MiniTable xds_type_matcher_v3_RegexMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init;
-
-
-
-/* xds.type.matcher.v3.RegexMatcher */
-
-UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_RegexMatcher*)_upb_Message_New(&xds_type_matcher_v3_RegexMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_RegexMatcher* ret = xds_type_matcher_v3_RegexMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_RegexMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_RegexMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_RegexMatcher* ret = xds_type_matcher_v3_RegexMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_RegexMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_serialize(const xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_RegexMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_serialize_ex(const xds_type_matcher_v3_RegexMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_RegexMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_RegexMatcher_engine_type_google_re2 = 1,
-  xds_type_matcher_v3_RegexMatcher_engine_type_NOT_SET = 0
-} xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases;
-UPB_INLINE xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases xds_type_matcher_v3_RegexMatcher_engine_type_case(const xds_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_RegexMatcher_engine_type_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_RegexMatcher_clear_google_re2(xds_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_google_re2(const xds_type_matcher_v3_RegexMatcher* msg) {
-  const xds_type_matcher_v3_RegexMatcher_GoogleRE2* default_val = NULL;
-  const xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_RegexMatcher_has_google_re2(const xds_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_RegexMatcher_clear_regex(xds_type_matcher_v3_RegexMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_type_matcher_v3_RegexMatcher_regex(const xds_type_matcher_v3_RegexMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_google_re2(xds_type_matcher_v3_RegexMatcher *msg, xds_type_matcher_v3_RegexMatcher_GoogleRE2* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_mutable_google_re2(xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)xds_type_matcher_v3_RegexMatcher_google_re2(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, arena);
-    if (sub) xds_type_matcher_v3_RegexMatcher_set_google_re2(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_regex(xds_type_matcher_v3_RegexMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.type.matcher.v3.RegexMatcher.GoogleRE2 */
-
-UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_RegexMatcher_GoogleRE2*)_upb_Message_New(&xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret = xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_GoogleRE2_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_RegexMatcher_GoogleRE2* ret = xds_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize(const xds_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const xds_type_matcher_v3_RegexMatcher_GoogleRE2* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_RegexMatcher_GoogleRE2_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-
-
-extern const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c b/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
deleted file mode 100644
index 8bfe9db78a9c6..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/matcher/v3/string.upb.h"
-#include "xds/type/matcher/v3/regex.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_matcher_v3_StringMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_RegexMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = {
-  {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_StringMatcher_msg_init = {
-  &xds_type_matcher_v3_StringMatcher_submsgs[0],
-  &xds_type_matcher_v3_StringMatcher__fields[0],
-  UPB_SIZE(16, 24), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040100000a, &upb_pos_1bt},
-    {0x0008000402000012, &upb_pos_1bt},
-    {0x000800040300001a, &upb_pos_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800040500002a, &upb_pom_1bt_maxmaxb},
-    {0x000000003f000030, &upb_psb1_1bt},
-    {0x000800040700003a, &upb_pos_1bt},
-  })
-};
-
-static const upb_MiniTableSub xds_type_matcher_v3_ListStringMatcher_submsgs[1] = {
-  {.submsg = &xds_type_matcher_v3_StringMatcher_msg_init},
-};
-
-static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_matcher_v3_ListStringMatcher_msg_init = {
-  &xds_type_matcher_v3_ListStringMatcher_submsgs[0],
-  &xds_type_matcher_v3_ListStringMatcher__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_type_matcher_v3_StringMatcher_msg_init,
-  &xds_type_matcher_v3_ListStringMatcher_msg_init,
-};
-
-const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h b/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h
deleted file mode 100644
index 6cb749ca62db5..0000000000000
--- a/src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_matcher_v3_StringMatcher xds_type_matcher_v3_StringMatcher;
-typedef struct xds_type_matcher_v3_ListStringMatcher xds_type_matcher_v3_ListStringMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_StringMatcher_msg_init;
-extern const upb_MiniTable xds_type_matcher_v3_ListStringMatcher_msg_init;
-struct xds_type_matcher_v3_RegexMatcher;
-extern const upb_MiniTable xds_type_matcher_v3_RegexMatcher_msg_init;
-
-
-
-/* xds.type.matcher.v3.StringMatcher */
-
-UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds_type_matcher_v3_StringMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_StringMatcher* ret = xds_type_matcher_v3_StringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_StringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_StringMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_StringMatcher* ret = xds_type_matcher_v3_StringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_StringMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_StringMatcher_serialize(const xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_StringMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_StringMatcher_serialize_ex(const xds_type_matcher_v3_StringMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_StringMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_matcher_v3_StringMatcher_match_pattern_exact = 1,
-  xds_type_matcher_v3_StringMatcher_match_pattern_prefix = 2,
-  xds_type_matcher_v3_StringMatcher_match_pattern_suffix = 3,
-  xds_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5,
-  xds_type_matcher_v3_StringMatcher_match_pattern_contains = 7,
-  xds_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0
-} xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases;
-UPB_INLINE xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases xds_type_matcher_v3_StringMatcher_match_pattern_case(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_StringMatcher_match_pattern_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_exact(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_exact(const xds_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_exact(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_prefix(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_prefix(const xds_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_prefix(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_suffix(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_suffix(const xds_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_suffix(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_safe_regex(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_safe_regex(const xds_type_matcher_v3_StringMatcher* msg) {
-  const struct xds_type_matcher_v3_RegexMatcher* default_val = NULL;
-  const struct xds_type_matcher_v3_RegexMatcher* ret;
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_safe_regex(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_ignore_case(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_ignore_case(const xds_type_matcher_v3_StringMatcher* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_clear_contains(xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView xds_type_matcher_v3_StringMatcher_contains(const xds_type_matcher_v3_StringMatcher* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_contains(const xds_type_matcher_v3_StringMatcher* msg) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_exact(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_prefix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_suffix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_safe_regex(xds_type_matcher_v3_StringMatcher *msg, struct xds_type_matcher_v3_RegexMatcher* value) {
-  const upb_MiniTableField field = {5, 8, -5, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_mutable_safe_regex(xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) {
-  struct xds_type_matcher_v3_RegexMatcher* sub = (struct xds_type_matcher_v3_RegexMatcher*)xds_type_matcher_v3_StringMatcher_safe_regex(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_matcher_v3_RegexMatcher*)_upb_Message_New(&xds_type_matcher_v3_RegexMatcher_msg_init, arena);
-    if (sub) xds_type_matcher_v3_StringMatcher_set_safe_regex(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_ignore_case(xds_type_matcher_v3_StringMatcher *msg, bool value) {
-  const upb_MiniTableField field = {6, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_contains(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, 8, -5, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.type.matcher.v3.ListStringMatcher */
-
-UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_new(upb_Arena* arena) {
-  return (xds_type_matcher_v3_ListStringMatcher*)_upb_Message_New(&xds_type_matcher_v3_ListStringMatcher_msg_init, arena);
-}
-UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_matcher_v3_ListStringMatcher* ret = xds_type_matcher_v3_ListStringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ListStringMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_matcher_v3_ListStringMatcher* xds_type_matcher_v3_ListStringMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_matcher_v3_ListStringMatcher* ret = xds_type_matcher_v3_ListStringMatcher_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_matcher_v3_ListStringMatcher_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_matcher_v3_ListStringMatcher_serialize(const xds_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ListStringMatcher_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_matcher_v3_ListStringMatcher_serialize_ex(const xds_type_matcher_v3_ListStringMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_matcher_v3_ListStringMatcher_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_matcher_v3_ListStringMatcher_clear_patterns(xds_type_matcher_v3_ListStringMatcher* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_matcher_v3_StringMatcher* const* xds_type_matcher_v3_ListStringMatcher_patterns(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const xds_type_matcher_v3_StringMatcher* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_upb_array(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _xds_type_matcher_v3_ListStringMatcher_patterns_mutable_upb_array(const xds_type_matcher_v3_ListStringMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool xds_type_matcher_v3_ListStringMatcher_has_patterns(const xds_type_matcher_v3_ListStringMatcher* msg) {
-  size_t size;
-  xds_type_matcher_v3_ListStringMatcher_patterns(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMatcher_mutable_patterns(xds_type_matcher_v3_ListStringMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (xds_type_matcher_v3_StringMatcher**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE xds_type_matcher_v3_StringMatcher** xds_type_matcher_v3_ListStringMatcher_resize_patterns(xds_type_matcher_v3_ListStringMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_matcher_v3_StringMatcher**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStringMatcher_add_patterns(xds_type_matcher_v3_ListStringMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)_upb_Message_New(&xds_type_matcher_v3_StringMatcher_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/v3/cel.upb.c b/src/core/ext/upb-generated/xds/type/v3/cel.upb.c
deleted file mode 100644
index 9d00a5b1afe33..0000000000000
--- a/src/core/ext/upb-generated/xds/type/v3/cel.upb.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/v3/cel.upb.h"
-#include "google/api/expr/v1alpha1/checked.upb.h"
-#include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "validate/validate.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_v3_CelExpression_submsgs[2] = {
-  {.submsg = &google_api_expr_v1alpha1_ParsedExpr_msg_init},
-  {.submsg = &google_api_expr_v1alpha1_CheckedExpr_msg_init},
-};
-
-static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = {
-  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_CelExpression_msg_init = {
-  &xds_type_v3_CelExpression_submsgs[0],
-  &xds_type_v3_CelExpression__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pom_1bt_maxmaxb},
-    {0x0008000002010012, &upb_pom_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub xds_type_v3_CelExtractString_submsgs[2] = {
-  {.submsg = &xds_type_v3_CelExpression_msg_init},
-  {.submsg = &google_protobuf_StringValue_msg_init},
-};
-
-static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_CelExtractString_msg_init = {
-  &xds_type_v3_CelExtractString_submsgs[0],
-  &xds_type_v3_CelExtractString__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0010000002010012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[2] = {
-  &xds_type_v3_CelExpression_msg_init,
-  &xds_type_v3_CelExtractString_msg_init,
-};
-
-const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  2,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/v3/cel.upb.h b/src/core/ext/upb-generated/xds/type/v3/cel.upb.h
deleted file mode 100644
index b005d04790f8b..0000000000000
--- a/src/core/ext/upb-generated/xds/type/v3/cel.upb.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_v3_CelExpression xds_type_v3_CelExpression;
-typedef struct xds_type_v3_CelExtractString xds_type_v3_CelExtractString;
-extern const upb_MiniTable xds_type_v3_CelExpression_msg_init;
-extern const upb_MiniTable xds_type_v3_CelExtractString_msg_init;
-struct google_api_expr_v1alpha1_CheckedExpr;
-struct google_api_expr_v1alpha1_ParsedExpr;
-struct google_protobuf_StringValue;
-extern const upb_MiniTable google_api_expr_v1alpha1_CheckedExpr_msg_init;
-extern const upb_MiniTable google_api_expr_v1alpha1_ParsedExpr_msg_init;
-extern const upb_MiniTable google_protobuf_StringValue_msg_init;
-
-
-
-/* xds.type.v3.CelExpression */
-
-UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_new(upb_Arena* arena) {
-  return (xds_type_v3_CelExpression*)_upb_Message_New(&xds_type_v3_CelExpression_msg_init, arena);
-}
-UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_v3_CelExpression* ret = xds_type_v3_CelExpression_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_CelExpression_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_v3_CelExpression* xds_type_v3_CelExpression_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_v3_CelExpression* ret = xds_type_v3_CelExpression_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_CelExpression_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_v3_CelExpression_serialize(const xds_type_v3_CelExpression* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_CelExpression_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_v3_CelExpression_serialize_ex(const xds_type_v3_CelExpression* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_CelExpression_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-typedef enum {
-  xds_type_v3_CelExpression_expr_specifier_parsed_expr = 1,
-  xds_type_v3_CelExpression_expr_specifier_checked_expr = 2,
-  xds_type_v3_CelExpression_expr_specifier_NOT_SET = 0
-} xds_type_v3_CelExpression_expr_specifier_oneofcases;
-UPB_INLINE xds_type_v3_CelExpression_expr_specifier_oneofcases xds_type_v3_CelExpression_expr_specifier_case(const xds_type_v3_CelExpression* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (xds_type_v3_CelExpression_expr_specifier_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-}
-UPB_INLINE void xds_type_v3_CelExpression_clear_parsed_expr(xds_type_v3_CelExpression* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_parsed_expr(const xds_type_v3_CelExpression* msg) {
-  const struct google_api_expr_v1alpha1_ParsedExpr* default_val = NULL;
-  const struct google_api_expr_v1alpha1_ParsedExpr* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_v3_CelExpression_has_parsed_expr(const xds_type_v3_CelExpression* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_v3_CelExpression_clear_checked_expr(xds_type_v3_CelExpression* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_checked_expr(const xds_type_v3_CelExpression* msg) {
-  const struct google_api_expr_v1alpha1_CheckedExpr* default_val = NULL;
-  const struct google_api_expr_v1alpha1_CheckedExpr* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_v3_CelExpression_has_checked_expr(const xds_type_v3_CelExpression* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_v3_CelExpression_set_parsed_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_ParsedExpr* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_mutable_parsed_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) {
-  struct google_api_expr_v1alpha1_ParsedExpr* sub = (struct google_api_expr_v1alpha1_ParsedExpr*)xds_type_v3_CelExpression_parsed_expr(msg);
-  if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_ParsedExpr*)_upb_Message_New(&google_api_expr_v1alpha1_ParsedExpr_msg_init, arena);
-    if (sub) xds_type_v3_CelExpression_set_parsed_expr(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_v3_CelExpression_set_checked_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_mutable_checked_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) {
-  struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)xds_type_v3_CelExpression_checked_expr(msg);
-  if (sub == NULL) {
-    sub = (struct google_api_expr_v1alpha1_CheckedExpr*)_upb_Message_New(&google_api_expr_v1alpha1_CheckedExpr_msg_init, arena);
-    if (sub) xds_type_v3_CelExpression_set_checked_expr(msg, sub);
-  }
-  return sub;
-}
-
-/* xds.type.v3.CelExtractString */
-
-UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_new(upb_Arena* arena) {
-  return (xds_type_v3_CelExtractString*)_upb_Message_New(&xds_type_v3_CelExtractString_msg_init, arena);
-}
-UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_v3_CelExtractString* ret = xds_type_v3_CelExtractString_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_CelExtractString_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_v3_CelExtractString* xds_type_v3_CelExtractString_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_v3_CelExtractString* ret = xds_type_v3_CelExtractString_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_CelExtractString_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_v3_CelExtractString_serialize(const xds_type_v3_CelExtractString* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_CelExtractString_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_v3_CelExtractString_serialize_ex(const xds_type_v3_CelExtractString* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_CelExtractString_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_v3_CelExtractString_clear_expr_extract(xds_type_v3_CelExtractString* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const xds_type_v3_CelExpression* xds_type_v3_CelExtractString_expr_extract(const xds_type_v3_CelExtractString* msg) {
-  const xds_type_v3_CelExpression* default_val = NULL;
-  const xds_type_v3_CelExpression* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_v3_CelExtractString_has_expr_extract(const xds_type_v3_CelExtractString* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void xds_type_v3_CelExtractString_clear_default_value(xds_type_v3_CelExtractString* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_StringValue* xds_type_v3_CelExtractString_default_value(const xds_type_v3_CelExtractString* msg) {
-  const struct google_protobuf_StringValue* default_val = NULL;
-  const struct google_protobuf_StringValue* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool xds_type_v3_CelExtractString_has_default_value(const xds_type_v3_CelExtractString* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void xds_type_v3_CelExtractString_set_expr_extract(xds_type_v3_CelExtractString *msg, xds_type_v3_CelExpression* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutable_expr_extract(xds_type_v3_CelExtractString* msg, upb_Arena* arena) {
-  struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_v3_CelExtractString_expr_extract(msg);
-  if (sub == NULL) {
-    sub = (struct xds_type_v3_CelExpression*)_upb_Message_New(&xds_type_v3_CelExpression_msg_init, arena);
-    if (sub) xds_type_v3_CelExtractString_set_expr_extract(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void xds_type_v3_CelExtractString_set_default_value(xds_type_v3_CelExtractString *msg, struct google_protobuf_StringValue* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_mutable_default_value(xds_type_v3_CelExtractString* msg, upb_Arena* arena) {
-  struct google_protobuf_StringValue* sub = (struct google_protobuf_StringValue*)xds_type_v3_CelExtractString_default_value(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_StringValue*)_upb_Message_New(&google_protobuf_StringValue_msg_init, arena);
-    if (sub) xds_type_v3_CelExtractString_set_default_value(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_V3_CEL_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/v3/range.upb.c b/src/core/ext/upb-generated/xds/type/v3/range.upb.c
deleted file mode 100644
index 2452c43c784f3..0000000000000
--- a/src/core/ext/upb-generated/xds/type/v3/range.upb.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/v3/range.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableField xds_type_v3_Int64Range__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_Int64Range_msg_init = {
-  NULL,
-  &xds_type_v3_Int64Range__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv8_1bt},
-    {0x000800003f000010, &upb_psv8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_type_v3_Int32Range__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_Int32Range_msg_init = {
-  NULL,
-  &xds_type_v3_Int32Range__fields[0],
-  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000008, &upb_psv4_1bt},
-    {0x000400003f000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField xds_type_v3_DoubleRange__fields[2] = {
-  {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_DoubleRange_msg_init = {
-  NULL,
-  &xds_type_v3_DoubleRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f000009, &upb_psf8_1bt},
-    {0x000800003f000011, &upb_psf8_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[3] = {
-  &xds_type_v3_Int64Range_msg_init,
-  &xds_type_v3_Int32Range_msg_init,
-  &xds_type_v3_DoubleRange_msg_init,
-};
-
-const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  3,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upb-generated/xds/type/v3/range.upb.h b/src/core/ext/upb-generated/xds/type/v3/range.upb.h
deleted file mode 100644
index 6a435f3773f32..0000000000000
--- a/src/core/ext/upb-generated/xds/type/v3/range.upb.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct xds_type_v3_Int64Range xds_type_v3_Int64Range;
-typedef struct xds_type_v3_Int32Range xds_type_v3_Int32Range;
-typedef struct xds_type_v3_DoubleRange xds_type_v3_DoubleRange;
-extern const upb_MiniTable xds_type_v3_Int64Range_msg_init;
-extern const upb_MiniTable xds_type_v3_Int32Range_msg_init;
-extern const upb_MiniTable xds_type_v3_DoubleRange_msg_init;
-
-
-
-/* xds.type.v3.Int64Range */
-
-UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_new(upb_Arena* arena) {
-  return (xds_type_v3_Int64Range*)_upb_Message_New(&xds_type_v3_Int64Range_msg_init, arena);
-}
-UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_v3_Int64Range* ret = xds_type_v3_Int64Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_Int64Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_v3_Int64Range* xds_type_v3_Int64Range_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_v3_Int64Range* ret = xds_type_v3_Int64Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_Int64Range_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_v3_Int64Range_serialize(const xds_type_v3_Int64Range* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_Int64Range_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_v3_Int64Range_serialize_ex(const xds_type_v3_Int64Range* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_Int64Range_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_v3_Int64Range_clear_start(xds_type_v3_Int64Range* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t xds_type_v3_Int64Range_start(const xds_type_v3_Int64Range* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_type_v3_Int64Range_clear_end(xds_type_v3_Int64Range* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t xds_type_v3_Int64Range_end(const xds_type_v3_Int64Range* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_type_v3_Int64Range_set_start(xds_type_v3_Int64Range *msg, int64_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_v3_Int64Range_set_end(xds_type_v3_Int64Range *msg, int64_t value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.type.v3.Int32Range */
-
-UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_new(upb_Arena* arena) {
-  return (xds_type_v3_Int32Range*)_upb_Message_New(&xds_type_v3_Int32Range_msg_init, arena);
-}
-UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_v3_Int32Range* ret = xds_type_v3_Int32Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_Int32Range_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_v3_Int32Range* xds_type_v3_Int32Range_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_v3_Int32Range* ret = xds_type_v3_Int32Range_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_Int32Range_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_v3_Int32Range_serialize(const xds_type_v3_Int32Range* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_Int32Range_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_v3_Int32Range_serialize_ex(const xds_type_v3_Int32Range* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_Int32Range_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_v3_Int32Range_clear_start(xds_type_v3_Int32Range* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t xds_type_v3_Int32Range_start(const xds_type_v3_Int32Range* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_type_v3_Int32Range_clear_end(xds_type_v3_Int32Range* msg) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t xds_type_v3_Int32Range_end(const xds_type_v3_Int32Range* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_type_v3_Int32Range_set_start(xds_type_v3_Int32Range *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_v3_Int32Range_set_end(xds_type_v3_Int32Range *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* xds.type.v3.DoubleRange */
-
-UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_new(upb_Arena* arena) {
-  return (xds_type_v3_DoubleRange*)_upb_Message_New(&xds_type_v3_DoubleRange_msg_init, arena);
-}
-UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  xds_type_v3_DoubleRange* ret = xds_type_v3_DoubleRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_DoubleRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE xds_type_v3_DoubleRange* xds_type_v3_DoubleRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  xds_type_v3_DoubleRange* ret = xds_type_v3_DoubleRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &xds_type_v3_DoubleRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* xds_type_v3_DoubleRange_serialize(const xds_type_v3_DoubleRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_DoubleRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* xds_type_v3_DoubleRange_serialize_ex(const xds_type_v3_DoubleRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &xds_type_v3_DoubleRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void xds_type_v3_DoubleRange_clear_start(xds_type_v3_DoubleRange* msg) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double xds_type_v3_DoubleRange_start(const xds_type_v3_DoubleRange* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE void xds_type_v3_DoubleRange_clear_end(xds_type_v3_DoubleRange* msg) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double xds_type_v3_DoubleRange_end(const xds_type_v3_DoubleRange* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-
-UPB_INLINE void xds_type_v3_DoubleRange_set_start(xds_type_v3_DoubleRange *msg, double value) {
-  const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, double value) {
-  const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c b/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
deleted file mode 100644
index 92b392dff94b4..0000000000000
--- a/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/typed_struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "xds/type/v3/typed_struct.upb.h"
-#include "google/protobuf/struct.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub xds_type_v3_TypedStruct_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-};
-
-static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable xds_type_v3_TypedStruct_msg_init = {
-  &xds_type_v3_TypedStruct_submsgs[0],
-  &xds_type_v3_TypedStruct__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_pss_1bt},
-    {0x0018000001000012, &upb_psm_1bt_maxmaxb},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[1] = {
-  &xds_type_v3_TypedStruct_msg_init,
-};
-
-const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout = {
-  messages_layout,
-  NULL,
-  NULL,
-  1,
-  0,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c
index aeb3ccf039cf0..8f6a67488734a 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/certs.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/certs.upbdefs.h"
-#include "envoy/admin/v3/certs.upb.h"
+#include "envoy/admin/v3/certs.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_timestamp_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
index 8235c2f71af61..42f538d9bc4e2 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/certs.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c
index 1cf9d08512c9e..ed193cd1e3c32 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/clusters.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/clusters.upbdefs.h"
-#include "envoy/admin/v3/clusters.upb.h"
+#include "envoy/admin/v3/clusters.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_admin_v3_metrics_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
index 798ec1077418d..6a707fc74dd5e 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/clusters.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c
index 574f3a7162572..dfc7eef8de076 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/config_dump.upbdefs.h"
-#include "envoy/admin/v3/config_dump.upb.h"
+#include "envoy/admin/v3/config_dump.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_admin_v3_config_dump_shared_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
index 839bf59506e0e..bd97aec5c8d86 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c
index 77d231c96b556..34b51a3babe21 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump_shared.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/config_dump_shared.upbdefs.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_timestamp_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
index a528592c2df25..2192701778cfd 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/config_dump_shared.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c
index c6ff92c6b79b9..2d79ca5a3a924 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/init_dump.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/init_dump.upbdefs.h"
-#include "envoy/admin/v3/init_dump.upb.h"
+#include "envoy/admin/v3/init_dump.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 static const char descriptor[416] = {'\n', '\036', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 'i', 'n', 'i', 't', '_', 'd', 'u', 'm', 
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
index b599767c818e4..4eb11f02e920d 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/init_dump.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c
index e4aae5b5465a6..3ed0c4ee6c5e4 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/listeners.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/listeners.upbdefs.h"
-#include "envoy/admin/v3/listeners.upb.h"
+#include "envoy/admin/v3/listeners.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
index 40e138b1fee81..8e7d96037e523 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/listeners.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c
index 31545c7239293..0d40cd55ade40 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/memory.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/memory.upbdefs.h"
-#include "envoy/admin/v3/memory.upb.h"
+#include "envoy/admin/v3/memory.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
index 97eda40bc1eef..9ea80bec681c7 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/memory.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c
index 6e35cecf6f160..388ee91459f37 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/metrics.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/metrics.upbdefs.h"
-#include "envoy/admin/v3/metrics.upb.h"
+#include "envoy/admin/v3/metrics.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
index 48da546a45b1c..71297b5c9eefd 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/metrics.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c
index 919cd893545a4..55bb5545d2756 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/mutex_stats.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/mutex_stats.upbdefs.h"
-#include "envoy/admin/v3/mutex_stats.upb.h"
+#include "envoy/admin/v3/mutex_stats.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
index 67ae02284d922..0b34cf49c5494 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/mutex_stats.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c
index 32cec198a57c8..9e9cd9db90727 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/server_info.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/server_info.upbdefs.h"
-#include "envoy/admin/v3/server_info.upb.h"
+#include "envoy/admin/v3/server_info.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
index a4eb49b68bf47..9d6327278525d 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/server_info.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c
index 795ad0920675a..472ebda263b6f 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/tap.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/admin/v3/tap.upbdefs.h"
-#include "envoy/admin/v3/tap.upb.h"
+#include "envoy/admin/v3/tap.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_tap_v3_common_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
index aa63548daaf5e..e122ecd5e0cea 100644
--- a/src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/admin/v3/tap.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c
index db2e159e4c5a4..2a1cc9edfbc18 100644
--- a/src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/annotations/deprecation.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/annotations/deprecation.upbdefs.h"
-#include "envoy/annotations/deprecation.upb.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
 static const char descriptor[550] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 
diff --git a/src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
similarity index 83%
rename from src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
index 8bcbf9de7ae74..b062ac6787367 100644
--- a/src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/annotations/deprecation.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c
new file mode 100644
index 0000000000000..b5601d46d4519
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c
@@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/annotations/resource.upbdefs.h"
+#include "envoy/annotations/resource.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[300] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 
+'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\021', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
+'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\022', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 
+'t', 'y', 'p', 'e', ':', 'e', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', 
+'\301', '\344', '\262', '~', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'r', 
+'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', ':', 'Z', '8', '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', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_annotations_resource_proto_upbdefinit = {
+  deps,
+  &envoy_annotations_resource_proto_upb_file_layout,
+  "envoy/annotations/resource.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 300)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
new file mode 100644
index 0000000000000..57117e01b463f
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_annotations_resource_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_annotations_ResourceAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_annotations_resource_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.annotations.ResourceAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c
new file mode 100644
index 0000000000000..67d765c51f22c
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c
@@ -0,0 +1,233 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/accesslog/v3/accesslog.upbdefs.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[4736] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 
+'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', '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', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', 
+'3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', 
+'\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 
+'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 
+'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 
+'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 
+'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
+'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', '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', '!', 'u', 
+'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
+'g', '.', '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', '\"', '\356', '\001', '\n', '\t', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', '\022', '\n', '\004', 
+'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'B', '\n', '\006', 'f', 'i', 'l', 't', 'e', 
+'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 
+'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 
+'r', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', 
+'\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '1', '\232', '\305', '\210', '\036', ',', 
+'\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 
+'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 
+'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\312', 
+'\t', '\n', '\017', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 's', 't', 'a', 
+'t', 'u', 's', '_', 'c', 'o', 'd', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
+'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 's', 't', 'a', 't', 'u', 
+'s', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'T', '\n', '\017', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'f', 
+'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 
+'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'h', '\n', 
+'\027', 'n', 'o', 't', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', 
+'\003', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 
+'l', 't', 'e', 'r', 'H', '\000', 'R', '\024', 'n', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 
+'t', 'e', 'r', '\022', 'W', '\n', '\020', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\004', 
+' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 
+'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 
+'R', '\017', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'Q', '\n', '\016', 'r', 'u', 'n', 't', 
+'i', 'm', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 
+'m', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\r', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
+'\022', 'E', '\n', '\n', 'a', 'n', 'd', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 
+'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\t', 'a', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'B', '\n', '\t', 
+'o', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'O', 'r', 'F', 'i', 'l', 't', 
+'e', 'r', 'H', '\000', 'R', '\010', 'o', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 
+'f', 'i', 'l', 't', 'e', 'r', '\030', '\010', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 
+'t', 'e', 'r', 'H', '\000', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'a', '\n', '\024', 'r', 'e', 
+'s', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', 
+'-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 
+'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\022', 
+'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 'g', 'r', 'p', 
+'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\n', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
+'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 'g', 'r', 'p', 'c', 'S', 
+'t', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'W', '\n', '\020', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 
+'f', 'i', 'l', 't', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 
+'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 
+'\022', 'T', '\n', '\017', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', 
+'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'm', 'e', 't', 
+'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'R', '\n', '\017', 'l', 'o', 'g', '_', 't', 'y', 'p', 'e', '_', 'f', 
+'i', 'l', 't', 'e', 'r', '\030', '\r', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 
+'t', 'e', 'r', 'H', '\000', 'R', '\r', 'l', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', 
+'\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 
+'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 
+'e', 'r', 'B', '\027', '\n', '\020', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 
+'B', '\001', '\"', '\371', '\001', '\n', '\020', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'H', 
+'\n', '\002', 'o', 'p', '\030', '\001', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 
+'i', 'l', 't', 'e', 'r', '.', 'O', 'p', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\002', 'o', 'p', '\022', 'C', '\n', 
+'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', 'B', 
+'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '\034', '\n', '\002', 'O', 'p', '\022', '\006', '\n', 
+'\002', 'E', 'Q', '\020', '\000', '\022', '\006', '\n', '\002', 'G', 'E', '\020', '\001', '\022', '\006', '\n', '\002', 'L', 'E', '\020', '\002', ':', '8', '\232', '\305', 
+'\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 
+'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 
+'l', 't', 'e', 'r', '\"', '\243', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
+'\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 
+'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 
+'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'.', 'v', '2', '.', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\237', '\001', '\n', '\016', 
+'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 
+'s', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 
+'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 
+'n', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 
+'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 
+'n', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'T', '\n', '\024', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 
+'F', 'i', 'l', 't', 'e', 'r', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'N', 'o', 
+'t', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'J', '\n', '\017', 'T', 'r', 'a', 
+'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\371', '\001', '\n', '\r', 'R', 
+'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 
+'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 
+'e', 'K', 'e', 'y', '\022', 'I', '\n', '\017', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\002', 
+' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 
+'t', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'S', 'a', 'm', 
+'p', 'l', 'e', 'd', '\022', '<', '\n', '\032', 'u', 's', 'e', '_', 'i', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', '_', 'r', 
+'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\030', 'u', 's', 'e', 'I', 'n', 'd', 'e', 'p', 
+'e', 'n', 'd', 'e', 'n', 't', 'R', 'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 
+'s', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\216', '\001', '\n', 
+'\t', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', 
+'(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
+'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', 
+'\005', '\222', '\001', '\002', '\010', '\002', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 
+'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\010', 'O', 'r', 'F', 'i', 
+'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
+'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 
+'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', 
+'.', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\014', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 
+'r', '\022', 'F', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', ':', '4', 
+'\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 
+'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 
+'e', 'r', '\"', '\352', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', 
+'\022', '\227', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\200', '\001', '\372', 'B', '}', '\222', '\001', 'z', 
+'\"', 'x', 'r', 'v', 'R', '\002', 'L', 'H', 'R', '\002', 'U', 'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', '\002', 'U', 'R', 'R', 
+'\002', 'U', 'F', 'R', '\002', 'U', 'C', 'R', '\002', 'U', 'O', 'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', 'F', 'I', 'R', '\002', 
+'R', 'L', 'R', '\004', 'U', 'A', 'E', 'X', 'R', '\004', 'R', 'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', 'R', 'X', 'R', '\002', 
+'S', 'I', 'R', '\002', 'I', 'H', 'R', '\003', 'D', 'P', 'E', 'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', 'F', 'C', 'F', 'R', 
+'\004', 'N', 'F', 'C', 'F', 'R', '\002', 'D', 'T', 'R', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', 'M', 'R', '\005', 'f', 
+'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 
+'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\200', '\004', '\n', '\020', 'G', 'r', 'p', 'c', 'S', 't', 
+'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', ']', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', 
+'\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 
+'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '.', 'S', 
+'t', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', 'a', 
+'t', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 
+'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', '\006', '\n', '\002', 'O', 'K', '\020', '\000', 
+'\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', 'L', 'E', 'D', '\020', '\001', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 
+'\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', 'A', 'L', 'I', 'D', '_', 'A', 'R', 'G', 'U', 'M', 'E', 'N', 'T', '\020', '\003', '\022', 
+'\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', 'N', 'E', '_', 'E', 'X', 'C', 'E', 'E', 'D', 'E', 'D', '\020', '\004', '\022', '\r', '\n', 
+'\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\005', '\022', '\022', '\n', '\016', 'A', 'L', 'R', 'E', 'A', 'D', 'Y', '_', 'E', 
+'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', '\n', '\021', 'P', 'E', 'R', 'M', 'I', 'S', 'S', 'I', 'O', 'N', '_', 'D', 'E', 'N', 
+'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', 'R', 'E', 'S', 'O', 'U', 'R', 'C', 'E', '_', 'E', 'X', 'H', 'A', 'U', 'S', 'T', 
+'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', 'A', 'I', 'L', 'E', 'D', '_', 'P', 'R', 'E', 'C', 'O', 'N', 'D', 'I', 'T', 'I', 
+'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', 'B', 'O', 'R', 'T', 'E', 'D', '\020', '\n', '\022', '\020', '\n', '\014', 'O', 'U', 'T', '_', 
+'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\013', '\022', '\021', '\n', '\r', 'U', 'N', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 
+'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\r', '\022', '\017', '\n', '\013', 'U', 'N', 'A', 
+'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\016', '\022', '\r', '\n', '\t', 'D', 'A', 'T', 'A', '_', 'L', 'O', 'S', 'S', '\020', '\017', 
+'\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', 'H', 'E', 'N', 'T', 'I', 'C', 'A', 'T', 'E', 'D', '\020', '\020', ':', '8', '\232', '\305', 
+'\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 
+'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 
+'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', '@', 
+'\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
+'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'N', '\n', '\026', 'm', 'a', 't', 'c', 'h', '_', 'i', 
+'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', 
+'\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', 'e', 'y', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', ':', '6', '\232', '\305', '\210', '\036', 
+'1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 
+'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', 
+'\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 
+'s', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 
+'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', 't', 'y', 'p', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 
+'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\266', '\001', '\n', '\017', 
+'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', 
+' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 
+'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', 
+'2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 
+'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 
+'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 
+'o', 'n', 'f', 'i', 'g', 'B', '\221', '\001', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', 
+'\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'L', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '/', 'v', '3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', 
+'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[11] = {
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &envoy_config_route_v3_route_components_proto_upbdefinit,
+  &envoy_data_accesslog_v3_accesslog_proto_upbdefinit,
+  &envoy_type_matcher_v3_metadata_proto_upbdefinit,
+  &envoy_type_v3_percent_proto_upbdefinit,
+  &google_protobuf_any_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = {
+  deps,
+  &envoy_config_accesslog_v3_accesslog_proto_upb_file_layout,
+  "envoy/config/accesslog/v3/accesslog.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 4736)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
new file mode 100644
index 0000000000000..2b520e13acf3e
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
@@ -0,0 +1,110 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AccessLog_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AccessLog");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AccessLogFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AccessLogFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ComparisonFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ComparisonFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_StatusCodeFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.StatusCodeFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_DurationFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.DurationFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_NotHealthCheckFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.NotHealthCheckFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_TraceableFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.TraceableFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_RuntimeFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.RuntimeFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AndFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AndFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_OrFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.OrFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_HeaderFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.HeaderFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ResponseFlagFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ResponseFlagFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_GrpcStatusFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.GrpcStatusFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_MetadataFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.MetadataFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_LogTypeFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.LogTypeFilter");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ExtensionFilter_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ExtensionFilter");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
index d57562ca0a236..898250628a77b 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/bootstrap/v3/bootstrap.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/bootstrap/v3/bootstrap.upbdefs.h"
-#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
index b7cc97a678b5e..7fab8e68f3805 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/bootstrap/v3/bootstrap.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
index 3d69ace51d8de..b4c3116420333 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/circuit_breaker.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/cluster/v3/circuit_breaker.upbdefs.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
index fe1abaff964fa..70605c94e88e3 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/circuit_breaker.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c
new file mode 100644
index 0000000000000..49ebc83b71653
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c
@@ -0,0 +1,566 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/cluster/v3/cluster.upbdefs.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_cluster_v3_filter_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_health_check_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_protocol_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_resolver_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_endpoint_v3_endpoint_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init xds_core_v3_collection_entry_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[12402] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
+'/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
+'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 
+'e', 'a', 'k', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', 
+'/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'f', 'i', 'l', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', 
+'/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 
+'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 
+'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 
+'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\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', '(', 'e', 'n', 'v', 'o', 'y', '/', 
+'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 
+'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
+'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\'', 'e', 
+'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', 'a', 'l', 't', 
+'h', '_', 'c', 'h', 'e', 'c', 'k', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 
+'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', 
+'\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 
+'s', 'o', 'l', 'v', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 
+'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'p', 'r', 
+'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 
+'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
+'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 
+'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 
+'o', 't', 'o', '\032', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 
+'o', 'n', '_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 
+'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 
+'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'s', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', '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', '!', 'u', 
+'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
+'g', '.', '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', '\"', 'K', '\n', '\021', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', 't', 
+'i', 'o', 'n', '\022', '6', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 
+'s', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 
+'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\317', 'R', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'o', '\n', '\030', 
+'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 's', '\030', 
+'+', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
+'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 
+'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'R', '\026', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 
+'e', 't', 'M', 'a', 't', 'c', 'h', 'e', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', 
+'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\r', 'a', 'l', 't', '_', 's', 't', 'a', 't', 
+'_', 'n', 'a', 'm', 'e', '\030', '\034', ' ', '\001', '(', '\t', 'B', '\032', '\362', '\230', '\376', '\217', '\005', '\024', '\n', '\022', 'o', 'b', 's', 'e', 
+'r', 'v', 'a', 'b', 'i', 'l', 'i', 't', 'y', '_', 'n', 'a', 'm', 'e', 'R', '\013', 'a', 'l', 't', 'S', 't', 'a', 't', 'N', 'a', 
+'m', 'e', '\022', 'N', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 
+'.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'H', 
+'\000', 'R', '\004', 't', 'y', 'p', 'e', '\022', 'W', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '&', 
+' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
+'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 
+'e', 'r', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '_', '\n', '\022', 
+'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 
+'1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 
+'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 
+'R', '\020', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\017', 'c', 'o', 'n', 
+'n', 'e', 'c', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
+'\252', '\001', '\002', '*', '\000', 'R', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'o', '\n', '!', 
+'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 
+'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', 
+'\002', '\020', '\001', 'R', '\035', 'p', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 
+'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', 'P', '\n', '\t', 'l', 'b', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', 
+'\001', '(', '\016', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 
+'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', 
+'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 'l', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', '\017', 'l', 'o', 'a', 'd', '_', 
+'a', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '\030', '!', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 
+'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'R', '\016', 'l', 'o', 'a', 'd', 'A', 's', 's', 'i', 
+'g', 'n', 'm', 'e', 'n', 't', '\022', 'F', '\n', '\r', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 's', '\030', '\010', 
+' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
+'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'R', '\014', 'h', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 
+'c', 'k', 's', '\022', 'h', '\n', '\033', 'm', 'a', 'x', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'p', 'e', 'r', '_', 'c', 
+'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', 
+'\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\030', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'P', 'e', 'r', 'C', 
+'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'S', '\n', '\020', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 'e', 'a', 
+'k', 'e', 'r', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 
+'r', 's', 'R', '\017', 'c', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 'r', 's', '\022', '\203', '\001', '\n', '\036', 'u', 
+'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 
+'i', 'o', 'n', 's', '\030', '.', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 
+'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', 
+'\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 
+'o', 'n', 's', '\022', 'w', '\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 
+'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\035', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 
+'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\031', 'c', 
+'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 
+'k', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', 
+'\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', 
+'.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', 
+'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 
+'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 't', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 
+'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 
+'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\022', '\030', '\001', '\212', '\223', '\267', '*', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', 
+'\003', '3', '.', '0', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 
+'s', '\022', '\214', '\001', '\n', ' ', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 
+'t', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '$', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 
+'t', 'e', 'r', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 
+'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\035', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
+'s', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'Q', '\n', '\020', 'd', 'n', 
+'s', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'r', 'a', 't', 'e', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 
+'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\016', 'd', 'n', 's', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 
+'t', 'e', '\022', 'e', '\n', '\030', 'd', 'n', 's', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', 
+'_', 'r', 'a', 't', 'e', '\030', ',', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 
+'e', 's', 'h', 'R', 'a', 't', 'e', 'R', '\025', 'd', 'n', 's', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'f', 'r', 'e', 's', 
+'h', 'R', 'a', 't', 'e', '\022', '&', '\n', '\017', 'r', 'e', 's', 'p', 'e', 'c', 't', '_', 'd', 'n', 's', '_', 't', 't', 'l', '\030', 
+'\'', ' ', '\001', '(', '\010', 'R', '\r', 'r', 'e', 's', 'p', 'e', 'c', 't', 'D', 'n', 's', 'T', 't', 'l', '\022', 'f', '\n', '\021', 'd', 
+'n', 's', '_', 'l', 'o', 'o', 'k', 'u', 'p', '_', 'f', 'a', 'm', 'i', 'l', 'y', '\030', '\021', ' ', '\001', '(', '\016', '2', '0', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 
+'l', 'u', 's', 't', 'e', 'r', '.', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', 'B', '\010', '\372', 
+'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\017', 'd', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', 
+'O', '\n', '\r', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 's', '\030', '\022', ' ', '\003', '(', '\013', '2', '\035', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 
+'e', 's', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'd', 'n', 's', 'R', 'e', 's', 'o', 
+'l', 'v', 'e', 'r', 's', '\022', 'A', '\n', '\027', 'u', 's', 'e', '_', 't', 'c', 'p', '_', 'f', 'o', 'r', '_', 'd', 'n', 's', '_', 
+'l', 'o', 'o', 'k', 'u', 'p', 's', '\030', '-', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', 
+'0', 'R', '\023', 'u', 's', 'e', 'T', 'c', 'p', 'F', 'o', 'r', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 's', '\022', 'j', '\n', 
+'\025', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '5', ' ', 
+'\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', 
+'3', '.', 'D', 'n', 's', 'R', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\013', '\030', '\001', 
+'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'd', 'n', 's', 'R', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'C', 
+'o', 'n', 'f', 'i', 'g', '\022', 'e', '\n', '\031', 't', 'y', 'p', 'e', 'd', '_', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'v', 
+'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '7', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 
+'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\026', 't', 'y', 'p', 'e', 'd', 'D', 'n', 's', 'R', 'e', 's', 'o', 'l', 'v', 
+'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\025', 'w', 'a', 'i', 't', '_', 'f', 'o', 'r', '_', 'w', 'a', 'r', 'm', 
+'_', 'o', 'n', '_', 'i', 'n', 'i', 't', '\030', '6', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 'w', 'a', 'i', 't', 'F', 'o', 
+'r', 'W', 'a', 'r', 'm', 'O', 'n', 'I', 'n', 'i', 't', '\022', 'V', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 
+'t', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\023', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 
+'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 
+'N', '\n', '\020', 'c', 'l', 'e', 'a', 'n', 'u', 'p', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\024', ' ', '\001', '(', '\013', 
+'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 
+'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\017', 'c', 'l', 'e', 'a', 'n', 'u', 'p', 'I', 'n', 't', 'e', 
+'r', 'v', 'a', 'l', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', 
+'f', 'i', 'g', '\030', '\025', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\022', 'u', 'p', 's', 't', 'r', 
+'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', 'l', 'b', '_', 's', 'u', 'b', 's', 'e', 
+'t', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\026', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 
+'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'l', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 
+'n', 'f', 'i', 'g', '\022', 'b', '\n', '\023', 'r', 'i', 'n', 'g', '_', 'h', 'a', 's', 'h', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 
+'i', 'g', '\030', '\027', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
+'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 
+'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\020', 'r', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 
+'n', 'f', 'i', 'g', '\022', '[', '\n', '\020', 'm', 'a', 'g', 'l', 'e', 'v', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
+'4', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
+'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 
+'n', 'f', 'i', 'g', 'H', '\001', 'R', '\016', 'm', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'k', '\n', 
+'\026', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'd', 's', 't', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\"', 
+' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
+'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 
+'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\023', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 
+'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'l', 'e', 'a', 's', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'l', 
+'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '%', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 
+'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\024', 'l', 'e', 
+'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'h', '\n', '\025', 'r', 'o', 'u', 
+'n', 'd', '_', 'r', 'o', 'b', 'i', 'n', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '8', ' ', '\001', '(', '\013', '2', 
+'3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 
+'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 
+'i', 'g', 'H', '\001', 'R', '\022', 'r', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
+'Y', '\n', '\020', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\033', ' ', '\001', '(', '\013', 
+'2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', 
+'3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', 
+'\016', 'c', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 
+'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\030', ' ', '\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', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', ':', '\n', 
+'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\031', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 
+'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'u', '\n', '\022', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 's', 'e', 'l', 'e', 'c', 
+'t', 'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 
+'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', 
+'\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\021', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 
+'n', '\022', 'r', '\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 
+'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\036', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 
+'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\031', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 
+'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '(', 'c', 'l', 'o', 's', 
+'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 'h', 'e', 'a', 
+'l', 't', 'h', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\037', ' ', '\001', '(', '\010', 'R', '#', 'c', 'l', 'o', 's', 'e', 'C', 
+'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'H', 'e', 'a', 'l', 't', 'h', 'F', 'a', 'i', 
+'l', 'u', 'r', 'e', '\022', '@', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'o', 'n', '_', 
+'h', 'o', 's', 't', '_', 'r', 'e', 'm', 'o', 'v', 'a', 'l', '\030', ' ', ' ', '\001', '(', '\010', 'R', '\031', 'i', 'g', 'n', 'o', 'r', 
+'e', 'H', 'e', 'a', 'l', 't', 'h', 'O', 'n', 'H', 'o', 's', 't', 'R', 'e', 'm', 'o', 'v', 'a', 'l', '\022', '9', '\n', '\007', 'f', 
+'i', 'l', 't', 'e', 'r', 's', '\030', '(', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 
+'t', 'e', 'r', 's', '\022', '`', '\n', '\025', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', 'p', 'o', 
+'l', 'i', 'c', 'y', '\030', ')', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 
+'P', 'o', 'l', 'i', 'c', 'y', 'R', '\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 
+'c', 'y', '\022', 'A', '\n', '\n', 'l', 'r', 's', '_', 's', 'e', 'r', 'v', 'e', 'r', '\030', '*', ' ', '\001', '(', '\013', '2', '\"', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 
+'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '?', '\n', '\025', 't', 'r', 
+'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', '\001', '(', '\010', 
+'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', 'i', 'm', 'e', 'o', 
+'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', 'S', '\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 
+'f', 'i', 'g', '\030', '0', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 
+'f', 'i', 'g', 'R', '\016', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\023', 't', 'r', 
+'a', 'c', 'k', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', '(', '\013', '2', '*', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 
+'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', 'a', 'c', 'k', 'C', 
+'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '^', '\n', '\021', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 
+'_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '2', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'P', 'r', 
+'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\020', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 
+'t', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'o', 'o', 
+'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 
+'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'o', 'o', 'l', 'P', 
+'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\032', '\346', '\001', 
+'\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\022', '\033', '\n', 
+'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 
+'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', 
+'\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', '\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', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 
+'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', 
+'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 
+'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 
+'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 
+'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', 
+'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 
+'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 
+'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 
+'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', '\246', '\001', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 
+'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', 
+'\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
+'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', 
+'\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 
+'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 
+'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 
+'n', 'f', 'i', 'g', '\032', '\244', '\n', '\n', '\016', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'y', 
+'\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', '(', '\016', '2', 'F', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 
+'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 
+'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', 
+'\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '>', '\n', '\016', 
+'d', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\r', 'd', 'e', 'f', 
+'a', 'u', 'l', 't', 'S', 'u', 'b', 's', 'e', 't', '\022', 'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', 's', 'e', 'l', 'e', 
+'c', 't', 'o', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 
+'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 
+'o', 'r', 'R', '\017', 's', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', '\n', '\025', 'l', 'o', 
+'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', ' ', '\001', '(', '\010', 
+'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', '\022', '2', '\n', '\025', 
+'s', 'c', 'a', 'l', 'e', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\005', ' ', '\001', 
+'(', '\010', 'R', '\023', 's', 'c', 'a', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', 
+'\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', 'm', 'o', 'd', 'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\014', 'p', 
+'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', 'A', 'n', 'y', '\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', 's', '_', 'a', 'n', 
+'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\t', 'l', 'i', 's', 't', 'A', 's', 'A', 'n', 'y', '\022', '\222', '\001', '\n', '\030', 'm', 'e', 
+'t', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', 
+'\001', '(', '\016', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 
+'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 
+'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 
+'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 'm', 'e', 't', 'a', 'd', 
+'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\032', '\332', '\003', '\n', '\020', 'L', 'b', 'S', 
+'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', 
+'(', '\t', 'R', '\004', 'k', 'e', 'y', 's', '\022', '3', '\n', '\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', 'o', 's', 't', '_', 'p', 
+'e', 'r', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', 'g', 'l', 'e', 'H', 'o', 
+'s', 't', 'P', 'e', 'r', 'S', 'u', 'b', 's', 'e', 't', '\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 
+'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 
+'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 
+'t', 'o', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 
+'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 
+'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'k', 'e', 
+'y', 's', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 
+'K', 'e', 'y', 's', 'S', 'u', 'b', 's', 'e', 't', '\"', 'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 
+'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', 
+'T', '_', 'D', 'E', 'F', 'I', 'N', 'E', 'D', '\020', '\000', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 
+'K', '\020', '\001', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\002', '\022', '\022', '\n', '\016', 
+'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', 'K', 'E', 'Y', 'S', '_', 
+'S', 'U', 'B', 'S', 'E', 'T', '\020', '\004', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 
+'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 
+'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', 'O', '\n', '\026', 'L', 'b', 
+'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 
+'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 
+'I', 'N', 'T', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\002', 
+'\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 
+'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', '\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', 'O', '_', 
+'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', 'L', 'I', 
+'S', 'T', '\020', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', 
+'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\343', 
+'\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', 'l', 'o', 
+'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 's', 
+'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 
+'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\n', 'a', 'g', 
+'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', '\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'p', 'e', 
+'r', 'c', 'e', 'n', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', 'r', 'c', 
+'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 
+'\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', 
+'(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 
+'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 
+'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\n', '\024', 'L', 
+'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', 'c', 'h', 
+'o', 'i', 'c', 'e', '_', 'c', 'o', 'u', 'n', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', 
+'\004', '*', '\002', '(', '\002', 'R', '\013', 'c', 'h', 'o', 'i', 'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', '\n', '\023', 'a', 'c', 't', 
+'i', 'v', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 
+'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\021', 'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 
+'i', 'a', 's', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
+'\003', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
+'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 
+'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', '0', '\232', 
+'\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 
+'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\221', '\003', 
+'\n', '\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', 'i', 'n', 
+'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 
+'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 
+'S', 'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', 'h', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', 
+'(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 
+'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 
+'f', 'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', 
+'\001', 'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', 'm', 'u', 
+'m', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 
+'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 
+'e', '\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', '_', 'H', 
+'A', 'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', 'R', 'M', 'U', 'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', '\001', ':', 
+',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 
+'t', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\002', '\020', 
+'\003', '\032', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', '\n', 't', 'a', 
+'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', 
+'\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\032', '\367', '\001', '\n', '\023', 'O', 'r', 'i', 
+'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', '_', 'h', 
+'t', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', 't', 'p', 
+'H', 'e', 'a', 'd', 'e', 'r', '\022', '(', '\n', '\020', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
+'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', ']', 
+'\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', 
+'\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 
+'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', 'u', 'p', 
+'s', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', ':', '/', '\232', '\305', '\210', '\036', '*', 
+'\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 
+'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\325', '\013', '\n', '\016', 'C', 'o', 'm', 
+'m', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', '\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 
+'n', 'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 
+'h', 'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 
+'a', 'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 
+'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 
+'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 
+'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 
+'i', 'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 
+'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 
+'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 
+'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
+'I', '\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', 'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', 
+'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 
+'a', 't', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', 'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 
+'C', '\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', 'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', 
+'_', 'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 
+'w', 'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', 's', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 
+'s', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 
+'t', '_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 
+'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', 'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', 
+'\n', '\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 
+'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 
+'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 
+'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 
+'s', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 
+'_', 'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 
+'a', 't', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 
+'u', 's', '\032', '\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
+'?', '\n', '\017', 'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', 
+'\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 
+'r', 'o', 'u', 't', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 
+'s', 't', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 
+'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', '\025', 'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 
+'i', 'c', '_', 'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 
+'a', 'f', 'f', 'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 
+'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 
+'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', 
+'_', '\n', '\030', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 
+'i', 'g', ':', 'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 
+'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 
+'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', 
+'\031', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 
+'g', '\022', '7', '\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 
+'h', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', 'e', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 
+'r', 'H', 'a', 's', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', 's', 'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 
+'f', 'a', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 
+'d', 'R', '\021', 'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'F', 'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', 
+'\036', '?', '\n', '=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 
+'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 
+'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 
+'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 
+'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 
+'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', '\322', '\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 
+'R', 'a', 't', 'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', 
+'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 
+'t', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '*', '\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 
+'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 
+'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 
+'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 
+'e', '\032', '\203', '\002', '\n', '\020', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'x', '\n', 
+'\035', 'p', 'e', 'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 
+'r', 'a', 't', 'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', 
+'\000', '\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\032', 'p', 'e', 'r', 'U', 'p', 's', 't', 
+'r', 'e', 'a', 'm', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\022', 'u', '\n', '\033', 'p', 'r', 
+'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', 
+'\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\031', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', 'P', 'r', 
+'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\032', 'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 
+'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 
+'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 
+'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', 
+'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', 
+'S', 'T', 'R', 'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', '\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', 
+'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', '\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', 
+'_', 'D', 'S', 'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', 
+'U', 'N', 'D', '_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', '\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', 
+'E', 'S', 'T', '\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', 'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', 
+'A', 'N', 'D', 'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', 'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', 
+'U', 'S', 'T', 'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', '\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', 
+'B', 'A', 'L', 'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', 'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', 
+'\"', '\004', '\010', '\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', 'P', 
+'\n', '\017', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', 
+'\020', '\000', '\022', '\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', 
+'Y', '\020', '\002', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', 'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 
+'A', 'L', 'L', '\020', '\004', '\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 
+'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 
+'D', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 
+'T', 'R', 'E', 'A', 'M', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 
+'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 
+'l', 'u', 's', 't', 'e', 'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 
+'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', 
+'\020', '\010', 'J', '\004', '\010', '\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', 'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 
+'s', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 
+'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\332', '\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 
+'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', 
+' ', '\003', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
+'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', 
+'.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\032', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 
+'i', 'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'c', 'o', 
+'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 
+'n', 'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 
+'g', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 
+'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', 
+'\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 
+'R', '\004', 'n', 'a', 'm', 'e', 'R', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', 
+'\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 
+'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\371', '\001', '\n', '\031', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 
+'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'G', '\n', '\r', 't', 'c', 'p', '_', 'k', 
+'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 
+'R', '\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 
+'a', 'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 
+'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 
+'e', 't', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 
+'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 
+'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', 'r', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 
+'s', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 
+'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', 
+'\022', '4', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', 'e', 
+'s', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'S', 
+'i', 'z', 'e', 's', 'B', '\211', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\014', 'C', 'l', 
+'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', 
+'3', ';', 'c', 'l', 'u', 's', 't', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 
+'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[24] = {
+  &envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit,
+  &envoy_config_cluster_v3_filter_proto_upbdefinit,
+  &envoy_config_cluster_v3_outlier_detection_proto_upbdefinit,
+  &envoy_config_core_v3_address_proto_upbdefinit,
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &envoy_config_core_v3_config_source_proto_upbdefinit,
+  &envoy_config_core_v3_extension_proto_upbdefinit,
+  &envoy_config_core_v3_health_check_proto_upbdefinit,
+  &envoy_config_core_v3_protocol_proto_upbdefinit,
+  &envoy_config_core_v3_resolver_proto_upbdefinit,
+  &envoy_config_endpoint_v3_endpoint_proto_upbdefinit,
+  &envoy_type_v3_percent_proto_upbdefinit,
+  &google_protobuf_any_proto_upbdefinit,
+  &google_protobuf_duration_proto_upbdefinit,
+  &google_protobuf_struct_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &xds_core_v3_collection_entry_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_migrate_proto_upbdefinit,
+  &udpa_annotations_security_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit = {
+  deps,
+  &envoy_config_cluster_v3_cluster_proto_upb_file_layout,
+  "envoy/config/cluster/v3/cluster.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 12402)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
new file mode 100644
index 0000000000000..614d3843b9a05
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
@@ -0,0 +1,150 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_ClusterCollection_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.ClusterCollection");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_TransportSocketMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.TransportSocketMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CustomClusterType_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CustomClusterType");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_EdsClusterConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.EdsClusterConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LbSubsetConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LbSubsetConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_SlowStartConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.SlowStartConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RoundRobinLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LeastRequestLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RingHashLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RingHashLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_MaglevLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.MaglevLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.OriginalDstLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RefreshRate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RefreshRate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_PreconnectPolicy_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.PreconnectPolicy");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_LoadBalancingPolicy_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.LoadBalancingPolicy");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_LoadBalancingPolicy_Policy_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.LoadBalancingPolicy.Policy");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptions_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.TrackClusterStats");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c
index 830a748d1891d..f14e243a0d944 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/filter.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/cluster/v3/filter.upbdefs.h"
-#include "envoy/config/cluster/v3/filter.upb.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
index 9ab3f174aa9bf..9dc23d501a71e 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/filter.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c
index cfdabc00d6a7e..cfc27c7e90d1f 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/outlier_detection.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/cluster/v3/outlier_detection.upbdefs.h"
-#include "envoy/config/cluster/v3/outlier_detection.upb.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
index 0a0b0f59b2ef1..433a6f4580110 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/cluster/v3/outlier_detection.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c
new file mode 100644
index 0000000000000..d090d06c446a6
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c
@@ -0,0 +1,205 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/common/matcher/v3/matcher.upbdefs.h"
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[4235] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\036', 'e', 'n', 
+'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'v', '3', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', 
+'/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
+'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 
+'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 
+'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', 
+'.', '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', '\"', '\344', '\021', '\n', '\007', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 
+'X', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', '_', 'l', 'i', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', 'H', 
+'\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'X', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'_', 't', 'r', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'T', 'r', 'e', 'e', '\022', 'O', '\n', '\013', 'o', 'n', '_', 'n', 'o', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', 
+'2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', 
+'\t', 'o', 'n', 'N', 'o', 'M', 'a', 't', 'c', 'h', '\032', '\245', '\001', '\n', '\007', 'O', 'n', 'M', 'a', 't', 'c', 'h', '\022', 'C', '\n', 
+'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'D', '\n', '\006', 'a', 'c', 't', 'i', 'o', 
+'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
+'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 
+'g', 'H', '\000', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '\017', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\022', '\003', 
+'\370', 'B', '\001', '\032', '\242', '\t', '\n', '\013', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'f', '\n', '\010', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\334', 
+'\006', '\n', '\t', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'z', '\n', '\020', 's', 'i', 'n', 'g', 'l', 'e', '_', 'p', 'r', 
+'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'M', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
+'e', '.', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\017', 's', 'i', 'n', 'g', 
+'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'l', '\n', '\n', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 
+'m', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 'r', 'e', 'd', 'i', 
+'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\t', 'o', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'n', '\n', '\013', 
+'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
+'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 
+'i', 'c', 'a', 't', 'e', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\n', 'a', 'n', 
+'d', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '`', '\n', '\013', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', 
+' ', '\001', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 
+'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\n', 'n', 'o', 't', 'M', 
+'a', 't', 'c', 'h', 'e', 'r', '\032', '\207', '\002', '\n', '\017', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
+'e', '\022', 'J', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
+'s', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 'n', 'p', 
+'u', 't', '\022', 'G', '\n', '\013', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 
+'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\n', 'v', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 
+'\022', 'O', '\n', '\014', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '*', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 
+'d', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 
+'m', 'M', 'a', 't', 'c', 'h', 'B', '\016', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'v', '\n', 
+'\r', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', '\022', 'e', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 
+'t', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
+'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', 
+'\005', '\222', '\001', '\002', '\010', '\002', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\021', '\n', '\n', 'm', 'a', 't', 'c', 
+'h', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\032', '\313', '\001', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '\022', 'e', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '=', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', 
+'.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\t', 'p', 'r', 'e', 
+'d', 'i', 'c', 'a', 't', 'e', '\022', 'T', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', 
+'/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'B', '\010', 
+'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\032', '\347', '\004', '\n', '\013', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'J', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 
+'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', 
+'\020', '\001', 'R', '\005', 'i', 'n', 'p', 'u', 't', '\022', 'f', '\n', '\017', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 
+'m', 'a', 'p', '\030', '\002', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', 'H', '\000', 'R', '\r', 
+'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'h', '\n', '\020', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 
+'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\003', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 
+'p', 'H', '\000', 'R', '\016', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'O', '\n', '\014', 'c', 'u', 
+'s', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
+'s', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', 
+'\032', '\326', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'a', '\n', '\003', 'm', 'a', 'p', '\030', '\001', ' ', '\003', '(', 
+'\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '.', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', 'B', '\010', '\372', 
+'B', '\005', '\232', '\001', '\002', '\010', '\001', 'R', '\003', 'm', 'a', 'p', '\032', 'g', '\n', '\010', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 
+'\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', 'E', '\n', '\005', 'v', 'a', 'l', 'u', 
+'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
+'m', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 
+'n', 'M', 'a', 't', 'c', 'h', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', '\020', '\n', '\t', 't', 'r', 'e', 'e', 
+'_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', ':', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'B', '\023', '\n', '\014', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\350', '\010', '\n', '\016', 'M', 'a', 't', 'c', 
+'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'T', '\n', '\010', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', 
+'\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
+'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'V', '\n', '\t', 
+'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 
+'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', 
+'\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'M', '\n', '\t', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', 
+'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
+'e', 'H', '\000', 'R', '\010', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 
+'h', '\030', '\004', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 
+'t', 'c', 'h', '\022', 'o', '\n', '\032', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 
+'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 
+'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\027', 'h', 't', 't', 'p', 'R', 'e', 'q', 
+'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\033', 'h', 't', 't', 'p', '_', 
+'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', 
+'\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 
+'t', 'c', 'h', 'H', '\000', 'R', '\030', 'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 
+'s', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\033', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 
+'e', 'a', 'd', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
+'3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\030', 'h', 't', 't', 
+'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 's', '\n', '\034', 
+'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 
+'t', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 
+'d', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\031', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 
+'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '|', '\n', '\037', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 
+'u', 'e', 's', 't', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', 
+' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 
+'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 
+'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\033', 'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'G', 'e', 
+'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\022', '~', '\n', ' ', 'h', 't', 't', 'p', '_', 'r', 'e', 
+'s', 'p', 'o', 'n', 's', 'e', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', 
+'\030', '\n', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 
+'m', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 
+'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\034', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 
+'e', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\032', 'Z', '\n', '\010', 'M', 'a', 't', 'c', 
+'h', 'S', 'e', 't', '\022', 'N', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
+'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', 
+'\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', 'R', '\n', 
+'\020', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 
+'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 
+'e', 'a', 'd', 'e', 'r', 's', '\"', '\241', '\002', '\n', '\024', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 
+'y', 'M', 'a', 't', 'c', 'h', '\022', '\037', '\n', '\013', 'b', 'y', 't', 'e', 's', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', 
+'(', '\r', 'R', '\n', 'b', 'y', 't', 'e', 's', 'L', 'i', 'm', 'i', 't', '\022', 'k', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 
+'s', '\030', '\002', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
+'m', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 
+'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 
+'t', 'c', 'h', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\032', '{', 
+'\n', '\020', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 's', 't', 'r', 
+'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', 
+'\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 'b', 'i', 'n', 'a', 'r', 'y', '_', 
+'m', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\014', 'B', '\007', '\372', 'B', '\004', 'z', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'b', 
+'i', 'n', 'a', 'r', 'y', 'M', 'a', 't', 'c', 'h', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', 'B', '\227', 
+'\001', '\n', ',', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\014', 'M', 
+'a', 't', 'c', 'h', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'O', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', 
+'\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[7] = {
+  &envoy_config_core_v3_extension_proto_upbdefinit,
+  &envoy_config_route_v3_route_components_proto_upbdefinit,
+  &envoy_type_matcher_v3_string_proto_upbdefinit,
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit = {
+  deps,
+  &envoy_config_common_matcher_v3_matcher_proto_upb_file_layout,
+  "envoy/config/common/matcher/v3/matcher.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 4235)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
new file mode 100644
index 0000000000000..9326f7f7c615a
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
@@ -0,0 +1,105 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_OnMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.OnMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_MatchPredicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.MatchPredicate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_MatchPredicate_MatchSet_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.MatchPredicate.MatchSet");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpHeadersMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpHeadersMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpGenericBodyMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c
index e2909d32808b3..8fcbb9759fae7 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/address.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/address.upbdefs.h"
-#include "envoy/config/core/v3/address.upb.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_socket_option_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
index 1a9be780f1b75..9b7a99d8679e8 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/address.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c
index 156fda8046d35..492197f7f7993 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/backoff.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/backoff.upbdefs.h"
-#include "envoy/config/core/v3/backoff.upb.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
index c032117edd9d7..394736d66e479 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/backoff.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c
index 4f71e6de56c22..1640198500f12 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/base.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/base.upbdefs.h"
-#include "envoy/config/core/v3/base.upb.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_backoff_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
index 1e7b578efdf4f..232c4e1d66767 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/base.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c
index 2c764f532f0dc..cf9430481060b 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/config_source.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/config_source.upbdefs.h"
-#include "envoy/config/core/v3/config_source.upb.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
index 19930b588a360..69aad26a38264 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/config_source.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c
index c0cb49a847d98..7d691df12fedf 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/event_service_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/event_service_config.upbdefs.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
index 9705fd4fba051..25a6619b3a110 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/event_service_config.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c
new file mode 100644
index 0000000000000..119ccab9cb3af
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/core/v3/extension.upbdefs.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[404] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 
+'t', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '/', 'a', 'n', 'y', '.', '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', '\"', 'v', '\n', '\024', 'T', 'y', 'p', 
+'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', 
+'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', '\014', 
+'t', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\010', '\372', 'B', '\005', '\242', '\001', '\002', '\010', '\001', 
+'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\202', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 
+'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
+'v', '3', 'B', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
+'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 
+'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &google_protobuf_any_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit = {
+  deps,
+  &envoy_config_core_v3_extension_proto_upb_file_layout,
+  "envoy/config/core/v3/extension.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 404)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
new file mode 100644
index 0000000000000..9dcffd8b5efda
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_core_v3_TypedExtensionConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_extension_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.TypedExtensionConfig");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c
index cd6bc69fc9271..ecccc67a5daae 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_method_list.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/grpc_method_list.upbdefs.h"
-#include "envoy/config/core/v3/grpc_method_list.upb.h"
+#include "envoy/config/core/v3/grpc_method_list.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
index 95eaa858ae0bc..80acfdb80fcac 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_method_list.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c
index 4718786b98655..a6fd22a017605 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_service.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/grpc_service.upbdefs.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
index ee189489f2ea6..96d95cf303ec2 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/grpc_service.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c
index 2625bf14b6a2c..3550943637772 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/health_check.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/health_check.upbdefs.h"
-#include "envoy/config/core/v3/health_check.upb.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_event_service_config_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
index 0f02cfab6ee4f..5a4dc981bf936 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/health_check.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c
index 50de24e3256fe..2044c935f6871 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/http_uri.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/http_uri.upbdefs.h"
-#include "envoy/config/core/v3/http_uri.upb.h"
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
index c8336748afc0f..f6d9fa5bf3c62 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/http_uri.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c
index 39d3ef949dff9..2149d24a12cd1 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/protocol.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/protocol.upbdefs.h"
-#include "envoy/config/core/v3/protocol.upb.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
index b2616486ab075..0e8b9dd3fbe62 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/protocol.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c
index d3c71a9349004..9ddf49f9bc95a 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/proxy_protocol.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/proxy_protocol.upbdefs.h"
-#include "envoy/config/core/v3/proxy_protocol.upb.h"
+#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
index e2d1af4b6d19e..6c70366f2562a 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/proxy_protocol.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c
index b916b0f2eaa64..dd563910285d5 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/resolver.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/resolver.upbdefs.h"
-#include "envoy/config/core/v3/resolver.upb.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
index 7aef9b303d36f..e82289a9bb642 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/resolver.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c
index c8f578f068e68..53f3134013a01 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/socket_option.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/socket_option.upbdefs.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
index 0c69f17636907..3b1149ff7f6ec 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/socket_option.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c
index 51fbd332256f7..399a9708a8ccd 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/substitution_format_string.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/substitution_format_string.upbdefs.h"
-#include "envoy/config/core/v3/substitution_format_string.upb.h"
+#include "envoy/config/core/v3/substitution_format_string.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
index 1054fe0131fd2..5316ccb5dab53 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/substitution_format_string.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c
index 6b5e3086053ff..4940161ef9888 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/udp_socket_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/core/v3/udp_socket_config.upbdefs.h"
-#include "envoy/config/core/v3/udp_socket_config.upb.h"
+#include "envoy/config/core/v3/udp_socket_config.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
index 0d836e69b98c2..0fca023ac5596 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/core/v3/udp_socket_config.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c
index 15e186ab5aa14..7cbd1f7f5d9c3 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
-#include "envoy/config/endpoint/v3/endpoint.upb.h"
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
index ca331dc9da525..f4a257c8b7cc6 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
index 15f301ea7fcf8..62e23df756d3d 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint_components.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/endpoint/v3/endpoint_components.upbdefs.h"
-#include "envoy/config/endpoint/v3/endpoint_components.upb.h"
+#include "envoy/config/endpoint/v3/endpoint_components.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
index 699ee50be7b1f..76818e3d4fde2 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/endpoint_components.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c
index 1e02cbd1861e2..a086dc1b148a2 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/load_report.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/endpoint/v3/load_report.upbdefs.h"
-#include "envoy/config/endpoint/v3/load_report.upb.h"
+#include "envoy/config/endpoint/v3/load_report.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
similarity index 94%
rename from src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
index 0d1775beaabb0..4e3f495427b52 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/endpoint/v3/load_report.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c
index 781b5d35f2a35..2404f0fce568f 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/api_listener.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/listener/v3/api_listener.upbdefs.h"
-#include "envoy/config/listener/v3/api_listener.upb.h"
+#include "envoy/config/listener/v3/api_listener.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
index 7cf0bd783dbe3..02966a47e92b8 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/api_listener.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c
index e021324d62e0c..ac79c4613939d 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/listener/v3/listener.upbdefs.h"
-#include "envoy/config/listener/v3/listener.upb.h"
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
index 8f84d6654f650..a643aadf7c182 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c
index 50ad4ded4ae85..575d0a81b462b 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener_components.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/listener/v3/listener_components.upbdefs.h"
-#include "envoy/config/listener/v3/listener_components.upb.h"
+#include "envoy/config/listener/v3/listener_components.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
index 0df2792aaff89..b5acc80e05a57 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/listener_components.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c
index d665703b3a191..a3d587f4e0ec9 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/quic_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/listener/v3/quic_config.upbdefs.h"
-#include "envoy/config/listener/v3/quic_config.upb.h"
+#include "envoy/config/listener/v3/quic_config.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
index 5000854a3dcdb..fa4d3e78524ad 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/quic_config.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c
index 6142edb7c40bf..f62523979b7e3 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/udp_listener_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/listener/v3/udp_listener_config.upbdefs.h"
-#include "envoy/config/listener/v3/udp_listener_config.upb.h"
+#include "envoy/config/listener/v3/udp_listener_config.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_udp_socket_config_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
similarity index 91%
rename from src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
index cd488ee65f556..272b547a1d107 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/listener/v3/udp_listener_config.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c
index 3cc5c8866c6a5..1f04a2e5e235a 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/metrics_service.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/metrics/v3/metrics_service.upbdefs.h"
-#include "envoy/config/metrics/v3/metrics_service.upb.h"
+#include "envoy/config/metrics/v3/metrics_service.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
index ab650f2ab9e0e..cecb88736b15f 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/metrics_service.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c
index 1b3f11dedad73..6e4a0b0e2ffe5 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/stats.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/metrics/v3/stats.upbdefs.h"
-#include "envoy/config/metrics/v3/stats.upb.h"
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
index 427e8068673cd..7cec60520ee4e 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/metrics/v3/stats.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c
index 04438001b91e2..8d91bca08b4e8 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/overload/v3/overload.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/overload/v3/overload.upbdefs.h"
-#include "envoy/config/overload/v3/overload.upb.h"
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
index 2d123619624ab..8c8357279b009 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/overload/v3/overload.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c
new file mode 100644
index 0000000000000..863f58c3f9902
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c
@@ -0,0 +1,222 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/rbac/v3/rbac.upbdefs.h"
+#include "envoy/config/rbac/v3/rbac.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_filter_state_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_path_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit;
+extern _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit;
+extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 
+'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 
+'a', 'c', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 
+'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
+'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 
+'r', 'o', 't', 'o', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 
+'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', 
+'\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'f', 
+'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 
+'t', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 
+'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'/', 'v', '3', '/', 'p', 'a', 't', 'h', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 
+'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', 
+'\032', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', '\032', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 
+'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 'o', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', 
+'/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', 
+'.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 
+'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 
+'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\341', '\006', '\n', '\004', 'R', 'B', 'A', 'C', 
+'\022', 'C', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', 'i', 'o', 
+'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\010', 'p', 'o', 
+'l', 'i', 'c', 'i', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', 'E', 
+'n', 't', 'r', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'b', '\n', '\025', 'a', 'u', 'd', 'i', 't', '_', 'l', 
+'o', 'g', 'g', 'i', 'n', 'g', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 
+'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'a', 'u', 'd', 'i', 't', 
+'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\032', '\304', '\003', '\n', '\023', 'A', 'u', 'd', 'i', 't', 'L', 
+'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'p', '\n', '\017', 'a', 'u', 'd', 'i', 't', '_', 'c', 'o', 
+'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 
+'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'u', 'd', 'i', 't', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 
+'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'a', 'u', 'd', 'i', 't', 'C', 'o', 'n', 'd', 'i', 't', 'i', 
+'o', 'n', '\022', 'g', '\n', '\016', 'l', 'o', 'g', 'g', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\002', ' ', '\003', '(', 
+'\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 
+'R', 'B', 'A', 'C', '.', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 
+'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\r', 'l', 'o', 'g', 'g', 'e', 'r', 
+'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', '\203', '\001', '\n', '\021', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', 'C', 'o', 
+'n', 'f', 'i', 'g', '\022', 'M', '\n', '\014', 'a', 'u', 'd', 'i', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\001', ' ', '\001', '(', 
+'\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
+'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 'a', 'u', 'd', 
+'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\002', 
+' ', '\001', '(', '\010', 'R', '\n', 'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', 'L', '\n', '\016', 'A', 'u', 'd', 'i', 't', 
+'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\013', '\n', '\007', 'O', 'N', 
+'_', 'D', 'E', 'N', 'Y', '\020', '\001', '\022', '\014', '\n', '\010', 'O', 'N', '_', 'A', 'L', 'L', 'O', 'W', '\020', '\002', '\022', '\025', '\n', '\021', 
+'O', 'N', '_', 'D', 'E', 'N', 'Y', '_', 'A', 'N', 'D', '_', 'A', 'L', 'L', 'O', 'W', '\020', '\003', '\032', 'Y', '\n', '\r', 'P', 'o', 
+'l', 'i', 'c', 'i', 'e', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
+'\003', 'k', 'e', 'y', '\022', '2', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', 
+'\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', '&', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 
+'L', 'L', 'O', 'W', '\020', '\000', '\022', '\010', '\n', '\004', 'D', 'E', 'N', 'Y', '\020', '\001', '\022', '\007', '\n', '\003', 'L', 'O', 'G', '\020', '\002', 
+':', ' ', '\232', '\305', '\210', '\036', '\033', '\n', '\031', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 
+'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\223', '\003', '\n', '\006', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'L', '\n', '\013', 'p', 
+'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 
+'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\013', 'p', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 's', '\022', 'I', 
+'\n', '\n', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 
+'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\n', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 's', '\022', 'Z', 
+'\n', '\t', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'B', 
+'\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 
+'f', 'i', 'e', 'r', 'R', '\t', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'p', '\n', '\021', 'c', 'h', 'e', 'c', 'k', 'e', 
+'d', '_', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 'k', 
+'e', 'd', 'E', 'x', 'p', 'r', 'B', '\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 
+'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\020', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'C', 'o', 'n', 'd', 'i', 
+'t', 'i', 'o', 'n', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\332', '\007', '\n', '\n', 'P', 'e', 'r', 'm', 'i', 
+'s', 's', 'i', 'o', 'n', '\022', 'C', '\n', '\t', 'a', 'n', 'd', '_', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 
+'$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 
+'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'R', 'u', 'l', 'e', 's', '\022', 
+'A', '\n', '\010', 'o', 'r', '_', 'r', 'u', 'l', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 
+'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'R', 'u', 'l', 'e', 's', '\022', '\033', '\n', '\003', 'a', 'n', 'y', '\030', '\003', 
+' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', '>', '\n', '\006', 'h', 
+'e', 'a', 'd', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', 
+'\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', 'p', 'a', 't', 'h', '\030', '\n', ' ', '\001', 
+'(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
+'3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 
+'H', '\n', '\016', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'i', 'p', '\030', '\005', ' ', '\001', '(', '\013', '2', '\037', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 
+'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\r', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'I', 'p', '\022', '6', 
+'\n', '\020', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', '\r', 'B', 
+'\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'H', '\000', 'R', '\017', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 
+'P', 'o', 'r', 't', '\022', 'Q', '\n', '\026', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '_', 
+'r', 'a', 'n', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\024', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 
+'i', 'o', 'n', 'P', 'o', 'r', 't', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', 
+'\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', 'm', 
+'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '=', '\n', '\010', 'n', 'o', 't', '_', 'r', 'u', 'l', 'e', '\030', '\010', ' ', '\001', '(', '\013', 
+'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 
+'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'H', '\000', 'R', '\007', 'n', 'o', 't', 'R', 'u', 'l', 'e', '\022', 'Z', '\n', '\025', 'r', 
+'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\t', ' ', '\001', '(', 
+'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
+'.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 
+'e', 'd', 'S', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'F', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', 
+' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
+'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 
+'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\032', 's', '\n', '\003', 'S', 'e', 't', '\022', '@', '\n', '\005', 'r', 'u', 'l', 'e', 's', 
+'\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 
+'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 
+'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 
+'t', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 
+'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', 
+'\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', '>', '\n', '\007', 'a', 'n', 'd', 
+'_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', 
+'\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 
+'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', '\022', '\033', '\n', '\003', 'a', 'n', 
+'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', 'U', 
+'\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 
+'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', '\000', 'R', '\r', 'a', 'u', 't', 
+'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\005', 
+' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
+'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 
+'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 
+'m', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\016', 
+'d', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', 'e', 'm', 'o', 't', 'e', '_', 
+'i', 'p', '\030', '\013', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
+'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\010', 'r', 'e', 'm', 'o', 't', 
+'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', 
+'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 
+'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\001', '(', '\013', 
+'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 
+'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 
+'t', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', '2', 
+')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'F', 
+'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', 
+'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', ' ', '\001', '(', '\013', '2', '\037', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 
+'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', 'S', 'e', 't', '\022', ';', '\n', 
+'\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', 
+'\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 
+'t', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\016', 'p', 'r', 
+'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 
+'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', 'm', 'e', ':', '3', '\232', '\305', 
+'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', 
+'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'J', 
+'\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\021', '\n', '\n', 'i', 'd', 
+'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', 
+'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 
+'m', 'e', '\022', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', 
+'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '}', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 
+'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', 
+'\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 
+'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[16] = {
+  &envoy_config_core_v3_address_proto_upbdefinit,
+  &envoy_config_core_v3_extension_proto_upbdefinit,
+  &envoy_config_route_v3_route_components_proto_upbdefinit,
+  &envoy_type_matcher_v3_filter_state_proto_upbdefinit,
+  &envoy_type_matcher_v3_metadata_proto_upbdefinit,
+  &envoy_type_matcher_v3_path_proto_upbdefinit,
+  &envoy_type_matcher_v3_string_proto_upbdefinit,
+  &envoy_type_v3_range_proto_upbdefinit,
+  &google_api_expr_v1alpha1_checked_proto_upbdefinit,
+  &google_api_expr_v1alpha1_syntax_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_migrate_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit = {
+  deps,
+  &envoy_config_rbac_v3_rbac_proto_upb_file_layout,
+  "envoy/config/rbac/v3/rbac.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 4221)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
new file mode 100644
index 0000000000000..d6d7037445911
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
@@ -0,0 +1,85 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_AuditLoggingOptions_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.AuditLoggingOptions");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_PoliciesEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.PoliciesEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Policy_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Policy");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Permission_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Permission");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Permission_Set_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Permission.Set");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_Set_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal.Set");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_Authenticated_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal.Authenticated");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Action_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Action");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c
index e01bc3c00d97b..a4c4efd5c79a8 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/route/v3/route.upbdefs.h"
-#include "envoy/config/route/v3/route.upb.h"
+#include "envoy/config/route/v3/route.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
index b10c83d8ad264..d09e43aeb082d 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c
index bd0f9bce24418..2d3120fc2f02f 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route_components.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/route/v3/route_components.upbdefs.h"
-#include "envoy/config/route/v3/route_components.upb.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
index d309d9d66b78d..9923b99acc397 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/route_components.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c
index f3e4f07766a54..2aae2647e5035 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/scoped_route.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/route/v3/scoped_route.upbdefs.h"
-#include "envoy/config/route/v3/scoped_route.upb.h"
+#include "envoy/config/route/v3/scoped_route.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_route_v3_route_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
index 9ec5807ac1270..40dcb1ced3502 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/route/v3/scoped_route.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c
new file mode 100644
index 0000000000000..844d95e460d1f
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c
@@ -0,0 +1,198 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/tap/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/config/tap/v3/common.upbdefs.h"
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[3873] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'a', 'p', '/', 'v', '3', '/', 'c', 'o', 'm', 
+'m', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 
+'a', 'p', '.', 'v', '3', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 
+'n', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 
+'o', '\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', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
+'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 
+'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 
+'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 
+'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 
+'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 
+'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 
+'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\365', '\002', '\n', '\t', 'T', 'a', 'p', 'C', 'o', 'n', 'f', 
+'i', 'g', '\022', 'S', '\n', '\014', 'm', 'a', 't', 'c', 'h', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 
+'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 'a', 't', 
+'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', 
+'\013', 'm', 'a', 't', 'c', 'h', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'D', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', 
+'(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 
+'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', '\n', '\r', 'o', 'u', 't', 'p', 'u', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
+'\002', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 
+'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 
+'R', '\014', 'o', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'O', '\n', '\013', 't', 'a', 'p', '_', 'e', 'n', 'a', 
+'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 
+'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 't', 'a', 'p', 'E', 'n', 'a', 'b', 'l', 'e', 'd', ':', '*', '\232', '\305', '\210', 
+'\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 
+'l', 'p', 'h', 'a', '.', 'T', 'a', 'p', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\346', '\010', '\n', '\016', 'M', 'a', 't', 'c', 'h', 'P', 
+'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'I', '\n', '\010', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', 
+'\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 
+'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', 
+'\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'K', '\n', '\t', 'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', 
+'(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 
+'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 
+'R', '\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'B', '\n', '\t', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', 
+' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
+'3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\010', 'n', 'o', 't', 'M', 'a', 
+'t', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\010', 'B', '\007', '\372', 
+'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 't', 'c', 'h', '\022', 'd', '\n', '\032', 'h', 't', 't', 
+'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\005', 
+' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
+'3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\027', 'h', 't', 't', 
+'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'f', '\n', '\033', 'h', 
+'t', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 
+'h', '\030', '\006', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 
+'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\030', 
+'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 
+'f', '\n', '\033', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 
+'m', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
+'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 
+'H', '\000', 'R', '\030', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 
+'t', 'c', 'h', '\022', 'h', '\n', '\034', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 
+'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 
+'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\031', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 
+'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\037', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 
+'_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', '\001', '(', '\013', 
+'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 
+'t', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\033', 'h', 't', 't', 
+'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\022', 
+'s', '\n', ' ', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 
+'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 
+'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\034', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 
+'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\032', '\211', '\001', '\n', '\010', 'M', 'a', 't', 'c', 
+'h', 'S', 'e', 't', '\022', 'C', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 
+'d', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '8', 
+'\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 
+'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 
+'t', 'c', 'h', 'S', 'e', 't', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 
+'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 
+'i', 'c', 'a', 't', 'e', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\205', '\001', '\n', '\020', 'H', 't', 
+'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', 
+'\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 
+'t', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 
+'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', 
+'.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 
+'a', 't', 'c', 'h', '\"', '\226', '\002', '\n', '\024', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 
+'a', 't', 'c', 'h', '\022', '\037', '\n', '\013', 'b', 'y', 't', 'e', 's', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', '(', '\r', 
+'R', '\n', 'b', 'y', 't', 'e', 's', 'L', 'i', 'm', 'i', 't', '\022', '`', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', 
+'\002', ' ', '\003', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 
+'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '.', 'G', 
+'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 
+'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\032', '{', '\n', '\020', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 
+'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', 
+'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
+'h', '\022', ',', '\n', '\014', 'b', 'i', 'n', 'a', 'r', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\014', 'B', '\007', 
+'\372', 'B', '\004', 'z', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'b', 'i', 'n', 'a', 'r', 'y', 'M', 'a', 't', 'c', 'h', 'B', '\013', '\n', 
+'\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\300', '\002', '\n', '\014', 'O', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 
+'i', 'g', '\022', 'A', '\n', '\005', 's', 'i', 'n', 'k', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', 
+'B', '\n', '\372', 'B', '\007', '\222', '\001', '\004', '\010', '\001', '\020', '\001', 'R', '\005', 's', 'i', 'n', 'k', 's', '\022', 'O', '\n', '\025', 'm', 'a', 
+'x', '_', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', 
+'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 
+'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 'x', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'R', 'x', 'B', 'y', 't', 'e', 's', 
+'\022', 'O', '\n', '\025', 'm', 'a', 'x', '_', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 't', 'x', '_', 'b', 'y', 't', 'e', 's', 
+'\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 'x', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'T', 
+'x', 'B', 'y', 't', 'e', 's', '\022', '\034', '\n', '\t', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\004', ' ', '\001', '(', '\010', 
+'R', '\t', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', 
+'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'O', 'u', 't', 'p', 
+'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\333', '\004', '\n', '\n', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', '\022', 'H', 
+'\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', '.', 'F', 'o', 
+'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\022', 'R', '\n', 
+'\017', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '_', 'a', 'd', 'm', 'i', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '\'', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'S', 't', 'r', 'e', 'a', 
+'m', 'i', 'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\016', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 
+'g', 'A', 'd', 'm', 'i', 'n', '\022', 'G', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'p', 'e', 'r', '_', 't', 'a', 'p', '\030', '\003', ' ', 
+'\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', 
+'.', 'F', 'i', 'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\n', 'f', 'i', 'l', 'e', 'P', 'e', 
+'r', 'T', 'a', 'p', '\022', 'O', '\n', '\016', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '_', 'g', 'r', 'p', 'c', '\030', '\004', ' ', 
+'\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', 
+'.', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\r', 's', 't', 'r', 
+'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', '\022', 'O', '\n', '\016', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 'a', 'd', 
+'m', 'i', 'n', '\030', '\005', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'t', 'a', 'p', '.', 'v', '3', '.', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', 'H', 
+'\000', 'R', '\r', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'A', 'd', 'm', 'i', 'n', '\"', '~', '\n', '\006', 'F', 'o', 'r', 'm', 'a', 
+'t', '\022', '\026', '\n', '\022', 'J', 'S', 'O', 'N', '_', 'B', 'O', 'D', 'Y', '_', 'A', 'S', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\000', 
+'\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'B', 'O', 'D', 'Y', '_', 'A', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', 
+'\022', '\020', '\n', '\014', 'P', 'R', 'O', 'T', 'O', '_', 'B', 'I', 'N', 'A', 'R', 'Y', '\020', '\002', '\022', '!', '\n', '\035', 'P', 'R', 'O', 
+'T', 'O', '_', 'B', 'I', 'N', 'A', 'R', 'Y', '_', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 
+'D', '\020', '\003', '\022', '\016', '\n', '\n', 'P', 'R', 'O', 'T', 'O', '_', 'T', 'E', 'X', 'T', '\020', '\004', ':', '+', '\232', '\305', '\210', '\036', 
+'&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 
+'p', 'h', 'a', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', 'B', '\027', '\n', '\020', 'o', 'u', 't', 'p', 'u', 't', '_', 
+'s', 'i', 'n', 'k', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\"', 'I', '\n', '\022', 'S', 't', 'r', 'e', 'a', 'm', 'i', 
+'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', 
+'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 't', 'r', 'e', 
+'a', 'm', 'i', 'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', '\"', 'p', '\n', '\021', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 
+'d', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', '\022', '&', '\n', '\n', 'm', 'a', 'x', '_', 't', 'r', 'a', 'c', 'e', 's', '\030', 
+'\001', ' ', '\001', '(', '\004', 'B', '\007', '\372', 'B', '\004', '2', '\002', ' ', '\000', 'R', '\t', 'm', 'a', 'x', 'T', 'r', 'a', 'c', 'e', 's', 
+'\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\007', 't', 'i', 'm', 'e', 
+'o', 'u', 't', '\"', 'k', '\n', '\016', 'F', 'i', 'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', '\022', '(', '\n', '\013', 
+'p', 'a', 't', 'h', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', 
+'\001', 'R', '\n', 'p', 'a', 't', 'h', 'P', 'r', 'e', 'f', 'i', 'x', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 
+'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'F', 'i', 
+'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', '\"', '\256', '\001', '\n', '\021', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 
+'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', '\022', '\025', '\n', '\006', 't', 'a', 'p', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\005', 't', 'a', 'p', 'I', 'd', '\022', 'N', '\n', '\014', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\002', 
+' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
+'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', 
+'\013', 'g', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 
+'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 't', 'r', 
+'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', 'B', '|', '\n', '!', 'i', 'o', '.', 'e', 'n', 'v', 'o', 
+'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
+'3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '@', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'a', 'p', '/', 'v', 
+'3', ';', 't', 'a', 'p', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[11] = {
+  &envoy_config_common_matcher_v3_matcher_proto_upbdefinit,
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &envoy_config_core_v3_grpc_service_proto_upbdefinit,
+  &envoy_config_route_v3_route_components_proto_upbdefinit,
+  &google_protobuf_duration_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_config_tap_v3_common_proto_upbdefinit = {
+  deps,
+  &envoy_config_tap_v3_common_proto_upb_file_layout,
+  "envoy/config/tap/v3/common.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 3873)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
new file mode 100644
index 0000000000000..8f93d94b19c81
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
@@ -0,0 +1,90 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/tap/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_config_tap_v3_common_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_TapConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.TapConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_MatchPredicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.MatchPredicate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_MatchPredicate_MatchSet_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.MatchPredicate.MatchSet");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpHeadersMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpHeadersMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpGenericBodyMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpGenericBodyMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_OutputConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.OutputConfig");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_OutputSink_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.OutputSink");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingAdminSink_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.StreamingAdminSink");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_BufferedAdminSink_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.BufferedAdminSink");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_FilePerTapSink_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.FilePerTapSink");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingGrpcSink_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.StreamingGrpcSink");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c
index fca5f0a1c9900..dc1736c01e65d 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/datadog.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/datadog.upbdefs.h"
-#include "envoy/config/trace/v3/datadog.upb.h"
+#include "envoy/config/trace/v3/datadog.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
index 9afc2d832fe86..cf801548464cb 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/datadog.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c
index d7528c3b0b0d5..dc43adb24aaf1 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/dynamic_ot.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/dynamic_ot.upbdefs.h"
-#include "envoy/config/trace/v3/dynamic_ot.upb.h"
+#include "envoy/config/trace/v3/dynamic_ot.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
index 30563f83df53a..6bf69e209a496 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/dynamic_ot.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c
index 4b6a4acfd34a9..4fad20ab31b68 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/http_tracer.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/http_tracer.upbdefs.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
index 2acbfd7ebed69..35c465bf64cc4 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/http_tracer.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c
index 11f7d5a647642..59c3c42b5e1e2 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/lightstep.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/lightstep.upbdefs.h"
-#include "envoy/config/trace/v3/lightstep.upb.h"
+#include "envoy/config/trace/v3/lightstep.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
index f9efa7ca5e631..d40263c7ed7d3 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/lightstep.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c
index 20478958fcd79..b9d8f60a58bf5 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opencensus.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/opencensus.upbdefs.h"
-#include "envoy/config/trace/v3/opencensus.upb.h"
+#include "envoy/config/trace/v3/opencensus.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern _upb_DefPool_Init opencensus_proto_trace_v1_trace_config_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
index d71fe83c6177b..ebc941ff475cc 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opencensus.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c
index a9910c1853ce5..b8e65700a2518 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opentelemetry.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/opentelemetry.upbdefs.h"
-#include "envoy/config/trace/v3/opentelemetry.upb.h"
+#include "envoy/config/trace/v3/opentelemetry.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
index 2d73369bb87b3..d2ece6bd53546 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/opentelemetry.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c
index c18d54a968b64..57ab06ee26dd5 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/service.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/service.upbdefs.h"
-#include "envoy/config/trace/v3/service.upb.h"
+#include "envoy/config/trace/v3/service.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
index 11825fa998ef9..e51cf919627d7 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/service.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c
index a59b203b57f50..374827888ef3c 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/skywalking.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/skywalking.upbdefs.h"
-#include "envoy/config/trace/v3/skywalking.upb.h"
+#include "envoy/config/trace/v3/skywalking.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
index a85af64a1e1df..1b45f3bd5d548 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/skywalking.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c
index fa785fb5b9fbc..8628a6b4b0e22 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/trace.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/trace.upbdefs.h"
-#include "envoy/config/trace/v3/trace.upb.h"
+#include "envoy/config/trace/v3/trace.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_trace_v3_datadog_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_trace_v3_dynamic_ot_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
similarity index 83%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
index 64328cf33bb96..f7f80cee453a6 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/trace.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c
index eff30ec62b5f1..6f1f19c108c73 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/xray.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/xray.upbdefs.h"
-#include "envoy/config/trace/v3/xray.upb.h"
+#include "envoy/config/trace/v3/xray.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
index 99d033c0f62b3..d9a3b36ec4722 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/xray.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c
index f1dd8f028d9a5..61ad81a946b07 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/zipkin.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/config/trace/v3/zipkin.upbdefs.h"
-#include "envoy/config/trace/v3/zipkin.upb.h"
+#include "envoy/config/trace/v3/zipkin.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
index d935c6b83e045..309028483e1d0 100644
--- a/src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/config/trace/v3/zipkin.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c
new file mode 100644
index 0000000000000..ef28ea85a84d2
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c
@@ -0,0 +1,401 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/data/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/data/accesslog/v3/accesslog.upbdefs.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_timestamp_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[8931] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', 
+'/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'd', 
+'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
+'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 
+'t', 'o', '\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', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'g', 'o', 'o', 'g', 
+'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '.', 'p', 'r', 'o', 
+'t', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 
+'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 
+'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\200', '\002', '\n', '\021', 'T', 'C', 'P', 'A', 'c', 'c', 'e', 's', 
+'s', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'U', '\n', '\021', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 
+'r', 't', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 
+'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 
+'m', 'o', 'n', 'R', '\020', 'c', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'b', '\n', '\025', 
+'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\002', ' ', '\001', 
+'(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'.', 'v', '3', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', 
+'\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', ':', '0', '\232', '\305', 
+'\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'.', 'v', '2', '.', 'T', 'C', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\"', '\360', '\003', '\n', 
+'\022', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'U', '\n', '\021', 'c', 'o', 
+'m', 'm', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 
+'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', 'R', '\020', 'c', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 'p', 
+'e', 'r', 't', 'i', 'e', 's', '\022', 'b', '\n', '\020', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 'e', 'r', 's', 'i', 'o', 
+'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 
+'r', 'y', '.', 'H', 'T', 'T', 'P', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\017', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 
+'e', 'r', 's', 'i', 'o', 'n', '\022', 'H', '\n', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
+'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\007', 'r', 'e', 
+'q', 'u', 'e', 's', 't', '\022', 'K', '\n', '\010', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '/', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
+'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\010', 'r', 
+'e', 's', 'p', 'o', 'n', 's', 'e', '\"', 'U', '\n', '\013', 'H', 'T', 'T', 'P', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\030', '\n', 
+'\024', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\n', 
+'\n', '\006', 'H', 'T', 'T', 'P', '1', '0', '\020', '\001', '\022', '\n', '\n', '\006', 'H', 'T', 'T', 'P', '1', '1', '\020', '\002', '\022', '\t', '\n', 
+'\005', 'H', 'T', 'T', 'P', '2', '\020', '\003', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', '\020', '\004', ':', '1', '\232', '\305', '\210', '\036', 
+',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', 
+'2', '.', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\"', '\221', '\001', '\n', '\024', 
+'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '%', '\n', '\016', 'r', 
+'e', 'c', 'e', 'i', 'v', 'e', 'd', '_', 'b', 'y', 't', 'e', 's', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\r', 'r', 'e', 'c', 'e', 
+'i', 'v', 'e', 'd', 'B', 'y', 't', 'e', 's', '\022', '\035', '\n', '\n', 's', 'e', 'n', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', 
+' ', '\001', '(', '\004', 'R', '\t', 's', 'e', 'n', 't', 'B', 'y', 't', 'e', 's', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 
+'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'C', 'o', 
+'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\226', '\025', '\n', '\017', 'A', 'c', 
+'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '\022', '8', '\n', '\013', 's', 'a', 'm', 'p', 'l', 'e', '_', 'r', 
+'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\001', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 
+'!', '\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\n', 's', 'a', 'm', 'p', 'l', 'e', 'R', 'a', 't', 'e', '\022', 'Y', '\n', '\031', 
+'d', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 
+'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'R', 
+'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'W', '\n', '\030', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 
+'m', '_', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 
+'s', 's', 'R', '\026', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 
+'s', '\022', 'M', '\n', '\016', 't', 'l', 's', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', 
+'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', 
+'3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\r', 't', 'l', 's', 'P', 'r', 'o', 'p', 'e', 
+'r', 't', 'i', 'e', 's', '\022', '9', '\n', '\n', 's', 't', 'a', 'r', 't', '_', 't', 'i', 'm', 'e', '\030', '\005', ' ', '\001', '(', '\013', 
+'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 
+'a', 'm', 'p', 'R', '\t', 's', 't', 'a', 'r', 't', 'T', 'i', 'm', 'e', '\022', 'I', '\n', '\024', 't', 'i', 'm', 'e', '_', 't', 'o', 
+'_', 'l', 'a', 's', 't', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\020', 't', 'i', 
+'m', 'e', 'T', 'o', 'L', 'a', 's', 't', 'R', 'x', 'B', 'y', 't', 'e', '\022', '\\', '\n', '\036', 't', 'i', 'm', 'e', '_', 't', 'o', 
+'_', 'f', 'i', 'r', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\007', 
+' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 
+'r', 'a', 't', 'i', 'o', 'n', 'R', '\031', 't', 'i', 'm', 'e', 'T', 'o', 'F', 'i', 'r', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 
+'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', '\022', 'Z', '\n', '\035', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', '_', 
+'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 
+'\030', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', 
+'\022', '\\', '\n', '\036', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'f', 'i', 'r', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 
+'m', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\031', 't', 'i', 'm', 'e', 'T', 'o', 
+'F', 'i', 'r', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'x', 'B', 'y', 't', 'e', '\022', 'Z', '\n', '\035', 't', 'i', 
+'m', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'x', '_', 'b', 'y', 
+'t', 'e', '\030', '\n', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\030', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'U', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', 'R', 'x', 'B', 'y', 't', 'e', '\022', '`', '\n', ' ', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'f', 'i', 
+'r', 's', 't', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\013', ' ', 
+'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 
+'a', 't', 'i', 'o', 'n', 'R', '\033', 't', 'i', 'm', 'e', 'T', 'o', 'F', 'i', 'r', 's', 't', 'D', 'o', 'w', 'n', 's', 't', 'r', 
+'e', 'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', '\022', '^', '\n', '\037', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', 
+'_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', 
+'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 
+'o', 'n', 'R', '\032', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 
+'x', 'B', 'y', 't', 'e', '\022', 'U', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 
+'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
+'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\025', 'u', 'p', 's', 't', 
+'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'S', '\n', '\026', 'u', 'p', 's', 't', 
+'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', 
+'\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 
+'d', 'r', 'e', 's', 's', 'R', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 
+'s', 's', '\022', ')', '\n', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\017', ' ', 
+'\001', '(', '\t', 'R', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'M', '\n', '\016', 'r', 
+'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', '\020', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 
+'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', 'R', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', 
+':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\021', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', 
+'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'I', '\n', '!', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'r', 'a', 
+'n', 's', 'p', 'o', 'r', 't', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\022', ' ', '\001', 
+'(', '\t', 'R', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'F', 'a', 'i', 'l', 
+'u', 'r', 'e', 'R', 'e', 'a', 's', 'o', 'n', '\022', '\035', '\n', '\n', 'r', 'o', 'u', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\023', 
+' ', '\001', '(', '\t', 'R', '\t', 'r', 'o', 'u', 't', 'e', 'N', 'a', 'm', 'e', '\022', 'f', '\n', ' ', 'd', 'o', 'w', 'n', 's', 't', 
+'r', 'e', 'a', 'm', '_', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 
+'s', '\030', '\024', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
+'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 
+'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'r', '\n', '\024', 'f', 'i', 
+'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '_', 'o', 'b', 'j', 'e', 'c', 't', 's', '\030', '\025', ' ', '\003', '(', '\013', '2', 
+'@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 
+'.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 
+'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', 'E', 'n', 't', 'r', 'y', 'R', '\022', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 
+'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', '\022', 'Y', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', 
+'\030', '\026', ' ', '\003', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 
+'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '.', 'C', 
+'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 
+'s', '\022', '5', '\n', '\010', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\027', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'd', 'u', 
+'r', 'a', 't', 'i', 'o', 'n', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 
+'t', '_', 'a', 't', 't', 'e', 'm', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '\030', '\030', ' ', '\001', '(', '\r', 'R', '\033', 'u', 'p', 
+'s', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'q', 'u', 'e', 's', 't', 'A', 't', 't', 'e', 'm', 'p', 't', 'C', 'o', 'u', 'n', 't', 
+'\022', 'D', '\n', '\036', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 
+'n', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\031', ' ', '\001', '(', '\t', 'R', '\034', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 
+'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\033', '\n', '\t', 's', 
+'t', 'r', 'e', 'a', 'm', '_', 'i', 'd', '\030', '\032', ' ', '\001', '(', '\t', 'R', '\010', 's', 't', 'r', 'e', 'a', 'm', 'I', 'd', '\022', 
+'A', '\n', '\026', 'i', 'n', 't', 'e', 'r', 'm', 'e', 'd', 'i', 'a', 't', 'e', '_', 'l', 'o', 'g', '_', 'e', 'n', 't', 'r', 'y', 
+'\030', '\033', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'i', 'n', 't', 'e', 
+'r', 'm', 'e', 'd', 'i', 'a', 't', 'e', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'M', '\n', '#', 'd', 'o', 'w', 'n', 's', 
+'t', 'r', 'e', 'a', 'm', '_', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 
+'e', 'a', 's', 'o', 'n', '\030', '\034', ' ', '\001', '(', '\t', 'R', ' ', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'r', 
+'a', 'n', 's', 'p', 'o', 'r', 't', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'a', 's', 'o', 'n', '\022', ';', '\n', '\032', 'd', 
+'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', 
+'\030', '\035', ' ', '\001', '(', '\004', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 
+'e', 's', 'S', 'e', 'n', 't', '\022', 'C', '\n', '\036', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', 
+'_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\036', ' ', '\001', '(', '\004', 'R', '\033', 'd', 'o', 
+'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', 
+'\022', '7', '\n', '\030', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 'b', 'y', 't', 'e', 's', '_', 's', 
+'e', 'n', 't', '\030', '\037', ' ', '\001', '(', '\004', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 
+'t', 'e', 's', 'S', 'e', 'n', 't', '\022', '?', '\n', '\034', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 
+'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', ' ', ' ', '\001', '(', '\004', 'R', '\031', 'u', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\022', 'N', '\n', 
+'\017', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 't', 'y', 'p', 'e', '\030', '!', ' ', '\001', '(', '\016', '2', '&', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 
+'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'R', '\r', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 
+'p', 'e', '\032', '[', '\n', '\027', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', 'E', 
+'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', 
+'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', '=', '\n', '\017', 'C', 
+'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', 
+'(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 
+'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 
+'t', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 
+'C', 'o', 'm', 'm', 'o', 'n', '\"', '\351', '\r', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', 
+'8', '\n', '\030', 'f', 'a', 'i', 'l', 'e', 'd', '_', 'l', 'o', 'c', 'a', 'l', '_', 'h', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 
+'c', 'k', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\026', 'f', 'a', 'i', 'l', 'e', 'd', 'L', 'o', 'c', 'a', 'l', 'H', 'e', 'a', 'l', 
+'t', 'h', 'c', 'h', 'e', 'c', 'k', '\022', '.', '\n', '\023', 'n', 'o', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'u', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\021', 'n', 'o', 'H', 'e', 'a', 'l', 't', 'h', 'y', 'U', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', '\022', '8', '\n', '\030', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 
+'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 
+'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '\037', '\n', '\013', 'l', 'o', 'c', 'a', 'l', '_', 'r', 'e', 
+'s', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\n', 'l', 'o', 'c', 'a', 'l', 'R', 'e', 's', 'e', 't', '\022', '2', '\n', '\025', 
+'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'r', 'e', 's', 'e', 't', '\030', '\005', ' ', '\001', 
+'(', '\010', 'R', '\023', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'R', 'e', 's', 'e', 't', '\022', '>', 
+'\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 
+'l', 'u', 'r', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\031', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 
+'c', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'F', '\n', '\037', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 
+'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\030', '\007', ' ', 
+'\001', '(', '\010', 'R', '\035', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 
+'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\022', '+', '\n', '\021', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'o', 'v', 'e', 
+'r', 'f', 'l', 'o', 'w', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'O', 'v', 'e', 'r', 
+'f', 'l', 'o', 'w', '\022', '$', '\n', '\016', 'n', 'o', '_', 'r', 'o', 'u', 't', 'e', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\t', ' ', 
+'\001', '(', '\010', 'R', '\014', 'n', 'o', 'R', 'o', 'u', 't', 'e', 'F', 'o', 'u', 'n', 'd', '\022', '%', '\n', '\016', 'd', 'e', 'l', 'a', 
+'y', '_', 'i', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\030', '\n', ' ', '\001', '(', '\010', 'R', '\r', 'd', 'e', 'l', 'a', 'y', 'I', 'n', 
+'j', 'e', 'c', 't', 'e', 'd', '\022', '%', '\n', '\016', 'f', 'a', 'u', 'l', 't', '_', 'i', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\030', 
+'\013', ' ', '\001', '(', '\010', 'R', '\r', 'f', 'a', 'u', 'l', 't', 'I', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\022', '!', '\n', '\014', 'r', 
+'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 'e', 'd', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\013', 'r', 'a', 't', 'e', 'L', 'i', 
+'m', 'i', 't', 'e', 'd', '\022', 'f', '\n', '\024', 'u', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '_', 'd', 'e', 't', 
+'a', 'i', 'l', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 
+'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', 
+'.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', 'R', '\023', 'u', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 
+'e', 'd', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '7', '\n', '\030', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 's', 
+'e', 'r', 'v', 'i', 'c', 'e', '_', 'e', 'r', 'r', 'o', 'r', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\025', 'r', 'a', 't', 'e', 'L', 
+'i', 'm', 'i', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'E', 'r', 'r', 'o', 'r', '\022', 'J', '\n', '!', 'd', 'o', 'w', 'n', 's', 
+'t', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 
+'i', 'o', 'n', '\030', '\017', ' ', '\001', '(', '\010', 'R', '\037', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 
+'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\035', 'u', 'p', 's', 't', 
+'r', 'e', 'a', 'm', '_', 'r', 'e', 't', 'r', 'y', '_', 'l', 'i', 'm', 'i', 't', '_', 'e', 'x', 'c', 'e', 'e', 'd', 'e', 'd', 
+'\030', '\020', ' ', '\001', '(', '\010', 'R', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 't', 'r', 'y', 'L', 'i', 'm', 'i', 
+'t', 'E', 'x', 'c', 'e', 'e', 'd', 'e', 'd', '\022', '.', '\n', '\023', 's', 't', 'r', 'e', 'a', 'm', '_', 'i', 'd', 'l', 'e', '_', 
+'t', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\021', 's', 't', 'r', 'e', 'a', 'm', 'I', 'd', 'l', 'e', 
+'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'A', '\n', '\035', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'e', 'n', 'v', 'o', 'y', '_', 
+'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\022', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'n', 
+'v', 'a', 'l', 'i', 'd', 'E', 'n', 'v', 'o', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 
+':', '\n', '\031', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'e', 'r', 
+'r', 'o', 'r', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'o', 't', 
+'o', 'c', 'o', 'l', 'E', 'r', 'r', 'o', 'r', '\022', 'N', '\n', '$', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'm', 'a', 'x', 
+'_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'r', 'e', 'a', 'c', 'h', 'e', 'd', '\030', 
+'\024', ' ', '\001', '(', '\010', 'R', ' ', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 
+'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 'e', 'a', 'c', 'h', 'e', 'd', '\022', ';', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 
+'e', '_', 'f', 'r', 'o', 'm', '_', 'c', 'a', 'c', 'h', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\025', ' ', '\001', '(', '\010', 
+'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'r', 'o', 'm', 'C', 'a', 'c', 'h', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
+'\022', '3', '\n', '\026', 'n', 'o', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'f', 'o', 'u', 'n', 
+'d', '\030', '\026', ' ', '\001', '(', '\010', 'R', '\023', 'n', 'o', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'F', 'o', 
+'u', 'n', 'd', '\022', ')', '\n', '\020', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\027', 
+' ', '\001', '(', '\010', 'R', '\017', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '6', '\n', '\027', 
+'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'e', 'r', 'r', 'o', 'r', '\030', '\030', 
+' ', '\001', '(', '\010', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'E', 'r', 'r', 
+'o', 'r', '\022', '(', '\n', '\020', 'n', 'o', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\031', ' ', 
+'\001', '(', '\010', 'R', '\016', 'n', 'o', 'C', 'l', 'u', 's', 't', 'e', 'r', 'F', 'o', 'u', 'n', 'd', '\022', ')', '\n', '\020', 'o', 'v', 
+'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'v', 'e', 
+'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '4', '\n', '\026', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 
+'u', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\024', 'd', 'n', 's', 'R', 
+'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\032', '\325', '\001', '\n', '\014', 'U', 'n', 'a', 'u', 
+'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 
+':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 
+'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 
+'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', '\n', '\006', 'R', 'e', 'a', 's', 
+'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', 
+'\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\001', ':', '9', 
+'\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
+'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 
+'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 
+'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 
+'a', 'g', 's', '\"', '\255', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'R', '\n', '\013', 
+'t', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 
+'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\n', 't', 'l', 's', 'V', 'e', 
+'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', 'e', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', 'h', 'e', 'r', 'S', 'u', 'i', 
+'t', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', 
+'\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '~', '\n', '\034', 'l', 'o', 
+'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 
+'s', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 
+'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\032', 'l', 'o', 'c', 'a', 
+'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '|', '\n', 
+'\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 
+'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 
+'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 
+'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\031', 'p', 'e', 
+'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '$', 
+'\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\014', 't', 
+'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', 'f', 'i', 'n', 'g', 'e', 'r', 
+'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', 
+'n', 't', '\032', '\201', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 
+'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', '\030', '\001', 
+' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
+'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 
+'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 
+'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\030', '\n', 
+'\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\032', '\222', 
+'\001', '\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\003', 'u', 'r', 'i', '\030', 
+'\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', '\002', ' ', '\001', '(', '\t', 
+'H', '\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 
+'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 
+'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 
+'.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', 'a', 'n', ':', 'B', '\232', 
+'\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 
+'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 
+'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', 'L', 'S', 'V', 'e', 'r', 
+'s', 'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 
+'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', 
+'1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', 
+'_', '3', '\020', '\004', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 
+'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 
+'\"', '\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 
+'s', '\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\001', ' ', '\001', '(', '\016', 
+'2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 
+'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\r', 'r', 
+'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\002', ' ', 
+'\001', '(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', 
+'\003', ' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '0', '\n', '\004', 'p', 'o', 'r', 't', '\030', 
+'\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 
+'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', 
+'\005', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', 
+'\030', '\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', '\007', 'r', 'e', 'f', 'e', 
+'r', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', '\n', '\r', 'f', 'o', 'r', 
+'w', 'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 
+'e', 'd', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\t', ' ', '\001', '(', '\t', 
+'R', '\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'p', 
+'a', 't', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', 'a', 't', 'h', '\022', '2', 
+'\n', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\013', 
+' ', '\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', 
+'\022', ',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\014', ' ', 
+'\001', '(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'k', '\n', '\017', 
+'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 
+'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 'q', 'u', 'e', 
+'s', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 
+'a', 'd', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 
+'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 
+'m', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', 'd', 'o', 'w', 'n', 's', 
+'t', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 
+'e', 'd', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 
+'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 
+'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 
+'u', 'e', ':', '\002', '8', '\001', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', 
+'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 
+'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 
+'s', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 
+'c', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 
+'C', 'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 
+'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 
+'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'o', 'd', 'y', 
+'_', 'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 
+'y', 'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 
+'s', '\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
+'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 
+'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 
+'r', 'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'r', '\n', '\021', 'r', 'e', 
+'s', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 
+'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 
+'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', 'e', 's', 'p', 'o', 'n', 
+'s', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 
+'d', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 
+'e', 'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 
+'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\007', ' ', '\001', 
+'(', '\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 
+'c', 'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 
+'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\031', 'd', 'o', 'w', 'n', 
+'s', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\032', 'B', '\n', '\024', 
+'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 
+'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', 
+'\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', 'C', '\n', '\025', 'R', 'e', 's', 'p', 'o', 'n', 's', 
+'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', 
+'(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 
+'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 
+'t', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 
+'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\207', '\002', '\n', '\r', 'A', 'c', 'c', 'e', 's', 's', 'L', 
+'o', 'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', '\n', '\024', 'T', 'c', 'p', 
+'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', '\017', '\n', '\013', 'T', 'c', 
+'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 
+'i', 'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'S', 't', 'a', 
+'r', 't', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 
+'c', '\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\006', '\022', '\025', '\n', 
+'\021', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', '\022', '\024', '\n', '\020', 'U', 
+'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', '\013', 'U', 'p', 's', 't', 
+'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'u', 
+'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 
+'e', 'd', '\020', '\n', 'B', '\215', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 
+'c', 'e', 's', 's', 'l', 'o', 'g', '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', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
+'/', 'v', '3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
+'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[11] = {
+  &envoy_config_core_v3_address_proto_upbdefinit,
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &google_protobuf_any_proto_upbdefinit,
+  &google_protobuf_duration_proto_upbdefinit,
+  &google_protobuf_timestamp_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit = {
+  deps,
+  &envoy_data_accesslog_v3_accesslog_proto_upb_file_layout,
+  "envoy/data/accesslog/v3/accesslog.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 8931)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
new file mode 100644
index 0000000000000..beca037fac253
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
@@ -0,0 +1,110 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/data/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TCPAccessLogEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TCPAccessLogEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPAccessLogEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPAccessLogEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ConnectionProperties_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ConnectionProperties");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ResponseFlags_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ResponseFlags");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ResponseFlags_Unauthorized_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ResponseFlags.Unauthorized");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_CertificateProperties_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties.CertificateProperties");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPRequestProperties_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPRequestProperties");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
new file mode 100644
index 0000000000000..0e4fc786335bc
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/clusters/aggregate/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
+#include "envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[481] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'c', 'l', 'u', 's', 't', 'e', 
+'r', 's', '/', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '/', 'v', '3', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 
+'r', 'o', 't', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'c', 'l', 
+'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '.', 'v', '3', '\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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
+'n', 'i', 'n', 'g', '.', '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', '\"', 'r', '\n', '\r', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 
+'i', 'g', '\022', '$', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', 
+'\222', '\001', '\002', '\010', '\001', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'a', 'g', 'g', 'r', 'e', 
+'g', 'a', 't', 'e', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 
+'g', 'B', '\251', '\001', '\n', '4', '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', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 
+'e', 'g', 'a', 't', 'e', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 
+'Y', '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', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '/', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 
+'/', 'v', '3', ';', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
+'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout,
+  "envoy/extensions/clusters/aggregate/v3/cluster.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 481)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
new file mode 100644
index 0000000000000..447a6200c52c4
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/clusters/aggregate/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.clusters.aggregate.v3.ClusterConfig");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
new file mode 100644
index 0000000000000..6ddf9e396cf52
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
@@ -0,0 +1,91 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/common/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/filters/common/fault/v3/fault.upbdefs.h"
+#include "envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[1444] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
+'s', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 
+'r', 'o', 't', 'o', '\022', '(', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 
+'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', '\033', 'e', 'n', 
+'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', 
+'\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 
+'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 
+'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\304', 
+'\003', '\n', '\n', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '\022', 'F', '\n', '\013', 'f', 'i', 'x', 'e', 'd', '_', 'd', 'e', 
+'l', 'a', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'H', '\000', 'R', '\n', 
+'f', 'i', 'x', 'e', 'd', 'D', 'e', 'l', 'a', 'y', '\022', 'e', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'd', 'e', 'l', 'a', 
+'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 
+'s', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', 
+'.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', 'H', '\000', 
+'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 
+'g', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 
+'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 
+'t', 'a', 'g', 'e', '\032', 'I', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', ':', ':', '\232', '\305', '\210', '\036', 
+'5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 
+'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 
+'e', 'l', 'a', 'y', '\"', '\033', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', 'T', 'y', 'p', 'e', '\022', '\t', '\n', 
+'\005', 'F', 'I', 'X', 'E', 'D', '\020', '\000', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
+'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 
+'t', 'D', 'e', 'l', 'a', 'y', 'B', '\033', '\n', '\024', 'f', 'a', 'u', 'l', 't', '_', 'd', 'e', 'l', 'a', 'y', '_', 's', 'e', 'c', 
+'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'R', '\004', 't', 
+'y', 'p', 'e', '\"', '\260', '\004', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', 'f', '\n', 
+'\013', 'f', 'i', 'x', 'e', 'd', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 
+'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 
+'t', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\n', 'f', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 
+'t', '\022', 'i', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', 'D', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', 
+'.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 
+'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', 
+'d', 'e', 'r', 'L', 'i', 'm', 'i', 't', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\002', ' ', 
+'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 
+'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', 
+'s', '\n', '\n', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\022', '&', '\n', '\n', 'l', 'i', 'm', 'i', 't', '_', 'k', 'b', 
+'p', 's', '\030', '\001', ' ', '\001', '(', '\004', 'B', '\007', '\372', 'B', '\004', '2', '\002', '(', '\001', 'R', '\t', 'l', 'i', 'm', 'i', 't', 'K', 
+'b', 'p', 's', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 
+'L', 'i', 'm', 'i', 't', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\032', 'M', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 
+'r', 'L', 'i', 'm', 'i', 't', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 
+'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', ':', '2', '\232', '\305', '\210', 
+'\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 
+'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'B', '\021', '\n', 
+'\n', 'l', 'i', 'm', 'i', 't', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'B', '\247', '\001', '\n', '6', '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', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', 
+'B', '\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'W', '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', '/', 'f', 'i', 'l', 
+'t', 'e', 'r', 's', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', ';', 'f', 'a', 'u', 'l', 
+'t', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[6] = {
+  &envoy_type_v3_percent_proto_upbdefinit,
+  &google_protobuf_duration_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout,
+  "envoy/extensions/filters/common/fault/v3/fault.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 1444)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
new file mode 100644
index 0000000000000..056735bb97443
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/common/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultDelay_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultDelay");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
new file mode 100644
index 0000000000000..27dab7a0e0e2e
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
@@ -0,0 +1,122 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
+#include "envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[2069] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
+'s', '/', 'h', 't', 't', 'p', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', 
+'t', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 
+'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 
+'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 
+'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 
+'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 
+'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 
+'t', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 
+'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 
+'r', 's', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 
+'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', 
+'\244', '\003', '\n', '\n', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '\022', '.', '\n', '\013', 'h', 't', 't', 'p', '_', 's', 't', 
+'a', 't', 'u', 's', '\030', '\002', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'H', '\000', 
+'R', '\n', 'h', 't', 't', 'p', 'S', 't', 'a', 't', 'u', 's', '\022', '!', '\n', '\013', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 
+'u', 's', '\030', '\005', ' ', '\001', '(', '\r', 'H', '\000', 'R', '\n', 'g', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', '\022', 'c', '\n', 
+'\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 'b', 'o', 'r', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 
+'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 
+'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '.', 'H', 'e', 'a', 
+'d', 'e', 'r', 'A', 'b', 'o', 'r', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', '\022', '@', 
+'\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 
+'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', 'N', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 
+'b', 'o', 'r', 't', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 
+'l', 't', 'A', 'b', 'o', 'r', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', ':', '3', '\232', '\305', '\210', '\036', 
+'.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 
+'t', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', 'B', '\021', '\n', 
+'\n', 'e', 'r', 'r', 'o', 'r', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\001', '\020', '\002', '\"', '\307', '\010', 
+'\n', '\t', 'H', 'T', 'T', 'P', 'F', 'a', 'u', 'l', 't', '\022', 'J', '\n', '\005', 'd', 'e', 'l', 'a', 'y', '\030', '\001', ' ', '\001', '(', 
+'\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 
+'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 
+'D', 'e', 'l', 'a', 'y', 'R', '\005', 'd', 'e', 'l', 'a', 'y', '\022', 'H', '\n', '\005', 'a', 'b', 'o', 'r', 't', '\030', '\002', ' ', '\001', 
+'(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 
+'t', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 
+'b', 'o', 'r', 't', 'R', '\005', 'a', 'b', 'o', 'r', 't', '\022', ')', '\n', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 
+'l', 'u', 's', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 
+'s', 't', 'e', 'r', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 
+'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 
+'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', ')', '\n', '\020', 'd', 'o', 'w', 
+'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'n', 'o', 'd', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\017', 'd', 'o', 'w', 'n', 
+'s', 't', 'r', 'e', 'a', 'm', 'N', 'o', 'd', 'e', 's', '\022', 'H', '\n', '\021', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', 
+'_', 'f', 'a', 'u', 'l', 't', 's', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
+'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'm', 'a', 'x', 'A', 'c', 
+'t', 'i', 'v', 'e', 'F', 'a', 'u', 'l', 't', 's', '\022', 'h', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'r', 'a', 
+'t', 'e', '_', 'l', 'i', 'm', 'i', 't', '\030', '\007', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 
+'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 
+'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\021', 'r', 
+'e', 's', 'p', 'o', 'n', 's', 'e', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', '2', '\n', '\025', 'd', 'e', 'l', 'a', 'y', 
+'_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\023', 'd', 
+'e', 'l', 'a', 'y', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '2', '\n', '\025', 'a', 'b', 'o', 
+'r', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\t', ' ', '\001', '(', '\t', 'R', 
+'\023', 'a', 'b', 'o', 'r', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '4', '\n', '\026', 'd', 
+'e', 'l', 'a', 'y', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\n', ' ', '\001', 
+'(', '\t', 'R', '\024', 'd', 'e', 'l', 'a', 'y', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', 
+'9', '\n', '\031', 'a', 'b', 'o', 'r', 't', '_', 'h', 't', 't', 'p', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 
+'i', 'm', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\026', 'a', 'b', 'o', 'r', 't', 'H', 't', 't', 'p', 'S', 't', 'a', 't', 'u', 
+'s', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'f', 'a', 
+'u', 'l', 't', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\026', 'm', 'a', 'x', 'A', 'c', 
+'t', 'i', 'v', 'e', 'F', 'a', 'u', 'l', 't', 's', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', 'L', '\n', '#', 'r', 'e', 's', 'p', 
+'o', 'n', 's', 'e', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 
+'u', 'n', 't', 'i', 'm', 'e', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\037', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'R', 'a', 't', 
+'e', 'L', 'i', 'm', 'i', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'a', 
+'b', 'o', 'r', 't', '_', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', 
+'\016', ' ', '\001', '(', '\t', 'R', '\026', 'a', 'b', 'o', 'r', 't', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'R', 'u', 'n', 
+'t', 'i', 'm', 'e', '\022', 'G', '\n', ' ', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 
+'m', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '\017', ' ', '\001', '(', '\010', 'R', '\035', 'd', 'i', 
+'s', 'a', 'b', 'l', 'e', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 
+'t', 's', '\022', '@', '\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\020', ' ', '\001', 
+'(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 
+'c', 't', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', ':', '2', '\232', '\305', '\210', '\036', '-', 
+'\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 
+'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'F', 'a', 'u', 'l', 't', 'B', '\243', '\001', '\n', '4', 
+'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', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 
+'v', '3', 'B', '\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'U', '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', '/', 'f', 
+'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', ';', 'f', 'a', 'u', 'l', 
+'t', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[9] = {
+  &envoy_config_route_v3_route_components_proto_upbdefinit,
+  &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit,
+  &envoy_type_v3_percent_proto_upbdefinit,
+  &google_protobuf_struct_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout,
+  "envoy/extensions/filters/http/fault/v3/fault.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 2069)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
new file mode 100644
index 0000000000000..1c0eecd5082fc
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/fault/v3/fault.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_FaultAbort_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.FaultAbort");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_HTTPFault_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.HTTPFault");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
new file mode 100644
index 0000000000000..9f0197369f5f6
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
@@ -0,0 +1,79 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h"
+#include "envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit;
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+static const char descriptor[1080] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
+'s', '/', 'h', 't', 't', 'p', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', 
+'\022', '%', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 
+'s', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
+'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 
+'d', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 
+'p', 'r', 'o', 't', 'o', '\032', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', 
+'3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 
+'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 
+'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\335', '\003', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', 
+'\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\027', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', 
+'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'W', '\n', 
+'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', 
+'\005', '\021', '\022', '\017', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', 
+'\010', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 
+'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 
+'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 
+'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', 
+'w', 'R', 'u', 'l', 'e', 's', '\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', 
+'\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
+'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 
+'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 
+'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', 
+'_', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', 
+'\025', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', ':', ',', '\232', 
+'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', 
+'.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', 
+'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\001', '(', '\013', '2', 
+'+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 
+'s', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', 
+':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 
+'t', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 
+'o', 'u', 't', 'e', 'J', '\004', '\010', '\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', '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', '.', 'f', 'i', 'l', 't', 
+'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 
+'t', 'o', 'P', '\001', 'Z', 'S', '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', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 
+'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 
+'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[7] = {
+  &envoy_config_rbac_v3_rbac_proto_upbdefinit,
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &xds_type_matcher_v3_matcher_proto_upbdefinit,
+  &udpa_annotations_migrate_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout,
+  "envoy/extensions/filters/http/rbac/v3/rbac.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 1080)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
new file mode 100644
index 0000000000000..1decddcd339f9
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/filters/http/rbac/v3/rbac.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBAC_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.rbac.v3.RBAC");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBACPerRoute_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.rbac.v3.RBACPerRoute");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c
index 5019b043f1dc1..2a303ffad73ae 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/router/v3/router.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
-#include "envoy/extensions/filters/http/router/v3/router.upb.h"
+#include "envoy/extensions/filters/http/router/v3/router.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
similarity index 91%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
index 67989461c9cb0..2797e801c03d2 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/router/v3/router.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
index 9812b6091c7b3..8d04ea50f98dd 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h"
-#include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h"
+#include "envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
index 0968558d0e566..0c263b98bca56 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
index 2df4377065297..140199760ac5d 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
-#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h"
+#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
index 20480bc16cc16..af7d9705bdbf1 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
new file mode 100644
index 0000000000000..54427e9234cee
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
@@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h"
+#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[487] = {'\n', '=', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'h', 't', 't', 'p', '/', 's', 
+'t', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '/', 'c', 'o', 'o', 'k', 'i', 'e', '/', 'v', '3', 
+'/', 'c', 'o', 'o', 'k', 'i', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '0', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 
+'n', 's', 'i', 'o', 'n', 's', '.', 'h', 't', 't', 'p', '.', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 
+'i', 'o', 'n', '.', 'c', 'o', 'o', 'k', 'i', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', 
+'/', 'h', 't', 't', 'p', '/', 'v', '3', '/', 'c', 'o', 'o', 'k', 'i', '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', '\"', 'W', '\n', '\027', 'C', 'o', 'o', 'k', 'i', 'e', 'B', 'a', 's', 'e', 'd', 'S', 'e', 's', 's', 'i', 'o', 'n', 'S', 
+'t', 'a', 't', 'e', '\022', '<', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'B', '\010', 
+'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', 'B', '\271', '\001', '\n', '>', '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', '.', 'h', 't', 't', 'p', '.', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '.', 'c', 
+'o', 'o', 'k', 'i', 'e', '.', 'v', '3', 'B', '\013', 'C', 'o', 'o', 'k', 'i', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '`', 
+'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', '/', 'h', 't', 't', 'p', '/', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 
+'o', 'n', '/', 'c', 'o', 'o', 'k', 'i', 'e', '/', 'v', '3', ';', 'c', 'o', 'o', 'k', 'i', 'e', '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_type_http_v3_cookie_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout,
+  "envoy/extensions/http/stateful_session/cookie/v3/cookie.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 487)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
new file mode 100644
index 0000000000000..84b5be9c2b08c
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
index 3c0f14863a4c0..5f6ce4bef0340 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/cert.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h"
-#include "envoy/extensions/transport_sockets/tls/v3/cert.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
similarity index 85%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
index 38b861fb6f085..74fc505ba5605 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/cert.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
new file mode 100644
index 0000000000000..1c8ff8d23c96a
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
@@ -0,0 +1,214 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h"
+#include "envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[4224] = {'\n', '6', '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', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', 
+'.', 'p', 'r', 'o', 't', 'o', '\022', ')', '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', '.', 't', 'l', 's', '.', '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', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 
+'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 
+'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', 
+'.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 
+'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 
+'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 
+'t', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 
+'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', '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', 
+'!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 
+'i', 'n', 'g', '.', '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', '\"', '\245', '\004', '\n', '\r', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 
+'r', 's', '\022', '\217', '\001', '\n', '\034', 't', 'l', 's', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 
+'o', 'l', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 'D', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 
+'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 
+'s', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\217', 
+'\001', '\n', '\034', 't', 'l', 's', '_', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 
+'e', 'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', 'D', '.', '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', '.', 
+'t', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', 's', 'P', 
+'r', 'o', 't', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', 'a', 'x', 
+'i', 'm', 'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '#', '\n', '\r', 'c', 'i', 
+'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\014', 'c', 'i', 'p', 'h', 'e', 'r', 
+'S', 'u', 'i', 't', 'e', 's', '\022', '\037', '\n', '\013', 'e', 'c', 'd', 'h', '_', 'c', 'u', 'r', 'v', 'e', 's', '\030', '\004', ' ', '\003', 
+'(', '\t', 'R', '\n', 'e', 'c', 'd', 'h', 'C', 'u', 'r', 'v', 'e', 's', '\022', '1', '\n', '\024', 's', 'i', 'g', 'n', 'a', 't', 'u', 
+'r', 'e', '_', 'a', 'l', 'g', 'o', 'r', 'i', 't', 'h', 'm', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\023', 's', 'i', 'g', 'n', 
+'a', 't', 'u', 'r', 'e', 'A', 'l', 'g', 'o', 'r', 'i', 't', 'h', 'm', 's', '\"', 'O', '\n', '\013', 'T', 'l', 's', 'P', 'r', 'o', 
+'t', 'o', 'c', 'o', 'l', '\022', '\014', '\n', '\010', 'T', 'L', 'S', '_', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\013', '\n', '\007', 'T', 'L', 
+'S', 'v', '1', '_', '0', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 
+'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '3', '\020', '\004', ':', '&', '\232', '\305', 
+'\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 
+'s', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\"', '\317', '\001', '\n', '\022', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 
+'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', ',', '\n', '\r', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
+'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 
+'r', 'N', 'a', 'm', 'e', '\022', 'A', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', 
+'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', 
+'\006', '\270', '\267', '\213', '\244', '\002', '\001', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '+', '\232', 
+'\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'P', 
+'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 
+'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\310', '\005', '\n', 
+'\016', 'T', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'M', '\n', '\021', 'c', 'e', 'r', 't', 'i', 'f', 
+'i', 'c', 'a', 't', 'e', '_', 'c', 'h', 'a', 'i', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 
+'e', 'R', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'h', 'a', 'i', 'n', '\022', 'I', '\n', '\013', 'p', 'r', 
+'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', 
+'\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\n', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', '\022', '@', '\n', '\006', 'p', 'k', 
+'c', 's', '1', '2', '\030', '\010', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
+'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', 
+'\002', '\001', 'R', '\006', 'p', 'k', 'c', 's', '1', '2', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 
+'e', 'c', 't', 'o', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
+'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 
+'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'o', '\n', '\024', 'p', 
+'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', 
+'2', '=', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'P', 'r', 'i', 'v', 'a', 
+'t', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'R', '\022', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 
+'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', 'D', '\n', '\010', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '\030', '\003', ' ', '\001', '(', 
+'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
+'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\010', 'p', 'a', 's', 's', 'w', 
+'o', 'r', 'd', '\022', 'A', '\n', '\013', 'o', 'c', 's', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', 
+' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 
+'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'o', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', '\022', 'b', '\n', '\034', 's', 
+'i', 'g', 'n', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 
+'m', 'p', '\030', '\005', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
+'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\032', 's', 'i', 'g', 'n', 'e', 'd', 
+'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', ':', '\'', '\232', '\305', '\210', 
+'\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 
+'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\"', '\213', '\001', '\n', '\024', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 
+'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'D', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', '\013', 
+'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 
+'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\016', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', '\270', '\267', '\213', '\244', '\002', '\001', 
+'R', '\004', 'k', 'e', 'y', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 
+'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 
+'e', 'y', 's', '\"', 's', '\n', '!', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 
+'r', 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', '#', '\n', '\r', 'i', 'n', 's', 't', 'a', 'n', 
+'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\014', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'N', 'a', 
+'m', 'e', '\022', ')', '\n', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', 
+'\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\"', '\244', '\002', '\n', '\025', 
+'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'o', '\n', '\010', 
+'s', 'a', 'n', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', 'H', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'S', 'a', 'n', 'T', 'y', 'p', 'e', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\000', 
+'R', '\007', 's', 'a', 'n', 'T', 'y', 'p', 'e', '\022', 'H', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\001', '(', 
+'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
+'.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', 
+'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\"', 'P', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', '\024', 'S', 'A', 
+'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'E', 
+'M', 'A', 'I', 'L', '\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', '\020', '\003', '\022', 
+'\016', '\n', '\n', 'I', 'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\"', '\220', '\014', '\n', '\034', 'C', 'e', 'r', 't', 'i', 
+'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'W', 
+'\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 
+'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 
+'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', '\255', '\001', '\n', ' ', 'c', 'a', '_', 'c', 'e', 'r', 't', 'i', 
+'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', 
+'\r', ' ', '\001', '(', '\013', '2', 'L', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 
+'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 
+'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', 
+'_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 
+'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 
+'d', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\013', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
+'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 
+'c', 't', 'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'F', 
+'\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'p', 'k', 'i', 
+'\030', '\003', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', 'R', '\025', 'v', 
+'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', '\n', '\027', 'v', 
+'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', '\030', '\002', ' ', 
+'\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', 'e', 'r', 'i', 
+'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', 'a', 's', 'h', '\022', '\202', '\001', '\n', '\035', 'm', 'a', 't', 
+'c', 'h', '_', 't', 'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 
+'s', '\030', '\017', ' ', '\003', '(', '\013', '2', '@', '.', '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', '.', 't', 'l', 's', '.', 'v', 
+'3', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\031', 
+'m', 'a', 't', 'c', 'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', 
+'\022', 'h', '\n', '\027', 'm', 'a', 't', 'c', 'h', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 
+'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\013', '\030', '\001', 
+'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 
+'t', 'N', 'a', 'm', 'e', 's', '\022', 'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', 'e', 'd', '_', 
+'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', '\006', ' ', '\001', 
+'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 
+'V', 'a', 'l', 'u', 'e', 'R', '!', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 
+'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', '\030', '\007', ' ', 
+'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', 
+'3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', 'l', 'l', 'o', 
+'w', '_', 'e', 'x', 'p', 'i', 'r', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\010', ' ', '\001', 
+'(', '\010', 'R', '\027', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 
+'t', 'e', '\022', '\242', '\001', '\n', '\030', 't', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', 'i', 'f', 'i', 
+'c', 'a', 't', 'i', 'o', 'n', '\030', '\n', ' ', '\001', '(', '\016', '2', '^', '.', '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', '.', 
+'t', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 
+'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 
+'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', 'u', 's', 't', 
+'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', 'b', '\n', '\027', 'c', 'u', 's', 't', 
+'o', 'm', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', '\001', '(', '\013', 
+'2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 
+'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 'c', 'u', 's', 't', 
+'o', 'm', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', 'n', 'l', 'y', 
+'_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', '\016', ' ', '\001', 
+'(', '\010', 'R', '\025', 'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', 'C', 'r', 'l', 
+'\022', 'O', '\n', '\020', 'm', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\030', '\020', ' ', '\001', '(', 
+'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', 
+'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', 'r', 'i', 'f', 
+'y', 'D', 'e', 'p', 't', 'h', '\"', 'F', '\n', '\026', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 
+'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\022', 'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', 'S', 'T', '_', 'C', 
+'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', 'U', 'S', 'T', 'E', 
+'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 
+'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 
+'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\027', 'v', 'e', 'r', 
+'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', '\250', '\001', '\n', '7', 
+'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', '.', 't', 
+'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'V', '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', '/', 't', 'l', 's', '/', 
+'v', '3', ';', 't', 'l', 's', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[12] = {
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &envoy_config_core_v3_extension_proto_upbdefinit,
+  &envoy_type_matcher_v3_string_proto_upbdefinit,
+  &google_protobuf_any_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_migrate_proto_upbdefinit,
+  &udpa_annotations_sensitive_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout,
+  "envoy/extensions/transport_sockets/tls/v3/common.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 4224)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
new file mode 100644
index 0000000000000..cf645b172d5c7
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
@@ -0,0 +1,65 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/tls/v3/common.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsParameters_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsParameters");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsCertificate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsCertificate");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
index f1de5914b4923..b4fa286c30710 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/secret.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
index ebd444495732d..393fc633ee810 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/secret.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
index 4cf6fdb8fa042..970d06b6ea3dd 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
index f4fc1fe9a087e..561ba85d07008 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
index 41ed52262e86b..8c18a00c0f5be 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h"
-#include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h"
+#include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
index 7ad4637dbebe0..fbb90a97de73d 100644
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c
index 5e1f3780e0669..1b1ae9f09286e 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/discovery/v3/ads.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/service/discovery/v3/ads.upbdefs.h"
-#include "envoy/service/discovery/v3/ads.upb.h"
+#include "envoy/service/discovery/v3/ads.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_service_discovery_v3_discovery_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
index 500249a4d8b43..7289da6e7c81a 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/discovery/v3/ads.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c
index 2fdfc54dd4f63..0ba9e04f38693 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/discovery/v3/discovery.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/service/discovery/v3/discovery.upbdefs.h"
-#include "envoy/service/discovery/v3/discovery.upb.h"
+#include "envoy/service/discovery/v3/discovery.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
index 9ca66b035c676..d8217792ffb3e 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/discovery/v3/discovery.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c
index b377963d5c2b1..033b3d61a4967 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/load_stats/v3/lrs.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/service/load_stats/v3/lrs.upbdefs.h"
-#include "envoy/service/load_stats/v3/lrs.upb.h"
+#include "envoy/service/load_stats/v3/lrs.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_endpoint_v3_load_report_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
index 7f168e5df477b..5108d6ad164b0 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/load_stats/v3/lrs.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c
index 3060d51091d51..c4026a67bbe97 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/status/v3/csds.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/service/status/v3/csds.upbdefs.h"
-#include "envoy/service/status/v3/csds.upb.h"
+#include "envoy/service/status/v3/csds.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_admin_v3_config_dump_shared_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
similarity index 94%
rename from src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
index be58e5d0de481..aae2867d4293a 100644
--- a/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/service/status/v3/csds.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c
new file mode 100644
index 0000000000000..5895d44efee0e
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/http/v3/cookie.upbdefs.h"
+#include "envoy/type/http/v3/cookie.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[388] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'h', 't', 't', 'p', '/', 'v', '3', '/', 'c', 'o', 'o', 'k', 
+'i', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', 
+'.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 
+'t', 'i', 'o', 'n', '.', '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', '\"', 'p', '\n', '\006', 'C', 'o', 'o', 'k', 'i', 
+'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', 
+'\004', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
+'\252', '\001', '\002', '2', '\000', 'R', '\003', 't', 't', 'l', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', 
+'\004', 'p', 'a', 't', 'h', 'B', '{', '\n', ' ', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
+'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', 'B', '\013', 'C', 'o', 'o', 'k', 'i', 'e', 'P', 
+'r', 'o', 't', 'o', 'P', '\001', 'Z', '@', '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', '/', 't', 'y', 'p', 'e', '/', 'h', 't', 't', 'p', '/', 'v', '3', ';', 'h', 't', 't', 'p', 'v', '3', '\272', '\200', '\310', 
+'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &google_protobuf_duration_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit = {
+  deps,
+  &envoy_type_http_v3_cookie_proto_upb_file_layout,
+  "envoy/type/http/v3/cookie.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 388)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
new file mode 100644
index 0000000000000..47084ee25d104
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/http/v3/cookie.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_http_v3_Cookie_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_http_v3_cookie_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.http.v3.Cookie");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c
index 700dccb385220..d897eae71fdbe 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/http/v3/path_transformation.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/http/v3/path_transformation.upbdefs.h"
-#include "envoy/type/http/v3/path_transformation.upb.h"
+#include "envoy/type/http/v3/path_transformation.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
index beefc3d761cec..d029014fcd51e 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/http/v3/path_transformation.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c
index 6dae34d0a5372..2f54b89fc29fb 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/filter_state.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/filter_state.upbdefs.h"
-#include "envoy/type/matcher/v3/filter_state.upb.h"
+#include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
similarity index 88%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
index b9a0da8378c27..63b785e0e0dc1 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/filter_state.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c
new file mode 100644
index 0000000000000..b4f053fd760fb
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c
@@ -0,0 +1,54 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/matcher/v3/http_inputs.upbdefs.h"
+#include "envoy/type/matcher/v3/http_inputs.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[656] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'h', 
+'t', 't', 'p', '_', 'i', 'n', 'p', 'u', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 
+'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\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', '\"', 'K', '\n', '\033', 'H', 
+'t', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 
+'t', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 
+'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\"', 'L', '\n', 
+'\034', 'H', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'I', 
+'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
+'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', 
+'\"', 'L', '\n', '\034', 'H', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 
+'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', 
+'\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 
+'a', 'm', 'e', '\"', 'M', '\n', '\035', 'H', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 
+'r', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
+'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 
+'d', 'e', 'r', 'N', 'a', 'm', 'e', '\"', 'K', '\n', '\037', 'H', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'Q', 'u', 'e', 
+'r', 'y', 'P', 'a', 'r', 'a', 'm', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', '(', '\n', '\013', 'q', 'u', 'e', 'r', 
+'y', '_', 'p', 'a', 'r', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'q', 
+'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'B', '\210', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 
+'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', 
+'\017', 'H', 't', 't', 'p', 'I', 'n', 'p', 'u', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 
+'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
+'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_matcher_v3_http_inputs_proto_upbdefinit = {
+  deps,
+  &envoy_type_matcher_v3_http_inputs_proto_upb_file_layout,
+  "envoy/type/matcher/v3/http_inputs.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 656)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
new file mode 100644
index 0000000000000..4da68056025d6
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
@@ -0,0 +1,55 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_http_inputs_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestHeaderMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestHeaderMatchInput");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestTrailerMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestTrailerMatchInput");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseHeaderMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpResponseHeaderMatchInput");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseTrailerMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpResponseTrailerMatchInput");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestQueryParamMatchInput");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c
new file mode 100644
index 0000000000000..204b8b71f7d2d
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c
@@ -0,0 +1,60 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/matcher/v3/metadata.upbdefs.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_value_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[718] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 
+'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 'a', 'l', 'u', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 
+'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\377', '\002', '\n', '\017', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\037', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', 
+'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'P', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', 
+' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 
+'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'C', '\n', 
+'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', 
+'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '\026', '\n', '\006', 'i', 'n', 'v', 'e', 'r', 
+'t', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\006', 'i', 'n', 'v', 'e', 'r', 't', '\032', 'q', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 
+'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
+'\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
+'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', 
+'\022', '\003', '\370', 'B', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\206', 
+'\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
+'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'P', 'r', 
+'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[5] = {
+  &envoy_type_matcher_v3_value_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit = {
+  deps,
+  &envoy_type_matcher_v3_metadata_proto_upb_file_layout,
+  "envoy/type/matcher/v3/metadata.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 718)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
new file mode 100644
index 0000000000000..c03c4fbbdbc1b
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.MetadataMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_PathSegment_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.MetadataMatcher.PathSegment");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c
index 4d9f5744d2139..827b8bdab62b8 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/node.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/node.upbdefs.h"
-#include "envoy/type/matcher/v3/node.upb.h"
+#include "envoy/type/matcher/v3/node.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_matcher_v3_struct_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
index 18cae4d6e84b2..9a3e52d61a518 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/node.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c
index 217e91808c7d2..4f5a781f00b80 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/number.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/number.upbdefs.h"
-#include "envoy/type/matcher/v3/number.upb.h"
+#include "envoy/type/matcher/v3/number.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
index ea4abd8235a04..ff1977bb32c53 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/number.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c
index 075cd1756a75e..edd2b67f40ba5 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/path.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/path.upbdefs.h"
-#include "envoy/type/matcher/v3/path.upb.h"
+#include "envoy/type/matcher/v3/path.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
index 9524ef55a667f..8120a71c53ea4 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/path.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c
new file mode 100644
index 0000000000000..1ddda7e27aab4
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c
@@ -0,0 +1,70 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/matcher/v3/regex.upbdefs.h"
+#include "envoy/type/matcher/v3/regex.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[906] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 
+'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 
+'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'s', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\326', '\002', '\n', '\014', 'R', 'e', 
+'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '[', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', '2', '\030', 
+'\001', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 
+'E', '2', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 
+'R', 'e', '2', '\022', '\035', '\n', '\005', 'r', 'e', 'g', 'e', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
+'\020', '\001', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\032', '\222', '\001', '\n', '\t', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', '\022', 'S', 
+'\n', '\020', 'm', 'a', 'x', '_', 'p', 'r', 'o', 'g', 'r', 'a', 'm', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 
+'\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 
+'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\016', 'm', 'a', 'x', 'P', 'r', 'o', 
+'g', 'r', 'a', 'm', 'S', 'i', 'z', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
+'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'G', 
+'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
+'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\r', 
+'\n', '\013', 'e', 'n', 'g', 'i', 'n', 'e', '_', 't', 'y', 'p', 'e', '\"', '\306', '\001', '\n', '\027', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 
+'t', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', '\022', 'G', '\n', '\007', 'p', 'a', 't', 't', 'e', 
+'r', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', 
+'\212', '\001', '\002', '\020', '\001', 'R', '\007', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '/', '\n', '\014', 's', 'u', 'b', 's', 't', 'i', 't', 
+'u', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', 
+'\014', 's', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 
+'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 
+'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'B', '\203', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 
+'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', 'B', '\n', 'R', 'e', 'g', 'e', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 
+'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
+'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[6] = {
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &envoy_annotations_deprecation_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit = {
+  deps,
+  &envoy_type_matcher_v3_regex_proto_upb_file_layout,
+  "envoy/type/matcher/v3/regex.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 906)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
new file mode 100644
index 0000000000000..bf365eb9596ff
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatcher_GoogleRE2_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatcher.GoogleRE2");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatchAndSubstitute_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatchAndSubstitute");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c
similarity index 94%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c
index bece9319dfad0..97f4f8de8cf71 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/status_code_input.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/status_code_input.upbdefs.h"
-#include "envoy/type/matcher/v3/status_code_input.upb.h"
+#include "envoy/type/matcher/v3/status_code_input.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 static const char descriptor[330] = {'\n', '-', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
similarity index 91%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
index 35a40f3d484bd..3bab42c85b14c 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/status_code_input.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c
new file mode 100644
index 0000000000000..a20340c53c8d5
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c
@@ -0,0 +1,64 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/matcher/v3/string.upbdefs.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[811] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
+'t', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
+'n', 'i', 'n', 'g', '.', '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', '\"', '\321', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 'e', 'x', 'a', 
+'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
+'\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\030', '\003', ' ', 
+'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\022', 'N', '\n', 
+'\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', 
+'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 
+'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', 
+'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', 
+'\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 
+'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', 
+'\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', 
+'\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
+'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', 
+'\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', 
+'.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', 
+'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', '/', 't', 'y', 'p', 'e', '/', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', 
+'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[5] = {
+  &envoy_type_matcher_v3_regex_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit = {
+  deps,
+  &envoy_type_matcher_v3_string_proto_upb_file_layout,
+  "envoy/type/matcher/v3/string.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 811)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
new file mode 100644
index 0000000000000..9a0f5566a6175
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StringMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_string_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StringMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_ListStringMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_string_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.ListStringMatcher");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c
new file mode 100644
index 0000000000000..34db36122514d
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c
@@ -0,0 +1,57 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/matcher/v3/struct.upbdefs.h"
+#include "envoy/type/matcher/v3/struct.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_value_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[649] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
+'t', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 'a', 'l', 'u', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
+'n', 'i', 'n', 'g', '.', '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', '\"', '\276', '\002', '\n', '\r', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '\022', 'N', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', 
+'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', 
+'\010', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'C', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '#', 
+'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'V', 'a', 
+'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 
+'u', 'e', '\032', 'o', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', 
+'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '3', '\232', '\305', 
+'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 
+'t', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', 
+'\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\003', '\370', 'B', '\001', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 
+'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', 
+'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 
+'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 
+'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[5] = {
+  &envoy_type_matcher_v3_value_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_matcher_v3_struct_proto_upbdefinit = {
+  deps,
+  &envoy_type_matcher_v3_struct_proto_upb_file_layout,
+  "envoy/type/matcher/v3/struct.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 649)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
new file mode 100644
index 0000000000000..f24827de18c75
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/matcher/v3/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_matcher_v3_struct_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StructMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_PathSegment_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StructMatcher.PathSegment");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c
index deb6425c95165..529b648953909 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/value.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/matcher/v3/value.upbdefs.h"
-#include "envoy/type/matcher/v3/value.upb.h"
+#include "envoy/type/matcher/v3/value.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_matcher_v3_number_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
similarity index 91%
rename from src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
index 1d3ae18369bdb..3275df0910109 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/matcher/v3/value.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c
new file mode 100644
index 0000000000000..3d48afd746d98
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c
@@ -0,0 +1,77 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/metadata/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/metadata/v3/metadata.upbdefs.h"
+#include "envoy/type/metadata/v3/metadata.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[1179] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '/', 'v', '3', '/', 
+'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 
+'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '\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', '!', 'u', 'd', 'p', 'a', 
+'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\225', '\002', '\n', '\013', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '\031', '\n', '\003', 'k', 
+'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', '\022', 'M', '\n', 
+'\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
+'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '.', 'P', 
+'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\004', 'p', 'a', 't', 
+'h', '\032', 'q', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', '\001', 
+' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', 
+'\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', 
+'2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 
+'B', '\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\003', '\370', 'B', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 
+'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 
+'t', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\"', '\322', '\004', '\n', '\014', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 
+'d', '\022', 'H', '\n', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 
+'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 
+'t', 'a', 'K', 'i', 'n', 'd', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', '\000', 'R', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', 
+'\022', 'B', '\n', '\005', 'r', 'o', 'u', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
+'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 
+'i', 'n', 'd', '.', 'R', 'o', 'u', 't', 'e', 'H', '\000', 'R', '\005', 'r', 'o', 'u', 't', 'e', '\022', 'H', '\n', '\007', 'c', 'l', 'u', 
+'s', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
+'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'C', 
+'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', '?', '\n', '\004', 'h', 'o', 's', 't', 
+'\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 
+'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'H', 'o', 's', 't', 'H', 
+'\000', 'R', '\004', 'h', 'o', 's', 't', '\032', '=', '\n', '\007', 'R', 'e', 'q', 'u', 'e', 's', 't', ':', '2', '\232', '\305', '\210', '\036', '-', 
+'\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 
+'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '9', '\n', '\005', 'R', 
+'o', 'u', 't', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
+'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'R', 
+'o', 'u', 't', 'e', '\032', '=', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 
+'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 
+'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', '7', '\n', '\004', 'H', 'o', 's', 't', 
+':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 
+'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'H', 'o', 's', 't', ':', 
+'*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 
+'t', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', 'B', '\013', '\n', '\004', 'k', 'i', 'n', 
+'d', '\022', '\003', '\370', 'B', '\001', 'B', '\211', '\001', '\n', '$', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 
+'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', 'B', '\r', 'M', 
+'e', 't', 'a', 'd', 'a', 't', 'a', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '/', 
+'v', '3', ';', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 
+'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_metadata_v3_metadata_proto_upbdefinit = {
+  deps,
+  &envoy_type_metadata_v3_metadata_proto_upb_file_layout,
+  "envoy/type/metadata/v3/metadata.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 1179)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
new file mode 100644
index 0000000000000..f4213f1656d6b
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
@@ -0,0 +1,65 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/metadata/v3/metadata.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_metadata_v3_metadata_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKey_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKey");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKey_PathSegment_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKey.PathSegment");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Request_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Request");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Route_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Route");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Cluster_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Cluster");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Host_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Host");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c
index 808f49434df33..3f6701f1d1072 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/tracing/v3/custom_tag.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/tracing/v3/custom_tag.upbdefs.h"
-#include "envoy/type/tracing/v3/custom_tag.upb.h"
+#include "envoy/type/tracing/v3/custom_tag.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_metadata_v3_metadata_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
similarity index 94%
rename from src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
index 8a87f4c720c5a..10c41f05409d4 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/tracing/v3/custom_tag.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c
index d2473dacf8f12..c5f17553bf557 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/hash_policy.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/hash_policy.upbdefs.h"
-#include "envoy/type/v3/hash_policy.upb.h"
+#include "envoy/type/v3/hash_policy.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
similarity index 91%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
index ac8904a961e4f..d89020f66fe2d 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/hash_policy.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c
new file mode 100644
index 0000000000000..045af7c785e52
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/v3/http.upbdefs.h"
+#include "envoy/type/v3/http.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+static const char descriptor[245] = {'\n', '\030', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 
+'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\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', '*', '2', '\n', 
+'\017', 'C', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '1', 
+'\020', '\000', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\001', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', '\020', '\002', 'B', 
+'o', '\n', '\033', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
+'p', 'e', '.', 'v', '3', 'B', '\t', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ';', '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', '/', 't', 'y', 'p', 'e', '/', 'v', '3', ';', 't', 'y', 
+'p', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit = {
+  deps,
+  &envoy_type_v3_http_proto_upb_file_layout,
+  "envoy/type/v3/http.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 245)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
new file mode 100644
index 0000000000000..7be49e4945180
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c
index 9c64e8059d38c..f62b1e213eff2 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/http_status.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/http_status.upbdefs.h"
-#include "envoy/type/v3/http_status.upb.h"
+#include "envoy/type/v3/http_status.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
index 846eca98d6d96..3d806e8f483f0 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/http_status.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c
index 865adf5c3df5b..dbef106d9c636 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/percent.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/percent.upbdefs.h"
-#include "envoy/type/v3/percent.upb.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
index 952671b0e722b..859c35578d340 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/percent.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c
new file mode 100644
index 0000000000000..6e182349d1a57
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c
@@ -0,0 +1,47 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "envoy/type/v3/range.upbdefs.h"
+#include "envoy/type/v3/range.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+static const char descriptor[484] = {'\n', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\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', '!', 
+'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
+'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', 'R', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', 
+'\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 
+'d', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 
+'y', '.', 't', 'y', 'p', 'e', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', '\"', 'R', '\n', '\n', 'I', 'n', 't', '3', 
+'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
+'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', ':', '\034', '\232', '\305', 
+'\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 
+'e', '\"', 'T', '\n', '\013', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', 
+'\030', '\001', ' ', '\001', '(', '\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', 
+'\001', 'R', '\003', 'e', 'n', 'd', ':', '\035', '\232', '\305', '\210', '\036', '\030', '\n', '\026', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
+'.', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'B', 'p', '\n', '\033', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 
+'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 
+'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ';', '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', '/', 't', 'y', 'p', 'e', '/', 'v', '3', ';', 't', 'y', 'p', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', 
+'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  &udpa_annotations_versioning_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit = {
+  deps,
+  &envoy_type_v3_range_proto_upb_file_layout,
+  "envoy/type/v3/range.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 484)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
new file mode 100644
index 0000000000000..caad602fddd25
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#define ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.Int64Range");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.Int32Range");
+}
+
+UPB_INLINE const upb_MessageDef *envoy_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.DoubleRange");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c
index c72f908c41c77..77a3cf2857f60 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_strategy.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/ratelimit_strategy.upbdefs.h"
-#include "envoy/type/v3/ratelimit_strategy.upb.h"
+#include "envoy/type/v3/ratelimit_strategy.upb_minitable.h"
 
 extern _upb_DefPool_Init envoy_type_v3_ratelimit_unit_proto_upbdefinit;
 extern _upb_DefPool_Init envoy_type_v3_token_bucket_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
index 9157f71ac5de1..ea6168110957c 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_strategy.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c
similarity index 94%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c
index 0362f30f01174..bef953604ff9d 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_unit.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/ratelimit_unit.upbdefs.h"
-#include "envoy/type/v3/ratelimit_unit.upb.h"
+#include "envoy/type/v3/ratelimit_unit.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 static const char descriptor[306] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 't', 'e', 'l', 'i', 'm', 'i', 't', 
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
similarity index 83%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
index 6b564cf7a12d4..65e011066dd8b 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/ratelimit_unit.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c
index 56155d794f209..386cda22638bc 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/semantic_version.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/semantic_version.upbdefs.h"
-#include "envoy/type/v3/semantic_version.upb.h"
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
 
 extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
 extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
index d65924ffda674..6c995fe291448 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/semantic_version.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c
rename to src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c
index 10a4c1200689d..847262b443928 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/token_bucket.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "envoy/type/v3/token_bucket.upbdefs.h"
-#include "envoy/type/v3/token_bucket.upb.h"
+#include "envoy/type/v3/token_bucket.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h
rename to src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
index 4e88dfe11e9b8..d581562b4138c 100644
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     envoy/type/v3/token_bucket.proto
  *
@@ -10,7 +9,7 @@
 #define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c
index d6f5e44346eaa..56e65c853f307 100644
--- a/src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/annotations.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/api/annotations.upbdefs.h"
-#include "google/api/annotations.upb.h"
+#include "google/api/annotations.upb_minitable.h"
 
 extern _upb_DefPool_Init google_api_http_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
similarity index 82%
rename from src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
index 50a974c32ecba..53146fd6782b9 100644
--- a/src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/annotations.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c
index 978f33b3644ef..d664aa3531bc5 100644
--- a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/checked.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/api/expr/v1alpha1/checked.upbdefs.h"
-#include "google/api/expr/v1alpha1/checked.upb.h"
+#include "google/api/expr/v1alpha1/checked.upb_minitable.h"
 
 extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_empty_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
index 850228b5a30bd..7ac40f8e96336 100644
--- a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/checked.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c
index e531fb31793cb..1bc7aafdd35eb 100644
--- a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/syntax.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/api/expr/v1alpha1/syntax.upbdefs.h"
-#include "google/api/expr/v1alpha1/syntax.upb.h"
+#include "google/api/expr/v1alpha1/syntax.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
index 6e4908c547f98..44d17f0518094 100644
--- a/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/expr/v1alpha1/syntax.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c
new file mode 100644
index 0000000000000..af8bd97177204
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "google/api/http.upbdefs.h"
+#include "google/api/http.upb_minitable.h"
+
+static const char descriptor[684] = {'\n', '\025', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\n', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '\"', 'y', '\n', '\004', 'H', 't', 't', 'p', '\022', '*', '\n', '\005', 'r', 'u', 'l', 
+'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'H', 't', 't', 
+'p', 'R', 'u', 'l', 'e', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'E', '\n', '\037', 'f', 'u', 'l', 'l', 'y', '_', 'd', 'e', 'c', 
+'o', 'd', 'e', '_', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'e', 'x', 'p', 'a', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', 
+'\001', '(', '\010', 'R', '\034', 'f', 'u', 'l', 'l', 'y', 'D', 'e', 'c', 'o', 'd', 'e', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'E', 
+'x', 'p', 'a', 'n', 's', 'i', 'o', 'n', '\"', '\332', '\002', '\n', '\010', 'H', 't', 't', 'p', 'R', 'u', 'l', 'e', '\022', '\032', '\n', '\010', 
+'s', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\010', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', 
+'\022', '\n', '\003', 'g', 'e', 't', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'g', 'e', 't', '\022', '\022', '\n', '\003', 'p', 'u', 
+'t', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'p', 'u', 't', '\022', '\024', '\n', '\004', 'p', 'o', 's', 't', '\030', '\004', ' ', 
+'\001', '(', '\t', 'H', '\000', 'R', '\004', 'p', 'o', 's', 't', '\022', '\030', '\n', '\006', 'd', 'e', 'l', 'e', 't', 'e', '\030', '\005', ' ', '\001', 
+'(', '\t', 'H', '\000', 'R', '\006', 'd', 'e', 'l', 'e', 't', 'e', '\022', '\026', '\n', '\005', 'p', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', 
+'(', '\t', 'H', '\000', 'R', '\005', 'p', 'a', 't', 'c', 'h', '\022', '7', '\n', '\006', 'c', 'u', 's', 't', 'o', 'm', '\030', '\010', ' ', '\001', 
+'(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 't', 't', 
+'p', 'P', 'a', 't', 't', 'e', 'r', 'n', 'H', '\000', 'R', '\006', 'c', 'u', 's', 't', 'o', 'm', '\022', '\022', '\n', '\004', 'b', 'o', 'd', 
+'y', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\004', 'b', 'o', 'd', 'y', '\022', '#', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 
+'_', 'b', 'o', 'd', 'y', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 'y', 
+'\022', 'E', '\n', '\023', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', '_', 'b', 'i', 'n', 'd', 'i', 'n', 'g', 's', '\030', '\013', 
+' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'H', 't', 't', 'p', 'R', 'u', 'l', 
+'e', 'R', '\022', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'B', 'i', 'n', 'd', 'i', 'n', 'g', 's', 'B', '\t', '\n', '\007', 
+'p', 'a', 't', 't', 'e', 'r', 'n', '\"', ';', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 't', 't', 'p', 'P', 'a', 't', 't', 
+'e', 'r', 'n', '\022', '\022', '\n', '\004', 'k', 'i', 'n', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'k', 'i', 'n', 'd', '\022', '\022', 
+'\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', 'B', 'j', '\n', '\016', 'c', 'o', 'm', 
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', 'B', '\t', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 
+'A', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 
+'t', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 
+'i', 'o', 'n', 's', ';', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\370', '\001', '\001', '\242', '\002', '\004', 'G', 'A', 'P', 
+'I', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init google_api_http_proto_upbdefinit = {
+  deps,
+  &google_api_http_proto_upb_file_layout,
+  "google/api/http.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 684)
+};
diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
new file mode 100644
index 0000000000000..e2b6bf0e33486
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/api/http.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
+#define GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init google_api_http_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *google_api_Http_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.api.Http");
+}
+
+UPB_INLINE const upb_MessageDef *google_api_HttpRule_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.api.HttpRule");
+}
+
+UPB_INLINE const upb_MessageDef *google_api_CustomHttpPattern_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.api.CustomHttpPattern");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c
index 2a6c7d2c38186..aa6c5dc51c949 100644
--- a/src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/httpbody.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/api/httpbody.upbdefs.h"
-#include "google/api/httpbody.upb.h"
+#include "google/api/httpbody.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 static const char descriptor[301] = {'\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'h', 't', 't', 'p', 'b', 'o', 'd', 'y', '.', 'p', 'r', 'o', 
diff --git a/src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
index 7fb51affa9610..fdbb639612e63 100644
--- a/src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/api/httpbody.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c
similarity index 93%
rename from src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c
index 6ad8023976780..2c58aa2862bf5 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/any.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/protobuf/any.upbdefs.h"
-#include "google/protobuf/any.upb.h"
+#include "google/protobuf/any.upb_minitable.h"
 
 static const char descriptor[228] = {'\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '6', '\n', '\003', 'A', 'n', 
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
index f7a87fec9155b..4d6644b59aee8 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/any.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
new file mode 100644
index 0000000000000..5a56d3b51923d
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
@@ -0,0 +1,488 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "google/protobuf/descriptor.upbdefs.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+static const char descriptor[11620] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
+'t', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', 
+'\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
+'\004', 'f', 'i', 'l', 'e', '\"', '\230', '\005', '\n', '\023', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
+'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 
+'\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', 
+'\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', 
+'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', 'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 
+'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', 'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 
+'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', 
+'(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', 
+'s', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
+'\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', 
+'\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 
+'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 
+'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', 
+'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
+'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 
+'s', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', 
+'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 
+'e', 'I', 'n', 'f', 'o', 'R', '\016', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', 
+'s', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '2', '\n', '\007', 'e', 
+'d', 'i', 't', 'i', 'o', 'n', '\030', '\016', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\"', '\271', '\006', 
+'\n', '\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', 
+'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', 
+'(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 
+'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', 
+'\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 
+'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', 
+'e', 'd', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
+'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\n', 'n', 
+'e', 's', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', 
+'\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 
+'m', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 
+'e', '\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', 
+'\013', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 
+'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 
+'R', '\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', 
+'_', 'd', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 
+'R', '\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', 
+'\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 
+'s', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', 
+'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 
+'o', 't', 'o', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 
+'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', 
+'\n', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', 
+'t', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', 
+'(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 
+'n', 'd', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 
+'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', 
+'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 
+'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', 
+'\"', '\307', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 
+'s', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', 
+'\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 
+'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a', 
+'r', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 
+'n', 's', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l', 
+'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', 
+'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 
+'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'h', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 
+'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 
+'s', '.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E', 
+'R', 'I', 'F', 'I', 'E', 'D', 'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\224', '\001', '\n', '\013', 
+'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\001', ' ', '\001', 
+'(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', 
+' ', '\001', '(', '\t', 'R', '\010', 'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\003', ' ', 
+'\001', '(', '\t', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\030', '\005', ' ', '\001', 
+'(', '\010', 'R', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '\030', 
+'\006', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020', '\005', '\"', '4', '\n', '\021', 
+'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n', '\013', 'D', 'E', 'C', 'L', 
+'A', 'R', 'A', 'T', 'I', 'O', 'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', '\020', '\001', 
+'*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 
+'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\006', 'n', 
+'u', 'm', 'b', 'e', 'r', '\022', 'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 
+'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', 'e', 'l', '\022', '>', '\n', 
+'\004', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 
+'.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_', 'n', 'a', 'm', 'e', '\030', 
+'\006', ' ', '\001', '(', '\t', 'R', '\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', 'x', 't', 'e', 'n', 'd', 
+'e', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 
+'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 
+'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', '\030', '\t', ' ', '\001', '(', 
+'\005', 'R', '\n', 'o', 'n', 'e', 'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 'a', 'm', 
+'e', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 
+'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 
+'\'', '\n', '\017', 'p', 'r', 'o', 't', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021', ' ', '\001', '(', '\010', 'R', 
+'\016', 'p', 'r', 'o', 't', 'o', '3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', 'T', 'y', 'p', 'e', '\022', 
+'\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 
+'F', 'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', 
+'\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 
+'N', 'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', 
+'\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', 
+'_', 'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', 
+'\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 
+'E', 'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', 
+'\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 
+'E', 'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', 
+'\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 
+'P', 'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', 
+'4', '\020', '\022', '\"', 'C', '\n', '\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'O', 'P', 'T', 
+'I', 'O', 'N', 'A', 'L', '\020', '\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', 
+'\020', '\003', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\002', '\"', 'c', '\n', 
+'\024', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 
+'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 
+'n', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\343', 
+'\002', '\n', '\023', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', 
+'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', '\005', 'v', 'a', 'l', 'u', 
+'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 
+'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 
+'\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 
+'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 
+'_', 'r', 'a', 'n', 'g', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 
+'.', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 
+'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', 
+'\030', '\005', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', ';', '\n', '\021', 'E', 
+'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', 
+'\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', 
+'\005', 'R', '\003', 'e', 'n', 'd', '\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 
+'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
+'\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 
+'m', 'b', 'e', 'r', '\022', ';', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 
+'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', 'S', 'e', 'r', 'v', 'i', 
+'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', 
+'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\002', ' ', 
+'\003', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 
+'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', 'm', 'e', 't', 'h', 'o', 
+'d', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 
+'s', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 
+'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\004', 'n', 'a', 'm', 'e', '\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', 
+'\t', 'R', '\t', 'i', 'n', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', 'u', 't', '_', 't', 'y', 
+'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '8', '\n', '\007', 'o', 
+'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 
+'o', 'n', 's', '\022', '0', '\n', '\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', 
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 
+'i', 'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', 
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 
+'i', 'n', 'g', '\"', '\312', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 
+'v', 'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 
+'k', 'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 
+'a', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', 'C', 'l', 'a', 's', 's', 
+'n', 'a', 'm', 'e', '\022', '5', '\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', '_', 'f', 'i', 'l', 
+'e', 's', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', 'a', 'M', 'u', 'l', 't', 
+'i', 'p', 'l', 'e', 'F', 'i', 'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'a', 't', 
+'e', '_', 'e', 'q', 'u', 'a', 'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ', '\001', '(', '\010', 'B', '\002', 
+'\030', '\001', 'R', '\031', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', 'l', 's', 'A', 'n', 'd', 
+'H', 'a', 's', 'h', '\022', ':', '\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'c', 'h', 'e', 'c', 'k', 
+'_', 'u', 't', 'f', '8', '\030', '\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'S', 
+'t', 'r', 'i', 'n', 'g', 'C', 'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', 't', 'i', 'm', 'i', 'z', 
+'e', '_', 'f', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 
+'M', 'o', 'd', 'e', ':', '\005', 'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'F', 'o', 'r', '\022', 
+'\035', '\n', '\n', 'g', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\t', 'g', 'o', 'P', 'a', 
+'c', 'k', 'a', 'g', 'e', '\022', '5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 
+'c', 'e', 's', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', 'G', 'e', 'n', 'e', 'r', 
+'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'i', 
+'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 
+'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '5', '\n', '\023', 'p', 'y', 
+'_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', '\001', '(', '\010', ':', '\005', 
+'f', 'a', 'l', 's', 'e', 'R', '\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', 
+'7', '\n', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '*', 
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\022', 'p', 'h', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 
+'r', 'v', 'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', 
+'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 
+'c', '_', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n', 'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 
+'u', 'e', 'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A', 'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 
+'c', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 
+'c', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', ')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 
+'m', 'e', 's', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t', 'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 
+'s', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', 
+'(', '\t', 'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 
+'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ', '\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 
+'s', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', 
+')', ' ', '\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 
+'p', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', 
+'\t', 'R', '\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', 
+'\n', '\014', 'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 
+'y', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', 
+'\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 
+'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 
+'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 
+'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 
+'p', 't', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 
+'S', 'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', 
+'\014', 'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', 
+'\002', 'J', '\004', '\010', '&', '\020', '\'', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 
+'s', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o', 'r', 
+'m', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g', 'e', 
+'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n', 'd', 
+'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030', '\002', 
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D', 'e', 
+'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 
+'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 
+'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', 
+'\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 
+'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 
+'s', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 
+'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', 
+'\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 
+'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 
+'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 
+'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', 
+'\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', 
+'\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\255', '\n', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 
+'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'C', 
+'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', 'a', 
+'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', 't', 
+'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', 'J', 
+'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', '\030', 
+'\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', 'v', 
+'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 
+'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 
+'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 
+'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 
+'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\020', 
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 
+'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 
+'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 
+'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 
+'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', 
+'\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003', '(', 
+'\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 
+'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017', 'e', 
+'d', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 
+'s', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 
+'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', 
+'(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 
+'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 
+'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', 'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 
+'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 
+'d', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 
+'l', 'u', 'e', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', 
+'\010', '\n', '\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', 
+'\020', '\002', '\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 
+'\020', '\000', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 
+'U', 'M', 'B', 'E', 'R', '\020', '\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 
+'n', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', 
+'\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', 
+'\020', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 
+'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', 
+'_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', 
+'_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 
+'P', 'E', '_', 'E', 'X', 'T', 'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 
+'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 
+'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 
+'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 
+'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 
+'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 
+'T', '_', 'T', 'Y', 'P', 'E', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 
+'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', 
+'\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 
+'t', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\033', 
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 
+'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 
+'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 
+'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 
+'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 
+'i', 'o', 'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 
+'R', '\n', 'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
+'d', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
+'d', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 
+'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', '\001', '(', '\010', 'B', 
+'\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 
+'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 
+'s', '\030', '\007', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 
+'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', 
+'(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 
+'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 
+'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', 
+'\005', '\020', '\006', '\"', '\201', '\002', '\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 
+'%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 
+'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', 
+'\030', '\002', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 
+'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
+'\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 
+'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 
+'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 
+'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 
+'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\"', ' ', '\001', '(', '\013', 
+'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 
+'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 
+'t', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 
+'t', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 
+'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
+'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 
+'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', 
+'\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', 
+'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
+'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 
+'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
+'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'd', 'e', 'm', 
+'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', 
+'_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 
+'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 
+'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 
+'_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 
+'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'P', 
+'\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', '\023', 'I', 'D', 'E', 
+'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'N', 'O', '_', 
+'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 
+'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', 'U', 'n', 'i', 'n', 
+'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', 
+' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 
+'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 
+'t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '_', 'v', 'a', 'l', 
+'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 
+'\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', 
+'\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 
+'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\003', 'R', 
+'\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 'd', 'o', 'u', 'b', 
+'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 
+'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\014', 'R', 
+'\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 
+'_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'V', 'a', 
+'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', 'm', 'e', '_', 'p', 
+'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', '\n', '\014', 'i', 's', 
+'_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', 'x', 't', 'e', 'n', 
+'s', 'i', 'o', 'n', '\"', '\374', '\t', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '\022', '\213', '\001', '\n', '\016', 'f', 
+'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'F', 
+'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', 
+'\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\346', '\007', '\242', '\001', '\r', '\022', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 
+'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\350', '\007', 'R', '\r', 'f', 'i', 
+'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'f', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', 
+'\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 
+'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 'B', '#', '\210', '\001', '\001', '\230', '\001', 
+'\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\t', '\022', '\004', 'O', 'P', 
+'E', 'N', '\030', '\347', '\007', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\222', '\001', '\n', '\027', 'r', 'e', 'p', 'e', 'a', 
+'t', 'e', 'd', '_', 'f', 'i', 'e', 'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\016', '2', 
+'1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 
+'S', 'e', 't', '.', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 
+'B', '\'', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\030', 
+'\346', '\007', '\242', '\001', '\013', '\022', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 
+'d', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', 'x', '\n', '\017', 'u', 't', 'f', '8', '_', 'v', 'a', 
+'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', 'f', '8', 'V', 'a', 
+'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', '#', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\t', '\022', '\004', 'N', 
+'O', 'N', 'E', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', 'R', '\016', 'u', 't', 'f', 
+'8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'x', '\n', '\020', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'e', 'n', 
+'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 
+'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', ' ', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\024', '\022', '\017', 'L', 'E', 
+'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\346', '\007', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 
+'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '|', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\006', 
+' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 
+'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'B', '3', '\210', '\001', '\001', '\230', 
+'\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 
+'E', 'F', 'F', 'O', 'R', 'T', '\030', '\346', '\007', '\242', '\001', '\n', '\022', '\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', '\007', 'R', '\n', 'j', 
+'s', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 
+'e', '\022', '\032', '\n', '\026', 'F', 'I', 'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', 'N', 'K', 'N', 'O', 
+'W', 'N', '\020', '\000', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'M', 'P', 
+'L', 'I', 'C', 'I', 'T', '\020', '\002', '\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 
+'D', '\020', '\003', '\"', '7', '\n', '\010', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', 'U', 'M', '_', 'T', 
+'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', '\020', '\001', '\022', '\n', 
+'\n', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 
+'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '_', 'F', 'I', 
+'E', 'L', 'D', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', 
+'\006', 'P', 'A', 'C', 'K', 'E', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\020', '\002', '\"', 'C', 
+'\n', '\016', 'U', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'T', 'F', '8', '_', 
+'V', 'A', 'L', 'I', 'D', 'A', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'N', 
+'O', 'N', 'E', '\020', '\001', '\022', '\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 
+'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 
+'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 
+'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', 
+'\020', '\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 
+'F', 'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', 
+'\020', '\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', 
+'\002', '*', '\006', '\010', '\350', '\007', '\020', '\351', '\007', '*', '\006', '\010', '\351', '\007', '\020', '\352', '\007', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', 
+'J', '\006', '\010', '\347', '\007', '\020', '\350', '\007', '\"', '\376', '\002', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 
+'f', 'a', 'u', 'l', 't', 's', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
+'<', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 
+'S', 'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 
+'t', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 
+'m', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 
+'i', 'n', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 
+'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
+'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 
+'i', 't', 'i', 'o', 'n', '\032', '\207', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 
+'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', 
+'\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 
+'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', 
+' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 
+'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 
+'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', 
+'\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 
+'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 
+'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 
+'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 
+'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 
+'d', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 
+'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 
+'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 
+'m', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 
+'d', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 
+'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 
+'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 
+'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 
+'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 
+'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', 
+'(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', 'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', 
+' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', 
+'\003', 'e', 'n', 'd', '\022', 'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 
+'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 
+'t', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 
+'\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 
+'I', 'A', 'S', '\020', '\002', '*', '\352', '\001', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 
+'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 
+'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 
+'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', 
+'\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', 
+'\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', 
+'\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 
+'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', 'T', 'E', 
+'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', 
+'9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 
+'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', 
+'.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 
+'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', 
+'.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = {
+  deps,
+  &google_protobuf_descriptor_proto_upb_file_layout,
+  "google/protobuf/descriptor.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 11620)
+};
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
similarity index 92%
rename from src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
index 8919a24e1c6a7..1969662c80273 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/descriptor.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
@@ -152,6 +151,16 @@ UPB_INLINE const upb_MessageDef *google_protobuf_FeatureSet_getmsgdef(upb_DefPoo
   return upb_DefPool_FindMessageByName(s, "google.protobuf.FeatureSet");
 }
 
+UPB_INLINE const upb_MessageDef *google_protobuf_FeatureSetDefaults_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.FeatureSetDefaults");
+}
+
+UPB_INLINE const upb_MessageDef *google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault");
+}
+
 UPB_INLINE const upb_MessageDef *google_protobuf_SourceCodeInfo_getmsgdef(upb_DefPool *s) {
   _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
   return upb_DefPool_FindMessageByName(s, "google.protobuf.SourceCodeInfo");
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c
similarity index 93%
rename from src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c
index c14903bb6ae45..d32af46fa475d 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/duration.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/protobuf/duration.upbdefs.h"
-#include "google/protobuf/duration.upb.h"
+#include "google/protobuf/duration.upb_minitable.h"
 
 static const char descriptor[251] = {'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 
 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
index 365cdea98a1f9..f907868f7a8f3 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/duration.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c
similarity index 92%
rename from src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c
index f61e5e0a01807..7b783dacd6d6a 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/empty.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/protobuf/empty.upbdefs.h"
-#include "google/protobuf/empty.upb.h"
+#include "google/protobuf/empty.upb_minitable.h"
 
 static const char descriptor[190] = {'\n', '\033', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'e', 'm', 'p', 't', 'y', '.', 'p', 
 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\007', '\n', '\005', 
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
index 388d85a6a2ad5..b80312214af38 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/empty.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c
new file mode 100644
index 0000000000000..1ec9baec952e7
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "google/protobuf/struct.upbdefs.h"
+#include "google/protobuf/struct.upb_minitable.h"
+
+static const char descriptor[738] = {'\n', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 
+'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\230', '\001', 
+'\n', '\006', 'S', 't', 'r', 'u', 'c', 't', '\022', ';', '\n', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
+'#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', '.', 
+'F', 'i', 'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 'y', 'R', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\032', 'Q', '\n', '\013', 'F', 'i', 
+'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 
+'e', 'y', '\022', ',', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 'l', 'u', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', 
+'8', '\001', '\"', '\262', '\002', '\n', '\005', 'V', 'a', 'l', 'u', 'e', '\022', ';', '\n', '\n', 'n', 'u', 'l', 'l', '_', 'v', 'a', 'l', 'u', 
+'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\t', 'n', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '#', 
+'\n', '\014', 'n', 'u', 'm', 'b', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\001', 'H', '\000', 'R', '\013', 'n', 
+'u', 'm', 'b', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 
+'e', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', 
+'\n', 'b', 'o', 'o', 'l', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'b', 'o', 'o', 'l', 
+'V', 'a', 'l', 'u', 'e', '\022', '<', '\n', '\014', 's', 't', 'r', 'u', 'c', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', 
+'(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 
+'c', 't', 'H', '\000', 'R', '\013', 's', 't', 'r', 'u', 'c', 't', 'V', 'a', 'l', 'u', 'e', '\022', ';', '\n', '\n', 'l', 'i', 's', 't', 
+'_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'L', 'i', 's', 't', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\t', 'l', 'i', 's', 't', 'V', 'a', 
+'l', 'u', 'e', 'B', '\006', '\n', '\004', 'k', 'i', 'n', 'd', '\"', ';', '\n', '\t', 'L', 'i', 's', 't', 'V', 'a', 'l', 'u', 'e', '\022', 
+'.', '\n', '\006', 'v', 'a', 'l', 'u', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 'l', 'u', 'e', 'R', '\006', 'v', 'a', 'l', 'u', 'e', 's', '*', '\033', '\n', 
+'\t', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '\016', '\n', '\n', 'N', 'U', 'L', 'L', '_', 'V', 'A', 'L', 'U', 'E', '\020', 
+'\000', 'B', '\177', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', 
+'\013', 'S', 't', 'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '/', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 
+'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 
+'n', 'o', 'w', 'n', '/', 's', 't', 'r', 'u', 'c', 't', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 
+'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 
+'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init google_protobuf_struct_proto_upbdefinit = {
+  deps,
+  &google_protobuf_struct_proto_upb_file_layout,
+  "google/protobuf/struct.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 738)
+};
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
new file mode 100644
index 0000000000000..62a91df6c9849
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
+#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *google_protobuf_Struct_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.Struct");
+}
+
+UPB_INLINE const upb_MessageDef *google_protobuf_Struct_FieldsEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.Struct.FieldsEntry");
+}
+
+UPB_INLINE const upb_MessageDef *google_protobuf_Value_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.Value");
+}
+
+UPB_INLINE const upb_MessageDef *google_protobuf_ListValue_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.protobuf.ListValue");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c
similarity index 94%
rename from src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c
index 8104f835535c3..11010f4408a15 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/timestamp.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/protobuf/timestamp.upbdefs.h"
-#include "google/protobuf/timestamp.upb.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
 
 static const char descriptor[255] = {'\n', '\037', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 
 'm', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
index c27e7e3227d68..25b3a4fbcb892 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/timestamp.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
rename to src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c
index fa1758c6916b9..68283c39b5072 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/wrappers.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "google/protobuf/wrappers.upbdefs.h"
-#include "google/protobuf/wrappers.upb.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
 
 static const char descriptor[518] = {'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 
 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
similarity index 95%
rename from src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h
rename to src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
index d57bead947671..0a5052fc75767 100644
--- a/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/wrappers.proto
  *
@@ -10,7 +9,7 @@
 #define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c
new file mode 100644
index 0000000000000..8961336b75f07
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c
@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/rpc/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "google/rpc/status.upbdefs.h"
+#include "google/rpc/status.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+static const char descriptor[275] = {'\n', '\027', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', 
+'\022', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\"', 'f', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', 
+'\022', '\n', '\004', 'c', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\004', 'c', 'o', 'd', 'e', '\022', '\030', '\n', '\007', 'm', 'e', 
+'s', 's', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'm', 'e', 's', 's', 'a', 'g', 'e', '\022', '.', '\n', '\007', 'd', 
+'e', 't', 'a', 'i', 'l', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\007', 'd', 'e', 't', 'a', 'i', 'l', 's', 'B', 'a', '\n', '\016', 'c', 'o', 'm', 
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', 'B', '\013', 'S', 't', 'a', 't', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', 
+'\001', 'Z', '7', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 
+'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', 
+'s', ';', 's', 't', 'a', 't', 'u', 's', '\370', '\001', '\001', '\242', '\002', '\003', 'R', 'P', 'C', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_any_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init google_rpc_status_proto_upbdefinit = {
+  deps,
+  &google_rpc_status_proto_upb_file_layout,
+  "google/rpc/status.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 275)
+};
diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
new file mode 100644
index 0000000000000..21f154d6c59c3
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/rpc/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
+#define GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init google_rpc_status_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *google_rpc_Status_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &google_rpc_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "google.rpc.Status");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c
index c71dfd975c614..569fd34f2b450 100644
--- a/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     opencensus/proto/trace/v1/trace_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "opencensus/proto/trace/v1/trace_config.upbdefs.h"
-#include "opencensus/proto/trace/v1/trace_config.upb.h"
+#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
 
 static const char descriptor[1065] = {'\n', ',', 'o', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', '/', 'p', 'r', 'o', 't', 'o', '/', 't', 'r', 'a', 'c', 'e', '/', 
 'v', '1', '/', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'o', 'p', 
diff --git a/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
similarity index 93%
rename from src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
index 1f4a6e02c452f..40a0fc2823ee5 100644
--- a/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     opencensus/proto/trace/v1/trace_config.proto
  *
@@ -10,7 +9,7 @@
 #define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
similarity index 98%
rename from src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
rename to src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
index 774222114db3a..2579622d56cb0 100644
--- a/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/lookup/v1/rls_config.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
-#include "src/proto/grpc/lookup/v1/rls_config.upb.h"
+#include "src/proto/grpc/lookup/v1/rls_config.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
 static const char descriptor[1816] = {'\n', ')', 's', 'r', 'c', '/', 'p', 'r', 'o', 't', 'o', '/', 'g', 'r', 'p', 'c', '/', 'l', 'o', 'o', 'k', 'u', 'p', '/', 'v', 
diff --git a/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
similarity index 96%
rename from src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
rename to src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
index 5de7ea160864c..626c738b3152a 100644
--- a/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     src/proto/grpc/lookup/v1/rls_config.proto
  *
@@ -10,7 +9,7 @@
 #define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c
new file mode 100644
index 0000000000000..d0589404fbe82
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c
@@ -0,0 +1,61 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "udpa/annotations/migrate.upbdefs.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[893] = {'\n', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 
+'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
+'t', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '+', '\n', '\021', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 
+'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\006', 'r', 'e', 
+'n', 'a', 'm', 'e', '\"', 'Y', '\n', '\026', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 
+'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\006', 'r', 'e', 
+'n', 'a', 'm', 'e', '\022', '\'', '\n', '\017', 'o', 'n', 'e', 'o', 'f', '_', 'p', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\030', '\002', 
+' ', '\001', '(', '\t', 'R', '\016', 'o', 'n', 'e', 'o', 'f', 'P', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\"', '?', '\n', '\025', 'F', 
+'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '&', '\n', '\017', 'm', 
+'o', 'v', 'e', '_', 't', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'm', 'o', 'v', 
+'e', 'T', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', ':', 'p', '\n', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'm', 'i', 'g', 
+'r', 'a', 't', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 
+'s', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 
+'d', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 
+'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 
+'o', '\n', '\r', 'f', 'i', 'e', 'l', 'd', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', 
+'\377', 'Q', ' ', '\001', '(', '\013', '2', '(', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'.', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\014', 
+'f', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'g', '\n', '\014', 'e', 'n', 'u', 'm', '_', 'm', 'i', 'g', 'r', 
+'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 
+'m', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 'd', 'p', 'a', '.', 
+'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 
+'t', 'i', 'o', 'n', 'R', '\013', 'e', 'n', 'u', 'm', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'w', '\n', '\022', 'e', 'n', 'u', 'm', 
+'_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', 
+'\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'e', 'n', 'u', 
+'m', 'V', 'a', 'l', 'u', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'k', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'm', 'i', 'g', 
+'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 
+'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '\'', '.', 'u', 'd', 'p', 'a', 
+'.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'f', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'B', '$', 'Z', 
+'\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit = {
+  deps,
+  &udpa_annotations_migrate_proto_upb_file_layout,
+  "udpa/annotations/migrate.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 893)
+};
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
new file mode 100644
index 0000000000000..a621a2f8273bf
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_MigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.MigrateAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_FieldMigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FieldMigrateAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_FileMigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FileMigrateAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c
new file mode 100644
index 0000000000000..b41a62130a943
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "udpa/annotations/security.upbdefs.h"
+#include "udpa/annotations/security.upb_minitable.h"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[453] = {'\n', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 
+'t', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'s', '\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', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
+'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\257', '\001', '\n', '\027', 'F', 'i', 'e', 'l', 
+'d', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', 'K', '\n', '\"', 'c', 'o', 
+'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'd', 'o', 'w', 
+'n', 's', 't', 'r', 'e', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', 'F', 
+'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '\022', 'G', '\n', ' ', 
+'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'u', 
+'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\035', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', 'F', 
+'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', ':', 'g', '\n', '\010', 's', 'e', 
+'c', 'u', 'r', 'i', 't', 'y', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\261', '\362', '\246', '\005', ' ', '\001', '(', '\013', '2', ')', '.', 'u', 
+'d', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'F', 'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 
+'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'B', 
+',', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', 
+'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 
+'t', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &udpa_annotations_status_proto_upbdefinit,
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init udpa_annotations_security_proto_upbdefinit = {
+  deps,
+  &udpa_annotations_security_proto_upb_file_layout,
+  "udpa/annotations/security.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 453)
+};
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
new file mode 100644
index 0000000000000..65e48272aae9f
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_FieldSecurityAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_security_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FieldSecurityAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c
new file mode 100644
index 0000000000000..0f7412d47db4f
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "udpa/annotations/sensitive.upbdefs.h"
+#include "udpa/annotations/sensitive.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[196] = {'\n', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 
+'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 
+'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', ':', '>', '\n', '\t', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '\022', 
+'\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 
+'t', 'i', 'o', 'n', 's', '\030', '\367', '\266', '\301', '$', ' ', '\001', '(', '\010', 'R', '\t', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', 
+'B', '$', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 
+'o', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit = {
+  deps,
+  &udpa_annotations_sensitive_proto_upb_file_layout,
+  "udpa/annotations/sensitive.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 196)
+};
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
new file mode 100644
index 0000000000000..85783dfb63b31
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c
new file mode 100644
index 0000000000000..056281057ccde
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "udpa/annotations/status.upbdefs.h"
+#include "udpa/annotations/status.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[483] = {'\n', '\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', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\032', 
+' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 
+'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\232', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 
+'t', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', 
+'\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '\\', '\n', '\026', 
+'p', 'a', 'c', 'k', 'a', 'g', 'e', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\002', ' ', 
+'\001', '(', '\016', '2', '&', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'P', 'a', 
+'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', 'R', '\024', 'p', 'a', 'c', 'k', 'a', 
+'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '*', ']', '\n', '\024', 'P', 'a', 'c', 'k', 'a', 'g', 
+'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 
+'\020', '\000', '\022', '\n', '\n', '\006', 'F', 'R', 'O', 'Z', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'A', 'C', 'T', 'I', 'V', 'E', '\020', 
+'\002', '\022', ' ', '\n', '\034', 'N', 'E', 'X', 'T', '_', 'M', 'A', 'J', 'O', 'R', '_', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'C', 
+'A', 'N', 'D', 'I', 'D', 'A', 'T', 'E', '\020', '\003', ':', 'd', '\n', '\013', 'f', 'i', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', 
+'\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 
+'t', 'i', 'o', 'n', 's', '\030', '\207', '\200', '\231', 'j', ' ', '\001', '(', '\013', '2', '\"', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 
+'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'R', '\n', 'f', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'B', '$', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 
+'m', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init udpa_annotations_status_proto_upbdefinit = {
+  deps,
+  &udpa_annotations_status_proto_upb_file_layout,
+  "udpa/annotations/status.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 483)
+};
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
new file mode 100644
index 0000000000000..a7dc02f1cca58
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_StatusAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.StatusAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c
new file mode 100644
index 0000000000000..64f08b05dfdeb
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c
@@ -0,0 +1,38 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "udpa/annotations/versioning.upbdefs.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[317] = {'\n', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
+'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
+'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', 'J', '\n', '\024', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
+'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '2', '\n', '\025', 'p', 'r', 'e', 'v', 'i', 'o', 'u', 's', '_', 'm', 
+'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\023', 'p', 'r', 'e', 'v', 'i', 'o', 
+'u', 's', 'M', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', ':', 'j', '\n', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
+'n', 'g', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 
+'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\323', '\210', '\341', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'u', 'd', 'p', 
+'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', 'A', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', 'B', '$', 'Z', '\"', 
+'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 'n', 
+'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit = {
+  deps,
+  &udpa_annotations_versioning_proto_upb_file_layout,
+  "udpa/annotations/versioning.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 317)
+};
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
new file mode 100644
index 0000000000000..ca735349f477b
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     udpa/annotations/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *udpa_annotations_VersioningAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &udpa_annotations_versioning_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "udpa.annotations.VersioningAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c
similarity index 99%
rename from src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
rename to src/core/ext/upbdefs-gen/validate/validate.upbdefs.c
index d6212485af8cf..cd7577f0e2ae9 100644
--- a/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     validate/validate.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "validate/validate.upbdefs.h"
-#include "validate/validate.upb.h"
+#include "validate/validate.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/validate/validate.upbdefs.h b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
similarity index 97%
rename from src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
rename to src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
index 7ff2808c98fe8..351f6f77c5993 100644
--- a/src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     validate/validate.proto
  *
@@ -10,7 +9,7 @@
 #define VALIDATE_VALIDATE_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c
new file mode 100644
index 0000000000000..ad9ebb954c3d5
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c
@@ -0,0 +1,62 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/annotations/v3/migrate.upbdefs.h"
+#include "xds/annotations/v3/migrate.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[914] = {'\n', ' ', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 'm', 'i', 'g', 'r', 
+'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'s', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 
+'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '+', '\n', '\021', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\"', 'Y', '\n', '\026', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
+'R', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\022', '\'', '\n', '\017', 'o', 'n', 'e', 'o', 'f', '_', 'p', 'r', 'o', 'm', 'o', 't', 'i', 
+'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'o', 'n', 'e', 'o', 'f', 'P', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\"', 
+'?', '\n', '\025', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', 
+'&', '\n', '\017', 'm', 'o', 'v', 'e', '_', 't', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', 
+'\r', 'm', 'o', 'v', 'e', 'T', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', ':', 'r', '\n', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 
+'_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', 
+'2', '%', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 
+'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', 'M', 'i', 
+'g', 'r', 'a', 't', 'e', ':', 'q', '\n', '\r', 'f', 'i', 'e', 'l', 'd', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\035', '.', 
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 
+'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', '2', '*', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 
+'t', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 
+'t', 'a', 't', 'i', 'o', 'n', 'R', '\014', 'f', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'i', '\n', '\014', 'e', 
+'n', 'u', 'm', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
+'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', 
+'2', '%', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 
+'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'e', 'n', 'u', 'm', 'M', 'i', 'g', 'r', 'a', 
+'t', 'e', ':', 'y', '\n', '\022', 'e', 'n', 'u', 'm', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', 
+'!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 
+'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', '2', '%', '.', 'x', 'd', 's', '.', 
+'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 
+'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'e', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 
+':', 'm', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', 
+'5', ' ', '\001', '(', '\013', '2', ')', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', 
+'3', '.', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 
+'f', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', 
+'/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_annotations_v3_migrate_proto_upbdefinit = {
+  deps,
+  &xds_annotations_v3_migrate_proto_upb_file_layout,
+  "xds/annotations/v3/migrate.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 914)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
new file mode 100644
index 0000000000000..d9d4803006ef2
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/migrate.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_annotations_v3_migrate_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_MigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.MigrateAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldMigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldMigrateAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileMigrateAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FileMigrateAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c
new file mode 100644
index 0000000000000..b1ab8e792cdf2
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c
@@ -0,0 +1,46 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/annotations/v3/security.upbdefs.h"
+#include "xds/annotations/v3/security.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[468] = {'\n', '!', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 'e', 'c', 'u', 
+'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 
+'/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\257', '\001', 
+'\n', '\027', 'F', 'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
+'\022', 'K', '\n', '\"', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 
+'e', 'd', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'o', 'n', 'f', 
+'i', 'g', 'u', 'r', 'e', 'F', 'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 
+'a', 'm', '\022', 'G', '\n', ' ', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 
+'s', 't', 'e', 'd', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\035', 'c', 'o', 'n', 'f', 
+'i', 'g', 'u', 'r', 'e', 'F', 'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 
+':', 'i', '\n', '\010', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\247', '\226', '\235', '/', ' ', '\001', 
+'(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 
+'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 's', 
+'e', 'c', 'u', 'r', 'i', 't', 'y', 'B', '3', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 
+'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 
+'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_annotations_v3_security_proto_upbdefinit = {
+  deps,
+  &xds_annotations_v3_security_proto_upb_file_layout,
+  "xds/annotations/v3/security.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 468)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
new file mode 100644
index 0000000000000..ab0fc83d46688
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/security.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_annotations_v3_security_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldSecurityAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_security_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldSecurityAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c
new file mode 100644
index 0000000000000..d3286b2b6e292
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c
@@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/annotations/v3/sensitive.upbdefs.h"
+#include "xds/annotations/v3/sensitive.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[207] = {'\n', '\"', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 'e', 'n', 's', 
+'i', 't', 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
+'o', 'n', 's', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 
+'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', ':', '>', '\n', '\t', 's', 'e', 'n', 's', 'i', 't', 
+'i', 'v', 'e', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 
+'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\265', '\321', '\213', '\035', ' ', '\001', '(', '\010', 'R', '\t', 's', 'e', 'n', 's', 'i', 
+'t', 'i', 'v', 'e', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 
+'d', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 'b', 
+'\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit = {
+  deps,
+  &xds_annotations_v3_sensitive_proto_upb_file_layout,
+  "xds/annotations/v3/sensitive.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 207)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
new file mode 100644
index 0000000000000..a7b2e50ed87a7
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
@@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/sensitive.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c
new file mode 100644
index 0000000000000..e008b6c16d360
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c
@@ -0,0 +1,63 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/annotations/v3/status.upbdefs.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[936] = {'\n', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 
+'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
+'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '@', '\n', '\024', 'F', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 
+'s', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 
+'o', 'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 
+'e', 's', 's', '\"', 'C', '\n', '\027', 'M', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 
+'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', 
+'\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\"', 'A', '\n', 
+'\025', 'F', 'i', 'e', 'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', 
+'\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 
+'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\"', '\234', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 
+'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 
+'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 
+'s', 's', '\022', '^', '\n', '\026', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 's', 't', 'a', 
+'t', 'u', 's', '\030', '\002', ' ', '\001', '(', '\016', '2', '(', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '.', 'v', '3', '.', 'P', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 
+'s', 'R', '\024', 'p', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '*', ']', 
+'\n', '\024', 'P', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', 
+'\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'F', 'R', 'O', 'Z', 'E', 'N', '\020', '\001', '\022', '\n', '\n', 
+'\006', 'A', 'C', 'T', 'I', 'V', 'E', '\020', '\002', '\022', ' ', '\n', '\034', 'N', 'E', 'X', 'T', '_', 'M', 'A', 'J', 'O', 'R', '_', 'V', 
+'E', 'R', 'S', 'I', 'O', 'N', '_', 'C', 'A', 'N', 'D', 'I', 'D', 'A', 'T', 'E', '\020', '\003', ':', 'j', '\n', '\013', 'f', 'i', 'l', 
+'e', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
+'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', '(', '\013', '2', '(', '.', 
+'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 'i', 'l', 'e', 'S', 't', 
+'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'f', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 
+'s', ':', 'v', '\n', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\037', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 
+'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', '(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 
+'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 
+'t', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'm', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', ':', 'n', '\n', '\014', 
+'f', 'i', 'e', 'l', 'd', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', 
+'(', '\013', '2', ')', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 
+'i', 'e', 'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'f', 'i', 'e', 
+'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 
+'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
+'/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit = {
+  deps,
+  &xds_annotations_v3_status_proto_upb_file_layout,
+  "xds/annotations/v3/status.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 936)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
new file mode 100644
index 0000000000000..b97899e497640
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
@@ -0,0 +1,50 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/status.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileStatusAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FileStatusAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_MessageStatusAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.MessageStatusAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldStatusAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldStatusAnnotation");
+}
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_StatusAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.StatusAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c
new file mode 100644
index 0000000000000..f49fafe6aad57
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/annotations/v3/versioning.upbdefs.h"
+#include "xds/annotations/v3/versioning.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
+static const char descriptor[330] = {'\n', '#', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 'v', 'e', 'r', 's', 
+'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 
+'i', 'o', 'n', 's', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
+'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', 'J', '\n', '\024', 'V', 'e', 'r', 's', 'i', 
+'o', 'n', 'i', 'n', 'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '2', '\n', '\025', 'p', 'r', 'e', 'v', 'i', 'o', 
+'u', 's', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\023', 'p', 'r', 
+'e', 'v', 'i', 'o', 'u', 's', 'M', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', ':', 'l', '\n', '\n', 'v', 'e', 'r', 's', 
+'i', 'o', 'n', 'i', 'n', 'g', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
+'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\223', '\375', '\206', ',', ' ', '\001', '(', '\013', '2', '(', 
+'.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'V', 'e', 'r', 's', 'i', 
+'o', 'n', 'i', 'n', 'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
+'n', 'g', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', 
+'/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 'b', '\006', 'p', 
+'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_descriptor_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_annotations_v3_versioning_proto_upbdefinit = {
+  deps,
+  &xds_annotations_v3_versioning_proto_upb_file_layout,
+  "xds/annotations/v3/versioning.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 330)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
new file mode 100644
index 0000000000000..f6a5bc4e573cc
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/annotations/v3/versioning.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_annotations_v3_versioning_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_annotations_v3_VersioningAnnotation_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_versioning_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.VersioningAnnotation");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c
similarity index 94%
rename from src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c
index 8e9fc22e0d0cf..236f473b62c69 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/authority.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/authority.upbdefs.h"
-#include "xds/core/v3/authority.upb.h"
+#include "xds/core/v3/authority.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
index 95da63a1c5297..130cde65b733a 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/authority.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c
index 38cdba655d038..8109d0becfc10 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/cidr.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/cidr.upbdefs.h"
-#include "xds/core/v3/cidr.upb.h"
+#include "xds/core/v3/cidr.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
index 3e932b37ee3aa..fd30c8a8a726f 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/cidr.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c
index b6516993597cd..e4c4a4877edb1 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/collection_entry.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/collection_entry.upbdefs.h"
-#include "xds/core/v3/collection_entry.upb.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
index 49fd3223f1448..1851368827975 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/collection_entry.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c
similarity index 95%
rename from src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c
index c4f3fdd7a469b..9de28ae7307b3 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/context_params.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/context_params.upbdefs.h"
-#include "xds/core/v3/context_params.upb.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 static const char descriptor[321] = {'\n', ' ', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', 'r', 
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
index 435cd0e6c6a4a..15c097be1d357 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/context_params.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c
new file mode 100644
index 0000000000000..718c0229029a0
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/core/v3/extension.upbdefs.h"
+#include "xds/core/v3/extension.upb_minitable.h"
+
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+static const char descriptor[302] = {'\n', '\033', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 
+'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 
+'t', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', 
+'/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\"', 'v', '\n', '\024', 'T', 'y', 
+'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 
+'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', 
+'\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\010', '\372', 'B', '\005', '\242', '\001', '\002', '\010', 
+'\001', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', 'N', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 
+'h', 'u', 'b', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 
+'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', 
+'/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 
+'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &validate_validate_proto_upbdefinit,
+  &google_protobuf_any_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit = {
+  deps,
+  &xds_core_v3_extension_proto_upb_file_layout,
+  "xds/core/v3/extension.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 302)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
new file mode 100644
index 0000000000000..f7022ddfb02f6
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+#define XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_core_v3_TypedExtensionConfig_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_core_v3_extension_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.core.v3.TypedExtensionConfig");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c
new file mode 100644
index 0000000000000..812eaf3e30a7d
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c
@@ -0,0 +1,44 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/core/v3/resource.upbdefs.h"
+#include "xds/core/v3/resource.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init xds_core_v3_resource_name_proto_upbdefinit;
+static const char descriptor[365] = {'\n', '\032', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 
+'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 'd', 's', '/', 'a', 
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '\037', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 
+'a', 'm', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\205', '\001', '\n', '\010', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '-', '\n', 
+'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 
+'.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'v', 'e', 
+'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', '\010', 'r', 
+'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
+'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', 'U', '\n', '\026', 'c', 
+'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'R', 'e', 
+'s', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', 
+'/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '\322', 
+'\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &google_protobuf_any_proto_upbdefinit,
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &xds_core_v3_resource_name_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_core_v3_resource_proto_upbdefinit = {
+  deps,
+  &xds_core_v3_resource_proto_upb_file_layout,
+  "xds/core/v3/resource.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 365)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
new file mode 100644
index 0000000000000..b51596277e321
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/core/v3/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
+#define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_core_v3_resource_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_core_v3_Resource_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_core_v3_resource_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.core.v3.Resource");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c
index a3c5d6bf3df94..1b991ebcc4d6d 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_locator.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/resource_locator.upbdefs.h"
-#include "xds/core/v3/resource_locator.upb.h"
+#include "xds/core/v3/resource_locator.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init xds_core_v3_context_params_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
index 9033d858d59ac..66607ed0b47cf 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_locator.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c
index eae12a90dd755..25f1628261f21 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_name.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/core/v3/resource_name.upbdefs.h"
-#include "xds/core/v3/resource_name.upb.h"
+#include "xds/core/v3/resource_name.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init xds_core_v3_context_params_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
similarity index 87%
rename from src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
index e9ccafd26a6e5..c2e8b68f5a200 100644
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/core/v3/resource_name.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c
new file mode 100644
index 0000000000000..5b72b5c063337
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c
@@ -0,0 +1,42 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/cel.upbdefs.h"
+#include "xds/type/matcher/v3/cel.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[322] = {'\n', '\035', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'c', 'e', 'l', 
+'.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
+'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 
+'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\025', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'c', 
+'e', 'l', '.', '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', '\"', 'Q', '\n', '\n', 'C', 'e', 'l', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'C', '\n', 
+'\n', 'e', 'x', 'p', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 't', 
+'y', 'p', 'e', '.', 'v', '3', '.', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
+'\212', '\001', '\002', '\020', '\001', 'R', '\t', 'e', 'x', 'p', 'r', 'M', 'a', 't', 'c', 'h', 'B', '`', '\n', '\036', 'c', 'o', 'm', '.', 'g', 
+'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
+'B', '\010', 'C', 'e', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 
+'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 
+'h', 'e', 'r', '/', 'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &xds_type_v3_cel_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_cel_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_cel_proto_upb_file_layout,
+  "xds/type/matcher/v3/cel.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 322)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
new file mode 100644
index 0000000000000..4d5bd051c706f
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_cel_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_CelMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_cel_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.CelMatcher");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c
similarity index 96%
rename from src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c
index c171cdc7cc662..aa58b273b72e1 100644
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/domain.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/type/matcher/v3/domain.upbdefs.h"
-#include "xds/type/matcher/v3/domain.upb.h"
+#include "xds/type/matcher/v3/domain.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
similarity index 90%
rename from src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
index 8060f378ca7fa..96151575ad8b0 100644
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/domain.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c
new file mode 100644
index 0000000000000..9f6212d38e2b1
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/http_inputs.upbdefs.h"
+#include "xds/type/matcher/v3/http_inputs.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+static const char descriptor[237] = {'\n', '%', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'h', 't', 't', 
+'p', '_', 'i', 'n', 'p', 'u', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
+'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\"', '\035', '\n', '\033', 'H', 't', 't', 
+'p', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', 'C', 'e', 'l', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', 'B', 
+'g', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\017', 'H', 't', 't', 'p', 'I', 'n', 'p', 'u', 't', 's', 'P', 'r', 'o', 't', 'o', 
+'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 
+'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '\322', '\306', '\244', '\341', 
+'\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &xds_annotations_v3_status_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_http_inputs_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_http_inputs_proto_upb_file_layout,
+  "xds/type/matcher/v3/http_inputs.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 237)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
new file mode 100644
index 0000000000000..874f6b608984c
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/http_inputs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_http_inputs_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_HttpAttributesCelMatchInput_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_http_inputs_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.HttpAttributesCelMatchInput");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c
similarity index 97%
rename from src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c
index fdfd4ee6120b8..86aad83753f25 100644
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/ip.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/type/matcher/v3/ip.upbdefs.h"
-#include "xds/type/matcher/v3/ip.upb.h"
+#include "xds/type/matcher/v3/ip.upb_minitable.h"
 
 extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
 extern _upb_DefPool_Init xds_core_v3_cidr_proto_upbdefinit;
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
similarity index 89%
rename from src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
index 28e385b45337b..bb18c3c9a8864 100644
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/matcher/v3/ip.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c
new file mode 100644
index 0000000000000..69d2bc942a9e0
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c
@@ -0,0 +1,125 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/matcher.upbdefs.h"
+#include "xds/type/matcher/v3/matcher.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit;
+extern _upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[2330] = {'\n', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 
+'h', 'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 
+'3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 
+'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'x', 'd', 's', '/', 't', 
+'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', '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', '\"', '\200', '\020', '\n', '\007', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'M', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
+'_', 'l', 'i', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 
+'i', 's', 't', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'M', '\n', '\014', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '_', 't', 'r', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
+'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', 'T', 'r', 'e', 'e', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'D', '\n', 
+'\013', 'o', 'n', '_', 'n', 'o', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 
+'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 
+'n', 'M', 'a', 't', 'c', 'h', 'R', '\t', 'o', 'n', 'N', 'o', 'M', 'a', 't', 'c', 'h', '\032', '\221', '\001', '\n', '\007', 'O', 'n', 'M', 
+'a', 't', 'c', 'h', '\022', '8', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 
+'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
+'r', 'H', '\000', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ';', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', 
+'\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 
+'t', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '\017', 
+'\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\022', '\003', '\370', 'B', '\001', '\032', '\266', '\010', '\n', '\013', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', 'L', 'i', 's', 't', '\022', '[', '\n', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
+'5', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', 
+'\221', '\006', '\n', '\t', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'o', '\n', '\020', 's', 'i', 'n', 'g', 'l', 'e', '_', 'p', 
+'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'B', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 
+'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\017', 's', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
+'e', '\022', 'a', '\n', '\n', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '@', '.', 'x', 
+'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 
+'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\t', 'o', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'\022', 'c', '\n', '\013', 'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '@', '.', 'x', 
+'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 
+'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\n', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', 'e', 
+'r', '\022', 'U', '\n', '\013', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '2', '.', 
+'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', 
+'\000', 'R', '\n', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\032', '\363', '\001', '\n', '\017', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 
+'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'A', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', 
+'.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 
+'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 'n', 'p', 'u', 't', 
+'\022', 'E', '\n', '\013', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'x', 
+'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\n', 'v', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', 'F', '\n', '\014', 
+'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 
+'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 
+'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', 'B', '\016', '\n', '\007', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'k', '\n', '\r', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 
+'t', '\022', 'Z', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '2', '.', 'x', 'd', 
+'s', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 
+'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\021', '\n', '\n', 'm', 'a', 't', 
+'c', 'h', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\032', '\265', '\001', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 
+'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '2', 
+'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 
+'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'I', '\n', '\010', 
+'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
+'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 
+'c', 'h', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\032', '\251', '\004', '\n', 
+'\013', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'A', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', 
+'(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 
+'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 
+'n', 'p', 'u', 't', '\022', '[', '\n', '\017', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\002', 
+' ', '\001', '(', '\013', '2', '1', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
+'3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 
+'c', 'h', 'M', 'a', 'p', 'H', '\000', 'R', '\r', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', ']', '\n', 
+'\020', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', 
+'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', 'H', 
+'\000', 'R', '\016', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'F', '\n', '\014', 'c', 'u', 's', 't', 
+'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', 
+'.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', 
+'\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', '\032', '\300', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'M', 
+'a', 'p', '\022', 'V', '\n', '\003', 'm', 'a', 'p', '\030', '\001', ' ', '\003', '(', '\013', '2', ':', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
+'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
+'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '.', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', 
+'B', '\010', '\372', 'B', '\005', '\232', '\001', '\002', '\010', '\001', 'R', '\003', 'm', 'a', 'p', '\032', '\\', '\n', '\010', 'M', 'a', 'p', 'E', 'n', 't', 
+'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', ':', '\n', '\005', 'v', 
+'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\005', 
+'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', '\020', '\n', '\t', 't', 'r', 'e', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 
+'B', '\001', ':', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'B', '\016', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', '_', 't', 
+'y', 'p', 'e', 'B', '\\', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
+'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\014', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'P', 'r', 'o', 't', 
+'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 
+'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 
+'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[5] = {
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &xds_core_v3_extension_proto_upbdefinit,
+  &xds_type_matcher_v3_string_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_matcher_proto_upb_file_layout,
+  "xds/type/matcher/v3/matcher.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 2330)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
new file mode 100644
index 0000000000000..19531db5c8fe3
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
@@ -0,0 +1,80 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_OnMatch_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.OnMatch");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c
new file mode 100644
index 0000000000000..181008e088630
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c
@@ -0,0 +1,70 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/range.upbdefs.h"
+#include "xds/type/matcher/v3/range.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
+extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[1007] = {'\n', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'a', 'n', 
+'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', '\032', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 
+'r', 'o', 't', 'o', '\032', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 
+'/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', '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', '\"', '\374', '\001', '\n', '\021', 'I', 'n', 't', '6', '4', 'R', 
+'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\016', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 
+'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '3', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', 's', '\032', '\212', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '9', '\n', '\006', 'r', 
+'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\027', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', 
+'.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\006', 'r', 'a', 
+'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 
+'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\"', '\374', '\001', '\n', '\021', 'I', 
+'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\016', 'r', 'a', 'n', 'g', 'e', 
+'_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '3', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
+'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'r', 'a', 'n', 'g', 'e', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\212', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'\022', '9', '\n', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\027', '.', 'x', 'd', 's', '.', 't', 'y', 
+'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', 
+'\001', 'R', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', 
+'(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\"', 
+'\377', '\001', '\n', '\022', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '[', '\n', 
+'\016', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '4', '.', 'x', 
+'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'D', 'o', 'u', 'b', 'l', 'e', 
+'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
+'R', '\r', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\213', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 
+'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', ':', '\n', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\030', 
+'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'B', 
+'\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 
+'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 
+'o', 'n', 'M', 'a', 't', 'c', 'h', 'B', 'Z', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', 
+'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 
+'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 
+'s', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', 
+'\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &xds_type_v3_range_proto_upbdefinit,
+  &xds_type_matcher_v3_matcher_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_range_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_range_proto_upb_file_layout,
+  "xds/type/matcher/v3/range.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 1007)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
new file mode 100644
index 0000000000000..cfb45605bd73c
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
@@ -0,0 +1,60 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_range_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int64RangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int64RangeMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int32RangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int32RangeMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.DoubleRangeMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c
new file mode 100644
index 0000000000000..e9b0341404a90
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c
@@ -0,0 +1,39 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/regex.upbdefs.h"
+#include "xds/type/matcher/v3/regex.upb_minitable.h"
+
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[348] = {'\n', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 
+'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 
+'r', 'o', 't', 'o', '\"', '\246', '\001', '\n', '\014', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'V', '\n', '\n', 
+'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', '2', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 't', 'y', 
+'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 
+'r', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 
+'g', 'o', 'o', 'g', 'l', 'e', 'R', 'e', '2', '\022', '\035', '\n', '\005', 'r', 'e', 'g', 'e', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', 
+'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\032', '\013', '\n', '\t', 'G', 'o', 'o', 'g', 'l', 'e', 
+'R', 'E', '2', 'B', '\022', '\n', '\013', 'e', 'n', 'g', 'i', 'n', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'B', 'Z', 
+'\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
+'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\n', 'R', 'e', 'g', 'e', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 
+'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 
+'t', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_regex_proto_upb_file_layout,
+  "xds/type/matcher/v3/regex.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 348)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
new file mode 100644
index 0000000000000..9d25ee519f881
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/regex.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_regex_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.RegexMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_GoogleRE2_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_regex_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.RegexMatcher.GoogleRE2");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c
new file mode 100644
index 0000000000000..392bbab9ba51e
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c
@@ -0,0 +1,51 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/matcher/v3/string.upbdefs.h"
+#include "xds/type/matcher/v3/string.upb_minitable.h"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[593] = {'\n', ' ', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 
+'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 
+'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', 
+'3', '/', 'r', 'e', 'g', 'e', 'x', '.', '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', '\"', '\231', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 
+'a', 't', 'c', 'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 
+'e', 'x', 'a', 'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', 
+'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', 
+'\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', 
+'\022', 'L', '\n', '\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 
+'s', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 
+'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 
+'g', 'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', 
+'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 
+'r', 'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', 
+'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', '\"', ']', '\n', 
+'\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'H', '\n', '\010', 'p', 'a', 't', 
+'t', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
+'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 
+'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', 'B', '[', '\n', '\036', 'c', 'o', 'm', '.', 
+'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
+'3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 
+'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
+'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[3] = {
+  &xds_type_matcher_v3_regex_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit = {
+  deps,
+  &xds_type_matcher_v3_string_proto_upb_file_layout,
+  "xds/type/matcher/v3/string.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 593)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
new file mode 100644
index 0000000000000..e9d37bfce9fe1
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/matcher/v3/string.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_StringMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_string_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.StringMatcher");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ListStringMatcher_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_string_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.ListStringMatcher");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
new file mode 100644
index 0000000000000..f0ff9412fe17e
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
@@ -0,0 +1,59 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/v3/cel.upbdefs.h"
+#include "xds/type/v3/cel.upb_minitable.h"
+
+extern _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit;
+extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
+extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
+extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[646] = {'\n', '\025', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'c', 'e', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 
+'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 
+'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 
+'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 
+'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 
+'d', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', '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', '\"', '\273', '\001', '\n', '\r', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'G', 
+'\n', '\013', 'p', 'a', 'r', 's', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 
+'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'P', 'a', 'r', 
+'s', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\n', 'p', 'a', 'r', 's', 'e', 'd', 'E', 'x', 'p', 'r', '\022', 'J', '\n', '\014', 
+'c', 'h', 'e', 'c', 'k', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 
+'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 
+'k', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\013', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'E', 'x', 'p', 'r', 'B', '\025', '\n', 
+'\016', 'e', 'x', 'p', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\236', '\001', '\n', '\020', 
+'C', 'e', 'l', 'E', 'x', 't', 'r', 'a', 'c', 't', 'S', 't', 'r', 'i', 'n', 'g', '\022', 'G', '\n', '\014', 'e', 'x', 'p', 'r', '_', 
+'e', 'x', 't', 'r', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', '.', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', 
+'\001', 'R', '\013', 'e', 'x', 'p', 'r', 'E', 'x', 't', 'r', 'a', 'c', 't', '\022', 'A', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 
+'_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
+'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 
+'t', 'V', 'a', 'l', 'u', 'e', 'B', 'P', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 
+'t', 'y', 'p', 'e', '.', 'v', '3', 'B', '\010', 'C', 'e', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 
+'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 
+'p', 'e', '/', 'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[6] = {
+  &google_api_expr_v1alpha1_checked_proto_upbdefinit,
+  &google_api_expr_v1alpha1_syntax_proto_upbdefinit,
+  &google_protobuf_wrappers_proto_upbdefinit,
+  &xds_annotations_v3_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_cel_proto_upb_file_layout,
+  "xds/type/v3/cel.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 646)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
new file mode 100644
index 0000000000000..a6fe1cd437742
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
@@ -0,0 +1,40 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/cel.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_CelExpression_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExpression");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExtractString");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
new file mode 100644
index 0000000000000..5bef88f312a5b
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/v3/range.upbdefs.h"
+#include "xds/type/v3/range.upb_minitable.h"
+
+static const char descriptor[285] = {'\n', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\"', '4', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 
+'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', 
+'\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', '\"', '4', '\n', '\n', 'I', 'n', 't', '3', 
+'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
+'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '5', '\n', '\013', 
+'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', 
+'\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\001', 'R', '\003', 'e', 'n', 
+'d', 'B', 'J', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 
+'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
+'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_range_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_range_proto_upb_file_layout,
+  "xds/type/v3/range.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 285)
+};
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
new file mode 100644
index 0000000000000..8a8083e692293
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
@@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int64Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int32Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.DoubleRange");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
similarity index 94%
rename from src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
rename to src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
index 26d5b7ebd18e5..2d0514bd7ae88 100644
--- a/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/v3/typed_struct.proto
  *
@@ -8,7 +7,7 @@
 
 #include "upb/reflection/def.h"
 #include "xds/type/v3/typed_struct.upbdefs.h"
-#include "xds/type/v3/typed_struct.upb.h"
+#include "xds/type/v3/typed_struct.upb_minitable.h"
 
 extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
 static const char descriptor[254] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
similarity index 86%
rename from src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h
rename to src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
index 03119edf8019f..a035ec6d68ddd 100644
--- a/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     xds/type/v3/typed_struct.proto
  *
@@ -10,7 +9,7 @@
 #define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
 
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
+#include "upb/reflection/internal/def_pool.h"
 #include "upb/port/def.inc"
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
deleted file mode 100644
index 78b5244b569e0..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/annotations/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/annotations/resource.upbdefs.h"
-#include "envoy/annotations/resource.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[300] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 
-'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\021', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
-'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\022', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 
-'t', 'y', 'p', 'e', ':', 'e', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', 
-'\301', '\344', '\262', '~', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'r', 
-'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', ':', 'Z', '8', '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', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_annotations_resource_proto_upbdefinit = {
-  deps,
-  &envoy_annotations_resource_proto_upb_file_layout,
-  "envoy/annotations/resource.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 300)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h
deleted file mode 100644
index 2aac38a3806fd..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/annotations/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_annotations_resource_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_annotations_ResourceAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_annotations_resource_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.annotations.ResourceAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
deleted file mode 100644
index 40a199ef58afa..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/accesslog/v3/accesslog.upbdefs.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-
-extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[4736] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 
-'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', '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', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', 
-'3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', 
-'\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 
-'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 
-'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 
-'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 
-'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', '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', '!', 'u', 
-'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
-'g', '.', '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', '\"', '\356', '\001', '\n', '\t', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', '\022', '\n', '\004', 
-'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'B', '\n', '\006', 'f', 'i', 'l', 't', 'e', 
-'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 
-'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 
-'r', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', 
-'\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '1', '\232', '\305', '\210', '\036', ',', 
-'\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 
-'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 
-'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\312', 
-'\t', '\n', '\017', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 's', 't', 'a', 
-'t', 'u', 's', '_', 'c', 'o', 'd', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
-'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 's', 't', 'a', 't', 'u', 
-'s', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'T', '\n', '\017', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'f', 
-'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 
-'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'h', '\n', 
-'\027', 'n', 'o', 't', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', 
-'\003', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 
-'l', 't', 'e', 'r', 'H', '\000', 'R', '\024', 'n', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 
-'t', 'e', 'r', '\022', 'W', '\n', '\020', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\004', 
-' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 
-'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 
-'R', '\017', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'Q', '\n', '\016', 'r', 'u', 'n', 't', 
-'i', 'm', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 
-'m', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\r', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
-'\022', 'E', '\n', '\n', 'a', 'n', 'd', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 
-'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\t', 'a', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'B', '\n', '\t', 
-'o', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'O', 'r', 'F', 'i', 'l', 't', 
-'e', 'r', 'H', '\000', 'R', '\010', 'o', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 
-'f', 'i', 'l', 't', 'e', 'r', '\030', '\010', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 
-'t', 'e', 'r', 'H', '\000', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'a', '\n', '\024', 'r', 'e', 
-'s', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', 
-'-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 
-'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\022', 
-'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 'g', 'r', 'p', 
-'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\n', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
-'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 'g', 'r', 'p', 'c', 'S', 
-'t', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'W', '\n', '\020', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 
-'f', 'i', 'l', 't', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 
-'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 
-'\022', 'T', '\n', '\017', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', 
-'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'm', 'e', 't', 
-'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'R', '\n', '\017', 'l', 'o', 'g', '_', 't', 'y', 'p', 'e', '_', 'f', 
-'i', 'l', 't', 'e', 'r', '\030', '\r', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 
-'t', 'e', 'r', 'H', '\000', 'R', '\r', 'l', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', 
-'\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 
-'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 
-'e', 'r', 'B', '\027', '\n', '\020', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 
-'B', '\001', '\"', '\371', '\001', '\n', '\020', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'H', 
-'\n', '\002', 'o', 'p', '\030', '\001', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 
-'i', 'l', 't', 'e', 'r', '.', 'O', 'p', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\002', 'o', 'p', '\022', 'C', '\n', 
-'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', 'B', 
-'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '\034', '\n', '\002', 'O', 'p', '\022', '\006', '\n', 
-'\002', 'E', 'Q', '\020', '\000', '\022', '\006', '\n', '\002', 'G', 'E', '\020', '\001', '\022', '\006', '\n', '\002', 'L', 'E', '\020', '\002', ':', '8', '\232', '\305', 
-'\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 
-'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 
-'l', 't', 'e', 'r', '\"', '\243', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
-'\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 
-'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 
-'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'.', 'v', '2', '.', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\237', '\001', '\n', '\016', 
-'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 
-'s', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 
-'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 
-'n', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 
-'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 
-'n', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'T', '\n', '\024', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 
-'F', 'i', 'l', 't', 'e', 'r', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'N', 'o', 
-'t', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'J', '\n', '\017', 'T', 'r', 'a', 
-'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\371', '\001', '\n', '\r', 'R', 
-'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 
-'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 
-'e', 'K', 'e', 'y', '\022', 'I', '\n', '\017', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\002', 
-' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 
-'t', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'S', 'a', 'm', 
-'p', 'l', 'e', 'd', '\022', '<', '\n', '\032', 'u', 's', 'e', '_', 'i', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', '_', 'r', 
-'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\030', 'u', 's', 'e', 'I', 'n', 'd', 'e', 'p', 
-'e', 'n', 'd', 'e', 'n', 't', 'R', 'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 
-'s', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\216', '\001', '\n', 
-'\t', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', 
-'(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
-'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', 
-'\005', '\222', '\001', '\002', '\010', '\002', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 
-'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\010', 'O', 'r', 'F', 'i', 
-'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
-'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 
-'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', 
-'.', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\014', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 
-'r', '\022', 'F', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', ':', '4', 
-'\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 
-'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 
-'e', 'r', '\"', '\352', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', 
-'\022', '\227', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\200', '\001', '\372', 'B', '}', '\222', '\001', 'z', 
-'\"', 'x', 'r', 'v', 'R', '\002', 'L', 'H', 'R', '\002', 'U', 'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', '\002', 'U', 'R', 'R', 
-'\002', 'U', 'F', 'R', '\002', 'U', 'C', 'R', '\002', 'U', 'O', 'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', 'F', 'I', 'R', '\002', 
-'R', 'L', 'R', '\004', 'U', 'A', 'E', 'X', 'R', '\004', 'R', 'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', 'R', 'X', 'R', '\002', 
-'S', 'I', 'R', '\002', 'I', 'H', 'R', '\003', 'D', 'P', 'E', 'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', 'F', 'C', 'F', 'R', 
-'\004', 'N', 'F', 'C', 'F', 'R', '\002', 'D', 'T', 'R', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', 'M', 'R', '\005', 'f', 
-'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 
-'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\200', '\004', '\n', '\020', 'G', 'r', 'p', 'c', 'S', 't', 
-'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', ']', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', 
-'\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 
-'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '.', 'S', 
-'t', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', 'a', 
-'t', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 
-'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', '\006', '\n', '\002', 'O', 'K', '\020', '\000', 
-'\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', 'L', 'E', 'D', '\020', '\001', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 
-'\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', 'A', 'L', 'I', 'D', '_', 'A', 'R', 'G', 'U', 'M', 'E', 'N', 'T', '\020', '\003', '\022', 
-'\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', 'N', 'E', '_', 'E', 'X', 'C', 'E', 'E', 'D', 'E', 'D', '\020', '\004', '\022', '\r', '\n', 
-'\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\005', '\022', '\022', '\n', '\016', 'A', 'L', 'R', 'E', 'A', 'D', 'Y', '_', 'E', 
-'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', '\n', '\021', 'P', 'E', 'R', 'M', 'I', 'S', 'S', 'I', 'O', 'N', '_', 'D', 'E', 'N', 
-'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', 'R', 'E', 'S', 'O', 'U', 'R', 'C', 'E', '_', 'E', 'X', 'H', 'A', 'U', 'S', 'T', 
-'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', 'A', 'I', 'L', 'E', 'D', '_', 'P', 'R', 'E', 'C', 'O', 'N', 'D', 'I', 'T', 'I', 
-'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', 'B', 'O', 'R', 'T', 'E', 'D', '\020', '\n', '\022', '\020', '\n', '\014', 'O', 'U', 'T', '_', 
-'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\013', '\022', '\021', '\n', '\r', 'U', 'N', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 
-'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\r', '\022', '\017', '\n', '\013', 'U', 'N', 'A', 
-'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\016', '\022', '\r', '\n', '\t', 'D', 'A', 'T', 'A', '_', 'L', 'O', 'S', 'S', '\020', '\017', 
-'\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', 'H', 'E', 'N', 'T', 'I', 'C', 'A', 'T', 'E', 'D', '\020', '\020', ':', '8', '\232', '\305', 
-'\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 
-'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 
-'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', '@', 
-'\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
-'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'N', '\n', '\026', 'm', 'a', 't', 'c', 'h', '_', 'i', 
-'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', 
-'\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', 'e', 'y', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', ':', '6', '\232', '\305', '\210', '\036', 
-'1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 
-'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', 
-'\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 
-'s', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 
-'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', 't', 'y', 'p', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 
-'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\266', '\001', '\n', '\017', 
-'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', 
-' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 
-'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', 
-'2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 
-'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 
-'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 
-'o', 'n', 'f', 'i', 'g', 'B', '\221', '\001', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', 
-'\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'L', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '/', 'v', '3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', 
-'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[11] = {
-  &envoy_config_core_v3_base_proto_upbdefinit,
-  &envoy_config_route_v3_route_components_proto_upbdefinit,
-  &envoy_data_accesslog_v3_accesslog_proto_upbdefinit,
-  &envoy_type_matcher_v3_metadata_proto_upbdefinit,
-  &envoy_type_v3_percent_proto_upbdefinit,
-  &google_protobuf_any_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = {
-  deps,
-  &envoy_config_accesslog_v3_accesslog_proto_upb_file_layout,
-  "envoy/config/accesslog/v3/accesslog.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 4736)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h
deleted file mode 100644
index bf6a0e85958ee..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AccessLog_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AccessLog");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AccessLogFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AccessLogFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ComparisonFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ComparisonFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_StatusCodeFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.StatusCodeFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_DurationFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.DurationFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_NotHealthCheckFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.NotHealthCheckFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_TraceableFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.TraceableFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_RuntimeFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.RuntimeFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_AndFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.AndFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_OrFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.OrFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_HeaderFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.HeaderFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ResponseFlagFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ResponseFlagFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_GrpcStatusFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.GrpcStatusFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_MetadataFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.MetadataFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_LogTypeFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.LogTypeFilter");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ExtensionFilter_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.accesslog.v3.ExtensionFilter");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c
deleted file mode 100644
index 596abbadf1c1b..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/cluster/v3/cluster.upbdefs.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-
-extern _upb_DefPool_Init envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_cluster_v3_filter_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_health_check_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_protocol_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_resolver_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_endpoint_v3_endpoint_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init xds_core_v3_collection_entry_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[12402] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', 
-'/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
-'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 
-'e', 'a', 'k', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', 
-'/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'f', 'i', 'l', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', 
-'/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 
-'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 
-'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 
-'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\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', '(', 'e', 'n', 'v', 'o', 'y', '/', 
-'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 
-'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
-'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\'', 'e', 
-'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', 'a', 'l', 't', 
-'h', '_', 'c', 'h', 'e', 'c', 'k', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 
-'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', 
-'\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 
-'s', 'o', 'l', 'v', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 
-'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'p', 'r', 
-'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 
-'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 
-'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 
-'o', 't', 'o', '\032', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 
-'o', 'n', '_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 
-'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 
-'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 
-'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'s', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', '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', '!', 'u', 
-'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
-'g', '.', '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', '\"', 'K', '\n', '\021', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', 't', 
-'i', 'o', 'n', '\022', '6', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 
-'s', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 
-'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\317', 'R', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'o', '\n', '\030', 
-'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 's', '\030', 
-'+', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
-'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 
-'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'R', '\026', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 
-'e', 't', 'M', 'a', 't', 'c', 'h', 'e', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', 
-'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\r', 'a', 'l', 't', '_', 's', 't', 'a', 't', 
-'_', 'n', 'a', 'm', 'e', '\030', '\034', ' ', '\001', '(', '\t', 'B', '\032', '\362', '\230', '\376', '\217', '\005', '\024', '\n', '\022', 'o', 'b', 's', 'e', 
-'r', 'v', 'a', 'b', 'i', 'l', 'i', 't', 'y', '_', 'n', 'a', 'm', 'e', 'R', '\013', 'a', 'l', 't', 'S', 't', 'a', 't', 'N', 'a', 
-'m', 'e', '\022', 'N', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 
-'.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'H', 
-'\000', 'R', '\004', 't', 'y', 'p', 'e', '\022', 'W', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '&', 
-' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
-'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 
-'e', 'r', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '_', '\n', '\022', 
-'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 
-'1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 
-'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 
-'R', '\020', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\017', 'c', 'o', 'n', 
-'n', 'e', 'c', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
-'\252', '\001', '\002', '*', '\000', 'R', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'o', '\n', '!', 
-'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 
-'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', 
-'\002', '\020', '\001', 'R', '\035', 'p', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 
-'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', 'P', '\n', '\t', 'l', 'b', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', 
-'\001', '(', '\016', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 
-'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', 
-'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 'l', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', '\017', 'l', 'o', 'a', 'd', '_', 
-'a', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '\030', '!', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 
-'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'R', '\016', 'l', 'o', 'a', 'd', 'A', 's', 's', 'i', 
-'g', 'n', 'm', 'e', 'n', 't', '\022', 'F', '\n', '\r', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 's', '\030', '\010', 
-' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
-'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'R', '\014', 'h', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 
-'c', 'k', 's', '\022', 'h', '\n', '\033', 'm', 'a', 'x', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'p', 'e', 'r', '_', 'c', 
-'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', 
-'\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\030', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'P', 'e', 'r', 'C', 
-'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'S', '\n', '\020', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 'e', 'a', 
-'k', 'e', 'r', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 
-'r', 's', 'R', '\017', 'c', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 'r', 's', '\022', '\203', '\001', '\n', '\036', 'u', 
-'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 
-'i', 'o', 'n', 's', '\030', '.', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 
-'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', 
-'\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 
-'o', 'n', 's', '\022', 'w', '\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 
-'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\035', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 
-'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\031', 'c', 
-'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 
-'k', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', 
-'\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', 
-'.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', 
-'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 
-'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 't', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 
-'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 
-'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\022', '\030', '\001', '\212', '\223', '\267', '*', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', 
-'\003', '3', '.', '0', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 
-'s', '\022', '\214', '\001', '\n', ' ', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 
-'t', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '$', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 
-'t', 'e', 'r', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 
-'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\035', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
-'s', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'Q', '\n', '\020', 'd', 'n', 
-'s', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'r', 'a', 't', 'e', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 
-'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\016', 'd', 'n', 's', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 
-'t', 'e', '\022', 'e', '\n', '\030', 'd', 'n', 's', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', 
-'_', 'r', 'a', 't', 'e', '\030', ',', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 
-'e', 's', 'h', 'R', 'a', 't', 'e', 'R', '\025', 'd', 'n', 's', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'f', 'r', 'e', 's', 
-'h', 'R', 'a', 't', 'e', '\022', '&', '\n', '\017', 'r', 'e', 's', 'p', 'e', 'c', 't', '_', 'd', 'n', 's', '_', 't', 't', 'l', '\030', 
-'\'', ' ', '\001', '(', '\010', 'R', '\r', 'r', 'e', 's', 'p', 'e', 'c', 't', 'D', 'n', 's', 'T', 't', 'l', '\022', 'f', '\n', '\021', 'd', 
-'n', 's', '_', 'l', 'o', 'o', 'k', 'u', 'p', '_', 'f', 'a', 'm', 'i', 'l', 'y', '\030', '\021', ' ', '\001', '(', '\016', '2', '0', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 
-'l', 'u', 's', 't', 'e', 'r', '.', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', 'B', '\010', '\372', 
-'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\017', 'd', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', 
-'O', '\n', '\r', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 's', '\030', '\022', ' ', '\003', '(', '\013', '2', '\035', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 
-'e', 's', 's', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'd', 'n', 's', 'R', 'e', 's', 'o', 
-'l', 'v', 'e', 'r', 's', '\022', 'A', '\n', '\027', 'u', 's', 'e', '_', 't', 'c', 'p', '_', 'f', 'o', 'r', '_', 'd', 'n', 's', '_', 
-'l', 'o', 'o', 'k', 'u', 'p', 's', '\030', '-', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', 
-'0', 'R', '\023', 'u', 's', 'e', 'T', 'c', 'p', 'F', 'o', 'r', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 's', '\022', 'j', '\n', 
-'\025', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '5', ' ', 
-'\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', 
-'3', '.', 'D', 'n', 's', 'R', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\013', '\030', '\001', 
-'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 'd', 'n', 's', 'R', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'C', 
-'o', 'n', 'f', 'i', 'g', '\022', 'e', '\n', '\031', 't', 'y', 'p', 'e', 'd', '_', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'v', 
-'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '7', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 
-'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\026', 't', 'y', 'p', 'e', 'd', 'D', 'n', 's', 'R', 'e', 's', 'o', 'l', 'v', 
-'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\025', 'w', 'a', 'i', 't', '_', 'f', 'o', 'r', '_', 'w', 'a', 'r', 'm', 
-'_', 'o', 'n', '_', 'i', 'n', 'i', 't', '\030', '6', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 'w', 'a', 'i', 't', 'F', 'o', 
-'r', 'W', 'a', 'r', 'm', 'O', 'n', 'I', 'n', 'i', 't', '\022', 'V', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 
-'t', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\023', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 
-'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 
-'N', '\n', '\020', 'c', 'l', 'e', 'a', 'n', 'u', 'p', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\024', ' ', '\001', '(', '\013', 
-'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 
-'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\017', 'c', 'l', 'e', 'a', 'n', 'u', 'p', 'I', 'n', 't', 'e', 
-'r', 'v', 'a', 'l', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', 
-'f', 'i', 'g', '\030', '\025', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\022', 'u', 'p', 's', 't', 'r', 
-'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', 'l', 'b', '_', 's', 'u', 'b', 's', 'e', 
-'t', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\026', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 
-'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'l', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 
-'n', 'f', 'i', 'g', '\022', 'b', '\n', '\023', 'r', 'i', 'n', 'g', '_', 'h', 'a', 's', 'h', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 
-'i', 'g', '\030', '\027', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
-'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 
-'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\020', 'r', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 
-'n', 'f', 'i', 'g', '\022', '[', '\n', '\020', 'm', 'a', 'g', 'l', 'e', 'v', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
-'4', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
-'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 
-'n', 'f', 'i', 'g', 'H', '\001', 'R', '\016', 'm', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'k', '\n', 
-'\026', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'd', 's', 't', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\"', 
-' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
-'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 
-'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\023', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 
-'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'l', 'e', 'a', 's', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'l', 
-'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '%', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 
-'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\024', 'l', 'e', 
-'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'h', '\n', '\025', 'r', 'o', 'u', 
-'n', 'd', '_', 'r', 'o', 'b', 'i', 'n', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '8', ' ', '\001', '(', '\013', '2', 
-'3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 
-'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 
-'i', 'g', 'H', '\001', 'R', '\022', 'r', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
-'Y', '\n', '\020', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\033', ' ', '\001', '(', '\013', 
-'2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', 
-'3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', 
-'\016', 'c', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 
-'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\030', ' ', '\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', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', ':', '\n', 
-'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\031', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 
-'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'u', '\n', '\022', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 's', 'e', 'l', 'e', 'c', 
-'t', 'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 
-'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'B', '\013', '\030', '\001', '\222', '\307', 
-'\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\021', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 
-'n', '\022', 'r', '\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 
-'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\036', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 
-'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\031', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 
-'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '(', 'c', 'l', 'o', 's', 
-'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 'h', 'e', 'a', 
-'l', 't', 'h', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\037', ' ', '\001', '(', '\010', 'R', '#', 'c', 'l', 'o', 's', 'e', 'C', 
-'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'H', 'e', 'a', 'l', 't', 'h', 'F', 'a', 'i', 
-'l', 'u', 'r', 'e', '\022', '@', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'o', 'n', '_', 
-'h', 'o', 's', 't', '_', 'r', 'e', 'm', 'o', 'v', 'a', 'l', '\030', ' ', ' ', '\001', '(', '\010', 'R', '\031', 'i', 'g', 'n', 'o', 'r', 
-'e', 'H', 'e', 'a', 'l', 't', 'h', 'O', 'n', 'H', 'o', 's', 't', 'R', 'e', 'm', 'o', 'v', 'a', 'l', '\022', '9', '\n', '\007', 'f', 
-'i', 'l', 't', 'e', 'r', 's', '\030', '(', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 
-'t', 'e', 'r', 's', '\022', '`', '\n', '\025', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', 'p', 'o', 
-'l', 'i', 'c', 'y', '\030', ')', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 
-'P', 'o', 'l', 'i', 'c', 'y', 'R', '\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 
-'c', 'y', '\022', 'A', '\n', '\n', 'l', 'r', 's', '_', 's', 'e', 'r', 'v', 'e', 'r', '\030', '*', ' ', '\001', '(', '\013', '2', '\"', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 
-'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '?', '\n', '\025', 't', 'r', 
-'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', '\001', '(', '\010', 
-'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', 'i', 'm', 'e', 'o', 
-'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', 'S', '\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 
-'f', 'i', 'g', '\030', '0', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 
-'f', 'i', 'g', 'R', '\016', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\023', 't', 'r', 
-'a', 'c', 'k', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', '(', '\013', '2', '*', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 
-'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', 'a', 'c', 'k', 'C', 
-'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '^', '\n', '\021', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 
-'_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '2', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'P', 'r', 
-'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\020', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 
-'t', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'o', 'o', 
-'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 
-'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'o', 'o', 'l', 'P', 
-'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\032', '\346', '\001', 
-'\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\022', '\033', '\n', 
-'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 
-'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', 
-'\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', '\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', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 
-'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', 
-'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 
-'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 
-'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 
-'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', 
-'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 
-'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 
-'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 
-'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', '\246', '\001', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 
-'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', 
-'\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
-'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', 
-'\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 
-'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 
-'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 
-'n', 'f', 'i', 'g', '\032', '\244', '\n', '\n', '\016', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'y', 
-'\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', '(', '\016', '2', 'F', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 
-'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 
-'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', 
-'\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '>', '\n', '\016', 
-'d', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\r', 'd', 'e', 'f', 
-'a', 'u', 'l', 't', 'S', 'u', 'b', 's', 'e', 't', '\022', 'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', 's', 'e', 'l', 'e', 
-'c', 't', 'o', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 
-'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 
-'o', 'r', 'R', '\017', 's', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', '\n', '\025', 'l', 'o', 
-'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', ' ', '\001', '(', '\010', 
-'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', '\022', '2', '\n', '\025', 
-'s', 'c', 'a', 'l', 'e', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\005', ' ', '\001', 
-'(', '\010', 'R', '\023', 's', 'c', 'a', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', 
-'\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', 'm', 'o', 'd', 'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\014', 'p', 
-'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', 'A', 'n', 'y', '\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', 's', '_', 'a', 'n', 
-'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\t', 'l', 'i', 's', 't', 'A', 's', 'A', 'n', 'y', '\022', '\222', '\001', '\n', '\030', 'm', 'e', 
-'t', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', 
-'\001', '(', '\016', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 
-'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 
-'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 
-'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 'm', 'e', 't', 'a', 'd', 
-'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\032', '\332', '\003', '\n', '\020', 'L', 'b', 'S', 
-'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', 
-'(', '\t', 'R', '\004', 'k', 'e', 'y', 's', '\022', '3', '\n', '\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', 'o', 's', 't', '_', 'p', 
-'e', 'r', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', 'g', 'l', 'e', 'H', 'o', 
-'s', 't', 'P', 'e', 'r', 'S', 'u', 'b', 's', 'e', 't', '\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 
-'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 
-'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 
-'t', 'o', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 
-'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 
-'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'k', 'e', 
-'y', 's', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 
-'K', 'e', 'y', 's', 'S', 'u', 'b', 's', 'e', 't', '\"', 'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 
-'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', 
-'T', '_', 'D', 'E', 'F', 'I', 'N', 'E', 'D', '\020', '\000', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 
-'K', '\020', '\001', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\002', '\022', '\022', '\n', '\016', 
-'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', 'K', 'E', 'Y', 'S', '_', 
-'S', 'U', 'B', 'S', 'E', 'T', '\020', '\004', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 
-'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 
-'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', 'O', '\n', '\026', 'L', 'b', 
-'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 
-'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 
-'I', 'N', 'T', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\002', 
-'\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 
-'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', '\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', 'O', '_', 
-'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', 'L', 'I', 
-'S', 'T', '\020', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', 
-'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\343', 
-'\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', 'l', 'o', 
-'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 's', 
-'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 
-'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\n', 'a', 'g', 
-'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', '\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'p', 'e', 
-'r', 'c', 'e', 'n', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
-'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', 'r', 'c', 
-'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 
-'\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', 
-'(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 
-'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 
-'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\n', '\024', 'L', 
-'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', 'c', 'h', 
-'o', 'i', 'c', 'e', '_', 'c', 'o', 'u', 'n', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', 
-'\004', '*', '\002', '(', '\002', 'R', '\013', 'c', 'h', 'o', 'i', 'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', '\n', '\023', 'a', 'c', 't', 
-'i', 'v', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 
-'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\021', 'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 
-'i', 'a', 's', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
-'\003', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 
-'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 
-'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', '0', '\232', 
-'\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 
-'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\221', '\003', 
-'\n', '\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', 'i', 'n', 
-'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 
-'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 
-'S', 'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', 'h', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', 
-'(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 
-'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 
-'f', 'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', 
-'\001', 'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', 'm', 'u', 
-'m', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 
-'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 
-'e', '\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', '_', 'H', 
-'A', 'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', 'R', 'M', 'U', 'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', '\001', ':', 
-',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 
-'t', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\002', '\020', 
-'\003', '\032', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\n', '\n', 't', 'a', 
-'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', 
-'\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\032', '\367', '\001', '\n', '\023', 'O', 'r', 'i', 
-'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', '_', 'h', 
-'t', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', 't', 'p', 
-'H', 'e', 'a', 'd', 'e', 'r', '\022', '(', '\n', '\020', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
-'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', ']', 
-'\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', 
-'\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 
-'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', 'u', 'p', 
-'s', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', ':', '/', '\232', '\305', '\210', '\036', '*', 
-'\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 
-'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\325', '\013', '\n', '\016', 'C', 'o', 'm', 
-'m', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', '\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 
-'n', 'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 
-'h', 'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 
-'a', 'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 
-'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 
-'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 
-'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 
-'i', 'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 
-'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 
-'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 
-'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
-'I', '\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', 'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', 
-'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 
-'a', 't', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', 'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 
-'C', '\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', 'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', 
-'_', 'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 
-'w', 'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', 's', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 
-'s', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 
-'t', '_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 
-'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', 'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', 
-'\n', '\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 
-'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 
-'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 
-'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 
-'s', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 
-'_', 'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 
-'a', 't', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 
-'u', 's', '\032', '\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 
-'?', '\n', '\017', 'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', 
-'\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 
-'r', 'o', 'u', 't', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 
-'s', 't', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 
-'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', '\025', 'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 
-'i', 'c', '_', 'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 
-'a', 'f', 'f', 'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 
-'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 
-'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', 
-'_', '\n', '\030', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 
-'i', 'g', ':', 'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 
-'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 
-'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', 
-'\031', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 
-'g', '\022', '7', '\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 
-'h', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', 'e', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 
-'r', 'H', 'a', 's', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', 's', 'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 
-'f', 'a', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 
-'d', 'R', '\021', 'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'F', 'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', 
-'\036', '?', '\n', '=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 
-'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 
-'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 
-'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 
-'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 
-'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', '\322', '\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 
-'R', 'a', 't', 'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', 
-'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 
-'t', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '*', '\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 
-'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 
-'\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 
-'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 
-'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 
-'e', '\032', '\203', '\002', '\n', '\020', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'x', '\n', 
-'\035', 'p', 'e', 'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 
-'r', 'a', 't', 'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\032', 'p', 'e', 'r', 'U', 'p', 's', 't', 
-'r', 'e', 'a', 'm', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\022', 'u', '\n', '\033', 'p', 'r', 
-'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', 
-'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\031', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', 'P', 'r', 
-'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\032', 'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 
-'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 
-'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 
-'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', 
-'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', 
-'S', 'T', 'R', 'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', '\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', 
-'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', '\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', 
-'_', 'D', 'S', 'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', 
-'U', 'N', 'D', '_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', '\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', 
-'E', 'S', 'T', '\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', 'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', 
-'A', 'N', 'D', 'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', 'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', 
-'U', 'S', 'T', 'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', '\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', 
-'B', 'A', 'L', 'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', 'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', 
-'\"', '\004', '\010', '\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', 'P', 
-'\n', '\017', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', 
-'\020', '\000', '\022', '\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', 
-'Y', '\020', '\002', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', 'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 
-'A', 'L', 'L', '\020', '\004', '\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 
-'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 
-'D', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 
-'T', 'R', 'E', 'A', 'M', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 
-'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 
-'l', 'u', 's', 't', 'e', 'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 
-'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', 
-'\020', '\010', 'J', '\004', '\010', '\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', 'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 
-'s', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 
-'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\332', '\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 
-'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', 
-' ', '\003', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 
-'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', 
-'.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\032', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 
-'i', 'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'c', 'o', 
-'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 
-'n', 'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 
-'g', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 
-'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', 
-'\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 
-'R', '\004', 'n', 'a', 'm', 'e', 'R', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', 
-'\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 
-'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\371', '\001', '\n', '\031', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 
-'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'G', '\n', '\r', 't', 'c', 'p', '_', 'k', 
-'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 
-'R', '\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 
-'a', 'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 
-'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 
-'e', 't', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 
-'t', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 
-'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 
-'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', 'r', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 
-'s', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 
-'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', 
-'\022', '4', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', 'e', 
-'s', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'S', 
-'i', 'z', 'e', 's', 'B', '\211', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\014', 'C', 'l', 
-'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', 
-'3', ';', 'c', 'l', 'u', 's', 't', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 
-'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[24] = {
-  &envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit,
-  &envoy_config_cluster_v3_filter_proto_upbdefinit,
-  &envoy_config_cluster_v3_outlier_detection_proto_upbdefinit,
-  &envoy_config_core_v3_address_proto_upbdefinit,
-  &envoy_config_core_v3_base_proto_upbdefinit,
-  &envoy_config_core_v3_config_source_proto_upbdefinit,
-  &envoy_config_core_v3_extension_proto_upbdefinit,
-  &envoy_config_core_v3_health_check_proto_upbdefinit,
-  &envoy_config_core_v3_protocol_proto_upbdefinit,
-  &envoy_config_core_v3_resolver_proto_upbdefinit,
-  &envoy_config_endpoint_v3_endpoint_proto_upbdefinit,
-  &envoy_type_v3_percent_proto_upbdefinit,
-  &google_protobuf_any_proto_upbdefinit,
-  &google_protobuf_duration_proto_upbdefinit,
-  &google_protobuf_struct_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &xds_core_v3_collection_entry_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_migrate_proto_upbdefinit,
-  &udpa_annotations_security_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit = {
-  deps,
-  &envoy_config_cluster_v3_cluster_proto_upb_file_layout,
-  "envoy/config/cluster/v3/cluster.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 12402)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h
deleted file mode 100644
index e761c6ecbd8ee..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/cluster/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_ClusterCollection_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.ClusterCollection");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_TransportSocketMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.TransportSocketMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CustomClusterType_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CustomClusterType");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_EdsClusterConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.EdsClusterConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LbSubsetConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LbSubsetConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_SlowStartConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.SlowStartConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RoundRobinLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.LeastRequestLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RingHashLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RingHashLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_MaglevLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.MaglevLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.OriginalDstLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_RefreshRate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.RefreshRate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_PreconnectPolicy_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.PreconnectPolicy");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_LoadBalancingPolicy_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.LoadBalancingPolicy");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_LoadBalancingPolicy_Policy_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.LoadBalancingPolicy.Policy");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.TrackClusterStats");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c
deleted file mode 100644
index ea67ff71cdfef..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/common/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/common/matcher/v3/matcher.upbdefs.h"
-#include "envoy/config/common/matcher/v3/matcher.upb.h"
-
-extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[4235] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\036', 'e', 'n', 
-'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'v', '3', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', 
-'/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
-'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 
-'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 
-'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', 
-'.', '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', '\"', '\344', '\021', '\n', '\007', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 
-'X', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', '_', 'l', 'i', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', 'H', 
-'\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'X', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'_', 't', 'r', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'T', 'r', 'e', 'e', '\022', 'O', '\n', '\013', 'o', 'n', '_', 'n', 'o', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', 
-'2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', 
-'\t', 'o', 'n', 'N', 'o', 'M', 'a', 't', 'c', 'h', '\032', '\245', '\001', '\n', '\007', 'O', 'n', 'M', 'a', 't', 'c', 'h', '\022', 'C', '\n', 
-'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'D', '\n', '\006', 'a', 'c', 't', 'i', 'o', 
-'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
-'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 
-'g', 'H', '\000', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '\017', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\022', '\003', 
-'\370', 'B', '\001', '\032', '\242', '\t', '\n', '\013', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'f', '\n', '\010', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\334', 
-'\006', '\n', '\t', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'z', '\n', '\020', 's', 'i', 'n', 'g', 'l', 'e', '_', 'p', 'r', 
-'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'M', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
-'e', '.', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\017', 's', 'i', 'n', 'g', 
-'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'l', '\n', '\n', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'\030', '\002', ' ', '\001', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 
-'m', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 'r', 'e', 'd', 'i', 
-'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\t', 'o', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'n', '\n', '\013', 
-'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
-'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 
-'i', 'c', 'a', 't', 'e', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\n', 'a', 'n', 
-'d', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '`', '\n', '\013', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', 
-' ', '\001', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 
-'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\n', 'n', 'o', 't', 'M', 
-'a', 't', 'c', 'h', 'e', 'r', '\032', '\207', '\002', '\n', '\017', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
-'e', '\022', 'J', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
-'s', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 'n', 'p', 
-'u', 't', '\022', 'G', '\n', '\013', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 
-'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\n', 'v', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 
-'\022', 'O', '\n', '\014', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '*', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 
-'d', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 
-'m', 'M', 'a', 't', 'c', 'h', 'B', '\016', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'v', '\n', 
-'\r', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', '\022', 'e', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 
-'t', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
-'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', 
-'\005', '\222', '\001', '\002', '\010', '\002', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\021', '\n', '\n', 'm', 'a', 't', 'c', 
-'h', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\032', '\313', '\001', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '\022', 'e', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '=', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', 
-'.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\t', 'p', 'r', 'e', 
-'d', 'i', 'c', 'a', 't', 'e', '\022', 'T', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', 
-'/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'B', '\010', 
-'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\032', '\347', '\004', '\n', '\013', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'J', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 
-'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', 
-'\020', '\001', 'R', '\005', 'i', 'n', 'p', 'u', 't', '\022', 'f', '\n', '\017', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 
-'m', 'a', 'p', '\030', '\002', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', 'H', '\000', 'R', '\r', 
-'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'h', '\n', '\020', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 
-'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\003', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 
-'p', 'H', '\000', 'R', '\016', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'O', '\n', '\014', 'c', 'u', 
-'s', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 
-'s', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', 
-'\032', '\326', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'a', '\n', '\003', 'm', 'a', 'p', '\030', '\001', ' ', '\003', '(', 
-'\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '.', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', 'B', '\010', '\372', 
-'B', '\005', '\232', '\001', '\002', '\010', '\001', 'R', '\003', 'm', 'a', 'p', '\032', 'g', '\n', '\010', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 
-'\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', 'E', '\n', '\005', 'v', 'a', 'l', 'u', 
-'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
-'m', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 
-'n', 'M', 'a', 't', 'c', 'h', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', '\020', '\n', '\t', 't', 'r', 'e', 'e', 
-'_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', ':', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'B', '\023', '\n', '\014', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\350', '\010', '\n', '\016', 'M', 'a', 't', 'c', 
-'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'T', '\n', '\010', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', 
-'\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
-'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'V', '\n', '\t', 
-'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 
-'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', 
-'\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'M', '\n', '\t', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', 
-'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
-'e', 'H', '\000', 'R', '\010', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 
-'h', '\030', '\004', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 
-'t', 'c', 'h', '\022', 'o', '\n', '\032', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 
-'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 
-'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\027', 'h', 't', 't', 'p', 'R', 'e', 'q', 
-'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\033', 'h', 't', 't', 'p', '_', 
-'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', 
-'\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 
-'t', 'c', 'h', 'H', '\000', 'R', '\030', 'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 
-'s', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\033', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 
-'e', 'a', 'd', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
-'3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\030', 'h', 't', 't', 
-'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 's', '\n', '\034', 
-'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 
-'t', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 
-'d', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\031', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 
-'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '|', '\n', '\037', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 
-'u', 'e', 's', 't', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', 
-' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 
-'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 
-'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\033', 'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'G', 'e', 
-'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\022', '~', '\n', ' ', 'h', 't', 't', 'p', '_', 'r', 'e', 
-'s', 'p', 'o', 'n', 's', 'e', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', 
-'\030', '\n', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 
-'m', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 
-'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\034', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 
-'e', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\032', 'Z', '\n', '\010', 'M', 'a', 't', 'c', 
-'h', 'S', 'e', 't', '\022', 'N', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
-'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', 
-'\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', 'R', '\n', 
-'\020', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 
-'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 
-'e', 'a', 'd', 'e', 'r', 's', '\"', '\241', '\002', '\n', '\024', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 
-'y', 'M', 'a', 't', 'c', 'h', '\022', '\037', '\n', '\013', 'b', 'y', 't', 'e', 's', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', 
-'(', '\r', 'R', '\n', 'b', 'y', 't', 'e', 's', 'L', 'i', 'm', 'i', 't', '\022', 'k', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 
-'s', '\030', '\002', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
-'m', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 
-'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 
-'t', 'c', 'h', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\032', '{', 
-'\n', '\020', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 's', 't', 'r', 
-'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', 
-'\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 'b', 'i', 'n', 'a', 'r', 'y', '_', 
-'m', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\014', 'B', '\007', '\372', 'B', '\004', 'z', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'b', 
-'i', 'n', 'a', 'r', 'y', 'M', 'a', 't', 'c', 'h', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', 'B', '\227', 
-'\001', '\n', ',', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\014', 'M', 
-'a', 't', 'c', 'h', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'O', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', 
-'\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[7] = {
-  &envoy_config_core_v3_extension_proto_upbdefinit,
-  &envoy_config_route_v3_route_components_proto_upbdefinit,
-  &envoy_type_matcher_v3_string_proto_upbdefinit,
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit = {
-  deps,
-  &envoy_config_common_matcher_v3_matcher_proto_upb_file_layout,
-  "envoy/config/common/matcher/v3/matcher.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 4235)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h
deleted file mode 100644
index d337e0b22dabd..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/common/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_OnMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.OnMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_MatchPredicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.MatchPredicate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_MatchPredicate_MatchSet_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.MatchPredicate.MatchSet");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpHeadersMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpHeadersMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpGenericBodyMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_common_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
deleted file mode 100644
index 69fb716cf20f9..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/core/v3/extension.upbdefs.h"
-#include "envoy/config/core/v3/extension.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[404] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 
-'t', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '/', 'a', 'n', 'y', '.', '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', '\"', 'v', '\n', '\024', 'T', 'y', 'p', 
-'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', 
-'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', '\014', 
-'t', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\010', '\372', 'B', '\005', '\242', '\001', '\002', '\010', '\001', 
-'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\202', '\001', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 
-'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
-'v', '3', 'B', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
-'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 
-'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &google_protobuf_any_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit = {
-  deps,
-  &envoy_config_core_v3_extension_proto_upb_file_layout,
-  "envoy/config/core/v3/extension.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 404)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h
deleted file mode 100644
index 08d745115db82..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_core_v3_TypedExtensionConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_extension_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.TypedExtensionConfig");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c
deleted file mode 100644
index 0b043ad7dae28..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/rbac/v3/rbac.upbdefs.h"
-#include "envoy/config/rbac/v3/rbac.upb.h"
-
-extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_filter_state_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_path_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit;
-extern _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit;
-extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 
-'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 
-'a', 'c', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 
-'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
-'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 
-'r', 'o', 't', 'o', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 
-'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', 
-'\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'f', 
-'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 
-'t', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 
-'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'/', 'v', '3', '/', 'p', 'a', 't', 'h', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 
-'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', 
-'\032', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', '\032', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 
-'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 'o', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', 
-'/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', 
-'.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 
-'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 
-'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\341', '\006', '\n', '\004', 'R', 'B', 'A', 'C', 
-'\022', 'C', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', 'i', 'o', 
-'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\010', 'p', 'o', 
-'l', 'i', 'c', 'i', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', 'E', 
-'n', 't', 'r', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'b', '\n', '\025', 'a', 'u', 'd', 'i', 't', '_', 'l', 
-'o', 'g', 'g', 'i', 'n', 'g', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 
-'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'a', 'u', 'd', 'i', 't', 
-'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\032', '\304', '\003', '\n', '\023', 'A', 'u', 'd', 'i', 't', 'L', 
-'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'p', '\n', '\017', 'a', 'u', 'd', 'i', 't', '_', 'c', 'o', 
-'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 
-'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'u', 'd', 'i', 't', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 
-'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'a', 'u', 'd', 'i', 't', 'C', 'o', 'n', 'd', 'i', 't', 'i', 
-'o', 'n', '\022', 'g', '\n', '\016', 'l', 'o', 'g', 'g', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\002', ' ', '\003', '(', 
-'\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 
-'R', 'B', 'A', 'C', '.', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'i', 'n', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 
-'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\r', 'l', 'o', 'g', 'g', 'e', 'r', 
-'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', '\203', '\001', '\n', '\021', 'A', 'u', 'd', 'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', 'C', 'o', 
-'n', 'f', 'i', 'g', '\022', 'M', '\n', '\014', 'a', 'u', 'd', 'i', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\001', ' ', '\001', '(', 
-'\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
-'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 'a', 'u', 'd', 
-'i', 't', 'L', 'o', 'g', 'g', 'e', 'r', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\002', 
-' ', '\001', '(', '\010', 'R', '\n', 'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', 'L', '\n', '\016', 'A', 'u', 'd', 'i', 't', 
-'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\013', '\n', '\007', 'O', 'N', 
-'_', 'D', 'E', 'N', 'Y', '\020', '\001', '\022', '\014', '\n', '\010', 'O', 'N', '_', 'A', 'L', 'L', 'O', 'W', '\020', '\002', '\022', '\025', '\n', '\021', 
-'O', 'N', '_', 'D', 'E', 'N', 'Y', '_', 'A', 'N', 'D', '_', 'A', 'L', 'L', 'O', 'W', '\020', '\003', '\032', 'Y', '\n', '\r', 'P', 'o', 
-'l', 'i', 'c', 'i', 'e', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
-'\003', 'k', 'e', 'y', '\022', '2', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', 
-'\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', '&', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 
-'L', 'L', 'O', 'W', '\020', '\000', '\022', '\010', '\n', '\004', 'D', 'E', 'N', 'Y', '\020', '\001', '\022', '\007', '\n', '\003', 'L', 'O', 'G', '\020', '\002', 
-':', ' ', '\232', '\305', '\210', '\036', '\033', '\n', '\031', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 
-'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\223', '\003', '\n', '\006', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'L', '\n', '\013', 'p', 
-'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 
-'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\013', 'p', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 's', '\022', 'I', 
-'\n', '\n', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 
-'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\n', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 's', '\022', 'Z', 
-'\n', '\t', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'B', 
-'\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 
-'f', 'i', 'e', 'r', 'R', '\t', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'p', '\n', '\021', 'c', 'h', 'e', 'c', 'k', 'e', 
-'d', '_', 'c', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 'k', 
-'e', 'd', 'E', 'x', 'p', 'r', 'B', '\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 
-'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\020', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'C', 'o', 'n', 'd', 'i', 
-'t', 'i', 'o', 'n', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\332', '\007', '\n', '\n', 'P', 'e', 'r', 'm', 'i', 
-'s', 's', 'i', 'o', 'n', '\022', 'C', '\n', '\t', 'a', 'n', 'd', '_', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 
-'$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 
-'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'R', 'u', 'l', 'e', 's', '\022', 
-'A', '\n', '\010', 'o', 'r', '_', 'r', 'u', 'l', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 
-'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'R', 'u', 'l', 'e', 's', '\022', '\033', '\n', '\003', 'a', 'n', 'y', '\030', '\003', 
-' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', '>', '\n', '\006', 'h', 
-'e', 'a', 'd', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', 
-'\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', 'p', 'a', 't', 'h', '\030', '\n', ' ', '\001', 
-'(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
-'3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 
-'H', '\n', '\016', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'i', 'p', '\030', '\005', ' ', '\001', '(', '\013', '2', '\037', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 
-'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\r', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'I', 'p', '\022', '6', 
-'\n', '\020', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', '\r', 'B', 
-'\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'H', '\000', 'R', '\017', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 
-'P', 'o', 'r', 't', '\022', 'Q', '\n', '\026', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '_', 
-'r', 'a', 'n', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
-'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\024', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 
-'i', 'o', 'n', 'P', 'o', 'r', 't', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', 
-'\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', 'm', 
-'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '=', '\n', '\010', 'n', 'o', 't', '_', 'r', 'u', 'l', 'e', '\030', '\010', ' ', '\001', '(', '\013', 
-'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 
-'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'H', '\000', 'R', '\007', 'n', 'o', 't', 'R', 'u', 'l', 'e', '\022', 'Z', '\n', '\025', 'r', 
-'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\t', ' ', '\001', '(', 
-'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
-'.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 
-'e', 'd', 'S', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'F', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', 
-' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
-'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 
-'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\032', 's', '\n', '\003', 'S', 'e', 't', '\022', '@', '\n', '\005', 'r', 'u', 'l', 'e', 's', 
-'\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 
-'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 
-'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 
-'t', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 
-'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', 
-'\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', '>', '\n', '\007', 'a', 'n', 'd', 
-'_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', 
-'\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 
-'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', '\022', '\033', '\n', '\003', 'a', 'n', 
-'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', 'U', 
-'\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 
-'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', '\000', 'R', '\r', 'a', 'u', 't', 
-'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\005', 
-' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
-'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 
-'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 
-'m', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\016', 
-'d', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', 'e', 'm', 'o', 't', 'e', '_', 
-'i', 'p', '\030', '\013', ' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
-'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\010', 'r', 'e', 'm', 'o', 't', 
-'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', 
-'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', 
-'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\001', '(', '\013', 
-'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 
-'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 
-'t', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', '2', 
-')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'F', 
-'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', 
-'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', ' ', '\001', '(', '\013', '2', '\037', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 
-'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', 'S', 'e', 't', '\022', ';', '\n', 
-'\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', 
-'\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 
-'t', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\016', 'p', 'r', 
-'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 
-'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', 'm', 'e', ':', '3', '\232', '\305', 
-'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', 
-'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'J', 
-'\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\021', '\n', '\n', 'i', 'd', 
-'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', 
-'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 
-'m', 'e', '\022', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', 
-'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '}', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 
-'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', 
-'\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 
-'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[16] = {
-  &envoy_config_core_v3_address_proto_upbdefinit,
-  &envoy_config_core_v3_extension_proto_upbdefinit,
-  &envoy_config_route_v3_route_components_proto_upbdefinit,
-  &envoy_type_matcher_v3_filter_state_proto_upbdefinit,
-  &envoy_type_matcher_v3_metadata_proto_upbdefinit,
-  &envoy_type_matcher_v3_path_proto_upbdefinit,
-  &envoy_type_matcher_v3_string_proto_upbdefinit,
-  &envoy_type_v3_range_proto_upbdefinit,
-  &google_api_expr_v1alpha1_checked_proto_upbdefinit,
-  &google_api_expr_v1alpha1_syntax_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_migrate_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit = {
-  deps,
-  &envoy_config_rbac_v3_rbac_proto_upb_file_layout,
-  "envoy/config/rbac/v3/rbac.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 4221)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h
deleted file mode 100644
index f3077438a8fe6..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_AuditLoggingOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.AuditLoggingOptions");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_RBAC_PoliciesEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.RBAC.PoliciesEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Policy_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Policy");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Permission_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Permission");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Permission_Set_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Permission.Set");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_Set_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal.Set");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Principal_Authenticated_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Principal.Authenticated");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Action_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.rbac.v3.Action");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c
deleted file mode 100644
index 0d7600f12c2a2..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/tap/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/config/tap/v3/common.upbdefs.h"
-#include "envoy/config/tap/v3/common.upb.h"
-
-extern _upb_DefPool_Init envoy_config_common_matcher_v3_matcher_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[3873] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'a', 'p', '/', 'v', '3', '/', 'c', 'o', 'm', 
-'m', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 
-'a', 'p', '.', 'v', '3', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'm', 'm', 'o', 
-'n', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 
-'o', '\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', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 
-'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 
-'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 
-'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 
-'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 
-'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 
-'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\365', '\002', '\n', '\t', 'T', 'a', 'p', 'C', 'o', 'n', 'f', 
-'i', 'g', '\022', 'S', '\n', '\014', 'm', 'a', 't', 'c', 'h', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 
-'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 'a', 't', 
-'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', 
-'\013', 'm', 'a', 't', 'c', 'h', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'D', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', 
-'(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 
-'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', '\n', '\r', 'o', 'u', 't', 'p', 'u', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', 
-'\002', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 
-'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 
-'R', '\014', 'o', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'O', '\n', '\013', 't', 'a', 'p', '_', 'e', 'n', 'a', 
-'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 
-'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 't', 'a', 'p', 'E', 'n', 'a', 'b', 'l', 'e', 'd', ':', '*', '\232', '\305', '\210', 
-'\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 
-'l', 'p', 'h', 'a', '.', 'T', 'a', 'p', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\346', '\010', '\n', '\016', 'M', 'a', 't', 'c', 'h', 'P', 
-'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'I', '\n', '\010', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', 
-'\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 
-'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', 
-'\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'K', '\n', '\t', 'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', 
-'(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 
-'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 
-'R', '\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'B', '\n', '\t', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', 
-' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
-'3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\010', 'n', 'o', 't', 'M', 'a', 
-'t', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\010', 'B', '\007', '\372', 
-'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 't', 'c', 'h', '\022', 'd', '\n', '\032', 'h', 't', 't', 
-'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\005', 
-' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
-'3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\027', 'h', 't', 't', 
-'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'f', '\n', '\033', 'h', 
-'t', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 
-'h', '\030', '\006', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 
-'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\030', 
-'h', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 
-'f', '\n', '\033', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 
-'m', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 
-'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', 
-'H', '\000', 'R', '\030', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 
-'t', 'c', 'h', '\022', 'h', '\n', '\034', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 
-'l', 'e', 'r', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 
-'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\031', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 
-'l', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', 'q', '\n', '\037', 'h', 't', 't', 'p', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 
-'_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', '\001', '(', '\013', 
-'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 
-'t', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\033', 'h', 't', 't', 
-'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\022', 
-'s', '\n', ' ', 'h', 't', 't', 'p', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 
-'b', 'o', 'd', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 
-'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 
-'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\034', 'h', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 
-'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '\032', '\211', '\001', '\n', '\010', 'M', 'a', 't', 'c', 
-'h', 'S', 'e', 't', '\022', 'C', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 
-'d', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '8', 
-'\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 
-'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 
-'t', 'c', 'h', 'S', 'e', 't', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 
-'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 
-'i', 'c', 'a', 't', 'e', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\205', '\001', '\n', '\020', 'H', 't', 
-'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 'a', 't', 'c', 'h', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', 
-'\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 
-'t', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 
-'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', 
-'.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'M', 
-'a', 't', 'c', 'h', '\"', '\226', '\002', '\n', '\024', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 
-'a', 't', 'c', 'h', '\022', '\037', '\n', '\013', 'b', 'y', 't', 'e', 's', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', '(', '\r', 
-'R', '\n', 'b', 'y', 't', 'e', 's', 'L', 'i', 'm', 'i', 't', '\022', '`', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', 
-'\002', ' ', '\003', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 
-'v', '3', '.', 'H', 't', 't', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'B', 'o', 'd', 'y', 'M', 'a', 't', 'c', 'h', '.', 'G', 
-'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 
-'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\032', '{', '\n', '\020', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'T', 'e', 'x', 't', 
-'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', 
-'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
-'h', '\022', ',', '\n', '\014', 'b', 'i', 'n', 'a', 'r', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\014', 'B', '\007', 
-'\372', 'B', '\004', 'z', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'b', 'i', 'n', 'a', 'r', 'y', 'M', 'a', 't', 'c', 'h', 'B', '\013', '\n', 
-'\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\300', '\002', '\n', '\014', 'O', 'u', 't', 'p', 'u', 't', 'C', 'o', 'n', 'f', 
-'i', 'g', '\022', 'A', '\n', '\005', 's', 'i', 'n', 'k', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', 
-'B', '\n', '\372', 'B', '\007', '\222', '\001', '\004', '\010', '\001', '\020', '\001', 'R', '\005', 's', 'i', 'n', 'k', 's', '\022', 'O', '\n', '\025', 'm', 'a', 
-'x', '_', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', 
-'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 
-'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 'x', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'R', 'x', 'B', 'y', 't', 'e', 's', 
-'\022', 'O', '\n', '\025', 'm', 'a', 'x', '_', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 't', 'x', '_', 'b', 'y', 't', 'e', 's', 
-'\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 'x', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'T', 
-'x', 'B', 'y', 't', 'e', 's', '\022', '\034', '\n', '\t', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\004', ' ', '\001', '(', '\010', 
-'R', '\t', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', 
-'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'O', 'u', 't', 'p', 
-'u', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\333', '\004', '\n', '\n', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', '\022', 'H', 
-'\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', '.', 'F', 'o', 
-'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\022', 'R', '\n', 
-'\017', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '_', 'a', 'd', 'm', 'i', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '\'', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', '.', 'S', 't', 'r', 'e', 'a', 
-'m', 'i', 'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\016', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 
-'g', 'A', 'd', 'm', 'i', 'n', '\022', 'G', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'p', 'e', 'r', '_', 't', 'a', 'p', '\030', '\003', ' ', 
-'\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', 
-'.', 'F', 'i', 'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\n', 'f', 'i', 'l', 'e', 'P', 'e', 
-'r', 'T', 'a', 'p', '\022', 'O', '\n', '\016', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '_', 'g', 'r', 'p', 'c', '\030', '\004', ' ', 
-'\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', '3', 
-'.', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', 'H', '\000', 'R', '\r', 's', 't', 'r', 
-'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', '\022', 'O', '\n', '\016', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', '_', 'a', 'd', 
-'m', 'i', 'n', '\030', '\005', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'t', 'a', 'p', '.', 'v', '3', '.', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', 'H', 
-'\000', 'R', '\r', 'b', 'u', 'f', 'f', 'e', 'r', 'e', 'd', 'A', 'd', 'm', 'i', 'n', '\"', '~', '\n', '\006', 'F', 'o', 'r', 'm', 'a', 
-'t', '\022', '\026', '\n', '\022', 'J', 'S', 'O', 'N', '_', 'B', 'O', 'D', 'Y', '_', 'A', 'S', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\000', 
-'\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'B', 'O', 'D', 'Y', '_', 'A', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', 
-'\022', '\020', '\n', '\014', 'P', 'R', 'O', 'T', 'O', '_', 'B', 'I', 'N', 'A', 'R', 'Y', '\020', '\002', '\022', '!', '\n', '\035', 'P', 'R', 'O', 
-'T', 'O', '_', 'B', 'I', 'N', 'A', 'R', 'Y', '_', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 
-'D', '\020', '\003', '\022', '\016', '\n', '\n', 'P', 'R', 'O', 'T', 'O', '_', 'T', 'E', 'X', 'T', '\020', '\004', ':', '+', '\232', '\305', '\210', '\036', 
-'&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 
-'p', 'h', 'a', '.', 'O', 'u', 't', 'p', 'u', 't', 'S', 'i', 'n', 'k', 'B', '\027', '\n', '\020', 'o', 'u', 't', 'p', 'u', 't', '_', 
-'s', 'i', 'n', 'k', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\"', 'I', '\n', '\022', 'S', 't', 'r', 'e', 'a', 'm', 'i', 
-'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', 
-'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 't', 'r', 'e', 
-'a', 'm', 'i', 'n', 'g', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', '\"', 'p', '\n', '\021', 'B', 'u', 'f', 'f', 'e', 'r', 'e', 
-'d', 'A', 'd', 'm', 'i', 'n', 'S', 'i', 'n', 'k', '\022', '&', '\n', '\n', 'm', 'a', 'x', '_', 't', 'r', 'a', 'c', 'e', 's', '\030', 
-'\001', ' ', '\001', '(', '\004', 'B', '\007', '\372', 'B', '\004', '2', '\002', ' ', '\000', 'R', '\t', 'm', 'a', 'x', 'T', 'r', 'a', 'c', 'e', 's', 
-'\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\007', 't', 'i', 'm', 'e', 
-'o', 'u', 't', '\"', 'k', '\n', '\016', 'F', 'i', 'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', '\022', '(', '\n', '\013', 
-'p', 'a', 't', 'h', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', 
-'\001', 'R', '\n', 'p', 'a', 't', 'h', 'P', 'r', 'e', 'f', 'i', 'x', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 
-'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'F', 'i', 
-'l', 'e', 'P', 'e', 'r', 'T', 'a', 'p', 'S', 'i', 'n', 'k', '\"', '\256', '\001', '\n', '\021', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 
-'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', '\022', '\025', '\n', '\006', 't', 'a', 'p', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 
-'R', '\005', 't', 'a', 'p', 'I', 'd', '\022', 'N', '\n', '\014', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\002', 
-' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 
-'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', 
-'\013', 'g', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 
-'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 't', 'a', 'p', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 't', 'r', 
-'e', 'a', 'm', 'i', 'n', 'g', 'G', 'r', 'p', 'c', 'S', 'i', 'n', 'k', 'B', '|', '\n', '!', 'i', 'o', '.', 'e', 'n', 'v', 'o', 
-'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'a', 'p', '.', 'v', 
-'3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '@', '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', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'a', 'p', '/', 'v', 
-'3', ';', 't', 'a', 'p', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[11] = {
-  &envoy_config_common_matcher_v3_matcher_proto_upbdefinit,
-  &envoy_config_core_v3_base_proto_upbdefinit,
-  &envoy_config_core_v3_grpc_service_proto_upbdefinit,
-  &envoy_config_route_v3_route_components_proto_upbdefinit,
-  &google_protobuf_duration_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_config_tap_v3_common_proto_upbdefinit = {
-  deps,
-  &envoy_config_tap_v3_common_proto_upb_file_layout,
-  "envoy/config/tap/v3/common.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 3873)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h
deleted file mode 100644
index 364ff113e835d..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/config/tap/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_config_tap_v3_common_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_TapConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.TapConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_MatchPredicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.MatchPredicate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_MatchPredicate_MatchSet_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.MatchPredicate.MatchSet");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpHeadersMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpHeadersMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpGenericBodyMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpGenericBodyMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_OutputConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.OutputConfig");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_OutputSink_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.OutputSink");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingAdminSink_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.StreamingAdminSink");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_BufferedAdminSink_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.BufferedAdminSink");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_FilePerTapSink_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.FilePerTapSink");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingGrpcSink_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_config_tap_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.config.tap.v3.StreamingGrpcSink");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c
deleted file mode 100644
index ae55a40f32fb9..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/data/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/data/accesslog/v3/accesslog.upbdefs.h"
-#include "envoy/data/accesslog/v3/accesslog.upb.h"
-
-extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_timestamp_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[8931] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', 
-'/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'd', 
-'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 
-'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 
-'t', 'o', '\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', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'g', 'o', 'o', 'g', 
-'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '.', 'p', 'r', 'o', 
-'t', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 
-'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 
-'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\200', '\002', '\n', '\021', 'T', 'C', 'P', 'A', 'c', 'c', 'e', 's', 
-'s', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'U', '\n', '\021', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 
-'r', 't', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 
-'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 
-'m', 'o', 'n', 'R', '\020', 'c', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'b', '\n', '\025', 
-'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\002', ' ', '\001', 
-'(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'.', 'v', '3', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', 
-'\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', ':', '0', '\232', '\305', 
-'\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'.', 'v', '2', '.', 'T', 'C', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\"', '\360', '\003', '\n', 
-'\022', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'U', '\n', '\021', 'c', 'o', 
-'m', 'm', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 
-'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', 'R', '\020', 'c', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 'p', 
-'e', 'r', 't', 'i', 'e', 's', '\022', 'b', '\n', '\020', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 'e', 'r', 's', 'i', 'o', 
-'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 
-'r', 'y', '.', 'H', 'T', 'T', 'P', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\017', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 
-'e', 'r', 's', 'i', 'o', 'n', '\022', 'H', '\n', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
-'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\007', 'r', 'e', 
-'q', 'u', 'e', 's', 't', '\022', 'K', '\n', '\010', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '/', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 
-'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\010', 'r', 
-'e', 's', 'p', 'o', 'n', 's', 'e', '\"', 'U', '\n', '\013', 'H', 'T', 'T', 'P', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\030', '\n', 
-'\024', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\n', 
-'\n', '\006', 'H', 'T', 'T', 'P', '1', '0', '\020', '\001', '\022', '\n', '\n', '\006', 'H', 'T', 'T', 'P', '1', '1', '\020', '\002', '\022', '\t', '\n', 
-'\005', 'H', 'T', 'T', 'P', '2', '\020', '\003', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', '\020', '\004', ':', '1', '\232', '\305', '\210', '\036', 
-',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', 
-'2', '.', 'H', 'T', 'T', 'P', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\"', '\221', '\001', '\n', '\024', 
-'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '%', '\n', '\016', 'r', 
-'e', 'c', 'e', 'i', 'v', 'e', 'd', '_', 'b', 'y', 't', 'e', 's', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\r', 'r', 'e', 'c', 'e', 
-'i', 'v', 'e', 'd', 'B', 'y', 't', 'e', 's', '\022', '\035', '\n', '\n', 's', 'e', 'n', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', 
-' ', '\001', '(', '\004', 'R', '\t', 's', 'e', 'n', 't', 'B', 'y', 't', 'e', 's', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 
-'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'C', 'o', 
-'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\226', '\025', '\n', '\017', 'A', 'c', 
-'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '\022', '8', '\n', '\013', 's', 'a', 'm', 'p', 'l', 'e', '_', 'r', 
-'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\001', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 
-'!', '\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\n', 's', 'a', 'm', 'p', 'l', 'e', 'R', 'a', 't', 'e', '\022', 'Y', '\n', '\031', 
-'d', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', 
-'\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 
-'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'R', 
-'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'W', '\n', '\030', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 
-'m', '_', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 
-'s', 's', 'R', '\026', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 
-'s', '\022', 'M', '\n', '\016', 't', 'l', 's', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', 
-'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', 
-'3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\r', 't', 'l', 's', 'P', 'r', 'o', 'p', 'e', 
-'r', 't', 'i', 'e', 's', '\022', '9', '\n', '\n', 's', 't', 'a', 'r', 't', '_', 't', 'i', 'm', 'e', '\030', '\005', ' ', '\001', '(', '\013', 
-'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 
-'a', 'm', 'p', 'R', '\t', 's', 't', 'a', 'r', 't', 'T', 'i', 'm', 'e', '\022', 'I', '\n', '\024', 't', 'i', 'm', 'e', '_', 't', 'o', 
-'_', 'l', 'a', 's', 't', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\020', 't', 'i', 
-'m', 'e', 'T', 'o', 'L', 'a', 's', 't', 'R', 'x', 'B', 'y', 't', 'e', '\022', '\\', '\n', '\036', 't', 'i', 'm', 'e', '_', 't', 'o', 
-'_', 'f', 'i', 'r', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\007', 
-' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 
-'r', 'a', 't', 'i', 'o', 'n', 'R', '\031', 't', 'i', 'm', 'e', 'T', 'o', 'F', 'i', 'r', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 
-'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', '\022', 'Z', '\n', '\035', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', '_', 
-'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 
-'\030', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', 
-'\022', '\\', '\n', '\036', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'f', 'i', 'r', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 
-'m', '_', 'r', 'x', '_', 'b', 'y', 't', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\031', 't', 'i', 'm', 'e', 'T', 'o', 
-'F', 'i', 'r', 's', 't', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'x', 'B', 'y', 't', 'e', '\022', 'Z', '\n', '\035', 't', 'i', 
-'m', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'x', '_', 'b', 'y', 
-'t', 'e', '\030', '\n', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\030', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'U', 'p', 's', 
-'t', 'r', 'e', 'a', 'm', 'R', 'x', 'B', 'y', 't', 'e', '\022', '`', '\n', ' ', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'f', 'i', 
-'r', 's', 't', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\013', ' ', 
-'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 
-'a', 't', 'i', 'o', 'n', 'R', '\033', 't', 'i', 'm', 'e', 'T', 'o', 'F', 'i', 'r', 's', 't', 'D', 'o', 'w', 'n', 's', 't', 'r', 
-'e', 'a', 'm', 'T', 'x', 'B', 'y', 't', 'e', '\022', '^', '\n', '\037', 't', 'i', 'm', 'e', '_', 't', 'o', '_', 'l', 'a', 's', 't', 
-'_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'x', '_', 'b', 'y', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', 
-'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 
-'o', 'n', 'R', '\032', 't', 'i', 'm', 'e', 'T', 'o', 'L', 'a', 's', 't', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 
-'x', 'B', 'y', 't', 'e', '\022', 'U', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 
-'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 
-'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\025', 'u', 'p', 's', 't', 
-'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'S', '\n', '\026', 'u', 'p', 's', 't', 
-'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', 
-'\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 
-'d', 'r', 'e', 's', 's', 'R', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 
-'s', 's', '\022', ')', '\n', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\017', ' ', 
-'\001', '(', '\t', 'R', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'M', '\n', '\016', 'r', 
-'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', '\020', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 
-'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', 'R', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', 
-':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\021', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', 
-'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'I', '\n', '!', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 't', 'r', 'a', 
-'n', 's', 'p', 'o', 'r', 't', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\022', ' ', '\001', 
-'(', '\t', 'R', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'F', 'a', 'i', 'l', 
-'u', 'r', 'e', 'R', 'e', 'a', 's', 'o', 'n', '\022', '\035', '\n', '\n', 'r', 'o', 'u', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\023', 
-' ', '\001', '(', '\t', 'R', '\t', 'r', 'o', 'u', 't', 'e', 'N', 'a', 'm', 'e', '\022', 'f', '\n', ' ', 'd', 'o', 'w', 'n', 's', 't', 
-'r', 'e', 'a', 'm', '_', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 
-'s', '\030', '\024', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 
-'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 
-'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'r', '\n', '\024', 'f', 'i', 
-'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '_', 'o', 'b', 'j', 'e', 'c', 't', 's', '\030', '\025', ' ', '\003', '(', '\013', '2', 
-'@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 
-'.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 
-'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', 'E', 'n', 't', 'r', 'y', 'R', '\022', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 
-'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', '\022', 'Y', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', 
-'\030', '\026', ' ', '\003', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 
-'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'C', 'o', 'm', 'm', 'o', 'n', '.', 'C', 
-'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 
-'s', '\022', '5', '\n', '\010', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\027', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'd', 'u', 
-'r', 'a', 't', 'i', 'o', 'n', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 
-'t', '_', 'a', 't', 't', 'e', 'm', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '\030', '\030', ' ', '\001', '(', '\r', 'R', '\033', 'u', 'p', 
-'s', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'q', 'u', 'e', 's', 't', 'A', 't', 't', 'e', 'm', 'p', 't', 'C', 'o', 'u', 'n', 't', 
-'\022', 'D', '\n', '\036', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 
-'n', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\031', ' ', '\001', '(', '\t', 'R', '\034', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 
-'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\033', '\n', '\t', 's', 
-'t', 'r', 'e', 'a', 'm', '_', 'i', 'd', '\030', '\032', ' ', '\001', '(', '\t', 'R', '\010', 's', 't', 'r', 'e', 'a', 'm', 'I', 'd', '\022', 
-'A', '\n', '\026', 'i', 'n', 't', 'e', 'r', 'm', 'e', 'd', 'i', 'a', 't', 'e', '_', 'l', 'o', 'g', '_', 'e', 'n', 't', 'r', 'y', 
-'\030', '\033', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'i', 'n', 't', 'e', 
-'r', 'm', 'e', 'd', 'i', 'a', 't', 'e', 'L', 'o', 'g', 'E', 'n', 't', 'r', 'y', '\022', 'M', '\n', '#', 'd', 'o', 'w', 'n', 's', 
-'t', 'r', 'e', 'a', 'm', '_', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 
-'e', 'a', 's', 'o', 'n', '\030', '\034', ' ', '\001', '(', '\t', 'R', ' ', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'r', 
-'a', 'n', 's', 'p', 'o', 'r', 't', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'a', 's', 'o', 'n', '\022', ';', '\n', '\032', 'd', 
-'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', 
-'\030', '\035', ' ', '\001', '(', '\004', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 
-'e', 's', 'S', 'e', 'n', 't', '\022', 'C', '\n', '\036', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', 
-'_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\036', ' ', '\001', '(', '\004', 'R', '\033', 'd', 'o', 
-'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', 
-'\022', '7', '\n', '\030', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 'b', 'y', 't', 'e', 's', '_', 's', 
-'e', 'n', 't', '\030', '\037', ' ', '\001', '(', '\004', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 
-'t', 'e', 's', 'S', 'e', 'n', 't', '\022', '?', '\n', '\034', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'r', 'e', '_', 
-'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', ' ', ' ', '\001', '(', '\004', 'R', '\031', 'u', 'p', 's', 
-'t', 'r', 'e', 'a', 'm', 'W', 'i', 'r', 'e', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\022', 'N', '\n', 
-'\017', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 't', 'y', 'p', 'e', '\030', '!', ' ', '\001', '(', '\016', '2', '&', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 
-'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'R', '\r', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 
-'p', 'e', '\032', '[', '\n', '\027', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'O', 'b', 'j', 'e', 'c', 't', 's', 'E', 
-'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', 
-'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', '=', '\n', '\017', 'C', 
-'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', 
-'(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 
-'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 
-'t', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 
-'C', 'o', 'm', 'm', 'o', 'n', '\"', '\351', '\r', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', 
-'8', '\n', '\030', 'f', 'a', 'i', 'l', 'e', 'd', '_', 'l', 'o', 'c', 'a', 'l', '_', 'h', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 
-'c', 'k', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\026', 'f', 'a', 'i', 'l', 'e', 'd', 'L', 'o', 'c', 'a', 'l', 'H', 'e', 'a', 'l', 
-'t', 'h', 'c', 'h', 'e', 'c', 'k', '\022', '.', '\n', '\023', 'n', 'o', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'u', 'p', 's', 
-'t', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\021', 'n', 'o', 'H', 'e', 'a', 'l', 't', 'h', 'y', 'U', 'p', 's', 
-'t', 'r', 'e', 'a', 'm', '\022', '8', '\n', '\030', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 
-'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 
-'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '\037', '\n', '\013', 'l', 'o', 'c', 'a', 'l', '_', 'r', 'e', 
-'s', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\n', 'l', 'o', 'c', 'a', 'l', 'R', 'e', 's', 'e', 't', '\022', '2', '\n', '\025', 
-'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'r', 'e', 's', 'e', 't', '\030', '\005', ' ', '\001', 
-'(', '\010', 'R', '\023', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'R', 'e', 's', 'e', 't', '\022', '>', 
-'\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 
-'l', 'u', 'r', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\031', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 
-'c', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'F', '\n', '\037', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 
-'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\030', '\007', ' ', 
-'\001', '(', '\010', 'R', '\035', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 
-'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\022', '+', '\n', '\021', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'o', 'v', 'e', 
-'r', 'f', 'l', 'o', 'w', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'O', 'v', 'e', 'r', 
-'f', 'l', 'o', 'w', '\022', '$', '\n', '\016', 'n', 'o', '_', 'r', 'o', 'u', 't', 'e', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\t', ' ', 
-'\001', '(', '\010', 'R', '\014', 'n', 'o', 'R', 'o', 'u', 't', 'e', 'F', 'o', 'u', 'n', 'd', '\022', '%', '\n', '\016', 'd', 'e', 'l', 'a', 
-'y', '_', 'i', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\030', '\n', ' ', '\001', '(', '\010', 'R', '\r', 'd', 'e', 'l', 'a', 'y', 'I', 'n', 
-'j', 'e', 'c', 't', 'e', 'd', '\022', '%', '\n', '\016', 'f', 'a', 'u', 'l', 't', '_', 'i', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\030', 
-'\013', ' ', '\001', '(', '\010', 'R', '\r', 'f', 'a', 'u', 'l', 't', 'I', 'n', 'j', 'e', 'c', 't', 'e', 'd', '\022', '!', '\n', '\014', 'r', 
-'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 'e', 'd', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\013', 'r', 'a', 't', 'e', 'L', 'i', 
-'m', 'i', 't', 'e', 'd', '\022', 'f', '\n', '\024', 'u', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '_', 'd', 'e', 't', 
-'a', 'i', 'l', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 
-'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', 
-'.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', 'R', '\023', 'u', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 
-'e', 'd', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '7', '\n', '\030', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 's', 
-'e', 'r', 'v', 'i', 'c', 'e', '_', 'e', 'r', 'r', 'o', 'r', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\025', 'r', 'a', 't', 'e', 'L', 
-'i', 'm', 'i', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'E', 'r', 'r', 'o', 'r', '\022', 'J', '\n', '!', 'd', 'o', 'w', 'n', 's', 
-'t', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 
-'i', 'o', 'n', '\030', '\017', ' ', '\001', '(', '\010', 'R', '\037', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 
-'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\035', 'u', 'p', 's', 't', 
-'r', 'e', 'a', 'm', '_', 'r', 'e', 't', 'r', 'y', '_', 'l', 'i', 'm', 'i', 't', '_', 'e', 'x', 'c', 'e', 'e', 'd', 'e', 'd', 
-'\030', '\020', ' ', '\001', '(', '\010', 'R', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 't', 'r', 'y', 'L', 'i', 'm', 'i', 
-'t', 'E', 'x', 'c', 'e', 'e', 'd', 'e', 'd', '\022', '.', '\n', '\023', 's', 't', 'r', 'e', 'a', 'm', '_', 'i', 'd', 'l', 'e', '_', 
-'t', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\021', 's', 't', 'r', 'e', 'a', 'm', 'I', 'd', 'l', 'e', 
-'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'A', '\n', '\035', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'e', 'n', 'v', 'o', 'y', '_', 
-'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\022', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'n', 
-'v', 'a', 'l', 'i', 'd', 'E', 'n', 'v', 'o', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 
-':', '\n', '\031', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'e', 'r', 
-'r', 'o', 'r', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\027', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'o', 't', 
-'o', 'c', 'o', 'l', 'E', 'r', 'r', 'o', 'r', '\022', 'N', '\n', '$', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'm', 'a', 'x', 
-'_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'r', 'e', 'a', 'c', 'h', 'e', 'd', '\030', 
-'\024', ' ', '\001', '(', '\010', 'R', ' ', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 
-'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 'e', 'a', 'c', 'h', 'e', 'd', '\022', ';', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 
-'e', '_', 'f', 'r', 'o', 'm', '_', 'c', 'a', 'c', 'h', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\025', ' ', '\001', '(', '\010', 
-'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'r', 'o', 'm', 'C', 'a', 'c', 'h', 'e', 'F', 'i', 'l', 't', 'e', 'r', 
-'\022', '3', '\n', '\026', 'n', 'o', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'f', 'o', 'u', 'n', 
-'d', '\030', '\026', ' ', '\001', '(', '\010', 'R', '\023', 'n', 'o', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'F', 'o', 
-'u', 'n', 'd', '\022', ')', '\n', '\020', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\027', 
-' ', '\001', '(', '\010', 'R', '\017', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '6', '\n', '\027', 
-'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'e', 'r', 'r', 'o', 'r', '\030', '\030', 
-' ', '\001', '(', '\010', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'E', 'r', 'r', 
-'o', 'r', '\022', '(', '\n', '\020', 'n', 'o', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\031', ' ', 
-'\001', '(', '\010', 'R', '\016', 'n', 'o', 'C', 'l', 'u', 's', 't', 'e', 'r', 'F', 'o', 'u', 'n', 'd', '\022', ')', '\n', '\020', 'o', 'v', 
-'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'v', 'e', 
-'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '4', '\n', '\026', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 
-'u', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\024', 'd', 'n', 's', 'R', 
-'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\032', '\325', '\001', '\n', '\014', 'U', 'n', 'a', 'u', 
-'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 
-':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 
-'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 
-'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', '\n', '\006', 'R', 'e', 'a', 's', 
-'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', 
-'\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\001', ':', '9', 
-'\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
-'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 
-'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 
-'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 
-'a', 'g', 's', '\"', '\255', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'R', '\n', '\013', 
-'t', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 
-'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\n', 't', 'l', 's', 'V', 'e', 
-'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', 'e', 
-'\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', 'h', 'e', 'r', 'S', 'u', 'i', 
-'t', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', 
-'\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '~', '\n', '\034', 'l', 'o', 
-'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 
-'s', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 
-'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\032', 'l', 'o', 'c', 'a', 
-'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '|', '\n', 
-'\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 
-'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 
-'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 
-'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\031', 'p', 'e', 
-'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '$', 
-'\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\014', 't', 
-'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', 'f', 'i', 'n', 'g', 'e', 'r', 
-'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', 
-'n', 't', '\032', '\201', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 
-'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', '\030', '\001', 
-' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 
-'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 
-'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 
-'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\030', '\n', 
-'\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\032', '\222', 
-'\001', '\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\003', 'u', 'r', 'i', '\030', 
-'\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', '\002', ' ', '\001', '(', '\t', 
-'H', '\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 
-'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 
-'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 
-'.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', 'a', 'n', ':', 'B', '\232', 
-'\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 
-'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 
-'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', 'L', 'S', 'V', 'e', 'r', 
-'s', 'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 
-'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', 
-'1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', 
-'_', '3', '\020', '\004', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 
-'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 
-'\"', '\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 
-'s', '\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\001', ' ', '\001', '(', '\016', 
-'2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 
-'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\r', 'r', 
-'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\002', ' ', 
-'\001', '(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', 
-'\003', ' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '0', '\n', '\004', 'p', 'o', 'r', 't', '\030', 
-'\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 
-'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', 
-'\005', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', 
-'\030', '\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', '\007', 'r', 'e', 'f', 'e', 
-'r', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', '\n', '\r', 'f', 'o', 'r', 
-'w', 'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 
-'e', 'd', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\t', ' ', '\001', '(', '\t', 
-'R', '\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'p', 
-'a', 't', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', 'a', 't', 'h', '\022', '2', 
-'\n', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\013', 
-' ', '\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', 
-'\022', ',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\014', ' ', 
-'\001', '(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'k', '\n', '\017', 
-'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 
-'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 'q', 'u', 'e', 
-'s', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 
-'a', 'd', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 
-'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 
-'m', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', 'd', 'o', 'w', 'n', 's', 
-'t', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 
-'e', 'd', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 
-'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 
-'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 
-'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 
-'u', 'e', ':', '\002', '8', '\001', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', 
-'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 
-'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 
-'s', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 
-'c', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 
-'C', 'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 
-'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 
-'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'o', 'd', 'y', 
-'_', 'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 
-'y', 'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 
-'s', '\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 
-'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 
-'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 
-'r', 'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'r', '\n', '\021', 'r', 'e', 
-'s', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 
-'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 
-'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', 'e', 's', 'p', 'o', 'n', 
-'s', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 
-'d', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 
-'e', 'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 
-'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\007', ' ', '\001', 
-'(', '\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 
-'c', 'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 
-'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\031', 'd', 'o', 'w', 'n', 
-'s', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\032', 'B', '\n', '\024', 
-'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 
-'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', 
-'\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\032', 'C', '\n', '\025', 'R', 'e', 's', 'p', 'o', 'n', 's', 
-'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', 
-'(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 
-'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 
-'t', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 
-'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\207', '\002', '\n', '\r', 'A', 'c', 'c', 'e', 's', 's', 'L', 
-'o', 'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', '\n', '\024', 'T', 'c', 'p', 
-'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', '\017', '\n', '\013', 'T', 'c', 
-'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 
-'i', 'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'S', 't', 'a', 
-'r', 't', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 
-'c', '\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\006', '\022', '\025', '\n', 
-'\021', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', '\022', '\024', '\n', '\020', 'U', 
-'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', '\013', 'U', 'p', 's', 't', 
-'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'u', 
-'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 
-'e', 'd', '\020', '\n', 'B', '\215', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 
-'c', 'e', 's', 's', 'l', 'o', 'g', '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', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 
-'/', 'v', '3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
-'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[11] = {
-  &envoy_config_core_v3_address_proto_upbdefinit,
-  &envoy_config_core_v3_base_proto_upbdefinit,
-  &google_protobuf_any_proto_upbdefinit,
-  &google_protobuf_duration_proto_upbdefinit,
-  &google_protobuf_timestamp_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit = {
-  deps,
-  &envoy_data_accesslog_v3_accesslog_proto_upb_file_layout,
-  "envoy/data/accesslog/v3/accesslog.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 8931)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h
deleted file mode 100644
index 0365fbab04630..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/data/accesslog/v3/accesslog.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TCPAccessLogEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TCPAccessLogEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPAccessLogEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPAccessLogEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ConnectionProperties_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ConnectionProperties");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ResponseFlags_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ResponseFlags");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_ResponseFlags_Unauthorized_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.ResponseFlags.Unauthorized");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_CertificateProperties_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties.CertificateProperties");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPRequestProperties_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPRequestProperties");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_data_accesslog_v3_accesslog_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
deleted file mode 100644
index 35ed7d31ce8f1..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/clusters/aggregate/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
-#include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[481] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'c', 'l', 'u', 's', 't', 'e', 
-'r', 's', '/', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '/', 'v', '3', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 
-'r', 'o', 't', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'c', 'l', 
-'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '.', 'v', '3', '\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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
-'n', 'i', 'n', 'g', '.', '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', '\"', 'r', '\n', '\r', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 
-'i', 'g', '\022', '$', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', 
-'\222', '\001', '\002', '\010', '\001', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'a', 'g', 'g', 'r', 'e', 
-'g', 'a', 't', 'e', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 
-'g', 'B', '\251', '\001', '\n', '4', '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', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 
-'e', 'g', 'a', 't', 'e', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 
-'Y', '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', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '/', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 
-'/', 'v', '3', ';', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
-'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_clusters_aggregate_v3_cluster_proto_upb_file_layout,
-  "envoy/extensions/clusters/aggregate/v3/cluster.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 481)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
deleted file mode 100644
index 85a63d8d0c089..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/clusters/aggregate/v3/cluster.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.clusters.aggregate.v3.ClusterConfig");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
deleted file mode 100644
index fa1c04d29b96f..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/common/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/filters/common/fault/v3/fault.upbdefs.h"
-#include "envoy/extensions/filters/common/fault/v3/fault.upb.h"
-
-extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[1444] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
-'s', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 
-'r', 'o', 't', 'o', '\022', '(', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 
-'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', '\033', 'e', 'n', 
-'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', 
-'\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 
-'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 
-'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\304', 
-'\003', '\n', '\n', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '\022', 'F', '\n', '\013', 'f', 'i', 'x', 'e', 'd', '_', 'd', 'e', 
-'l', 'a', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'H', '\000', 'R', '\n', 
-'f', 'i', 'x', 'e', 'd', 'D', 'e', 'l', 'a', 'y', '\022', 'e', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'd', 'e', 'l', 'a', 
-'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 
-'s', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', 
-'.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', 'H', '\000', 
-'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 
-'g', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 
-'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 
-'t', 'a', 'g', 'e', '\032', 'I', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', ':', ':', '\232', '\305', '\210', '\036', 
-'5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 
-'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 
-'e', 'l', 'a', 'y', '\"', '\033', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', 'T', 'y', 'p', 'e', '\022', '\t', '\n', 
-'\005', 'F', 'I', 'X', 'E', 'D', '\020', '\000', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 
-'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 
-'t', 'D', 'e', 'l', 'a', 'y', 'B', '\033', '\n', '\024', 'f', 'a', 'u', 'l', 't', '_', 'd', 'e', 'l', 'a', 'y', '_', 's', 'e', 'c', 
-'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'R', '\004', 't', 
-'y', 'p', 'e', '\"', '\260', '\004', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', 'f', '\n', 
-'\013', 'f', 'i', 'x', 'e', 'd', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 
-'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 
-'t', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\n', 'f', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 
-'t', '\022', 'i', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', 'D', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', 
-'.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 
-'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', 
-'d', 'e', 'r', 'L', 'i', 'm', 'i', 't', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\002', ' ', 
-'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 
-'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', 
-'s', '\n', '\n', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\022', '&', '\n', '\n', 'l', 'i', 'm', 'i', 't', '_', 'k', 'b', 
-'p', 's', '\030', '\001', ' ', '\001', '(', '\004', 'B', '\007', '\372', 'B', '\004', '2', '\002', '(', '\001', 'R', '\t', 'l', 'i', 'm', 'i', 't', 'K', 
-'b', 'p', 's', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
-'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 
-'L', 'i', 'm', 'i', 't', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\032', 'M', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 
-'r', 'L', 'i', 'm', 'i', 't', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 
-'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', ':', '2', '\232', '\305', '\210', 
-'\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 
-'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'B', '\021', '\n', 
-'\n', 'l', 'i', 'm', 'i', 't', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'B', '\247', '\001', '\n', '6', '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', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', 
-'B', '\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'W', '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', '/', 'f', 'i', 'l', 
-'t', 'e', 'r', 's', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', ';', 'f', 'a', 'u', 'l', 
-'t', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[6] = {
-  &envoy_type_v3_percent_proto_upbdefinit,
-  &google_protobuf_duration_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_filters_common_fault_v3_fault_proto_upb_file_layout,
-  "envoy/extensions/filters/common/fault/v3/fault.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 1444)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
deleted file mode 100644
index 7466f434977ec..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/common/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultDelay_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultDelay");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
deleted file mode 100644
index 9453b2e2db86b..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
-#include "envoy/extensions/filters/http/fault/v3/fault.upb.h"
-
-extern _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_v3_percent_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[2069] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
-'s', '/', 'h', 't', 't', 'p', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', 
-'t', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 
-'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', 
-'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 
-'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 
-'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 
-'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 
-'t', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 
-'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 
-'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 
-'r', 's', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 
-'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', 
-'\244', '\003', '\n', '\n', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '\022', '.', '\n', '\013', 'h', 't', 't', 'p', '_', 's', 't', 
-'a', 't', 'u', 's', '\030', '\002', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'H', '\000', 
-'R', '\n', 'h', 't', 't', 'p', 'S', 't', 'a', 't', 'u', 's', '\022', '!', '\n', '\013', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 
-'u', 's', '\030', '\005', ' ', '\001', '(', '\r', 'H', '\000', 'R', '\n', 'g', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', '\022', 'c', '\n', 
-'\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 'b', 'o', 'r', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 
-'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 
-'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '.', 'H', 'e', 'a', 
-'d', 'e', 'r', 'A', 'b', 'o', 'r', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', '\022', '@', 
-'\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 
-'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', 'N', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 
-'b', 'o', 'r', 't', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 
-'l', 't', 'A', 'b', 'o', 'r', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', ':', '3', '\232', '\305', '\210', '\036', 
-'.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 
-'t', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', 'B', '\021', '\n', 
-'\n', 'e', 'r', 'r', 'o', 'r', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\001', '\020', '\002', '\"', '\307', '\010', 
-'\n', '\t', 'H', 'T', 'T', 'P', 'F', 'a', 'u', 'l', 't', '\022', 'J', '\n', '\005', 'd', 'e', 'l', 'a', 'y', '\030', '\001', ' ', '\001', '(', 
-'\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 
-'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 
-'D', 'e', 'l', 'a', 'y', 'R', '\005', 'd', 'e', 'l', 'a', 'y', '\022', 'H', '\n', '\005', 'a', 'b', 'o', 'r', 't', '\030', '\002', ' ', '\001', 
-'(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 
-'t', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 
-'b', 'o', 'r', 't', 'R', '\005', 'a', 'b', 'o', 'r', 't', '\022', ')', '\n', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 
-'l', 'u', 's', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 
-'s', 't', 'e', 'r', '\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 
-'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 
-'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', ')', '\n', '\020', 'd', 'o', 'w', 
-'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'n', 'o', 'd', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\017', 'd', 'o', 'w', 'n', 
-'s', 't', 'r', 'e', 'a', 'm', 'N', 'o', 'd', 'e', 's', '\022', 'H', '\n', '\021', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', 
-'_', 'f', 'a', 'u', 'l', 't', 's', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
-'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'm', 'a', 'x', 'A', 'c', 
-'t', 'i', 'v', 'e', 'F', 'a', 'u', 'l', 't', 's', '\022', 'h', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'r', 'a', 
-'t', 'e', '_', 'l', 'i', 'm', 'i', 't', '\030', '\007', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 
-'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 
-'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\021', 'r', 
-'e', 's', 'p', 'o', 'n', 's', 'e', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', '2', '\n', '\025', 'd', 'e', 'l', 'a', 'y', 
-'_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\023', 'd', 
-'e', 'l', 'a', 'y', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '2', '\n', '\025', 'a', 'b', 'o', 
-'r', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\t', ' ', '\001', '(', '\t', 'R', 
-'\023', 'a', 'b', 'o', 'r', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '4', '\n', '\026', 'd', 
-'e', 'l', 'a', 'y', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\n', ' ', '\001', 
-'(', '\t', 'R', '\024', 'd', 'e', 'l', 'a', 'y', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', 
-'9', '\n', '\031', 'a', 'b', 'o', 'r', 't', '_', 'h', 't', 't', 'p', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 
-'i', 'm', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\026', 'a', 'b', 'o', 'r', 't', 'H', 't', 't', 'p', 'S', 't', 'a', 't', 'u', 
-'s', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'f', 'a', 
-'u', 'l', 't', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\026', 'm', 'a', 'x', 'A', 'c', 
-'t', 'i', 'v', 'e', 'F', 'a', 'u', 'l', 't', 's', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', 'L', '\n', '#', 'r', 'e', 's', 'p', 
-'o', 'n', 's', 'e', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 
-'u', 'n', 't', 'i', 'm', 'e', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\037', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'R', 'a', 't', 
-'e', 'L', 'i', 'm', 'i', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'a', 
-'b', 'o', 'r', 't', '_', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', 
-'\016', ' ', '\001', '(', '\t', 'R', '\026', 'a', 'b', 'o', 'r', 't', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'R', 'u', 'n', 
-'t', 'i', 'm', 'e', '\022', 'G', '\n', ' ', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 
-'m', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '\017', ' ', '\001', '(', '\010', 'R', '\035', 'd', 'i', 
-'s', 'a', 'b', 'l', 'e', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 
-'t', 's', '\022', '@', '\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\020', ' ', '\001', 
-'(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 
-'c', 't', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', ':', '2', '\232', '\305', '\210', '\036', '-', 
-'\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 
-'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'F', 'a', 'u', 'l', 't', 'B', '\243', '\001', '\n', '4', 
-'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', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 
-'v', '3', 'B', '\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'U', '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', '/', 'f', 
-'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', ';', 'f', 'a', 'u', 'l', 
-'t', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[9] = {
-  &envoy_config_route_v3_route_components_proto_upbdefinit,
-  &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit,
-  &envoy_type_v3_percent_proto_upbdefinit,
-  &google_protobuf_struct_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_filters_http_fault_v3_fault_proto_upb_file_layout,
-  "envoy/extensions/filters/http/fault/v3/fault.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 2069)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
deleted file mode 100644
index 63d7d6f2132fc..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/fault/v3/fault.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_FaultAbort_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.FaultAbort");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_HTTPFault_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.fault.v3.HTTPFault");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
deleted file mode 100644
index 03e2cc930ec43..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h"
-#include "envoy/extensions/filters/http/rbac/v3/rbac.upb.h"
-
-extern _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit;
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-static const char descriptor[1080] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 
-'s', '/', 'h', 't', 't', 'p', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', 
-'\022', '%', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 
-'s', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 
-'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 
-'d', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 
-'p', 'r', 'o', 't', 'o', '\032', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', 
-'3', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 
-'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 
-'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\335', '\003', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', 
-'\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\027', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', 
-'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'W', '\n', 
-'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', 
-'\005', '\021', '\022', '\017', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', 
-'\010', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 
-'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 
-'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 
-'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', 
-'w', 'R', 'u', 'l', 'e', 's', '\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', 
-'\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
-'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 
-'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 
-'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', 
-'_', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', 
-'\025', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', ':', ',', '\232', 
-'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', 
-'.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', 
-'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\001', '(', '\013', '2', 
-'+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 
-'s', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', 
-':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 
-'t', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 
-'o', 'u', 't', 'e', 'J', '\004', '\010', '\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', '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', '.', 'f', 'i', 'l', 't', 
-'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 
-'t', 'o', 'P', '\001', 'Z', 'S', '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', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'h', 't', 't', 'p', '/', 
-'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 
-'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[7] = {
-  &envoy_config_rbac_v3_rbac_proto_upbdefinit,
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &xds_type_matcher_v3_matcher_proto_upbdefinit,
-  &udpa_annotations_migrate_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout,
-  "envoy/extensions/filters/http/rbac/v3/rbac.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 1080)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
deleted file mode 100644
index ec65dcc99fb4f..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/filters/http/rbac/v3/rbac.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBAC_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.rbac.v3.RBAC");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBACPerRoute_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.filters.http.rbac.v3.RBACPerRoute");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
deleted file mode 100644
index c440af64eaab4..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h"
-#include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h"
-
-extern _upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[487] = {'\n', '=', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'h', 't', 't', 'p', '/', 's', 
-'t', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '/', 'c', 'o', 'o', 'k', 'i', 'e', '/', 'v', '3', 
-'/', 'c', 'o', 'o', 'k', 'i', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '0', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 
-'n', 's', 'i', 'o', 'n', 's', '.', 'h', 't', 't', 'p', '.', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 
-'i', 'o', 'n', '.', 'c', 'o', 'o', 'k', 'i', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', 
-'/', 'h', 't', 't', 'p', '/', 'v', '3', '/', 'c', 'o', 'o', 'k', 'i', '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', '\"', 'W', '\n', '\027', 'C', 'o', 'o', 'k', 'i', 'e', 'B', 'a', 's', 'e', 'd', 'S', 'e', 's', 's', 'i', 'o', 'n', 'S', 
-'t', 'a', 't', 'e', '\022', '<', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'B', '\010', 
-'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', 'B', '\271', '\001', '\n', '>', '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', '.', 'h', 't', 't', 'p', '.', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '.', 'c', 
-'o', 'o', 'k', 'i', 'e', '.', 'v', '3', 'B', '\013', 'C', 'o', 'o', 'k', 'i', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '`', 
-'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', '/', 'h', 't', 't', 'p', '/', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 's', 'e', 's', 's', 'i', 
-'o', 'n', '/', 'c', 'o', 'o', 'k', 'i', 'e', '/', 'v', '3', ';', 'c', 'o', 'o', 'k', 'i', 'e', '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_type_http_v3_cookie_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upb_file_layout,
-  "envoy/extensions/http/stateful_session/cookie/v3/cookie.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 487)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
deleted file mode 100644
index 3afb4063c9a06..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/http/stateful_session/cookie/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_http_stateful_session_cookie_v3_cookie_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
deleted file mode 100644
index c3820d5574561..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h"
-#include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
-
-extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[4224] = {'\n', '6', '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', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', 
-'.', 'p', 'r', 'o', 't', 'o', '\022', ')', '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', '.', 't', 'l', 's', '.', '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', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 
-'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 
-'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', 
-'.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 
-'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 
-'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 
-'t', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 
-'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', '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', 
-'!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 
-'i', 'n', 'g', '.', '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', '\"', '\245', '\004', '\n', '\r', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 
-'r', 's', '\022', '\217', '\001', '\n', '\034', 't', 'l', 's', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 
-'o', 'l', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 'D', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 
-'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 
-'s', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\217', 
-'\001', '\n', '\034', 't', 'l', 's', '_', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 
-'e', 'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', 'D', '.', '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', '.', 
-'t', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', 's', 'P', 
-'r', 'o', 't', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', 'a', 'x', 
-'i', 'm', 'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '#', '\n', '\r', 'c', 'i', 
-'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\014', 'c', 'i', 'p', 'h', 'e', 'r', 
-'S', 'u', 'i', 't', 'e', 's', '\022', '\037', '\n', '\013', 'e', 'c', 'd', 'h', '_', 'c', 'u', 'r', 'v', 'e', 's', '\030', '\004', ' ', '\003', 
-'(', '\t', 'R', '\n', 'e', 'c', 'd', 'h', 'C', 'u', 'r', 'v', 'e', 's', '\022', '1', '\n', '\024', 's', 'i', 'g', 'n', 'a', 't', 'u', 
-'r', 'e', '_', 'a', 'l', 'g', 'o', 'r', 'i', 't', 'h', 'm', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\023', 's', 'i', 'g', 'n', 
-'a', 't', 'u', 'r', 'e', 'A', 'l', 'g', 'o', 'r', 'i', 't', 'h', 'm', 's', '\"', 'O', '\n', '\013', 'T', 'l', 's', 'P', 'r', 'o', 
-'t', 'o', 'c', 'o', 'l', '\022', '\014', '\n', '\010', 'T', 'L', 'S', '_', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\013', '\n', '\007', 'T', 'L', 
-'S', 'v', '1', '_', '0', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 
-'L', 'S', 'v', '1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '3', '\020', '\004', ':', '&', '\232', '\305', 
-'\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 
-'s', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\"', '\317', '\001', '\n', '\022', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 
-'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', ',', '\n', '\r', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
-'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 
-'r', 'N', 'a', 'm', 'e', '\022', 'A', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', 
-'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', 
-'\006', '\270', '\267', '\213', '\244', '\002', '\001', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '+', '\232', 
-'\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'P', 
-'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 
-'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\310', '\005', '\n', 
-'\016', 'T', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'M', '\n', '\021', 'c', 'e', 'r', 't', 'i', 'f', 
-'i', 'c', 'a', 't', 'e', '_', 'c', 'h', 'a', 'i', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 
-'e', 'R', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'h', 'a', 'i', 'n', '\022', 'I', '\n', '\013', 'p', 'r', 
-'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', 
-'\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\n', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', '\022', '@', '\n', '\006', 'p', 'k', 
-'c', 's', '1', '2', '\030', '\010', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', 
-'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', 
-'\002', '\001', 'R', '\006', 'p', 'k', 'c', 's', '1', '2', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 
-'e', 'c', 't', 'o', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 
-'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 
-'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'o', '\n', '\024', 'p', 
-'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', 
-'2', '=', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'P', 'r', 'i', 'v', 'a', 
-'t', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'R', '\022', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 
-'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', 'D', '\n', '\010', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '\030', '\003', ' ', '\001', '(', 
-'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 
-'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\010', 'p', 'a', 's', 's', 'w', 
-'o', 'r', 'd', '\022', 'A', '\n', '\013', 'o', 'c', 's', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', 
-' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 
-'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'o', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', '\022', 'b', '\n', '\034', 's', 
-'i', 'g', 'n', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 
-'m', 'p', '\030', '\005', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 
-'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\032', 's', 'i', 'g', 'n', 'e', 'd', 
-'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', ':', '\'', '\232', '\305', '\210', 
-'\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 
-'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\"', '\213', '\001', '\n', '\024', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 
-'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'D', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', '\013', 
-'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 
-'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\016', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', '\270', '\267', '\213', '\244', '\002', '\001', 
-'R', '\004', 'k', 'e', 'y', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 
-'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 
-'e', 'y', 's', '\"', 's', '\n', '!', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 
-'r', 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', '#', '\n', '\r', 'i', 'n', 's', 't', 'a', 'n', 
-'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\014', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'N', 'a', 
-'m', 'e', '\022', ')', '\n', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', 
-'\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\"', '\244', '\002', '\n', '\025', 
-'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'o', '\n', '\010', 
-'s', 'a', 'n', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', 'H', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'S', 'a', 'n', 'T', 'y', 'p', 'e', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\000', 
-'R', '\007', 's', 'a', 'n', 'T', 'y', 'p', 'e', '\022', 'H', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\001', '(', 
-'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
-'.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', 
-'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\"', 'P', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', '\024', 'S', 'A', 
-'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'E', 
-'M', 'A', 'I', 'L', '\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', '\020', '\003', '\022', 
-'\016', '\n', '\n', 'I', 'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\"', '\220', '\014', '\n', '\034', 'C', 'e', 'r', 't', 'i', 
-'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'W', 
-'\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 
-'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 
-'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', '\255', '\001', '\n', ' ', 'c', 'a', '_', 'c', 'e', 'r', 't', 'i', 
-'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', 
-'\r', ' ', '\001', '(', '\013', '2', 'L', '.', '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', '.', 't', 'l', 's', '.', 'v', '3', '.', 
-'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 
-'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', 
-'_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 
-'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 
-'d', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\013', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 
-'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 
-'c', 't', 'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'F', 
-'\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'p', 'k', 'i', 
-'\030', '\003', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', 'R', '\025', 'v', 
-'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', '\n', '\027', 'v', 
-'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', '\030', '\002', ' ', 
-'\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', 'e', 'r', 'i', 
-'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', 'a', 's', 'h', '\022', '\202', '\001', '\n', '\035', 'm', 'a', 't', 
-'c', 'h', '_', 't', 'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 
-'s', '\030', '\017', ' ', '\003', '(', '\013', '2', '@', '.', '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', '.', 't', 'l', 's', '.', 'v', 
-'3', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\031', 
-'m', 'a', 't', 'c', 'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', 
-'\022', 'h', '\n', '\027', 'm', 'a', 't', 'c', 'h', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 
-'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\013', '\030', '\001', 
-'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 
-'t', 'N', 'a', 'm', 'e', 's', '\022', 'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', 'e', 'd', '_', 
-'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', '\006', ' ', '\001', 
-'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 
-'V', 'a', 'l', 'u', 'e', 'R', '!', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 
-'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', '\030', '\007', ' ', 
-'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', 
-'3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', 'l', 'l', 'o', 
-'w', '_', 'e', 'x', 'p', 'i', 'r', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\010', ' ', '\001', 
-'(', '\010', 'R', '\027', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 
-'t', 'e', '\022', '\242', '\001', '\n', '\030', 't', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', 'i', 'f', 'i', 
-'c', 'a', 't', 'i', 'o', 'n', '\030', '\n', ' ', '\001', '(', '\016', '2', '^', '.', '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', '.', 
-'t', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 
-'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 
-'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', 'u', 's', 't', 
-'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', 'b', '\n', '\027', 'c', 'u', 's', 't', 
-'o', 'm', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', '\001', '(', '\013', 
-'2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 
-'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 'c', 'u', 's', 't', 
-'o', 'm', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', 'n', 'l', 'y', 
-'_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', '\016', ' ', '\001', 
-'(', '\010', 'R', '\025', 'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', 'C', 'r', 'l', 
-'\022', 'O', '\n', '\020', 'm', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\030', '\020', ' ', '\001', '(', 
-'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', 
-'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', 'r', 'i', 'f', 
-'y', 'D', 'e', 'p', 't', 'h', '\"', 'F', '\n', '\026', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 
-'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\022', 'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', 'S', 'T', '_', 'C', 
-'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', 'U', 'S', 'T', 'E', 
-'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 
-'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 
-'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\027', 'v', 'e', 'r', 
-'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', '\250', '\001', '\n', '7', 
-'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', '.', 't', 
-'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'V', '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', '/', 't', 'l', 's', '/', 
-'v', '3', ';', 't', 'l', 's', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[12] = {
-  &envoy_config_core_v3_base_proto_upbdefinit,
-  &envoy_config_core_v3_extension_proto_upbdefinit,
-  &envoy_type_matcher_v3_string_proto_upbdefinit,
-  &google_protobuf_any_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_migrate_proto_upbdefinit,
-  &udpa_annotations_sensitive_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit = {
-  deps,
-  &envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout,
-  "envoy/extensions/transport_sockets/tls/v3/common.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 4224)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
deleted file mode 100644
index d21f54107b927..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/extensions/transport_sockets/tls/v3/common.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsParameters_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsParameters");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsCertificate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsCertificate");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c
deleted file mode 100644
index 6d8a6e7460749..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/http/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/http/v3/cookie.upbdefs.h"
-#include "envoy/type/http/v3/cookie.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[388] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'h', 't', 't', 'p', '/', 'v', '3', '/', 'c', 'o', 'o', 'k', 
-'i', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', 
-'.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 
-'t', 'i', 'o', 'n', '.', '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', '\"', 'p', '\n', '\006', 'C', 'o', 'o', 'k', 'i', 
-'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', 
-'\004', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
-'\252', '\001', '\002', '2', '\000', 'R', '\003', 't', 't', 'l', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', 
-'\004', 'p', 'a', 't', 'h', 'B', '{', '\n', ' ', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 
-'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', 'B', '\013', 'C', 'o', 'o', 'k', 'i', 'e', 'P', 
-'r', 'o', 't', 'o', 'P', '\001', 'Z', '@', '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', '/', 't', 'y', 'p', 'e', '/', 'h', 't', 't', 'p', '/', 'v', '3', ';', 'h', 't', 't', 'p', 'v', '3', '\272', '\200', '\310', 
-'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &google_protobuf_duration_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit = {
-  deps,
-  &envoy_type_http_v3_cookie_proto_upb_file_layout,
-  "envoy/type/http/v3/cookie.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 388)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h
deleted file mode 100644
index 638eb3fec1a8f..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/http/v3/cookie.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_http_v3_cookie_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_http_v3_Cookie_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_http_v3_cookie_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.http.v3.Cookie");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c
deleted file mode 100644
index cdfbf61cdbc04..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/matcher/v3/http_inputs.upbdefs.h"
-#include "envoy/type/matcher/v3/http_inputs.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[656] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'h', 
-'t', 't', 'p', '_', 'i', 'n', 'p', 'u', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 
-'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\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', '\"', 'K', '\n', '\033', 'H', 
-'t', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 
-'t', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 
-'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\"', 'L', '\n', 
-'\034', 'H', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'I', 
-'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
-'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', 
-'\"', 'L', '\n', '\034', 'H', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 
-'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', 
-'\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 
-'a', 'm', 'e', '\"', 'M', '\n', '\035', 'H', 't', 't', 'p', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 
-'r', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', ',', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 
-'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 
-'d', 'e', 'r', 'N', 'a', 'm', 'e', '\"', 'K', '\n', '\037', 'H', 't', 't', 'p', 'R', 'e', 'q', 'u', 'e', 's', 't', 'Q', 'u', 'e', 
-'r', 'y', 'P', 'a', 'r', 'a', 'm', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', '\022', '(', '\n', '\013', 'q', 'u', 'e', 'r', 
-'y', '_', 'p', 'a', 'r', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'q', 
-'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'B', '\210', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 
-'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', 
-'\017', 'H', 't', 't', 'p', 'I', 'n', 'p', 'u', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 
-'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
-'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_matcher_v3_http_inputs_proto_upbdefinit = {
-  deps,
-  &envoy_type_matcher_v3_http_inputs_proto_upb_file_layout,
-  "envoy/type/matcher/v3/http_inputs.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 656)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h
deleted file mode 100644
index a416f6ad77298..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_http_inputs_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestHeaderMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestHeaderMatchInput");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestTrailerMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestTrailerMatchInput");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseHeaderMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpResponseHeaderMatchInput");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseTrailerMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpResponseTrailerMatchInput");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.HttpRequestQueryParamMatchInput");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
deleted file mode 100644
index 206169d75cf15..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/matcher/v3/metadata.upbdefs.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_value_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[718] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 
-'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 'a', 'l', 'u', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 
-'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\377', '\002', '\n', '\017', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\037', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', 
-'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'P', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', 
-' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 
-'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'C', '\n', 
-'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', 
-'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '\026', '\n', '\006', 'i', 'n', 'v', 'e', 'r', 
-'t', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\006', 'i', 'n', 'v', 'e', 'r', 't', '\032', 'q', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 
-'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
-'\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
-'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', 
-'\022', '\003', '\370', 'B', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\206', 
-'\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
-'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'P', 'r', 
-'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[5] = {
-  &envoy_type_matcher_v3_value_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit = {
-  deps,
-  &envoy_type_matcher_v3_metadata_proto_upb_file_layout,
-  "envoy/type/matcher/v3/metadata.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 718)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h
deleted file mode 100644
index 02e1864560844..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_metadata_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.MetadataMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_PathSegment_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.MetadataMatcher.PathSegment");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
deleted file mode 100644
index 7f1f40c4c9981..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/matcher/v3/regex.upbdefs.h"
-#include "envoy/type/matcher/v3/regex.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[906] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 
-'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 
-'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'s', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\326', '\002', '\n', '\014', 'R', 'e', 
-'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '[', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', '2', '\030', 
-'\001', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 
-'E', '2', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 
-'R', 'e', '2', '\022', '\035', '\n', '\005', 'r', 'e', 'g', 'e', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
-'\020', '\001', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\032', '\222', '\001', '\n', '\t', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', '\022', 'S', 
-'\n', '\020', 'm', 'a', 'x', '_', 'p', 'r', 'o', 'g', 'r', 'a', 'm', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 
-'\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 
-'a', 'l', 'u', 'e', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\016', 'm', 'a', 'x', 'P', 'r', 'o', 
-'g', 'r', 'a', 'm', 'S', 'i', 'z', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
-'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'G', 
-'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
-'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\r', 
-'\n', '\013', 'e', 'n', 'g', 'i', 'n', 'e', '_', 't', 'y', 'p', 'e', '\"', '\306', '\001', '\n', '\027', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 
-'t', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', '\022', 'G', '\n', '\007', 'p', 'a', 't', 't', 'e', 
-'r', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', 
-'\212', '\001', '\002', '\020', '\001', 'R', '\007', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '/', '\n', '\014', 's', 'u', 'b', 's', 't', 'i', 't', 
-'u', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', 
-'\014', 's', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 
-'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 
-'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'B', '\203', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 
-'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', 'B', '\n', 'R', 'e', 'g', 'e', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 
-'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 
-'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[6] = {
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &envoy_annotations_deprecation_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit = {
-  deps,
-  &envoy_type_matcher_v3_regex_proto_upb_file_layout,
-  "envoy/type/matcher/v3/regex.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 906)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h
deleted file mode 100644
index 91cb6e36d7169..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatcher_GoogleRE2_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatcher.GoogleRE2");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatchAndSubstitute_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_regex_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.RegexMatchAndSubstitute");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
deleted file mode 100644
index b7b22d63cd84c..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/matcher/v3/string.upbdefs.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[811] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
-'t', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
-'n', 'i', 'n', 'g', '.', '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', '\"', '\321', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 'e', 'x', 'a', 
-'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', 
-'\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\030', '\003', ' ', 
-'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\022', 'N', '\n', 
-'\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', 
-'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 
-'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', 
-'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', 
-'\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 
-'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', 
-'\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', 
-'\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
-'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', 
-'\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', 
-'.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', 
-'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', '/', 't', 'y', 'p', 'e', '/', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', 
-'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[5] = {
-  &envoy_type_matcher_v3_regex_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit = {
-  deps,
-  &envoy_type_matcher_v3_string_proto_upb_file_layout,
-  "envoy/type/matcher/v3/string.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 811)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h
deleted file mode 100644
index 190a145d28713..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StringMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_string_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StringMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_ListStringMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_string_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.ListStringMatcher");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c
deleted file mode 100644
index 6bc6267ee58e4..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/matcher/v3/struct.upbdefs.h"
-#include "envoy/type/matcher/v3/struct.upb.h"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_value_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[649] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
-'t', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 'a', 'l', 'u', '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', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
-'n', 'i', 'n', 'g', '.', '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', '\"', '\276', '\002', '\n', '\r', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '\022', 'N', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', 
-'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', 
-'\010', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'C', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '#', 
-'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'V', 'a', 
-'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 
-'u', 'e', '\032', 'o', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', 
-'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '3', '\232', '\305', 
-'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 
-'t', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', 
-'\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\003', '\370', 'B', '\001', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 
-'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', 
-'a', 't', 'c', 'h', 'e', 'r', 'B', '\204', '\001', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 
-'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'F', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 
-'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[5] = {
-  &envoy_type_matcher_v3_value_proto_upbdefinit,
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_matcher_v3_struct_proto_upbdefinit = {
-  deps,
-  &envoy_type_matcher_v3_struct_proto_upb_file_layout,
-  "envoy/type/matcher/v3/struct.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 649)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h
deleted file mode 100644
index b9bfd08885972..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/matcher/v3/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_matcher_v3_struct_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StructMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_PathSegment_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.matcher.v3.StructMatcher.PathSegment");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
deleted file mode 100644
index 6a128d9080d35..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/metadata/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/metadata/v3/metadata.upbdefs.h"
-#include "envoy/type/metadata/v3/metadata.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[1179] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '/', 'v', '3', '/', 
-'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 
-'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '\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', '!', 'u', 'd', 'p', 'a', 
-'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', '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', '\"', '\225', '\002', '\n', '\013', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '\031', '\n', '\003', 'k', 
-'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', '\022', 'M', '\n', 
-'\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 
-'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '.', 'P', 
-'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\004', 'p', 'a', 't', 
-'h', '\032', 'q', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', '\001', 
-' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', 
-'\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', 
-'2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 
-'B', '\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\003', '\370', 'B', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 
-'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 
-'t', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\"', '\322', '\004', '\n', '\014', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 
-'d', '\022', 'H', '\n', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 
-'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 
-'t', 'a', 'K', 'i', 'n', 'd', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', '\000', 'R', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', 
-'\022', 'B', '\n', '\005', 'r', 'o', 'u', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 
-'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 
-'i', 'n', 'd', '.', 'R', 'o', 'u', 't', 'e', 'H', '\000', 'R', '\005', 'r', 'o', 'u', 't', 'e', '\022', 'H', '\n', '\007', 'c', 'l', 'u', 
-'s', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
-'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'C', 
-'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', '?', '\n', '\004', 'h', 'o', 's', 't', 
-'\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 
-'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'H', 'o', 's', 't', 'H', 
-'\000', 'R', '\004', 'h', 'o', 's', 't', '\032', '=', '\n', '\007', 'R', 'e', 'q', 'u', 'e', 's', 't', ':', '2', '\232', '\305', '\210', '\036', '-', 
-'\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 
-'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '9', '\n', '\005', 'R', 
-'o', 'u', 't', 'e', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 
-'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'R', 
-'o', 'u', 't', 'e', '\032', '=', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 
-'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 
-'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', '7', '\n', '\004', 'H', 'o', 's', 't', 
-':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 
-'a', 't', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', '.', 'H', 'o', 's', 't', ':', 
-'*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 
-'t', 'a', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'i', 'n', 'd', 'B', '\013', '\n', '\004', 'k', 'i', 'n', 
-'d', '\022', '\003', '\370', 'B', '\001', 'B', '\211', '\001', '\n', '$', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 
-'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', 'B', '\r', 'M', 
-'e', 't', 'a', 'd', 'a', 't', 'a', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'H', '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', '/', 't', 'y', 'p', 'e', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '/', 
-'v', '3', ';', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 
-'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_metadata_v3_metadata_proto_upbdefinit = {
-  deps,
-  &envoy_type_metadata_v3_metadata_proto_upb_file_layout,
-  "envoy/type/metadata/v3/metadata.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 1179)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h
deleted file mode 100644
index c923119537588..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/metadata/v3/metadata.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_metadata_v3_metadata_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKey_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKey");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKey_PathSegment_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKey.PathSegment");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Request_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Request");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Route_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Route");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Cluster_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Cluster");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Host_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_metadata_v3_metadata_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.metadata.v3.MetadataKind.Host");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
deleted file mode 100644
index cc1a3b453e76d..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/v3/http.upbdefs.h"
-#include "envoy/type/v3/http.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-static const char descriptor[245] = {'\n', '\030', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 
-'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\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', '*', '2', '\n', 
-'\017', 'C', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '1', 
-'\020', '\000', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\001', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', '\020', '\002', 'B', 
-'o', '\n', '\033', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
-'p', 'e', '.', 'v', '3', 'B', '\t', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ';', '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', '/', 't', 'y', 'p', 'e', '/', 'v', '3', ';', 't', 'y', 
-'p', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit = {
-  deps,
-  &envoy_type_v3_http_proto_upb_file_layout,
-  "envoy/type/v3/http.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 245)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h
deleted file mode 100644
index 484bce20fab1e..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
deleted file mode 100644
index 2c2413edd1382..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "envoy/type/v3/range.upbdefs.h"
-#include "envoy/type/v3/range.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-static const char descriptor[484] = {'\n', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\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', '!', 
-'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
-'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', 'R', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', 
-'\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 
-'d', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 
-'y', '.', 't', 'y', 'p', 'e', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', '\"', 'R', '\n', '\n', 'I', 'n', 't', '3', 
-'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
-'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', ':', '\034', '\232', '\305', 
-'\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 
-'e', '\"', 'T', '\n', '\013', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', 
-'\030', '\001', ' ', '\001', '(', '\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', 
-'\001', 'R', '\003', 'e', 'n', 'd', ':', '\035', '\232', '\305', '\210', '\036', '\030', '\n', '\026', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
-'.', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'B', 'p', '\n', '\033', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 
-'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 
-'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ';', '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', '/', 't', 'y', 'p', 'e', '/', 'v', '3', ';', 't', 'y', 'p', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', 
-'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  &udpa_annotations_versioning_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit = {
-  deps,
-  &envoy_type_v3_range_proto_upb_file_layout,
-  "envoy/type/v3/range.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 484)
-};
diff --git a/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h
deleted file mode 100644
index 78c8491acba31..0000000000000
--- a/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     envoy/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *envoy_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.Int64Range");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.Int32Range");
-}
-
-UPB_INLINE const upb_MessageDef *envoy_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &envoy_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "envoy.type.v3.DoubleRange");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/google/api/http.upbdefs.c b/src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
deleted file mode 100644
index fbfc9b627d3b3..0000000000000
--- a/src/core/ext/upbdefs-generated/google/api/http.upbdefs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "google/api/http.upbdefs.h"
-#include "google/api/http.upb.h"
-
-static const char descriptor[684] = {'\n', '\025', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\n', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '\"', 'y', '\n', '\004', 'H', 't', 't', 'p', '\022', '*', '\n', '\005', 'r', 'u', 'l', 
-'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'H', 't', 't', 
-'p', 'R', 'u', 'l', 'e', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'E', '\n', '\037', 'f', 'u', 'l', 'l', 'y', '_', 'd', 'e', 'c', 
-'o', 'd', 'e', '_', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'e', 'x', 'p', 'a', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', 
-'\001', '(', '\010', 'R', '\034', 'f', 'u', 'l', 'l', 'y', 'D', 'e', 'c', 'o', 'd', 'e', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'E', 
-'x', 'p', 'a', 'n', 's', 'i', 'o', 'n', '\"', '\332', '\002', '\n', '\010', 'H', 't', 't', 'p', 'R', 'u', 'l', 'e', '\022', '\032', '\n', '\010', 
-'s', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\010', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', 
-'\022', '\n', '\003', 'g', 'e', 't', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'g', 'e', 't', '\022', '\022', '\n', '\003', 'p', 'u', 
-'t', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'p', 'u', 't', '\022', '\024', '\n', '\004', 'p', 'o', 's', 't', '\030', '\004', ' ', 
-'\001', '(', '\t', 'H', '\000', 'R', '\004', 'p', 'o', 's', 't', '\022', '\030', '\n', '\006', 'd', 'e', 'l', 'e', 't', 'e', '\030', '\005', ' ', '\001', 
-'(', '\t', 'H', '\000', 'R', '\006', 'd', 'e', 'l', 'e', 't', 'e', '\022', '\026', '\n', '\005', 'p', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', 
-'(', '\t', 'H', '\000', 'R', '\005', 'p', 'a', 't', 'c', 'h', '\022', '7', '\n', '\006', 'c', 'u', 's', 't', 'o', 'm', '\030', '\010', ' ', '\001', 
-'(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 't', 't', 
-'p', 'P', 'a', 't', 't', 'e', 'r', 'n', 'H', '\000', 'R', '\006', 'c', 'u', 's', 't', 'o', 'm', '\022', '\022', '\n', '\004', 'b', 'o', 'd', 
-'y', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\004', 'b', 'o', 'd', 'y', '\022', '#', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 
-'_', 'b', 'o', 'd', 'y', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 'y', 
-'\022', 'E', '\n', '\023', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', '_', 'b', 'i', 'n', 'd', 'i', 'n', 'g', 's', '\030', '\013', 
-' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'H', 't', 't', 'p', 'R', 'u', 'l', 
-'e', 'R', '\022', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'B', 'i', 'n', 'd', 'i', 'n', 'g', 's', 'B', '\t', '\n', '\007', 
-'p', 'a', 't', 't', 'e', 'r', 'n', '\"', ';', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 't', 't', 'p', 'P', 'a', 't', 't', 
-'e', 'r', 'n', '\022', '\022', '\n', '\004', 'k', 'i', 'n', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'k', 'i', 'n', 'd', '\022', '\022', 
-'\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', 'B', 'j', '\n', '\016', 'c', 'o', 'm', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', 'B', '\t', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 
-'A', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 
-'t', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', 's', ';', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\370', '\001', '\001', '\242', '\002', '\004', 'G', 'A', 'P', 
-'I', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[1] = {
-  NULL
-};
-
-_upb_DefPool_Init google_api_http_proto_upbdefinit = {
-  deps,
-  &google_api_http_proto_upb_file_layout,
-  "google/api/http.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 684)
-};
diff --git a/src/core/ext/upbdefs-generated/google/api/http.upbdefs.h b/src/core/ext/upbdefs-generated/google/api/http.upbdefs.h
deleted file mode 100644
index 8ee6c892ba475..0000000000000
--- a/src/core/ext/upbdefs-generated/google/api/http.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/api/http.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
-#define GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init google_api_http_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *google_api_Http_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.api.Http");
-}
-
-UPB_INLINE const upb_MessageDef *google_api_HttpRule_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.api.HttpRule");
-}
-
-UPB_INLINE const upb_MessageDef *google_api_CustomHttpPattern_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_api_http_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.api.CustomHttpPattern");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c b/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
deleted file mode 100644
index 3255e7ad94b3e..0000000000000
--- a/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "google/protobuf/descriptor.upbdefs.h"
-#include "google/protobuf/descriptor.upb.h"
-
-static const char descriptor[10979] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
-'t', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', 
-'\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\004', 'f', 'i', 'l', 'e', '\"', '\376', '\004', '\n', '\023', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 
-'\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', 
-'\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', 
-'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', 'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 
-'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', 'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 
-'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', 
-'(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', 
-'s', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', 
-'\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 
-'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 
-'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', 
-'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 
-'s', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', 
-'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 
-'e', 'I', 'n', 'f', 'o', 'R', '\016', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', 
-'s', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '\030', '\n', '\007', 'e', 
-'d', 'i', 't', 'i', 'o', 'n', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\"', '\271', '\006', '\n', 
-'\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', 
-'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', '(', 
-'\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 
-'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', '\n', 
-'\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 
-'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', 'e', 
-'d', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\n', 'n', 'e', 
-'s', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', 
-'(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 
-'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 
-'\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', '\013', 
-'2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 
-'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'R', 
-'\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', '_', 
-'d', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', 
-'(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 
-'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', 'e', 
-'s', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 
-'t', 'o', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 
-'d', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\n', 
-' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', 't', 
-'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', 
-'\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 
-'d', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 
-'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', 'e', 
-'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', 
-'\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', 
-'\307', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 
-'\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', 
-'\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 
-'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a', 'r', 
-'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 
-'s', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l', 'a', 
-'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', '2', 
-'\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 
-'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'h', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 
-'t', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 
-'.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E', 'R', 
-'I', 'F', 'I', 'E', 'D', 'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\224', '\001', '\n', '\013', 'D', 
-'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\001', ' ', '\001', '(', 
-'\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', 
-'\001', '(', '\t', 'R', '\010', 'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', 
-'(', '\t', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\030', '\005', ' ', '\001', '(', 
-'\010', 'R', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '\030', '\006', 
-' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020', '\005', '\"', '4', '\n', '\021', 'V', 
-'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n', '\013', 'D', 'E', 'C', 'L', 'A', 
-'R', 'A', 'T', 'I', 'O', 'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', '\020', '\001', '*', 
-'\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 
-'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
-'\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 
-'m', 'b', 'e', 'r', '\022', 'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 
-'t', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', 'e', 'l', '\022', '>', '\n', '\004', 
-'t', 'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 
-'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', 
-' ', '\001', '(', '\t', 'R', '\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 
-'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 
-'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 
-'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', '\030', '\t', ' ', '\001', '(', '\005', 
-'R', '\n', 'o', 'n', 'e', 'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 'a', 'm', 'e', 
-'\030', '\n', ' ', '\001', '(', '\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 
-'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '\'', 
-'\n', '\017', 'p', 'r', 'o', 't', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\016', 
-'p', 'r', 'o', 't', 'o', '3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '\017', 
-'\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'F', 
-'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', '\n', 
-'\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 
-'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', '\020', 
-'\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 
-'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', '\016', 
-'\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 
-'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', '\017', 
-'\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'E', 
-'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', '\022', 
-'\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 
-'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', '4', 
-'\020', '\022', '\"', 'C', '\n', '\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'O', 'P', 'T', 'I', 
-'O', 'N', 'A', 'L', '\020', '\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', 
-'\002', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '\020', '\003', '\"', 'c', '\n', '\024', 
-'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 
-'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 
-'s', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\343', '\002', 
-'\n', '\023', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 
-'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', '\005', 'v', 'a', 'l', 'u', 'e', 
-'\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\005', 'v', 'a', 'l', 'u', 'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 
-'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 
-'r', 'a', 'n', 'g', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 
-'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 
-'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', 
-'\005', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', ';', '\n', '\021', 'E', 'n', 
-'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', 
-'\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 
-'R', '\003', 'e', 'n', 'd', '\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 
-'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 
-'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 
-'b', 'e', 'r', '\022', ';', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 
-'t', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', 'S', 'e', 'r', 'v', 'i', 'c', 
-'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', 
-'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\002', ' ', '\003', 
-'(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 
-'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', 
-'\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 
-'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 
-'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
-'\004', 'n', 'a', 'm', 'e', '\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\t', 
-'R', '\t', 'i', 'n', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', 'u', 't', '_', 't', 'y', 'p', 
-'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '8', '\n', '\007', 'o', 'p', 
-'t', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 
-'n', 's', '\022', '0', '\n', '\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', ' ', 
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 'i', 
-'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', ' ', 
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 'i', 
-'n', 'g', '\"', '\312', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 'v', 
-'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 'k', 
-'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 'a', 
-'m', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', 'C', 'l', 'a', 's', 's', 'n', 
-'a', 'm', 'e', '\022', '5', '\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', '_', 'f', 'i', 'l', 'e', 
-'s', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', 'a', 'M', 'u', 'l', 't', 'i', 
-'p', 'l', 'e', 'F', 'i', 'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', 
-'_', 'e', 'q', 'u', 'a', 'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ', '\001', '(', '\010', 'B', '\002', '\030', 
-'\001', 'R', '\031', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', 'l', 's', 'A', 'n', 'd', 'H', 
-'a', 's', 'h', '\022', ':', '\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'c', 'h', 'e', 'c', 'k', '_', 
-'u', 't', 'f', '8', '\030', '\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'S', 't', 
-'r', 'i', 'n', 'g', 'C', 'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 
-'_', 'f', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 
-'o', 'd', 'e', ':', '\005', 'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'F', 'o', 'r', '\022', '\035', 
-'\n', '\n', 'g', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\t', 'g', 'o', 'P', 'a', 'c', 
-'k', 'a', 'g', 'e', '\022', '5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 
-'e', 's', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', 'G', 'e', 'n', 'e', 'r', 'i', 
-'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', 
-'_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 
-'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '5', '\n', '\023', 'p', 'y', '_', 
-'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', '\001', '(', '\010', ':', '\005', 'f', 
-'a', 'l', 's', 'e', 'R', '\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '7', 
-'\n', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '*', ' ', 
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\022', 'p', 'h', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 
-'v', 'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', 
-':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', 
-'_', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n', 'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 
-'e', 'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A', 'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', 
-'_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 
-'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', ')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 
-'e', 's', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t', 'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 
-'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', 
-'\t', 'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 
-'s', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ', '\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 
-'P', 'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', 
-' ', '\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', 
-'_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 
-'R', '\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', 
-'\014', 'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 
-'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', 
-'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 
-'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 
-'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 
-'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 
-'t', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 
-'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', '\014', 
-'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 
-'J', '\004', '\010', '&', '\020', '\'', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 
-'\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o', 'r', 'm', 
-'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g', 'e', 'S', 
-'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n', 'd', 'a', 
-'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030', '\002', ' ', 
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D', 'e', 's', 
-'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 
-'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 
-'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 
-'m', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 
-'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', 
-'\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 
-'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 
-'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 
-'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 
-'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 
-'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', 
-'\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', '\010', 
-'\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\223', '\n', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'s', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'C', 'T', 
-'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', 'a', 'c', 
-'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', 't', 'y', 
-'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', 'J', 'S', 
-'_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', '\030', '\005', 
-' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', 'v', 'e', 
-'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 
-'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 
-'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 
-'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\020', ' ', 
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'K', 
-'\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 
-'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 
-'\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 
-'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\022', 
-'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003', '(', '\013', 
-'2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 
-'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017', 'e', 'd', 
-'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', 
-'\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 
-'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', 
-'\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 
-'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 
-'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', '@', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 
-'u', 'l', 't', '\022', '\030', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'e', 'd', 'i', 
-'t', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 
-'e', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', '\010', '\n', 
-'\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', '\020', '\002', 
-'\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', '\020', '\000', 
-'\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'U', 'M', 
-'B', 'E', 'R', '\020', '\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', 
-'\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\025', '\n', 
-'\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', '\020', 'R', 
-'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 'p', 't', 
-'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 
-'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 
-'Y', 'P', 'E', '_', 'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', 
-'_', 'E', 'X', 'T', 'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 
-'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 
-'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 
-'T', '_', 'T', 'Y', 'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 
-'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 
-'E', '_', 'E', 'N', 'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 
-'T', 'Y', 'P', 'E', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 'T', '_', 
-'T', 'Y', 'P', 'E', '_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', 
-'\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 
-'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 
-'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 
-'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 
-'t', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 
-'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 
-'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', 
-'\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 
-'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', 
-'_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', '\001', '(', '\010', 'B', '\002', '\030', 
-'\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 
-'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', 
-'\007', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 
-'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 
-'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', 
-'2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 
-'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 
-'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', 
-'\006', '\"', '\201', '\002', '\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', 
-'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', 
-' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 
-'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 'e', 'b', 
-'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 
-'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 
-'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 
-'t', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 
-'t', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\"', ' ', '\001', '(', '\013', '2', '\033', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 
-'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
-'d', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
-'d', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', 
-'\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 
-'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', 
-'\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 
-'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'd', 'e', 'm', 'p', 'o', 
-'t', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 
-'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', 
-'7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 
-'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 
-'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'P', '\n', '\020', 
-'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', '\023', 'I', 'D', 'E', 'M', 'P', 
-'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'N', 'O', '_', 'S', 'I', 
-'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 
-'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', 'U', 'n', 'i', 'n', 't', 'e', 
-'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\003', 
-'(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 
-'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', 'R', 
-'\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', 
-'\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', ',', 
-'\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', 
-'\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'n', 'e', 
-'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\003', 'R', '\020', 'n', 
-'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', 
-'_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 
-'\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\014', 'R', '\013', 's', 
-'t', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '_', 'v', 
-'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'V', 'a', 'l', 'u', 
-'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', 'm', 'e', '_', 'p', 'a', 'r', 
-'t', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', '\n', '\014', 'i', 's', '_', 'e', 
-'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', 'x', 't', 'e', 'n', 's', 'i', 
-'o', 'n', '\"', '\235', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '\022', 'n', '\n', '\016', 'f', 'i', 'e', 'l', 
-'d', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'F', 'i', 'e', 'l', 
-'d', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '\034', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\020', '\n', '\004', 
-'2', '0', '2', '3', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', 'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 
-'e', 'n', 'c', 'e', '\022', '[', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 
-'e', 't', '.', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 'B', '\030', '\210', '\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\014', 
-'\n', '\004', '2', '0', '2', '3', '\022', '\004', 'O', 'P', 'E', 'N', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\205', '\001', 
-'\n', '\027', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', 'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 
-'\030', '\003', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 
-'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '\032', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\016', '\n', '\004', '2', '0', 
-'2', '3', '\022', '\006', 'P', 'A', 'C', 'K', 'E', 'D', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 
-'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\210', '\001', '\n', '\027', 's', 't', 'r', 'i', 'n', 'g', '_', 'f', 'i', 'e', 'l', 'd', 
-'_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'S', 't', 'r', 
-'i', 'n', 'g', 'F', 'i', 'e', 'l', 'd', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', '\035', '\210', '\001', '\001', '\230', '\001', 
-'\004', '\230', '\001', '\001', '\242', '\001', '\021', '\n', '\004', '2', '0', '2', '3', '\022', '\t', 'M', 'A', 'N', 'D', 'A', 'T', 'O', 'R', 'Y', 'R', 
-'\025', 's', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'e', 'l', 'd', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '{', '\n', 
-'\020', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 
-'e', 't', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '#', '\210', '\001', '\001', '\230', '\001', 
-'\004', '\230', '\001', '\001', '\242', '\001', '\027', '\n', '\004', '2', '0', '2', '3', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 
-'F', 'I', 'X', 'E', 'D', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', 'e', '\n', 
-'\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 
-'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\034', '\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\r', 
-'\n', '\004', '2', '0', '2', '3', '\022', '\005', 'A', 'L', 'L', 'O', 'W', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 
-'\022', 'D', '\n', '\014', 'r', 'a', 'w', '_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\347', '\007', ' ', '\001', '(', '\013', '2', '\033', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 
-'e', 't', 'B', '\003', '\230', '\001', '\000', 'R', '\013', 'r', 'a', 'w', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\"', '\\', '\n', '\r', 'F', 
-'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', 'E', 'L', 'D', '_', 'P', 'R', 'E', 
-'S', 'E', 'N', 'C', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 
-'I', 'T', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', '\022', '\023', '\n', '\017', 'L', 'E', 'G', 
-'A', 'C', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 
-'e', '\022', '\025', '\n', '\021', 'E', 'N', 'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', 
-'\010', '\n', '\004', 'O', 'P', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\020', '\002', '\"', 'V', '\n', '\025', 
-'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '#', '\n', '\037', 
-'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 
-'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 
-'X', 'P', 'A', 'N', 'D', 'E', 'D', '\020', '\002', '\"', '_', '\n', '\025', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'e', 'l', 'd', 'V', 
-'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '#', '\n', '\037', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'F', 'I', 'E', 'L', 'D', 
-'_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\r', '\n', '\t', 
-'M', 'A', 'N', 'D', 'A', 'T', 'O', 'R', 'Y', '\020', '\001', '\022', '\010', '\n', '\004', 'H', 'I', 'N', 'T', '\020', '\002', '\022', '\010', '\n', '\004', 
-'N', 'O', 'N', 'E', '\020', '\003', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 
-'\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 
-'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', 
-'\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', '\020', '\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 
-'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'F', 'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 
-'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 
-'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', '\002', '*', '\006', '\010', '\350', '\007', '\020', '\351', '\007', '*', '\006', 
-'\010', '\351', '\007', '\020', '\352', '\007', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 
-'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', 
-'\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 
-'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 
-'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', 
-'\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', 
-' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 
-'_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 
-'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 
-'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 
-'t', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 
-'m', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 
-'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 
-'d', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', 
-' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 
-'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 
-'t', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 
-'s', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', 'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 
-'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', 
-'\022', 'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 
-'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', 
-'\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 
-'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', 
-'\002', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', 
-'\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 
-'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', 
-'\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 
-'t', 'i', 'o', 'n', 
-};
-
-static _upb_DefPool_Init *deps[1] = {
-  NULL
-};
-
-_upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = {
-  deps,
-  &google_protobuf_descriptor_proto_upb_file_layout,
-  "google/protobuf/descriptor.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 10979)
-};
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c b/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c
deleted file mode 100644
index fc235b2127001..0000000000000
--- a/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "google/protobuf/struct.upbdefs.h"
-#include "google/protobuf/struct.upb.h"
-
-static const char descriptor[738] = {'\n', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 
-'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\230', '\001', 
-'\n', '\006', 'S', 't', 'r', 'u', 'c', 't', '\022', ';', '\n', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
-'#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', '.', 
-'F', 'i', 'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 'y', 'R', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\032', 'Q', '\n', '\013', 'F', 'i', 
-'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 
-'e', 'y', '\022', ',', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 'l', 'u', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', 
-'8', '\001', '\"', '\262', '\002', '\n', '\005', 'V', 'a', 'l', 'u', 'e', '\022', ';', '\n', '\n', 'n', 'u', 'l', 'l', '_', 'v', 'a', 'l', 'u', 
-'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\t', 'n', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '#', 
-'\n', '\014', 'n', 'u', 'm', 'b', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\001', 'H', '\000', 'R', '\013', 'n', 
-'u', 'm', 'b', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 
-'e', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', 
-'\n', 'b', 'o', 'o', 'l', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'b', 'o', 'o', 'l', 
-'V', 'a', 'l', 'u', 'e', '\022', '<', '\n', '\014', 's', 't', 'r', 'u', 'c', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', 
-'(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 
-'c', 't', 'H', '\000', 'R', '\013', 's', 't', 'r', 'u', 'c', 't', 'V', 'a', 'l', 'u', 'e', '\022', ';', '\n', '\n', 'l', 'i', 's', 't', 
-'_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'L', 'i', 's', 't', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'R', '\t', 'l', 'i', 's', 't', 'V', 'a', 
-'l', 'u', 'e', 'B', '\006', '\n', '\004', 'k', 'i', 'n', 'd', '\"', ';', '\n', '\t', 'L', 'i', 's', 't', 'V', 'a', 'l', 'u', 'e', '\022', 
-'.', '\n', '\006', 'v', 'a', 'l', 'u', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 'l', 'u', 'e', 'R', '\006', 'v', 'a', 'l', 'u', 'e', 's', '*', '\033', '\n', 
-'\t', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '\016', '\n', '\n', 'N', 'U', 'L', 'L', '_', 'V', 'A', 'L', 'U', 'E', '\020', 
-'\000', 'B', '\177', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', 
-'\013', 'S', 't', 'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '/', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 
-'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 
-'n', 'o', 'w', 'n', '/', 's', 't', 'r', 'u', 'c', 't', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 
-'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 
-'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[1] = {
-  NULL
-};
-
-_upb_DefPool_Init google_protobuf_struct_proto_upbdefinit = {
-  deps,
-  &google_protobuf_struct_proto_upb_file_layout,
-  "google/protobuf/struct.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 738)
-};
diff --git a/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h b/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h
deleted file mode 100644
index 066aa6a1a8c39..0000000000000
--- a/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/struct.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *google_protobuf_Struct_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.Struct");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_Struct_FieldsEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.Struct.FieldsEntry");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_Value_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.Value");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_ListValue_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_struct_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.ListValue");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c b/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
deleted file mode 100644
index 436f86562008f..0000000000000
--- a/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/rpc/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "google/rpc/status.upbdefs.h"
-#include "google/rpc/status.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-static const char descriptor[275] = {'\n', '\027', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', 
-'\022', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\"', 'f', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', 
-'\022', '\n', '\004', 'c', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\004', 'c', 'o', 'd', 'e', '\022', '\030', '\n', '\007', 'm', 'e', 
-'s', 's', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'm', 'e', 's', 's', 'a', 'g', 'e', '\022', '.', '\n', '\007', 'd', 
-'e', 't', 'a', 'i', 'l', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\007', 'd', 'e', 't', 'a', 'i', 'l', 's', 'B', 'a', '\n', '\016', 'c', 'o', 'm', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', 'B', '\013', 'S', 't', 'a', 't', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', 
-'\001', 'Z', '7', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 
-'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', 
-'s', ';', 's', 't', 'a', 't', 'u', 's', '\370', '\001', '\001', '\242', '\002', '\003', 'R', 'P', 'C', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_any_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init google_rpc_status_proto_upbdefinit = {
-  deps,
-  &google_rpc_status_proto_upb_file_layout,
-  "google/rpc/status.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 275)
-};
diff --git a/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h b/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h
deleted file mode 100644
index 5c3ea07e2128d..0000000000000
--- a/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/rpc/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
-#define GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init google_rpc_status_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *google_rpc_Status_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_rpc_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.rpc.Status");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c b/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
deleted file mode 100644
index 02b05f7b84f40..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "udpa/annotations/migrate.upbdefs.h"
-#include "udpa/annotations/migrate.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[893] = {'\n', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 
-'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
-'t', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '+', '\n', '\021', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 
-'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\006', 'r', 'e', 
-'n', 'a', 'm', 'e', '\"', 'Y', '\n', '\026', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 
-'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\006', 'r', 'e', 
-'n', 'a', 'm', 'e', '\022', '\'', '\n', '\017', 'o', 'n', 'e', 'o', 'f', '_', 'p', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\030', '\002', 
-' ', '\001', '(', '\t', 'R', '\016', 'o', 'n', 'e', 'o', 'f', 'P', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\"', '?', '\n', '\025', 'F', 
-'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '&', '\n', '\017', 'm', 
-'o', 'v', 'e', '_', 't', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'm', 'o', 'v', 
-'e', 'T', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', ':', 'p', '\n', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'm', 'i', 'g', 
-'r', 'a', 't', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 
-'s', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 
-'d', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 
-'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 
-'o', '\n', '\r', 'f', 'i', 'e', 'l', 'd', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', 
-'\377', 'Q', ' ', '\001', '(', '\013', '2', '(', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'.', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\014', 
-'f', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'g', '\n', '\014', 'e', 'n', 'u', 'm', '_', 'm', 'i', 'g', 'r', 
-'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 
-'m', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 'd', 'p', 'a', '.', 
-'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 
-'t', 'i', 'o', 'n', 'R', '\013', 'e', 'n', 'u', 'm', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'w', '\n', '\022', 'e', 'n', 'u', 'm', 
-'_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', 
-'\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '#', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'e', 'n', 'u', 
-'m', 'V', 'a', 'l', 'u', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'k', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'm', 'i', 'g', 
-'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 
-'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\216', '\343', '\377', 'Q', ' ', '\001', '(', '\013', '2', '\'', '.', 'u', 'd', 'p', 'a', 
-'.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'f', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'B', '$', 'Z', 
-'\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit = {
-  deps,
-  &udpa_annotations_migrate_proto_upb_file_layout,
-  "udpa/annotations/migrate.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 893)
-};
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h b/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h
deleted file mode 100644
index 6a8b3b533044e..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_MigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.MigrateAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_FieldMigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FieldMigrateAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_FileMigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FileMigrateAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c b/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
deleted file mode 100644
index 23bea230d81c5..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "udpa/annotations/security.upbdefs.h"
-#include "udpa/annotations/security.upb.h"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[453] = {'\n', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 
-'t', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'s', '\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', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\257', '\001', '\n', '\027', 'F', 'i', 'e', 'l', 
-'d', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', 'K', '\n', '\"', 'c', 'o', 
-'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'd', 'o', 'w', 
-'n', 's', 't', 'r', 'e', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', 'F', 
-'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '\022', 'G', '\n', ' ', 
-'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'u', 
-'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\035', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', 'F', 
-'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', ':', 'g', '\n', '\010', 's', 'e', 
-'c', 'u', 'r', 'i', 't', 'y', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\261', '\362', '\246', '\005', ' ', '\001', '(', '\013', '2', ')', '.', 'u', 
-'d', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'F', 'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 
-'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'B', 
-',', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', 
-'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 
-'t', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &udpa_annotations_status_proto_upbdefinit,
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init udpa_annotations_security_proto_upbdefinit = {
-  deps,
-  &udpa_annotations_security_proto_upb_file_layout,
-  "udpa/annotations/security.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 453)
-};
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h b/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h
deleted file mode 100644
index 6ccb4e45bac37..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_FieldSecurityAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_security_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.FieldSecurityAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c b/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
deleted file mode 100644
index 1a96d4458fb13..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "udpa/annotations/sensitive.upbdefs.h"
-#include "udpa/annotations/sensitive.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[196] = {'\n', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 
-'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 
-'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', ':', '>', '\n', '\t', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '\022', 
-'\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 
-'t', 'i', 'o', 'n', 's', '\030', '\367', '\266', '\301', '$', ' ', '\001', '(', '\010', 'R', '\t', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', 
-'B', '$', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 
-'o', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit = {
-  deps,
-  &udpa_annotations_sensitive_proto_upb_file_layout,
-  "udpa/annotations/sensitive.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 196)
-};
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h b/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h
deleted file mode 100644
index 8a7297dcf9f99..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c b/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
deleted file mode 100644
index 710d4c020aea6..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "udpa/annotations/status.upbdefs.h"
-#include "udpa/annotations/status.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[483] = {'\n', '\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', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '\032', 
-' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 
-'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\232', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 
-'t', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', 
-'\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '\\', '\n', '\026', 
-'p', 'a', 'c', 'k', 'a', 'g', 'e', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\002', ' ', 
-'\001', '(', '\016', '2', '&', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'P', 'a', 
-'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', 'R', '\024', 'p', 'a', 'c', 'k', 'a', 
-'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '*', ']', '\n', '\024', 'P', 'a', 'c', 'k', 'a', 'g', 
-'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 
-'\020', '\000', '\022', '\n', '\n', '\006', 'F', 'R', 'O', 'Z', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'A', 'C', 'T', 'I', 'V', 'E', '\020', 
-'\002', '\022', ' ', '\n', '\034', 'N', 'E', 'X', 'T', '_', 'M', 'A', 'J', 'O', 'R', '_', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'C', 
-'A', 'N', 'D', 'I', 'D', 'A', 'T', 'E', '\020', '\003', ':', 'd', '\n', '\013', 'f', 'i', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', 
-'\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 
-'t', 'i', 'o', 'n', 's', '\030', '\207', '\200', '\231', 'j', ' ', '\001', '(', '\013', '2', '\"', '.', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 
-'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'R', '\n', 'f', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'B', '$', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 
-'m', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init udpa_annotations_status_proto_upbdefinit = {
-  deps,
-  &udpa_annotations_status_proto_upb_file_layout,
-  "udpa/annotations/status.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 483)
-};
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h b/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h
deleted file mode 100644
index 8b01f1dc21016..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_StatusAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.StatusAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c b/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
deleted file mode 100644
index 2fd242f37a088..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "udpa/annotations/versioning.upbdefs.h"
-#include "udpa/annotations/versioning.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[317] = {'\n', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 
-'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
-'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', 'J', '\n', '\024', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 
-'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '2', '\n', '\025', 'p', 'r', 'e', 'v', 'i', 'o', 'u', 's', '_', 'm', 
-'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\023', 'p', 'r', 'e', 'v', 'i', 'o', 
-'u', 's', 'M', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', ':', 'j', '\n', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
-'n', 'g', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 
-'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\323', '\210', '\341', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'u', 'd', 'p', 
-'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', 'A', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', 'B', '$', 'Z', '\"', 
-'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'a', 'n', 
-'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit = {
-  deps,
-  &udpa_annotations_versioning_proto_upb_file_layout,
-  "udpa/annotations/versioning.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 317)
-};
diff --git a/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h b/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h
deleted file mode 100644
index 4722513a24b4a..0000000000000
--- a/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     udpa/annotations/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *udpa_annotations_VersioningAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &udpa_annotations_versioning_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "udpa.annotations.VersioningAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c b/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c
deleted file mode 100644
index 32c1273be5c97..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/annotations/v3/migrate.upbdefs.h"
-#include "xds/annotations/v3/migrate.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[914] = {'\n', ' ', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 'm', 'i', 'g', 'r', 
-'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'s', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 
-'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '+', '\n', '\021', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
-'R', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\"', 'Y', '\n', '\026', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 
-'R', '\006', 'r', 'e', 'n', 'a', 'm', 'e', '\022', '\'', '\n', '\017', 'o', 'n', 'e', 'o', 'f', '_', 'p', 'r', 'o', 'm', 'o', 't', 'i', 
-'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'o', 'n', 'e', 'o', 'f', 'P', 'r', 'o', 'm', 'o', 't', 'i', 'o', 'n', '\"', 
-'?', '\n', '\025', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', 
-'&', '\n', '\017', 'm', 'o', 'v', 'e', '_', 't', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', 
-'\r', 'm', 'o', 'v', 'e', 'T', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', ':', 'r', '\n', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 
-'_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', 
-'2', '%', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 
-'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', 'M', 'i', 
-'g', 'r', 'a', 't', 'e', ':', 'q', '\n', '\r', 'f', 'i', 'e', 'l', 'd', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\035', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 
-'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', '2', '*', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 
-'t', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 
-'t', 'a', 't', 'i', 'o', 'n', 'R', '\014', 'f', 'i', 'e', 'l', 'd', 'M', 'i', 'g', 'r', 'a', 't', 'e', ':', 'i', '\n', '\014', 'e', 
-'n', 'u', 'm', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', 
-'2', '%', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 
-'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'e', 'n', 'u', 'm', 'M', 'i', 'g', 'r', 'a', 
-'t', 'e', ':', 'y', '\n', '\022', 'e', 'n', 'u', 'm', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', 
-'!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 
-'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', '5', ' ', '\001', '(', '\013', '2', '%', '.', 'x', 'd', 's', '.', 
-'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 
-'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'e', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 
-':', 'm', '\n', '\014', 'f', 'i', 'l', 'e', '_', 'm', 'i', 'g', 'r', 'a', 't', 'e', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\316', '\351', '\355', 
-'5', ' ', '\001', '(', '\013', '2', ')', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', 
-'3', '.', 'F', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 
-'f', 'i', 'l', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'e', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', 
-'/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_annotations_v3_migrate_proto_upbdefinit = {
-  deps,
-  &xds_annotations_v3_migrate_proto_upb_file_layout,
-  "xds/annotations/v3/migrate.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 914)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h b/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h
deleted file mode 100644
index c1b5e12d42890..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/migrate.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_annotations_v3_migrate_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_MigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.MigrateAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldMigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldMigrateAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileMigrateAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_migrate_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FileMigrateAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c b/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c
deleted file mode 100644
index 37f208dd4f966..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/annotations/v3/security.upbdefs.h"
-#include "xds/annotations/v3/security.upb.h"
-
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[468] = {'\n', '!', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 'e', 'c', 'u', 
-'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 
-'/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '\257', '\001', 
-'\n', '\027', 'F', 'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
-'\022', 'K', '\n', '\"', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 's', 't', 
-'e', 'd', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'o', 'n', 'f', 
-'i', 'g', 'u', 'r', 'e', 'F', 'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 
-'a', 'm', '\022', 'G', '\n', ' ', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'e', '_', 'f', 'o', 'r', '_', 'u', 'n', 't', 'r', 'u', 
-'s', 't', 'e', 'd', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\035', 'c', 'o', 'n', 'f', 
-'i', 'g', 'u', 'r', 'e', 'F', 'o', 'r', 'U', 'n', 't', 'r', 'u', 's', 't', 'e', 'd', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 
-':', 'i', '\n', '\010', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\247', '\226', '\235', '/', ' ', '\001', 
-'(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 
-'i', 'e', 'l', 'd', 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\010', 's', 
-'e', 'c', 'u', 'r', 'i', 't', 'y', 'B', '3', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 
-'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 
-'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_annotations_v3_security_proto_upbdefinit = {
-  deps,
-  &xds_annotations_v3_security_proto_upb_file_layout,
-  "xds/annotations/v3/security.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 468)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h b/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h
deleted file mode 100644
index c20092233e492..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/security.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_annotations_v3_security_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldSecurityAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_security_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldSecurityAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c b/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c
deleted file mode 100644
index 6223cceb4079a..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/annotations/v3/sensitive.upbdefs.h"
-#include "xds/annotations/v3/sensitive.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[207] = {'\n', '\"', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 'e', 'n', 's', 
-'i', 't', 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 
-'o', 'n', 's', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 
-'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', ':', '>', '\n', '\t', 's', 'e', 'n', 's', 'i', 't', 
-'i', 'v', 'e', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 
-'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\265', '\321', '\213', '\035', ' ', '\001', '(', '\010', 'R', '\t', 's', 'e', 'n', 's', 'i', 
-'t', 'i', 'v', 'e', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 
-'d', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 'b', 
-'\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit = {
-  deps,
-  &xds_annotations_v3_sensitive_proto_upb_file_layout,
-  "xds/annotations/v3/sensitive.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 207)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h b/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h
deleted file mode 100644
index 774071b67d4fd..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/sensitive.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c b/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c
deleted file mode 100644
index 85f887ced0f38..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/annotations/v3/status.upbdefs.h"
-#include "xds/annotations/v3/status.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[936] = {'\n', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 
-'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 
-'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', '@', '\n', '\024', 'F', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 
-'s', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 
-'o', 'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 
-'e', 's', 's', '\"', 'C', '\n', '\027', 'M', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 
-'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', 
-'\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\"', 'A', '\n', 
-'\025', 'F', 'i', 'e', 'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', 
-'\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 
-'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\"', '\234', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 
-'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'w', 'o', 'r', 'k', '_', 'i', 'n', '_', 'p', 'r', 'o', 
-'g', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 'w', 'o', 'r', 'k', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 
-'s', 's', '\022', '^', '\n', '\026', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 's', 't', 'a', 
-'t', 'u', 's', '\030', '\002', ' ', '\001', '(', '\016', '2', '(', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '.', 'v', '3', '.', 'P', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 
-'s', 'R', '\024', 'p', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '*', ']', 
-'\n', '\024', 'P', 'a', 'c', 'k', 'a', 'g', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', 
-'\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'F', 'R', 'O', 'Z', 'E', 'N', '\020', '\001', '\022', '\n', '\n', 
-'\006', 'A', 'C', 'T', 'I', 'V', 'E', '\020', '\002', '\022', ' ', '\n', '\034', 'N', 'E', 'X', 'T', '_', 'M', 'A', 'J', 'O', 'R', '_', 'V', 
-'E', 'R', 'S', 'I', 'O', 'N', '_', 'C', 'A', 'N', 'D', 'I', 'D', 'A', 'T', 'E', '\020', '\003', ':', 'j', '\n', '\013', 'f', 'i', 'l', 
-'e', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', '(', '\013', '2', '(', '.', 
-'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 'i', 'l', 'e', 'S', 't', 
-'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'f', 'i', 'l', 'e', 'S', 't', 'a', 't', 'u', 
-'s', ':', 'v', '\n', '\016', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\037', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 
-'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', '(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', 's', '.', 'v', '3', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 
-'t', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'm', 'e', 's', 's', 'a', 'g', 'e', 'S', 't', 'a', 't', 'u', 's', ':', 'n', '\n', '\014', 
-'f', 'i', 'e', 'l', 'd', '_', 's', 't', 'a', 't', 'u', 's', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\352', '\310', '\224', 'l', ' ', '\001', 
-'(', '\013', '2', ')', '.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'F', 
-'i', 'e', 'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'f', 'i', 'e', 
-'l', 'd', 'S', 't', 'a', 't', 'u', 's', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 
-'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
-'/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit = {
-  deps,
-  &xds_annotations_v3_status_proto_upb_file_layout,
-  "xds/annotations/v3/status.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 936)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h b/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h
deleted file mode 100644
index 9076b90c42296..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/status.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileStatusAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FileStatusAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_MessageStatusAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.MessageStatusAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldStatusAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.FieldStatusAnnotation");
-}
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_StatusAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_status_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.StatusAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c b/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c
deleted file mode 100644
index 4bb508389a416..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/annotations/v3/versioning.upbdefs.h"
-#include "xds/annotations/v3/versioning.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-static const char descriptor[330] = {'\n', '#', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 'v', 'e', 'r', 's', 
-'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', 's', '.', 'v', '3', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\"', 'J', '\n', '\024', 'V', 'e', 'r', 's', 'i', 
-'o', 'n', 'i', 'n', 'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '2', '\n', '\025', 'p', 'r', 'e', 'v', 'i', 'o', 
-'u', 's', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\023', 'p', 'r', 
-'e', 'v', 'i', 'o', 'u', 's', 'M', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', ':', 'l', '\n', '\n', 'v', 'e', 'r', 's', 
-'i', 'o', 'n', 'i', 'n', 'g', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\223', '\375', '\206', ',', ' ', '\001', '(', '\013', '2', '(', 
-'.', 'x', 'd', 's', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'v', '3', '.', 'V', 'e', 'r', 's', 'i', 
-'o', 'n', 'i', 'n', 'g', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 
-'n', 'g', 'B', '+', 'Z', ')', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', 
-'/', 'g', 'o', '/', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', 'b', '\006', 'p', 
-'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &google_protobuf_descriptor_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_annotations_v3_versioning_proto_upbdefinit = {
-  deps,
-  &xds_annotations_v3_versioning_proto_upb_file_layout,
-  "xds/annotations/v3/versioning.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 330)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h b/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h
deleted file mode 100644
index 377bc10023bf7..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/annotations/v3/versioning.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_annotations_v3_versioning_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_annotations_v3_VersioningAnnotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_annotations_v3_versioning_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.annotations.v3.VersioningAnnotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c b/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c
deleted file mode 100644
index eaacb51dee196..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/core/v3/extension.upbdefs.h"
-#include "xds/core/v3/extension.upb.h"
-
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-static const char descriptor[302] = {'\n', '\033', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 
-'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 
-'t', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', 
-'/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\"', 'v', '\n', '\024', 'T', 'y', 
-'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 
-'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', 
-'\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\010', '\372', 'B', '\005', '\242', '\001', '\002', '\010', 
-'\001', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', 'N', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 
-'h', 'u', 'b', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 
-'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', 
-'/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 
-'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &validate_validate_proto_upbdefinit,
-  &google_protobuf_any_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit = {
-  deps,
-  &xds_core_v3_extension_proto_upb_file_layout,
-  "xds/core/v3/extension.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 302)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h
deleted file mode 100644
index 3252d711b9c7c..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/extension.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_core_v3_TypedExtensionConfig_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_core_v3_extension_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.core.v3.TypedExtensionConfig");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c b/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
deleted file mode 100644
index 8f829c2cebaf4..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/core/v3/resource.upbdefs.h"
-#include "xds/core/v3/resource.upb.h"
-
-extern _upb_DefPool_Init google_protobuf_any_proto_upbdefinit;
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init xds_core_v3_resource_name_proto_upbdefinit;
-static const char descriptor[365] = {'\n', '\032', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 
-'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 'd', 's', '/', 'a', 
-'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 
-'o', '\032', '\037', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 
-'a', 'm', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\205', '\001', '\n', '\010', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '-', '\n', 
-'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 
-'.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'v', 'e', 
-'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', '\010', 'r', 
-'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 
-'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', 'U', '\n', '\026', 'c', 
-'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'R', 'e', 
-'s', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', 
-'/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '\322', 
-'\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &google_protobuf_any_proto_upbdefinit,
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &xds_core_v3_resource_name_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_core_v3_resource_proto_upbdefinit = {
-  deps,
-  &xds_core_v3_resource_proto_upb_file_layout,
-  "xds/core/v3/resource.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 365)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h b/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h
deleted file mode 100644
index ecbc918b40c97..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/core/v3/resource.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_core_v3_resource_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_core_v3_Resource_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_core_v3_resource_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.core.v3.Resource");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c
deleted file mode 100644
index 4f1850e8e3ec1..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/cel.upbdefs.h"
-#include "xds/type/matcher/v3/cel.upb.h"
-
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[322] = {'\n', '\035', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'c', 'e', 'l', 
-'.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 
-'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', 's', 't', 
-'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\025', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'c', 
-'e', 'l', '.', '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', '\"', 'Q', '\n', '\n', 'C', 'e', 'l', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'C', '\n', 
-'\n', 'e', 'x', 'p', 'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 't', 
-'y', 'p', 'e', '.', 'v', '3', '.', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', 
-'\212', '\001', '\002', '\020', '\001', 'R', '\t', 'e', 'x', 'p', 'r', 'M', 'a', 't', 'c', 'h', 'B', '`', '\n', '\036', 'c', 'o', 'm', '.', 'g', 
-'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 
-'B', '\010', 'C', 'e', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 
-'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 
-'h', 'e', 'r', '/', 'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &xds_type_v3_cel_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_cel_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_cel_proto_upb_file_layout,
-  "xds/type/matcher/v3/cel.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 322)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h
deleted file mode 100644
index 7ff71b97e539a..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_cel_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_CelMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_cel_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.CelMatcher");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c
deleted file mode 100644
index 4d83ad6978a81..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/http_inputs.upbdefs.h"
-#include "xds/type/matcher/v3/http_inputs.upb.h"
-
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-static const char descriptor[237] = {'\n', '%', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'h', 't', 't', 
-'p', '_', 'i', 'n', 'p', 'u', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
-'n', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\"', '\035', '\n', '\033', 'H', 't', 't', 
-'p', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', 'C', 'e', 'l', 'M', 'a', 't', 'c', 'h', 'I', 'n', 'p', 'u', 't', 'B', 
-'g', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\017', 'H', 't', 't', 'p', 'I', 'n', 'p', 'u', 't', 's', 'P', 'r', 'o', 't', 'o', 
-'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 
-'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '\322', '\306', '\244', '\341', 
-'\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &xds_annotations_v3_status_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_http_inputs_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_http_inputs_proto_upb_file_layout,
-  "xds/type/matcher/v3/http_inputs.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 237)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h
deleted file mode 100644
index 1458b63068346..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/http_inputs.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_http_inputs_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_HttpAttributesCelMatchInput_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_http_inputs_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.HttpAttributesCelMatchInput");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c
deleted file mode 100644
index 42a1b3acfac7d..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/matcher.upbdefs.h"
-#include "xds/type/matcher/v3/matcher.upb.h"
-
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit;
-extern _upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[2330] = {'\n', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 
-'h', 'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 
-'3', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 
-'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'x', 'd', 's', '/', 't', 
-'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', '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', '\"', '\200', '\020', '\n', '\007', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'M', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', 
-'_', 'l', 'i', 's', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '(', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 
-'i', 's', 't', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '\022', 'M', '\n', '\014', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '_', 't', 'r', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
-'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', 'T', 'r', 'e', 'e', 'H', '\000', 'R', '\013', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'D', '\n', 
-'\013', 'o', 'n', '_', 'n', 'o', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 
-'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 
-'n', 'M', 'a', 't', 'c', 'h', 'R', '\t', 'o', 'n', 'N', 'o', 'M', 'a', 't', 'c', 'h', '\032', '\221', '\001', '\n', '\007', 'O', 'n', 'M', 
-'a', 't', 'c', 'h', '\022', '8', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 
-'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
-'r', 'H', '\000', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ';', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', 
-'\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 
-'t', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', 'B', '\017', 
-'\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\022', '\003', '\370', 'B', '\001', '\032', '\266', '\010', '\n', '\013', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', 'L', 'i', 's', 't', '\022', '[', '\n', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
-'5', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', 
-'\221', '\006', '\n', '\t', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'o', '\n', '\020', 's', 'i', 'n', 'g', 'l', 'e', '_', 'p', 
-'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'B', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 
-'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\017', 's', 'i', 'n', 'g', 'l', 'e', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 
-'e', '\022', 'a', '\n', '\n', 'o', 'r', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '@', '.', 'x', 
-'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 
-'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\t', 'o', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'\022', 'c', '\n', '\013', 'a', 'n', 'd', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '@', '.', 'x', 
-'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'P', 
-'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 't', 'H', '\000', 'R', '\n', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', 'e', 
-'r', '\022', 'U', '\n', '\013', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '2', '.', 
-'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', 
-'\000', 'R', '\n', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\032', '\363', '\001', '\n', '\017', 'S', 'i', 'n', 'g', 'l', 'e', 'P', 
-'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'A', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', 
-'.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 
-'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 'n', 'p', 'u', 't', 
-'\022', 'E', '\n', '\013', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'x', 
-'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\n', 'v', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', 'F', '\n', '\014', 
-'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 
-'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 
-'f', 'i', 'g', 'H', '\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', 'B', '\016', '\n', '\007', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'k', '\n', '\r', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'L', 'i', 's', 
-'t', '\022', 'Z', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '2', '.', 'x', 'd', 
-'s', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', 
-'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\021', '\n', '\n', 'm', 'a', 't', 
-'c', 'h', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\032', '\265', '\001', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 't', 
-'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '2', 
-'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'L', 'i', 's', 't', '.', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 
-'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\t', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'I', '\n', '\010', 
-'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', 
-'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 
-'c', 'h', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\032', '\251', '\004', '\n', 
-'\013', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '\022', 'A', '\n', '\005', 'i', 'n', 'p', 'u', 't', '\030', '\001', ' ', '\001', 
-'(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 
-'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'i', 
-'n', 'p', 'u', 't', '\022', '[', '\n', '\017', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\002', 
-' ', '\001', '(', '\013', '2', '1', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
-'3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 
-'c', 'h', 'M', 'a', 'p', 'H', '\000', 'R', '\r', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', ']', '\n', 
-'\020', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '_', 'm', 'a', 'p', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', 
-'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', 'H', 
-'\000', 'R', '\016', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '\022', 'F', '\n', '\014', 'c', 'u', 's', 't', 
-'o', 'm', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', 
-'.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', 
-'\000', 'R', '\013', 'c', 'u', 's', 't', 'o', 'm', 'M', 'a', 't', 'c', 'h', '\032', '\300', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'M', 
-'a', 'p', '\022', 'V', '\n', '\003', 'm', 'a', 'p', '\030', '\001', ' ', '\003', '(', '\013', '2', ':', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
-'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'M', 'a', 't', 'c', 
-'h', 'e', 'r', 'T', 'r', 'e', 'e', '.', 'M', 'a', 't', 'c', 'h', 'M', 'a', 'p', '.', 'M', 'a', 'p', 'E', 'n', 't', 'r', 'y', 
-'B', '\010', '\372', 'B', '\005', '\232', '\001', '\002', '\010', '\001', 'R', '\003', 'm', 'a', 'p', '\032', '\\', '\n', '\010', 'M', 'a', 'p', 'E', 'n', 't', 
-'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', ':', '\n', '\005', 'v', 
-'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\005', 
-'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', '\020', '\n', '\t', 't', 'r', 'e', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 
-'B', '\001', ':', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'B', '\016', '\n', '\014', 'm', 'a', 't', 'c', 'h', 'e', 'r', '_', 't', 
-'y', 'p', 'e', 'B', '\\', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
-'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\014', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'P', 'r', 'o', 't', 
-'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 
-'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 
-'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[5] = {
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &xds_core_v3_extension_proto_upbdefinit,
-  &xds_type_matcher_v3_string_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_matcher_proto_upb_file_layout,
-  "xds/type/matcher/v3/matcher.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 2330)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h
deleted file mode 100644
index 2819f37b4a30b..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/matcher.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_OnMatch_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.OnMatch");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_matcher_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c
deleted file mode 100644
index 206516ca40735..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/range.upbdefs.h"
-#include "xds/type/matcher/v3/range.upb.h"
-
-extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
-extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[1007] = {'\n', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'a', 'n', 
-'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', '\032', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 
-'r', 'o', 't', 'o', '\032', '!', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 
-'/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', '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', '\"', '\374', '\001', '\n', '\021', 'I', 'n', 't', '6', '4', 'R', 
-'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\016', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 
-'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '3', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', 's', '\032', '\212', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '9', '\n', '\006', 'r', 
-'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\027', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', 
-'.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\006', 'r', 'a', 
-'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 
-'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\"', '\374', '\001', '\n', '\021', 'I', 
-'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'Z', '\n', '\016', 'r', 'a', 'n', 'g', 'e', 
-'_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '3', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 
-'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'r', 'a', 'n', 'g', 'e', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\212', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'\022', '9', '\n', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\027', '.', 'x', 'd', 's', '.', 't', 'y', 
-'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', 
-'\001', 'R', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', 
-'(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 'o', 'n', 'M', 'a', 't', 'c', 'h', '\"', 
-'\377', '\001', '\n', '\022', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '[', '\n', 
-'\016', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '4', '.', 'x', 
-'d', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'D', 'o', 'u', 'b', 'l', 'e', 
-'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'R', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 
-'R', '\r', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 's', '\032', '\213', '\001', '\n', '\014', 'R', 'a', 'n', 'g', 'e', 
-'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', ':', '\n', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\030', 
-'.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', 'B', 
-'\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\006', 'r', 'a', 'n', 'g', 'e', 's', '\022', '?', '\n', '\010', 'o', 'n', '_', 'm', 
-'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '$', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'O', 'n', 'M', 'a', 't', 'c', 'h', 'R', '\007', 
-'o', 'n', 'M', 'a', 't', 'c', 'h', 'B', 'Z', '\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', 
-'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 
-'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 
-'s', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', 
-'\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[4] = {
-  &xds_type_v3_range_proto_upbdefinit,
-  &xds_type_matcher_v3_matcher_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_range_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_range_proto_upb_file_layout,
-  "xds/type/matcher/v3/range.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 1007)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h
deleted file mode 100644
index 1ff4138a3959c..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_range_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int64RangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int64RangeMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int32RangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int32RangeMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.DoubleRangeMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
deleted file mode 100644
index 9398f026522a7..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/regex.upbdefs.h"
-#include "xds/type/matcher/v3/regex.upb.h"
-
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[348] = {'\n', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 
-'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 
-'r', 'o', 't', 'o', '\"', '\246', '\001', '\n', '\014', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'V', '\n', '\n', 
-'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', '2', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'x', 'd', 's', '.', 't', 'y', 
-'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 
-'r', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'R', 'E', '2', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 
-'g', 'o', 'o', 'g', 'l', 'e', 'R', 'e', '2', '\022', '\035', '\n', '\005', 'r', 'e', 'g', 'e', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', 
-'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\032', '\013', '\n', '\t', 'G', 'o', 'o', 'g', 'l', 'e', 
-'R', 'E', '2', 'B', '\022', '\n', '\013', 'e', 'n', 'g', 'i', 'n', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'B', 'Z', 
-'\n', '\036', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 
-'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\n', 'R', 'e', 'g', 'e', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 
-'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 
-'t', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[2] = {
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_regex_proto_upb_file_layout,
-  "xds/type/matcher/v3/regex.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 348)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h
deleted file mode 100644
index 8f89d23c3c346..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/regex.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_regex_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.RegexMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_GoogleRE2_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_regex_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.RegexMatcher.GoogleRE2");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
deleted file mode 100644
index 3c9d09069ae76..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/matcher/v3/string.upbdefs.h"
-#include "xds/type/matcher/v3/string.upb.h"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_regex_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[593] = {'\n', ' ', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 
-'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\023', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 
-'e', 'r', '.', 'v', '3', '\032', '\037', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', 
-'3', '/', 'r', 'e', 'g', 'e', 'x', '.', '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', '\"', '\231', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 
-'a', 't', 'c', 'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 
-'e', 'x', 'a', 'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', 
-'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', 
-'\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', 
-'\022', 'L', '\n', '\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 
-'s', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 
-'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 
-'g', 'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', 
-'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 
-'r', 'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', 
-'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', '\"', ']', '\n', 
-'\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'H', '\n', '\010', 'p', 'a', 't', 
-'t', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
-'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 
-'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', 'B', '[', '\n', '\036', 'c', 'o', 'm', '.', 
-'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', 
-'3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '*', 'g', 'i', 't', 'h', 'u', 'b', '.', 
-'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
-'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[3] = {
-  &xds_type_matcher_v3_regex_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit = {
-  deps,
-  &xds_type_matcher_v3_string_proto_upb_file_layout,
-  "xds/type/matcher/v3/string.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 593)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h
deleted file mode 100644
index ee567fc062ece..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/matcher/v3/string.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_matcher_v3_string_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_StringMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_string_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.StringMatcher");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ListStringMatcher_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_matcher_v3_string_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.matcher.v3.ListStringMatcher");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c
deleted file mode 100644
index 8926c53bad425..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/v3/cel.upbdefs.h"
-#include "xds/type/v3/cel.upb.h"
-
-extern _upb_DefPool_Init google_api_expr_v1alpha1_checked_proto_upbdefinit;
-extern _upb_DefPool_Init google_api_expr_v1alpha1_syntax_proto_upbdefinit;
-extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit;
-extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit;
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
-static const char descriptor[646] = {'\n', '\025', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'c', 'e', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 
-'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '&', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 
-'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 'c', 'h', 'e', 'c', 'k', 'e', 'd', '.', 'p', 'r', 'o', 't', 
-'o', '\032', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 
-'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'x', 
-'d', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', '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', '\"', '\273', '\001', '\n', '\r', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'G', 
-'\n', '\013', 'p', 'a', 'r', 's', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'P', 'a', 'r', 
-'s', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\n', 'p', 'a', 'r', 's', 'e', 'd', 'E', 'x', 'p', 'r', '\022', 'J', '\n', '\014', 
-'c', 'h', 'e', 'c', 'k', 'e', 'd', '_', 'e', 'x', 'p', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'C', 'h', 'e', 'c', 
-'k', 'e', 'd', 'E', 'x', 'p', 'r', 'H', '\000', 'R', '\013', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'E', 'x', 'p', 'r', 'B', '\025', '\n', 
-'\016', 'e', 'x', 'p', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\236', '\001', '\n', '\020', 
-'C', 'e', 'l', 'E', 'x', 't', 'r', 'a', 'c', 't', 'S', 't', 'r', 'i', 'n', 'g', '\022', 'G', '\n', '\014', 'e', 'x', 'p', 'r', '_', 
-'e', 'x', 't', 'r', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
-'v', '3', '.', 'C', 'e', 'l', 'E', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', 
-'\001', 'R', '\013', 'e', 'x', 'p', 'r', 'E', 'x', 't', 'r', 'a', 'c', 't', '\022', 'A', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 
-'_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 
-'t', 'V', 'a', 'l', 'u', 'e', 'B', 'P', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 
-'t', 'y', 'p', 'e', '.', 'v', '3', 'B', '\010', 'C', 'e', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 
-'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 
-'p', 'e', '/', 'v', '3', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[6] = {
-  &google_api_expr_v1alpha1_checked_proto_upbdefinit,
-  &google_api_expr_v1alpha1_syntax_proto_upbdefinit,
-  &google_protobuf_wrappers_proto_upbdefinit,
-  &xds_annotations_v3_status_proto_upbdefinit,
-  &validate_validate_proto_upbdefinit,
-  NULL
-};
-
-_upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit = {
-  deps,
-  &xds_type_v3_cel_proto_upb_file_layout,
-  "xds/type/v3/cel.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 646)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h
deleted file mode 100644
index d6ebaadb80c20..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/cel.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_v3_cel_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_v3_CelExpression_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExpression");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_v3_cel_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.v3.CelExtractString");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c b/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c
deleted file mode 100644
index 3e47187448c4d..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include "upb/reflection/def.h"
-#include "xds/type/v3/range.upbdefs.h"
-#include "xds/type/v3/range.upb.h"
-
-static const char descriptor[285] = {'\n', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\"', '4', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 
-'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', 
-'\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', '\"', '4', '\n', '\n', 'I', 'n', 't', '3', 
-'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
-'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '5', '\n', '\013', 
-'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', 
-'\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\001', 'R', '\003', 'e', 'n', 
-'d', 'B', 'J', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
-'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 
-'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
-'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static _upb_DefPool_Init *deps[1] = {
-  NULL
-};
-
-_upb_DefPool_Init xds_type_v3_range_proto_upbdefinit = {
-  deps,
-  &xds_type_v3_range_proto_upb_file_layout,
-  "xds/type/v3/range.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 285)
-};
diff --git a/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h
deleted file mode 100644
index 2f8552e0572fe..0000000000000
--- a/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     xds/type/v3/range.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-
-#include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/port/def.inc"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "upb/reflection/def.h"
-
-#include "upb/port/def.inc"
-
-extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *xds_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int64Range");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int32Range");
-}
-
-UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "xds.type.v3.DoubleRange");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
diff --git a/src/core/ext/xds/certificate_provider_store.h b/src/core/ext/xds/certificate_provider_store.h
index 24b172ac32d78..aba287f97892b 100644
--- a/src/core/ext/xds/certificate_provider_store.h
+++ b/src/core/ext/xds/certificate_provider_store.h
@@ -36,7 +36,6 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
@@ -96,10 +95,6 @@ class CertificateProviderStore
       return certificate_provider_->distributor();
     }
 
-    grpc_pollset_set* interested_parties() const override {
-      return certificate_provider_->interested_parties();
-    }
-
     int CompareImpl(const grpc_tls_certificate_provider* other) const override {
       // TODO(yashykt): This should probably delegate to the `Compare` method of
       // the wrapped certificate_provider_ object.
diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc
index 8b77e30ed7914..b23c446401fb3 100644
--- a/src/core/ext/xds/xds_api.cc
+++ b/src/core/ext/xds/xds_api.cc
@@ -57,12 +57,12 @@
 namespace grpc_core {
 
 XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer,
-               const XdsBootstrap::Node* node, upb::SymbolTable* symtab,
+               const XdsBootstrap::Node* node, upb::DefPool* def_pool,
                std::string user_agent_name, std::string user_agent_version)
     : client_(client),
       tracer_(tracer),
       node_(node),
-      symtab_(symtab),
+      def_pool_(def_pool),
       user_agent_name_(std::move(user_agent_name)),
       user_agent_version_(std::move(user_agent_version)) {}
 
@@ -71,7 +71,7 @@ namespace {
 struct XdsApiContext {
   XdsClient* client;
   TraceFlag* tracer;
-  upb_DefPool* symtab;
+  upb_DefPool* def_pool;
   upb_Arena* arena;
 };
 
@@ -183,7 +183,7 @@ void MaybeLogDiscoveryRequest(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.symtab);
+        envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.def_pool);
     char buf[10240];
     upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s",
@@ -207,7 +207,8 @@ std::string XdsApi::CreateAdsRequest(
     absl::string_view nonce, const std::vector<std::string>& resource_names,
     absl::Status status, bool populate_node) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_discovery_v3_DiscoveryRequest* request =
       envoy_service_discovery_v3_DiscoveryRequest_new(arena.ptr());
@@ -270,7 +271,8 @@ void MaybeLogDiscoveryResponse(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(context.symtab);
+        envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(
+            context.def_pool);
     char buf[10240];
     upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", context.client,
@@ -283,7 +285,8 @@ void MaybeLogDiscoveryResponse(
 absl::Status XdsApi::ParseAdsResponse(absl::string_view encoded_response,
                                       AdsResponseParserInterface* parser) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Decode the response.
   const envoy_service_discovery_v3_DiscoveryResponse* response =
       envoy_service_discovery_v3_DiscoveryResponse_parse(
@@ -356,7 +359,8 @@ void MaybeLogLrsRequest(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(context.symtab);
+        envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(
+            context.def_pool);
     char buf[10240];
     upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s",
@@ -377,7 +381,8 @@ std::string SerializeLrsRequest(
 
 std::string XdsApi::CreateLrsInitialRequest() {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -447,7 +452,8 @@ void LocalityStatsPopulate(
 std::string XdsApi::CreateLrsRequest(
     ClusterLoadReportMap cluster_load_report_map) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -514,7 +520,8 @@ void MaybeLogLrsResponse(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(context.symtab);
+        envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(
+            context.def_pool);
     char buf[10240];
     upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] received LRS response: %s",
@@ -537,7 +544,8 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
   if (decoded_response == nullptr) {
     return absl::UnavailableError("Can't decode response.");
   }
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   MaybeLogLrsResponse(context, decoded_response);
   // Check send_all_clusters.
   if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters(
@@ -585,7 +593,8 @@ std::string XdsApi::AssembleClientConfig(
   // Fill-in the node information
   auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config,
                                                                  arena.ptr());
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   PopulateNode(context, node_, user_agent_name_, user_agent_version_, node);
   // Dump each resource.
   std::vector<std::string> type_url_storage;
diff --git a/src/core/ext/xds/xds_api.h b/src/core/ext/xds/xds_api.h
index 256998cc24df0..2d96892496667 100644
--- a/src/core/ext/xds/xds_api.h
+++ b/src/core/ext/xds/xds_api.h
@@ -148,7 +148,7 @@ class XdsApi {
                 "");
 
   XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node,
-         upb::SymbolTable* symtab, std::string user_agent_name,
+         upb::DefPool* def_pool, std::string user_agent_name,
          std::string user_agent_version);
 
   // Creates an ADS request.
@@ -184,7 +184,7 @@ class XdsApi {
   XdsClient* client_;
   TraceFlag* tracer_;
   const XdsBootstrap::Node* node_;  // Do not own.
-  upb::SymbolTable* symtab_;        // Do not own.
+  upb::DefPool* def_pool_;          // Do not own.
   const std::string user_agent_name_;
   const std::string user_agent_version_;
 };
diff --git a/src/core/ext/xds/xds_certificate_provider.cc b/src/core/ext/xds/xds_certificate_provider.cc
index 0ca497939eed3..439921c648aae 100644
--- a/src/core/ext/xds/xds_certificate_provider.cc
+++ b/src/core/ext/xds/xds_certificate_provider.cc
@@ -374,43 +374,4 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
   if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it);
 }
 
-namespace {
-
-void* XdsCertificateProviderArgCopy(void* p) {
-  XdsCertificateProvider* xds_certificate_provider =
-      static_cast<XdsCertificateProvider*>(p);
-  return xds_certificate_provider->Ref().release();
-}
-
-void XdsCertificateProviderArgDestroy(void* p) {
-  XdsCertificateProvider* xds_certificate_provider =
-      static_cast<XdsCertificateProvider*>(p);
-  xds_certificate_provider->Unref();
-}
-
-int XdsCertificateProviderArgCmp(void* p, void* q) {
-  return QsortCompare(p, q);
-}
-
-const grpc_arg_pointer_vtable kChannelArgVtable = {
-    XdsCertificateProviderArgCopy, XdsCertificateProviderArgDestroy,
-    XdsCertificateProviderArgCmp};
-
-}  // namespace
-
-grpc_arg XdsCertificateProvider::MakeChannelArg() const {
-  return grpc_channel_arg_pointer_create(
-      const_cast<char*>(GRPC_ARG_XDS_CERTIFICATE_PROVIDER),
-      const_cast<XdsCertificateProvider*>(this), &kChannelArgVtable);
-}
-
-RefCountedPtr<XdsCertificateProvider>
-XdsCertificateProvider::GetFromChannelArgs(const grpc_channel_args* args) {
-  XdsCertificateProvider* xds_certificate_provider =
-      grpc_channel_args_find_pointer<XdsCertificateProvider>(
-          args, GRPC_ARG_XDS_CERTIFICATE_PROVIDER);
-  return xds_certificate_provider != nullptr ? xds_certificate_provider->Ref()
-                                             : nullptr;
-}
-
 }  // namespace grpc_core
diff --git a/src/core/ext/xds/xds_certificate_provider.h b/src/core/ext/xds/xds_certificate_provider.h
index c17a7fa5cb728..44eb2421d8985 100644
--- a/src/core/ext/xds/xds_certificate_provider.h
+++ b/src/core/ext/xds/xds_certificate_provider.h
@@ -40,9 +40,6 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
-#define GRPC_ARG_XDS_CERTIFICATE_PROVIDER \
-  "grpc.internal.xds_certificate_provider"
-
 namespace grpc_core {
 
 class XdsCertificateProvider : public grpc_tls_certificate_provider {
@@ -50,15 +47,6 @@ class XdsCertificateProvider : public grpc_tls_certificate_provider {
   XdsCertificateProvider();
   ~XdsCertificateProvider() override;
 
-  static absl::string_view ChannelArgName() {
-    return GRPC_ARG_XDS_CERTIFICATE_PROVIDER;
-  }
-
-  static int ChannelArgsCompare(const XdsCertificateProvider* a,
-                                const XdsCertificateProvider* b) {
-    return QsortCompare(a, b);
-  }
-
   RefCountedPtr<grpc_tls_certificate_distributor> distributor() const override {
     return distributor_;
   }
@@ -86,10 +74,13 @@ class XdsCertificateProvider : public grpc_tls_certificate_provider {
   void UpdateSubjectAlternativeNameMatchers(
       const std::string& cluster, std::vector<StringMatcher> matchers);
 
-  grpc_arg MakeChannelArg() const;
-
-  static RefCountedPtr<XdsCertificateProvider> GetFromChannelArgs(
-      const grpc_channel_args* args);
+  static absl::string_view ChannelArgName() {
+    return "grpc.internal.xds_certificate_provider";
+  }
+  static int ChannelArgsCompare(const XdsCertificateProvider* a,
+                                const XdsCertificateProvider* b) {
+    return a->Compare(b);
+  }
 
  private:
   class ClusterCertificateState {
diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc
index 19d2702a6d51f..e6399e98d1a30 100644
--- a/src/core/ext/xds/xds_client.cc
+++ b/src/core/ext/xds/xds_client.cc
@@ -756,7 +756,7 @@ void XdsClient::ChannelState::AdsCallState::AdsResponseParser::ParseResource(
   // Parse the resource.
   XdsResourceType::DecodeContext context = {
       xds_client(), ads_call_state_->chand()->server_, &grpc_xds_client_trace,
-      xds_client()->symtab_.ptr(), arena};
+      xds_client()->def_pool_.ptr(), arena};
   XdsResourceType::DecodeResult decode_result =
       result_.type->Decode(context, serialized_resource);
   // If we didn't already have the resource name from the Resource
@@ -1490,7 +1490,7 @@ XdsClient::XdsClient(
       transport_factory_(std::move(transport_factory)),
       request_timeout_(resource_request_timeout),
       xds_federation_enabled_(XdsFederationEnabled()),
-      api_(this, &grpc_xds_client_trace, bootstrap_->node(), &symtab_,
+      api_(this, &grpc_xds_client_trace, bootstrap_->node(), &def_pool_,
            std::move(user_agent_name), std::move(user_agent_version)),
       work_serializer_(engine),
       engine_(std::move(engine)) {
@@ -1722,7 +1722,7 @@ void XdsClient::MaybeRegisterResourceTypeLocked(
     return;
   }
   resource_types_.emplace(resource_type->type_url(), resource_type);
-  resource_type->InitUpbSymtab(this, symtab_.ptr());
+  resource_type->InitUpbSymtab(this, def_pool_.ptr());
 }
 
 const XdsResourceType* XdsClient::GetResourceTypeLocked(
diff --git a/src/core/ext/xds/xds_client.h b/src/core/ext/xds/xds_client.h
index bd24d8ae193b9..0831c3c768ace 100644
--- a/src/core/ext/xds/xds_client.h
+++ b/src/core/ext/xds/xds_client.h
@@ -317,7 +317,7 @@ class XdsClient : public DualRefCounted<XdsClient> {
   // Stores resource type objects seen by type URL.
   std::map<absl::string_view /*resource_type*/, const XdsResourceType*>
       resource_types_ ABSL_GUARDED_BY(mu_);
-  upb::SymbolTable symtab_ ABSL_GUARDED_BY(mu_);
+  upb::DefPool def_pool_ ABSL_GUARDED_BY(mu_);
 
   // Map of existing xDS server channels.
   // Key is owned by the bootstrap config.
diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h
index 38bb070213cab..2c10d955127f4 100644
--- a/src/core/lib/channel/channel_args.h
+++ b/src/core/lib/channel/channel_args.h
@@ -125,6 +125,16 @@ struct ChannelArgTypeTraits<
   };
 };
 
+// Define a check for shared_ptr supported types, which must extend
+// enable_shared_from_this.
+template <typename T>
+struct SupportedSharedPtrType
+    : std::integral_constant<
+          bool, std::is_base_of<std::enable_shared_from_this<T>, T>::value> {};
+template <>
+struct SupportedSharedPtrType<grpc_event_engine::experimental::EventEngine>
+    : std::true_type {};
+
 // Specialization for shared_ptr
 // Incurs an allocation because shared_ptr.release is not a thing.
 template <typename T>
@@ -173,19 +183,27 @@ struct ChannelArgTypeTraits<T,
   };
 };
 
-// GetObject support for shared_ptr and RefCountedPtr
+// Determine if the pointer for a channel arg name should be const or not
+template <typename T, typename SfinaeVoid = void>
+struct ChannelArgPointerShouldBeConst {
+  static constexpr bool kValue = false;
+};
+
 template <typename T>
-struct WrapInSharedPtr
-    : std::integral_constant<
-          bool, std::is_base_of<std::enable_shared_from_this<T>, T>::value> {};
-template <>
-struct WrapInSharedPtr<grpc_event_engine::experimental::EventEngine>
-    : std::true_type {};
+struct ChannelArgPointerShouldBeConst<
+    T, absl::void_t<decltype(T::ChannelArgUseConstPtr())>> {
+  static constexpr bool kValue = T::ChannelArgUseConstPtr();
+};
+
+// GetObject support for shared_ptr and RefCountedPtr
 template <typename T, typename Ignored = void /* for SFINAE */>
 struct GetObjectImpl;
 // std::shared_ptr implementation
 template <typename T>
-struct GetObjectImpl<T, absl::enable_if_t<WrapInSharedPtr<T>::value, void>> {
+struct GetObjectImpl<
+    T, absl::enable_if_t<!ChannelArgPointerShouldBeConst<T>::kValue &&
+                             SupportedSharedPtrType<T>::value,
+                         void>> {
   using Result = T*;
   using ReffedResult = std::shared_ptr<T>;
   using StoredType = std::shared_ptr<T>*;
@@ -205,7 +223,10 @@ struct GetObjectImpl<T, absl::enable_if_t<WrapInSharedPtr<T>::value, void>> {
 };
 // RefCountedPtr
 template <typename T>
-struct GetObjectImpl<T, absl::enable_if_t<!WrapInSharedPtr<T>::value, void>> {
+struct GetObjectImpl<
+    T, absl::enable_if_t<!ChannelArgPointerShouldBeConst<T>::kValue &&
+                             !SupportedSharedPtrType<T>::value,
+                         void>> {
   using Result = T*;
   using ReffedResult = RefCountedPtr<T>;
   using StoredType = Result;
@@ -221,6 +242,26 @@ struct GetObjectImpl<T, absl::enable_if_t<!WrapInSharedPtr<T>::value, void>> {
   };
 };
 
+template <typename T>
+struct GetObjectImpl<
+    T, absl::enable_if_t<ChannelArgPointerShouldBeConst<T>::kValue &&
+                             !SupportedSharedPtrType<T>::value,
+                         void>> {
+  using Result = const T*;
+  using ReffedResult = RefCountedPtr<const T>;
+  using StoredType = Result;
+  static Result Get(StoredType p) { return p; };
+  static ReffedResult GetReffed(StoredType p) {
+    if (p == nullptr) return nullptr;
+    return p->Ref();
+  };
+  static ReffedResult GetReffed(StoredType p, const DebugLocation& location,
+                                const char* reason) {
+    if (p == nullptr) return nullptr;
+    return p->Ref(location, reason);
+  };
+};
+
 // Provide the canonical name for a type's channel arg key
 template <typename T>
 struct ChannelArgNameTraits {
@@ -237,6 +278,7 @@ struct ChannelArgNameTraits<grpc_event_engine::experimental::EventEngine> {
     return GRPC_INTERNAL_ARG_EVENT_ENGINE;
   }
 };
+
 class ChannelArgs {
  public:
   class Pointer {
@@ -376,21 +418,38 @@ class ChannelArgs {
   GRPC_MUST_USE_RESULT auto Set(absl::string_view name,
                                 RefCountedPtr<T> value) const
       -> absl::enable_if_t<
-          std::is_same<const grpc_arg_pointer_vtable*,
-                       decltype(ChannelArgTypeTraits<
-                                absl::remove_cvref_t<T>>::VTable())>::value,
+          !ChannelArgPointerShouldBeConst<T>::kValue &&
+              std::is_same<const grpc_arg_pointer_vtable*,
+                           decltype(ChannelArgTypeTraits<
+                                    absl::remove_cvref_t<T>>::VTable())>::value,
           ChannelArgs> {
     return Set(
         name, Pointer(value.release(),
                       ChannelArgTypeTraits<absl::remove_cvref_t<T>>::VTable()));
   }
   template <typename T>
+  GRPC_MUST_USE_RESULT auto Set(absl::string_view name,
+                                RefCountedPtr<const T> value) const
+      -> absl::enable_if_t<
+          ChannelArgPointerShouldBeConst<T>::kValue &&
+              std::is_same<const grpc_arg_pointer_vtable*,
+                           decltype(ChannelArgTypeTraits<
+                                    absl::remove_cvref_t<T>>::VTable())>::value,
+          ChannelArgs> {
+    return Set(
+        name, Pointer(const_cast<T*>(value.release()),
+                      ChannelArgTypeTraits<absl::remove_cvref_t<T>>::VTable()));
+  }
+  template <typename T>
   GRPC_MUST_USE_RESULT absl::enable_if_t<
       std::is_same<
           const grpc_arg_pointer_vtable*,
           decltype(ChannelArgTypeTraits<std::shared_ptr<T>>::VTable())>::value,
       ChannelArgs>
   Set(absl::string_view name, std::shared_ptr<T> value) const {
+    static_assert(SupportedSharedPtrType<T>::value,
+                  "Type T must extend std::enable_shared_from_this to be added "
+                  "into ChannelArgs as a shared_ptr<T>");
     auto* store_value = new std::shared_ptr<T>(value);
     return Set(
         name,
@@ -418,6 +477,8 @@ class ChannelArgs {
   absl::optional<int> GetInt(absl::string_view name) const;
   absl::optional<absl::string_view> GetString(absl::string_view name) const;
   absl::optional<std::string> GetOwnedString(absl::string_view name) const;
+  // WARNING: this is broken if `name` represents something that was stored as a
+  // RefCounted<const T> - we will discard the const-ness.
   void* GetVoidPointer(absl::string_view name) const;
   template <typename T>
   typename GetObjectImpl<T>::StoredType GetPointer(
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h
index 918628856b03a..5b6649a9eac87 100644
--- a/src/core/lib/channel/channel_stack.h
+++ b/src/core/lib/channel/channel_stack.h
@@ -128,6 +128,12 @@ struct grpc_channel_filter {
   grpc_core::ArenaPromise<grpc_core::ServerMetadataHandle> (*make_call_promise)(
       grpc_channel_element* elem, grpc_core::CallArgs call_args,
       grpc_core::NextPromiseFactory next_promise_factory);
+  // Register interceptors into a call.
+  // If this is non-null it may be used in preference to make_call_promise.
+  // There is an on-going migration to move all filters to providing this, and
+  // then to drop start_transport_stream_op_batch.
+  void (*init_call)(grpc_channel_element* elem,
+                    grpc_core::CallSpineInterface* call_spine);
   // Called to handle channel level operations - e.g. new calls, or transport
   // closure.
   // See grpc_channel_next_op on how to call the next element in the stack
diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc
index afca6eda5fc18..9ea8faeb507d0 100644
--- a/src/core/lib/channel/connected_channel.cc
+++ b/src/core/lib/channel/connected_channel.cc
@@ -857,6 +857,7 @@ grpc_channel_filter MakeConnectedFilter() {
   return {
       connected_channel_start_transport_stream_op_batch,
       make_call_promise != nullptr ? make_call_wrapper : nullptr,
+      /* init_call: */ nullptr,
       connected_channel_start_transport_op,
       sizeof(call_data),
       connected_channel_init_call_elem,
@@ -882,8 +883,8 @@ grpc_channel_filter MakeConnectedFilter() {
 }
 
 ArenaPromise<ServerMetadataHandle> MakeTransportCallPromise(
-    Transport* transport, CallArgs call_args, NextPromiseFactory) {
-  return transport->client_transport()->MakeCallPromise(std::move(call_args));
+    Transport*, CallArgs, NextPromiseFactory) {
+  Crash("unimplemented");
 }
 
 const grpc_channel_filter kPromiseBasedTransportFilter =
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 19efe505db29a..ad33f366378cd 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -43,6 +43,7 @@
 #include <grpc/support/log.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"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
@@ -60,6 +61,8 @@
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/poll.h"
+#include "src/core/lib/promise/promise.h"
+#include "src/core/lib/promise/race.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/surface/call.h"
@@ -122,6 +125,668 @@ class ChannelFilter {
       grpc_event_engine::experimental::GetDefaultEventEngine();
 };
 
+struct NoInterceptor {};
+
+namespace promise_filter_detail {
+
+// Determine if a list of interceptors has any that need to asyncronously error
+// the promise. If so, we need to allocate a latch for the generated promise for
+// the original promise stack polyfill code that's generated.
+
+inline constexpr bool HasAsyncErrorInterceptor() { return false; }
+
+inline constexpr bool HasAsyncErrorInterceptor(const NoInterceptor*) {
+  return false;
+}
+
+template <typename T, typename... A>
+inline constexpr bool HasAsyncErrorInterceptor(absl::Status (T::*)(A...)) {
+  return true;
+}
+
+template <typename T, typename... A>
+inline constexpr bool HasAsyncErrorInterceptor(
+    ServerMetadataHandle (T::*)(A...)) {
+  return true;
+}
+
+template <typename T, typename... A>
+inline constexpr bool HasAsyncErrorInterceptor(void (T::*)(A...)) {
+  return false;
+}
+
+// For the list case we do two interceptors to avoid amiguities with the single
+// argument forms above.
+template <typename I1, typename I2, typename... Interceptors>
+inline constexpr bool HasAsyncErrorInterceptor(I1 i1, I2 i2,
+                                               Interceptors... interceptors) {
+  return HasAsyncErrorInterceptor(i1) || HasAsyncErrorInterceptor(i2) ||
+         HasAsyncErrorInterceptor(interceptors...);
+}
+
+// Composite for a given channel type to determine if any of its interceptors
+// fall into this category: later code should use this.
+template <typename Derived>
+inline constexpr bool CallHasAsyncErrorInterceptor() {
+  return HasAsyncErrorInterceptor(&Derived::Call::OnClientToServerMessage,
+                                  &Derived::Call::OnServerInitialMetadata,
+                                  &Derived::Call::OnServerToClientMessage);
+}
+
+// Determine if an interceptor needs to access the channel via one of its
+// arguments. If so, we need to allocate a pointer to the channel for the
+// generated polyfill promise for the original promise stack.
+
+inline constexpr bool HasChannelAccess() { return false; }
+
+inline constexpr bool HasChannelAccess(const NoInterceptor*) { return false; }
+
+template <typename T, typename R, typename A>
+inline constexpr bool HasChannelAccess(R (T::*)(A)) {
+  return false;
+}
+
+template <typename T, typename R, typename A>
+inline constexpr bool HasChannelAccess(R (T::*)()) {
+  return false;
+}
+
+template <typename T, typename R, typename A, typename C>
+inline constexpr bool HasChannelAccess(R (T::*)(A, C)) {
+  return true;
+}
+
+// For the list case we do two interceptors to avoid amiguities with the single
+// argument forms above.
+template <typename I1, typename I2, typename... Interceptors>
+inline constexpr bool HasChannelAccess(I1 i1, I2 i2,
+                                       Interceptors... interceptors) {
+  return HasChannelAccess(i1) || HasChannelAccess(i2) ||
+         HasChannelAccess(interceptors...);
+}
+
+// Composite for a given channel type to determine if any of its interceptors
+// fall into this category: later code should use this.
+template <typename Derived>
+inline constexpr bool CallHasChannelAccess() {
+  return HasChannelAccess(&Derived::Call::OnClientInitialMetadata,
+                          &Derived::Call::OnClientToServerMessage,
+                          &Derived::Call::OnServerInitialMetadata,
+                          &Derived::Call::OnServerToClientMessage,
+                          &Derived::Call::OnServerTrailingMetadata,
+                          &Derived::Call::OnFinalize);
+}
+
+// Given a boolean X export a type:
+// either T if X is true
+// or an empty type if it is false
+template <typename T, bool X>
+struct TypeIfNeeded;
+
+template <typename T>
+struct TypeIfNeeded<T, false> {
+  struct Type {
+    Type() = default;
+    template <typename Whatever>
+    explicit Type(Whatever) : Type() {}
+  };
+};
+
+template <typename T>
+struct TypeIfNeeded<T, true> {
+  using Type = T;
+};
+
+// For the original promise scheme polyfill:
+// If a set of interceptors might fail asynchronously, wrap the main
+// promise in a race with the cancellation latch.
+// If not, just return the main promise.
+template <bool X>
+struct RaceAsyncCompletion;
+
+template <>
+struct RaceAsyncCompletion<false> {
+  template <typename Promise>
+  static Promise Run(Promise x, void*) {
+    return x;
+  }
+};
+
+template <>
+struct RaceAsyncCompletion<true> {
+  template <typename Promise>
+  static Promise Run(Promise x, Latch<ServerMetadataHandle>* latch) {
+    return Race(latch->Wait(), std::move(x));
+  }
+};
+
+// Zero-member wrapper to make sure that Call always has a constructor
+// that takes a channel pointer (even if it's thrown away)
+template <typename Derived, typename SfinaeVoid = void>
+class CallWrapper;
+
+template <typename Derived>
+class CallWrapper<Derived, absl::void_t<decltype(typename Derived::Call(
+                               std::declval<Derived*>()))>>
+    : public Derived::Call {
+ public:
+  explicit CallWrapper(Derived* channel) : Derived::Call(channel) {}
+};
+
+template <typename Derived>
+class CallWrapper<Derived, absl::void_t<decltype(typename Derived::Call())>>
+    : public Derived::Call {
+ public:
+  explicit CallWrapper(Derived*) : Derived::Call() {}
+};
+
+// For the original promise scheme polyfill: data associated with once call.
+template <typename Derived>
+struct FilterCallData {
+  explicit FilterCallData(Derived* channel) : call(channel), channel(channel) {}
+  GPR_NO_UNIQUE_ADDRESS CallWrapper<Derived> call;
+  GPR_NO_UNIQUE_ADDRESS
+  typename TypeIfNeeded<Latch<ServerMetadataHandle>,
+                        CallHasAsyncErrorInterceptor<Derived>()>::Type
+      error_latch;
+  GPR_NO_UNIQUE_ADDRESS
+  typename TypeIfNeeded<Derived*, CallHasChannelAccess<Derived>()>::Type
+      channel;
+};
+
+template <typename Promise>
+auto MapResult(const NoInterceptor*, Promise x, void*) {
+  return x;
+}
+
+template <typename Promise, typename Derived>
+auto MapResult(absl::Status (Derived::Call::*fn)(ServerMetadata&), Promise x,
+               FilterCallData<Derived>* call_data) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+    auto status = call_data->call.OnServerTrailingMetadata(*md);
+    if (!status.ok()) return ServerMetadataFromStatus(status);
+    return md;
+  });
+}
+
+template <typename Promise, typename Derived>
+auto MapResult(void (Derived::Call::*fn)(ServerMetadata&), Promise x,
+               FilterCallData<Derived>* call_data) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+    call_data->call.OnServerTrailingMetadata(*md);
+    return md;
+  });
+}
+
+inline auto RunCall(const NoInterceptor*, CallArgs call_args,
+                    NextPromiseFactory next_promise_factory, void*) {
+  return next_promise_factory(std::move(call_args));
+}
+
+template <typename Derived>
+inline auto RunCall(void (Derived::Call::*fn)(ClientMetadata& md),
+                    CallArgs call_args, NextPromiseFactory next_promise_factory,
+                    FilterCallData<Derived>* call_data) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_data->call.OnClientInitialMetadata(*call_args.client_initial_metadata);
+  return next_promise_factory(std::move(call_args));
+}
+
+template <typename Derived>
+inline auto RunCall(
+    ServerMetadataHandle (Derived::Call::*fn)(ClientMetadata& md),
+    CallArgs call_args, NextPromiseFactory next_promise_factory,
+    FilterCallData<Derived>* call_data) -> ArenaPromise<ServerMetadataHandle> {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  auto return_md = call_data->call.OnClientInitialMetadata(
+      *call_args.client_initial_metadata);
+  if (return_md == nullptr) return next_promise_factory(std::move(call_args));
+  return Immediate(std::move(return_md));
+}
+
+template <typename Derived>
+inline auto RunCall(ServerMetadataHandle (Derived::Call::*fn)(
+                        ClientMetadata& md, Derived* channel),
+                    CallArgs call_args, NextPromiseFactory next_promise_factory,
+                    FilterCallData<Derived>* call_data)
+    -> ArenaPromise<ServerMetadataHandle> {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  auto return_md = call_data->call.OnClientInitialMetadata(
+      *call_args.client_initial_metadata, call_data->channel);
+  if (return_md == nullptr) return next_promise_factory(std::move(call_args));
+  return Immediate(std::move(return_md));
+}
+
+template <typename Derived>
+inline auto RunCall(void (Derived::Call::*fn)(ClientMetadata& md,
+                                              Derived* channel),
+                    CallArgs call_args, NextPromiseFactory next_promise_factory,
+                    FilterCallData<Derived>* call_data) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_data->call.OnClientInitialMetadata(*call_args.client_initial_metadata,
+                                          call_data->channel);
+  return next_promise_factory(std::move(call_args));
+}
+
+inline void InterceptClientToServerMessage(const NoInterceptor*, void*,
+                                           const CallArgs&) {}
+
+template <typename Derived>
+inline void InterceptClientToServerMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientToServerMessage);
+  call_args.client_to_server_messages->InterceptAndMap(
+      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call_data->call.OnClientToServerMessage(*msg);
+        if (return_md == nullptr) return std::move(msg);
+        if (call_data->error_latch.is_set()) return absl::nullopt;
+        call_data->error_latch.Set(std::move(return_md));
+        return absl::nullopt;
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientToServerMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientToServerMessage);
+  call_args.client_to_server_messages->InterceptAndMap(
+      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md =
+            call_data->call.OnClientToServerMessage(*msg, call_data->channel);
+        if (return_md == nullptr) return std::move(msg);
+        if (call_data->error_latch.is_set()) return absl::nullopt;
+        call_data->error_latch.Set(std::move(return_md));
+        return absl::nullopt;
+      });
+}
+
+inline void InterceptClientToServerMessage(const NoInterceptor*, void*, void*,
+                                           CallSpineInterface*) {}
+
+template <typename Derived>
+inline void InterceptClientToServerMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientToServerMessage);
+  call_spine->server_to_client_messages().sender.InterceptAndMap(
+      [call, call_spine](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call->OnClientToServerMessage(*msg);
+        if (return_md == nullptr) return std::move(msg);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientToServerMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientToServerMessage);
+  call_spine->server_to_client_messages().sender.InterceptAndMap(
+      [call, call_spine,
+       channel](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call->OnClientToServerMessage(*msg, channel);
+        if (return_md == nullptr) return std::move(msg);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+inline void InterceptClientInitialMetadata(const NoInterceptor*, void*, void*,
+                                           CallSpineInterface*) {}
+
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    void (Derived::Call::*fn)(ClientMetadata& md), typename Derived::Call* call,
+    Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call](ClientMetadataHandle md) {
+        call->OnClientInitialMetadata(*md);
+        return md;
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    void (Derived::Call::*fn)(ClientMetadata& md, Derived* channel),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call, channel](ClientMetadataHandle md) {
+        call->OnClientInitialMetadata(*md, channel);
+        return md;
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    ServerMetadataHandle (Derived::Call::*fn)(ClientMetadata& md),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call_spine,
+       call](ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
+        auto return_md = call->OnClientInitialMetadata(*md);
+        if (return_md == nullptr) return std::move(md);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    ServerMetadataHandle (Derived::Call::*fn)(ClientMetadata& md,
+                                              Derived* channel),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call_spine, call, channel](
+          ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
+        auto return_md = call->OnClientInitialMetadata(*md, channel);
+        if (return_md == nullptr) return std::move(md);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+template <typename CallArgs>
+inline void InterceptServerInitialMetadata(const NoInterceptor*, void*,
+                                           const CallArgs&) {}
+
+template <typename Derived>
+inline void InterceptServerInitialMetadata(
+    void (Derived::Call::*fn)(ServerMetadata&),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerInitialMetadata);
+  call_args.server_initial_metadata->InterceptAndMap(
+      [call_data](ServerMetadataHandle md) {
+        call_data->call.OnServerInitialMetadata(*md);
+        return md;
+      });
+}
+
+template <typename Derived>
+inline void InterceptServerInitialMetadata(
+    absl::Status (Derived::Call::*fn)(ServerMetadata&),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerInitialMetadata);
+  call_args.server_initial_metadata->InterceptAndMap(
+      [call_data](
+          ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
+        auto status = call_data->call.OnServerInitialMetadata(*md);
+        if (!status.ok() && !call_data->error_latch.is_set()) {
+          call_data->error_latch.Set(ServerMetadataFromStatus(status));
+          return absl::nullopt;
+        }
+        return std::move(md);
+      });
+}
+
+inline void InterceptServerInitialMetadata(const NoInterceptor*, void*, void*,
+                                           CallSpineInterface*) {}
+
+template <typename Derived>
+inline void InterceptServerInitialMetadata(
+    void (Derived::Call::*fn)(ServerMetadata&), typename Derived::Call* call,
+    Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerInitialMetadata);
+  call_spine->server_initial_metadata().sender.InterceptAndMap(
+      [call](ServerMetadataHandle md) {
+        call->OnServerInitialMetadata(*md);
+        return md;
+      });
+}
+
+template <typename Derived>
+inline void InterceptServerInitialMetadata(
+    absl::Status (Derived::Call::*fn)(ServerMetadata&),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerInitialMetadata);
+  call_spine->server_initial_metadata().sender.InterceptAndMap(
+      [call, call_spine](
+          ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
+        auto status = call->OnServerInitialMetadata(*md);
+        if (status.ok()) return std::move(md);
+        return call_spine->Cancel(ServerMetadataFromStatus(status));
+      });
+}
+
+inline void InterceptServerToClientMessage(const NoInterceptor*, void*,
+                                           const CallArgs&) {}
+
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerToClientMessage);
+  call_args.server_to_client_messages->InterceptAndMap(
+      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call_data->call.OnServerToClientMessage(*msg);
+        if (return_md == nullptr) return std::move(msg);
+        if (call_data->error_latch.is_set()) return absl::nullopt;
+        call_data->error_latch.Set(std::move(return_md));
+        return absl::nullopt;
+      });
+}
+
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
+    FilterCallData<Derived>* call_data, const CallArgs& call_args) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerToClientMessage);
+  call_args.server_to_client_messages->InterceptAndMap(
+      [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md =
+            call_data->call.OnServerToClientMessage(*msg, call_data->channel);
+        if (return_md == nullptr) return std::move(msg);
+        if (call_data->error_latch.is_set()) return absl::nullopt;
+        call_data->error_latch.Set(std::move(return_md));
+        return absl::nullopt;
+      });
+}
+
+inline void InterceptServerToClientMessage(const NoInterceptor*, void*, void*,
+                                           CallSpineInterface*) {}
+
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerToClientMessage);
+  call_spine->server_to_client_messages().sender.InterceptAndMap(
+      [call, call_spine](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call->OnServerToClientMessage(*msg);
+        if (return_md == nullptr) return std::move(msg);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+template <typename Derived>
+inline void InterceptServerToClientMessage(
+    ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerToClientMessage);
+  call_spine->server_to_client_messages().sender.InterceptAndMap(
+      [call, call_spine,
+       channel](MessageHandle msg) -> absl::optional<MessageHandle> {
+        auto return_md = call->OnServerToClientMessage(*msg, channel);
+        if (return_md == nullptr) return std::move(msg);
+        return call_spine->Cancel(std::move(return_md));
+      });
+}
+
+inline void InterceptServerTrailingMetadata(const NoInterceptor*, void*, void*,
+                                            CallSpineInterface*) {}
+
+template <typename Derived>
+inline void InterceptServerTrailingMetadata(
+    void (Derived::Call::*fn)(ServerMetadata&), typename Derived::Call* call,
+    Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  call_spine->server_trailing_metadata().sender.InterceptAndMap(
+      [call](ServerMetadataHandle md) {
+        call->OnServerTrailingMetadata(*md);
+        return md;
+      });
+}
+
+template <typename Derived>
+inline void InterceptServerTrailingMetadata(
+    absl::Status (Derived::Call::*fn)(ServerMetadata&),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  call_spine->server_trailing_metadata().sender.InterceptAndMap(
+      [call](ServerMetadataHandle md) -> absl::optional<ServerMetadataHandle> {
+        auto status = call->OnServerTrailingMetadata(*md);
+        if (status.ok()) return std::move(md);
+        return ServerMetadataFromStatus(status);
+      });
+}
+
+inline void InterceptFinalize(const NoInterceptor*, void*) {}
+
+template <class Call>
+inline void InterceptFinalize(void (Call::*fn)(const grpc_call_final_info*),
+                              Call* call) {
+  GPR_DEBUG_ASSERT(fn == &Call::OnFinalize);
+  GetContext<CallFinalization>()->Add(
+      [call](const grpc_call_final_info* final_info) {
+        call->OnFinalize(final_info);
+      });
+}
+
+template <typename Derived>
+absl::enable_if_t<std::is_empty<FilterCallData<Derived>>::value,
+                  FilterCallData<Derived>*>
+MakeFilterCall(Derived*) {
+  static FilterCallData<Derived> call{nullptr};
+  return &call;
+}
+
+template <typename Derived>
+absl::enable_if_t<!std::is_empty<FilterCallData<Derived>>::value,
+                  FilterCallData<Derived>*>
+MakeFilterCall(Derived* derived) {
+  return GetContext<Arena>()->ManagedNew<FilterCallData<Derived>>(derived);
+}
+
+}  // namespace promise_filter_detail
+
+// Base class for promise-based channel filters.
+// Eventually this machinery will move elsewhere (the interception logic will
+// move directly into the channel stack, and so filters will just directly
+// derive from `ChannelFilter`)
+//
+// Implements new-style call filters, and polyfills them into the previous
+// scheme.
+//
+// Call filters:
+// Derived types should declare a class `Call` with the following members:
+// - OnClientInitialMetadata  - $VALUE_TYPE = ClientMetadata
+// - OnServerInitialMetadata  - $VALUE_TYPE = ServerMetadata
+// - OnServerToClientMessage  - $VALUE_TYPE = Message
+// - OnClientToServerMessage  - $VALUE_TYPE = Message
+// - OnServerTrailingMetadata - $VALUE_TYPE = ServerMetadata
+// - OnFinalize               - special, see below
+// These members define an interception point for a particular event in
+// the call lifecycle.
+// The type of these members matters, and is selectable by the class
+// author. For $INTERCEPTOR_NAME in the above list:
+// - static const NoInterceptor $INTERCEPTOR_NAME:
+//   defines that this filter does not intercept this event.
+//   there is zero runtime cost added to handling that event by this filter.
+// - void $INTERCEPTOR_NAME($VALUE_TYPE&):
+//   the filter intercepts this event, and can modify the value.
+//   it never fails.
+// - absl::Status $INTERCEPTOR_NAME($VALUE_TYPE&):
+//   the filter intercepts this event, and can modify the value.
+//   it can fail, in which case the call will be aborted.
+// - ServerMetadataHandle $INTERCEPTOR_NAME($VALUE_TYPE&)
+//   the filter intercepts this event, and can modify the value.
+//   the filter can return nullptr for success, or a metadata handle for
+//   failure (in which case the call will be aborted).
+//   useful for cases where the exact metadata returned needs to be customized.
+// - void $INTERCEPTOR_NAME($VALUE_TYPE&, Derived*):
+//   the filter intercepts this event, and can modify the value.
+//   it can access the channel via the second argument.
+//   it never fails.
+// - absl::Status $INTERCEPTOR_NAME($VALUE_TYPE&, Derived*):
+//   the filter intercepts this event, and can modify the value.
+//   it can access the channel via the second argument.
+//   it can fail, in which case the call will be aborted.
+// - ServerMetadataHandle $INTERCEPTOR_NAME($VALUE_TYPE&, Derived*)
+//   the filter intercepts this event, and can modify the value.
+//   it can access the channel via the second argument.
+//   the filter can return nullptr for success, or a metadata handle for
+//   failure (in which case the call will be aborted).
+//   useful for cases where the exact metadata returned needs to be customized.
+// Finally, OnFinalize can be added to intecept call finalization.
+// It must have one of the signatures:
+// - static const NoInterceptor OnFinalize:
+//   the filter does not intercept call finalization.
+// - void OnFinalize(const grpc_call_final_info*):
+//   the filter intercepts call finalization.
+template <typename Derived>
+class ImplementChannelFilter : public ChannelFilter {
+ public:
+  // Natively construct a v3 call.
+  void InitCall(CallSpineInterface* call_spine) {
+    typename Derived::Call* call =
+        GetContext<Arena>()
+            ->ManagedNew<promise_filter_detail::CallWrapper<Derived>>(
+                static_cast<Derived*>(this));
+    promise_filter_detail::InterceptClientInitialMetadata(
+        &Derived::Call::OnClientInitialMetadata, call,
+        static_cast<Derived*>(this), call_spine);
+    promise_filter_detail::InterceptClientToServerMessage(
+        &Derived::Call::OnClientToServerMessage, call,
+        static_cast<Derived*>(this), call_spine);
+    promise_filter_detail::InterceptServerInitialMetadata(
+        &Derived::Call::OnServerInitialMetadata, call,
+        static_cast<Derived*>(this), call_spine);
+    promise_filter_detail::InterceptServerToClientMessage(
+        &Derived::Call::OnServerToClientMessage, call,
+        static_cast<Derived*>(this), call_spine);
+    promise_filter_detail::InterceptServerTrailingMetadata(
+        &Derived::Call::OnServerTrailingMetadata, call,
+        static_cast<Derived*>(this), call_spine);
+    promise_filter_detail::InterceptFinalize(&Derived::Call::OnFinalize, call);
+  }
+
+  // Polyfill for the original promise scheme.
+  // Allows writing v3 filters that work with v2 stacks.
+  // (and consequently also v1 stacks since we can polyfill back to that too).
+  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+      CallArgs call_args, NextPromiseFactory next_promise_factory) final {
+    auto* call = promise_filter_detail::MakeFilterCall<Derived>(
+        static_cast<Derived*>(this));
+    promise_filter_detail::InterceptClientToServerMessage(
+        &Derived::Call::OnClientToServerMessage, call, call_args);
+    promise_filter_detail::InterceptServerInitialMetadata(
+        &Derived::Call::OnServerInitialMetadata, call, call_args);
+    promise_filter_detail::InterceptServerToClientMessage(
+        &Derived::Call::OnServerToClientMessage, call, call_args);
+    promise_filter_detail::InterceptFinalize(
+        &Derived::Call::OnFinalize,
+        static_cast<typename Derived::Call*>(&call->call));
+    return promise_filter_detail::MapResult(
+        &Derived::Call::OnServerTrailingMetadata,
+        promise_filter_detail::RaceAsyncCompletion<
+            promise_filter_detail::CallHasAsyncErrorInterceptor<Derived>()>::
+            Run(promise_filter_detail::RunCall(
+                    &Derived::Call::OnClientInitialMetadata,
+                    std::move(call_args), std::move(next_promise_factory),
+                    call),
+                &call->error_latch),
+        call);
+  }
+};
+
 // Designator for whether a filter is client side or server side.
 // Please don't use this outside calls to MakePromiseBasedFilter - it's
 // intended to be deleted once the promise conversion is complete.
@@ -912,7 +1577,49 @@ struct ChannelFilterWithFlagsMethods {
 //       ChannelArgs channel_args, ChannelFilter::Args filter_args);
 // };
 template <typename F, FilterEndpoint kEndpoint, uint8_t kFlags = 0>
-absl::enable_if_t<std::is_base_of<ChannelFilter, F>::value, grpc_channel_filter>
+absl::enable_if_t<std::is_base_of<ChannelFilter, F>::value &&
+                      !std::is_base_of<ImplementChannelFilter<F>, F>::value,
+                  grpc_channel_filter>
+MakePromiseBasedFilter(const char* name) {
+  using CallData = promise_filter_detail::CallData<kEndpoint>;
+
+  return grpc_channel_filter{
+      // start_transport_stream_op_batch
+      promise_filter_detail::BaseCallDataMethods::StartTransportStreamOpBatch,
+      // make_call_promise
+      promise_filter_detail::ChannelFilterMethods::MakeCallPromise,
+      nullptr,
+      // start_transport_op
+      promise_filter_detail::ChannelFilterMethods::StartTransportOp,
+      // sizeof_call_data
+      sizeof(CallData),
+      // init_call_elem
+      promise_filter_detail::CallDataFilterWithFlagsMethods<
+          CallData, kFlags>::InitCallElem,
+      // set_pollset_or_pollset_set
+      promise_filter_detail::BaseCallDataMethods::SetPollsetOrPollsetSet,
+      // destroy_call_elem
+      promise_filter_detail::CallDataFilterWithFlagsMethods<
+          CallData, kFlags>::DestroyCallElem,
+      // sizeof_channel_data
+      sizeof(F),
+      // init_channel_elem
+      promise_filter_detail::ChannelFilterWithFlagsMethods<
+          F, kFlags>::InitChannelElem,
+      // post_init_channel_elem
+      promise_filter_detail::ChannelFilterMethods::PostInitChannelElem,
+      // destroy_channel_elem
+      promise_filter_detail::ChannelFilterMethods::DestroyChannelElem,
+      // get_channel_info
+      promise_filter_detail::ChannelFilterMethods::GetChannelInfo,
+      // name
+      name,
+  };
+}
+
+template <typename F, FilterEndpoint kEndpoint, uint8_t kFlags = 0>
+absl::enable_if_t<std::is_base_of<ImplementChannelFilter<F>, F>::value,
+                  grpc_channel_filter>
 MakePromiseBasedFilter(const char* name) {
   using CallData = promise_filter_detail::CallData<kEndpoint>;
 
@@ -921,6 +1628,9 @@ MakePromiseBasedFilter(const char* name) {
       promise_filter_detail::BaseCallDataMethods::StartTransportStreamOpBatch,
       // make_call_promise
       promise_filter_detail::ChannelFilterMethods::MakeCallPromise,
+      [](grpc_channel_element* elem, CallSpineInterface* args) {
+        static_cast<F*>(elem->channel_data)->InitCall(args);
+      },
       // start_transport_op
       promise_filter_detail::ChannelFilterMethods::StartTransportOp,
       // sizeof_call_data
diff --git a/src/core/lib/channel/server_call_tracer_filter.cc b/src/core/lib/channel/server_call_tracer_filter.cc
index 026216fd59e2c..c2450a97d4c94 100644
--- a/src/core/lib/channel/server_call_tracer_filter.cc
+++ b/src/core/lib/channel/server_call_tracer_filter.cc
@@ -42,19 +42,55 @@ namespace grpc_core {
 
 namespace {
 
-// TODO(yashykt): This filter is not really needed. We should be able to move
-// this to the connected filter.
-class ServerCallTracerFilter : public ChannelFilter {
+class ServerCallTracerFilter
+    : public ImplementChannelFilter<ServerCallTracerFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<ServerCallTracerFilter> Create(
       const ChannelArgs& /*args*/, ChannelFilter::Args /*filter_args*/);
 
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& client_initial_metadata) {
+      auto* call_tracer = CallTracer();
+      if (call_tracer == nullptr) return;
+      call_tracer->RecordReceivedInitialMetadata(&client_initial_metadata);
+    }
+
+    void OnServerInitialMetadata(ServerMetadata& server_initial_metadata) {
+      auto* call_tracer = CallTracer();
+      if (call_tracer == nullptr) return;
+      call_tracer->RecordSendInitialMetadata(&server_initial_metadata);
+    }
+
+    void OnFinalize(const grpc_call_final_info* final_info) {
+      auto* call_tracer = CallTracer();
+      if (call_tracer == nullptr) return;
+      call_tracer->RecordEnd(final_info);
+    }
+
+    void OnServerTrailingMetadata(ServerMetadata& server_trailing_metadata) {
+      auto* call_tracer = CallTracer();
+      if (call_tracer == nullptr) return;
+      call_tracer->RecordSendTrailingMetadata(&server_trailing_metadata);
+    }
+
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+
+   private:
+    static ServerCallTracer* CallTracer() {
+      auto* call_context = GetContext<grpc_call_context_element>();
+      return static_cast<ServerCallTracer*>(
+          call_context[GRPC_CONTEXT_CALL_TRACER].value);
+    }
+  };
 };
 
+const NoInterceptor ServerCallTracerFilter::Call::OnClientToServerMessage;
+const NoInterceptor ServerCallTracerFilter::Call::OnServerToClientMessage;
+
 const grpc_channel_filter ServerCallTracerFilter::kFilter =
     MakePromiseBasedFilter<ServerCallTracerFilter, FilterEndpoint::kServer,
                            kFilterExaminesServerInitialMetadata>(
@@ -65,34 +101,6 @@ absl::StatusOr<ServerCallTracerFilter> ServerCallTracerFilter::Create(
   return ServerCallTracerFilter();
 }
 
-ArenaPromise<ServerMetadataHandle> ServerCallTracerFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  auto* call_context = GetContext<grpc_call_context_element>();
-  auto* call_tracer = static_cast<ServerCallTracer*>(
-      call_context[GRPC_CONTEXT_CALL_TRACER].value);
-  if (call_tracer == nullptr) {
-    return next_promise_factory(std::move(call_args));
-  }
-  call_tracer->RecordReceivedInitialMetadata(
-      call_args.client_initial_metadata.get());
-  call_args.server_initial_metadata->InterceptAndMap(
-      [call_tracer](ServerMetadataHandle metadata) {
-        call_tracer->RecordSendInitialMetadata(metadata.get());
-        return metadata;
-      });
-  GetContext<CallFinalization>()->Add(
-      [call_tracer](const grpc_call_final_info* final_info) {
-        call_tracer->RecordEnd(final_info);
-      });
-  return OnCancel(
-      Map(next_promise_factory(std::move(call_args)),
-          [call_tracer](ServerMetadataHandle md) {
-            call_tracer->RecordSendTrailingMetadata(md.get());
-            return md;
-          }),
-      [call_tracer]() { call_tracer->RecordCancel(absl::CancelledError()); });
-}
-
 }  // namespace
 
 void RegisterServerCallTracerFilter(CoreConfiguration::Builder* builder) {
diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc
index 08ab6185a35b9..70813eb649a7d 100644
--- a/src/core/lib/event_engine/ares_resolver.cc
+++ b/src/core/lib/event_engine/ares_resolver.cc
@@ -62,10 +62,12 @@
 
 #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"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
@@ -188,6 +190,18 @@ AresResolver::CreateAresResolver(
       std::move(polled_fd_factory), std::move(event_engine), channel);
 }
 
+AresResolver::AresResolver(
+    std::unique_ptr<GrpcPolledFdFactory> polled_fd_factory,
+    std::shared_ptr<EventEngine> event_engine, ares_channel channel)
+    : RefCountedDNSResolverInterface(
+          GRPC_TRACE_FLAG_ENABLED(grpc_trace_ares_resolver) ? "AresResolver"
+                                                            : nullptr),
+      channel_(channel),
+      polled_fd_factory_(std::move(polled_fd_factory)),
+      event_engine_(std::move(event_engine)) {
+  polled_fd_factory_->Initialize(&mutex_, event_engine_.get());
+}
+
 AresResolver::~AresResolver() {
   GPR_ASSERT(fd_node_list_.empty());
   GPR_ASSERT(callback_map_.empty());
@@ -206,8 +220,8 @@ void AresResolver::Orphan() {
       if (!fd_node->already_shutdown) {
         GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p shutdown fd: %s", this,
                                      fd_node->polled_fd->GetName());
-        fd_node->polled_fd->ShutdownLocked(
-            absl::CancelledError("AresResolver::Orphan"));
+        GPR_ASSERT(fd_node->polled_fd->ShutdownLocked(
+            absl::CancelledError("AresResolver::Orphan")));
         fd_node->already_shutdown = true;
       }
     }
@@ -216,8 +230,8 @@ void AresResolver::Orphan() {
 }
 
 void AresResolver::LookupHostname(
-    absl::string_view name, absl::string_view default_port,
-    EventEngine::DNSResolver::LookupHostnameCallback callback) {
+    EventEngine::DNSResolver::LookupHostnameCallback callback,
+    absl::string_view name, absl::string_view default_port) {
   absl::string_view host;
   absl::string_view port_string;
   if (!grpc_core::SplitHostPort(name, &host, &port_string)) {
@@ -282,8 +296,8 @@ void AresResolver::LookupHostname(
 }
 
 void AresResolver::LookupSRV(
-    absl::string_view name,
-    EventEngine::DNSResolver::LookupSRVCallback callback) {
+    EventEngine::DNSResolver::LookupSRVCallback callback,
+    absl::string_view name) {
   absl::string_view host;
   absl::string_view port;
   if (!grpc_core::SplitHostPort(name, &host, &port)) {
@@ -311,8 +325,8 @@ void AresResolver::LookupSRV(
 }
 
 void AresResolver::LookupTXT(
-    absl::string_view name,
-    EventEngine::DNSResolver::LookupTXTCallback callback) {
+    EventEngine::DNSResolver::LookupTXTCallback callback,
+    absl::string_view name) {
   absl::string_view host;
   absl::string_view port;
   if (!grpc_core::SplitHostPort(name, &host, &port)) {
@@ -339,20 +353,10 @@ void AresResolver::LookupTXT(
   MaybeStartTimerLocked();
 }
 
-AresResolver::AresResolver(
-    std::unique_ptr<GrpcPolledFdFactory> polled_fd_factory,
-    std::shared_ptr<EventEngine> event_engine, ares_channel channel)
-    : grpc_core::InternallyRefCounted<AresResolver>(
-          GRPC_TRACE_FLAG_ENABLED(grpc_trace_ares_resolver) ? "AresResolver"
-                                                            : nullptr),
-      channel_(channel),
-      polled_fd_factory_(std::move(polled_fd_factory)),
-      event_engine_(std::move(event_engine)) {}
-
 void AresResolver::CheckSocketsLocked() {
   FdNodeList new_list;
   if (!shutting_down_) {
-    ares_socket_t socks[ARES_GETSOCK_MAXNUM];
+    ares_socket_t socks[ARES_GETSOCK_MAXNUM] = {};
     int socks_bitmask = ares_getsock(channel_, socks, ARES_GETSOCK_MAXNUM);
     for (size_t i = 0; i < ARES_GETSOCK_MAXNUM; i++) {
       if (ARES_GETSOCK_READABLE(socks_bitmask, i) ||
@@ -383,7 +387,8 @@ void AresResolver::CheckSocketsLocked() {
             event_engine_->Run(
                 [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"),
                  fd_node]() mutable {
-                  self->OnReadable(fd_node, absl::OkStatus());
+                  static_cast<AresResolver*>(self.get())
+                      ->OnReadable(fd_node, absl::OkStatus());
                 });
           } else {
             // Otherwise register with the poller for readable event.
@@ -392,7 +397,8 @@ void AresResolver::CheckSocketsLocked() {
             fd_node->polled_fd->RegisterForOnReadableLocked(
                 [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"),
                  fd_node](absl::Status status) mutable {
-                  self->OnReadable(fd_node, status);
+                  static_cast<AresResolver*>(self.get())
+                      ->OnReadable(fd_node, status);
                 });
           }
         }
@@ -406,7 +412,8 @@ void AresResolver::CheckSocketsLocked() {
           fd_node->polled_fd->RegisterForOnWriteableLocked(
               [self = Ref(DEBUG_LOCATION, "CheckSocketsLocked"),
                fd_node](absl::Status status) mutable {
-                self->OnWritable(fd_node, status);
+                static_cast<AresResolver*>(self.get())
+                    ->OnWritable(fd_node, status);
               });
         }
       }
@@ -415,13 +422,17 @@ void AresResolver::CheckSocketsLocked() {
   // Any remaining fds in fd_node_list_ were not returned by ares_getsock()
   // and are therefore no longer in use, so they can be shut down and removed
   // from the list.
+  // TODO(yijiem): Since we are keeping the underlying socket opened for both
+  // Posix and Windows, it might be reasonable to also keep the FdNodes alive
+  // till the end. But we need to change the state management of FdNodes in this
+  // file. This may simplify the code a bit.
   while (!fd_node_list_.empty()) {
     FdNode* fd_node = fd_node_list_.front().get();
     if (!fd_node->already_shutdown) {
       GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p shutdown fd: %s", this,
                                    fd_node->polled_fd->GetName());
-      fd_node->polled_fd->ShutdownLocked(absl::OkStatus());
-      fd_node->already_shutdown = true;
+      fd_node->already_shutdown =
+          fd_node->polled_fd->ShutdownLocked(absl::OkStatus());
     }
     if (!fd_node->readable_registered && !fd_node->writable_registered) {
       GRPC_ARES_RESOLVER_TRACE_LOG("resolver: %p delete fd: %s", this,
@@ -445,7 +456,7 @@ void AresResolver::MaybeStartTimerLocked() {
   ares_backup_poll_alarm_handle_ = event_engine_->RunAfter(
       kAresBackupPollAlarmDuration,
       [self = Ref(DEBUG_LOCATION, "MaybeStartTimerLocked")]() {
-        self->OnAresBackupPollAlarm();
+        static_cast<AresResolver*>(self.get())->OnAresBackupPollAlarm();
       });
 }
 
diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h
index d90f13d8a8ff5..a1837f2ccf066 100644
--- a/src/core/lib/event_engine/ares_resolver.h
+++ b/src/core/lib/event_engine/ares_resolver.h
@@ -16,6 +16,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/debug/trace.h"
 
 #if GRPC_ARES == 1
@@ -37,6 +39,7 @@
 #include <grpc/support/log.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/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/sync.h"
 
@@ -52,7 +55,7 @@ extern grpc_core::TraceFlag grpc_trace_ares_resolver;
     }                                                                          \
   } while (0)
 
-class AresResolver : public grpc_core::InternallyRefCounted<AresResolver> {
+class AresResolver : public RefCountedDNSResolverInterface {
  public:
   static absl::StatusOr<grpc_core::OrphanablePtr<AresResolver>>
   CreateAresResolver(absl::string_view dns_server,
@@ -65,15 +68,13 @@ class AresResolver : public grpc_core::InternallyRefCounted<AresResolver> {
   ~AresResolver() override;
   void Orphan() override ABSL_LOCKS_EXCLUDED(mutex_);
 
-  void LookupHostname(absl::string_view name, absl::string_view default_port,
-                      EventEngine::DNSResolver::LookupHostnameCallback callback)
-      ABSL_LOCKS_EXCLUDED(mutex_);
-  void LookupSRV(absl::string_view name,
-                 EventEngine::DNSResolver::LookupSRVCallback callback)
-      ABSL_LOCKS_EXCLUDED(mutex_);
-  void LookupTXT(absl::string_view name,
-                 EventEngine::DNSResolver::LookupTXTCallback callback)
-      ABSL_LOCKS_EXCLUDED(mutex_);
+  void LookupHostname(EventEngine::DNSResolver::LookupHostnameCallback callback,
+                      absl::string_view name, absl::string_view default_port)
+      ABSL_LOCKS_EXCLUDED(mutex_) override;
+  void LookupSRV(EventEngine::DNSResolver::LookupSRVCallback callback,
+                 absl::string_view name) ABSL_LOCKS_EXCLUDED(mutex_) override;
+  void LookupTXT(EventEngine::DNSResolver::LookupTXTCallback callback,
+                 absl::string_view name) ABSL_LOCKS_EXCLUDED(mutex_) override;
 
  private:
   // A FdNode saves (not owns) a live socket/fd which c-ares creates, and owns a
@@ -87,8 +88,8 @@ class AresResolver : public grpc_core::InternallyRefCounted<AresResolver> {
   // close the socket (possibly through ares_destroy).
   struct FdNode {
     FdNode() = default;
-    FdNode(ares_socket_t as, GrpcPolledFd* polled_fd)
-        : as(as), polled_fd(polled_fd) {}
+    FdNode(ares_socket_t as, std::unique_ptr<GrpcPolledFd> pf)
+        : as(as), polled_fd(std::move(pf)) {}
     ares_socket_t as;
     std::unique_ptr<GrpcPolledFd> polled_fd;
     // true if the readable closure has been registered
diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc
index 57f60577d1078..98e77d8babf54 100644
--- a/src/core/lib/event_engine/forkable.cc
+++ b/src/core/lib/event_engine/forkable.cc
@@ -26,11 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-
 #include "src/core/lib/config/config_vars.h"
-#include "src/core/lib/gprpp/no_destruct.h"
-#include "src/core/lib/gprpp/sync.h"
 
 namespace grpc_event_engine {
 namespace experimental {
@@ -38,86 +34,71 @@ namespace experimental {
 grpc_core::TraceFlag grpc_trace_fork(false, "fork");
 
 namespace {
-grpc_core::NoDestruct<grpc_core::Mutex> g_mu;
-bool g_registered ABSL_GUARDED_BY(g_mu){false};
-
-// This must be ordered because there are ordering dependencies between
-// certain fork handlers.
-grpc_core::NoDestruct<std::vector<Forkable*>> g_forkables ABSL_GUARDED_BY(g_mu);
-
 bool IsForkEnabled() {
   static bool enabled = grpc_core::ConfigVars::Get().EnableForkSupport();
   return enabled;
 }
 }  // namespace
 
-Forkable::Forkable() { ManageForkable(this); }
-
-Forkable::~Forkable() { StopManagingForkable(this); }
-
-void RegisterForkHandlers() {
-  if (IsForkEnabled()) {
-    grpc_core::MutexLock lock(g_mu.get());
-    if (!std::exchange(g_registered, true)) {
+void ObjectGroupForkHandler::RegisterForkable(
+    std::shared_ptr<Forkable> forkable, GRPC_UNUSED void (*prepare)(void),
+    GRPC_UNUSED void (*parent)(void), GRPC_UNUSED void (*child)(void)) {
+  GPR_ASSERT(!is_forking_);
+  forkables_.emplace_back(forkable);
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
-      GRPC_FORK_TRACE_LOG_STRING("RegisterForkHandlers");
-      pthread_atfork(PrepareFork, PostforkParent, PostforkChild);
-#endif
-    }
+  if (!std::exchange(registered_, true)) {
+    pthread_atfork(prepare, parent, child);
   }
+#endif  // GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
 }
 
-void PrepareFork() {
+void ObjectGroupForkHandler::Prefork() {
   if (IsForkEnabled()) {
+    GPR_ASSERT(!std::exchange(is_forking_, true));
     GRPC_FORK_TRACE_LOG_STRING("PrepareFork");
-    grpc_core::MutexLock lock(g_mu.get());
-    for (auto forkable_iter = g_forkables->rbegin();
-         forkable_iter != g_forkables->rend(); ++forkable_iter) {
-      (*forkable_iter)->PrepareFork();
+    for (auto it = forkables_.begin(); it != forkables_.end();) {
+      auto shared = it->lock();
+      if (shared) {
+        shared->PrepareFork();
+        ++it;
+      } else {
+        it = forkables_.erase(it);
+      }
     }
-    GRPC_FORK_TRACE_LOG_STRING("PrepareFork finished");
   }
 }
 
-void PostforkParent() {
+void ObjectGroupForkHandler::PostforkParent() {
   if (IsForkEnabled()) {
+    GPR_ASSERT(is_forking_);
     GRPC_FORK_TRACE_LOG_STRING("PostforkParent");
-    grpc_core::MutexLock lock(g_mu.get());
-    for (auto* forkable : *g_forkables) {
-      GRPC_FORK_TRACE_LOG("Calling PostforkParent for forkable::%p", forkable);
-      forkable->PostforkParent();
+    for (auto it = forkables_.begin(); it != forkables_.end();) {
+      auto shared = it->lock();
+      if (shared) {
+        shared->PostforkParent();
+        ++it;
+      } else {
+        it = forkables_.erase(it);
+      }
     }
-    GRPC_FORK_TRACE_LOG_STRING("PostforkParent finished");
+    is_forking_ = false;
   }
 }
 
-void PostforkChild() {
+void ObjectGroupForkHandler::PostforkChild() {
   if (IsForkEnabled()) {
+    GPR_ASSERT(is_forking_);
     GRPC_FORK_TRACE_LOG_STRING("PostforkChild");
-    grpc_core::MutexLock lock(g_mu.get());
-    for (auto* forkable : *g_forkables) {
-      GRPC_FORK_TRACE_LOG("Calling PostforkChild for forkable::%p", forkable);
-      forkable->PostforkChild();
+    for (auto it = forkables_.begin(); it != forkables_.end();) {
+      auto shared = it->lock();
+      if (shared) {
+        shared->PostforkChild();
+        ++it;
+      } else {
+        it = forkables_.erase(it);
+      }
     }
-    GRPC_FORK_TRACE_LOG_STRING("PostforkChild finished");
-  }
-}
-
-void ManageForkable(Forkable* forkable) {
-  if (IsForkEnabled()) {
-    GRPC_FORK_TRACE_LOG("Manage forkable::%p", forkable);
-    grpc_core::MutexLock lock(g_mu.get());
-    g_forkables->push_back(forkable);
-  }
-}
-
-void StopManagingForkable(Forkable* forkable) {
-  if (IsForkEnabled()) {
-    GRPC_FORK_TRACE_LOG("Stop managing forkable::%p", forkable);
-    grpc_core::MutexLock lock(g_mu.get());
-    auto iter = std::find(g_forkables->begin(), g_forkables->end(), forkable);
-    GPR_ASSERT(iter != g_forkables->end());
-    g_forkables->erase(iter);
+    is_forking_ = false;
   }
 }
 
diff --git a/src/core/lib/event_engine/forkable.h b/src/core/lib/event_engine/forkable.h
index c585a8309881e..bcebc486232d8 100644
--- a/src/core/lib/event_engine/forkable.h
+++ b/src/core/lib/event_engine/forkable.h
@@ -16,6 +16,9 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <vector>
+
 #include <grpc/support/log.h>
 
 #include "src/core/lib/debug/trace.h"
@@ -34,41 +37,44 @@ extern grpc_core::TraceFlag grpc_trace_fork;
 
 #define GRPC_FORK_TRACE_LOG_STRING(format) GRPC_FORK_TRACE_LOG("%s", format)
 
-// Register fork handlers with the system, enabling fork support.
-//
-// This provides pthread-based support for fork events. Any objects that
-// implement Forkable can register themselves with this system using
-// ManageForkable, and their respective methods will be called upon fork.
-//
-// This should be called once upon grpc_initialization.
-void RegisterForkHandlers();
-
-// Global callback for pthread_atfork's *prepare argument
-void PrepareFork();
-// Global callback for pthread_atfork's *parent argument
-void PostforkParent();
-// Global callback for pthread_atfork's *child argument
-void PostforkChild();
-
 // An interface to be implemented by EventEngines that wish to have managed fork
-// support.
+// support. The child class must guarantee that those methods are thread-safe.
 class Forkable {
  public:
-  Forkable();
-  virtual ~Forkable();
+  virtual ~Forkable() = default;
   virtual void PrepareFork() = 0;
   virtual void PostforkParent() = 0;
   virtual void PostforkChild() = 0;
 };
 
-// Add Forkables from the set of objects that are supported.
-// Upon fork, each forkable will have its respective fork hooks called on
-// the thread that invoked the fork.
-//
-// Relative ordering of fork callback operations is not guaranteed.
-void ManageForkable(Forkable* forkable);
-// Remove a forkable from the managed set.
-void StopManagingForkable(Forkable* forkable);
+// ObjectGroupForkHandler is meant to be used as a static object in each
+// translation unit where Forkables are created and registered with the
+// ObjectGroupForkHandler. It essentially provides storage for Forkables'
+// instances (as a vector of weak pointers) and helper methods that are meant to
+// be invoked inside the fork handlers (see pthread_atfork(3)). The idea is to
+// have different Forkables (e.g. PosixEventPoller) to store their instances
+// (e.g. a PosixEventPoller object) in a single place separated from other
+// Forkables (a sharded approach). Forkables need to register their pthread fork
+// handlers and manage the relative ordering themselves. This object is
+// thread-unsafe.
+class ObjectGroupForkHandler {
+ public:
+  // Registers a Forkable with this ObjectGroupForkHandler, the Forkable must be
+  // created as a shared pointer.
+  void RegisterForkable(std::shared_ptr<Forkable> forkable,
+                        GRPC_UNUSED void (*prepare)(void),
+                        GRPC_UNUSED void (*parent)(void),
+                        GRPC_UNUSED void (*child)(void));
+
+  void Prefork();
+  void PostforkParent();
+  void PostforkChild();
+
+ private:
+  GRPC_UNUSED bool registered_ = false;
+  bool is_forking_ = false;
+  std::vector<std::weak_ptr<Forkable> > forkables_;
+};
 
 }  // namespace experimental
 }  // 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 bb66089d5ada2..463a403dc8149 100644
--- a/src/core/lib/event_engine/grpc_polled_fd.h
+++ b/src/core/lib/event_engine/grpc_polled_fd.h
@@ -17,6 +17,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include <grpc/event_engine/event_engine.h>
+
 #if GRPC_ARES == 1
 
 #include <ares.h>
@@ -24,7 +28,7 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 
-#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/gprpp/sync.h"
 
 namespace grpc_event_engine {
 namespace experimental {
@@ -46,8 +50,17 @@ class GrpcPolledFd {
   // Indicates if there is data left even after just being read from
   virtual bool IsFdStillReadableLocked() = 0;
   // Called once and only once. Must cause cancellation of any pending
-  // read/write callbacks.
-  virtual void ShutdownLocked(grpc_error_handle error) = 0;
+  // read/write callbacks. Return true when the Shutdown is confirmed, false
+  // otherwise.
+  //
+  // TODO(yijiem): On Posix, ShutdownLocked will always succeed. On Windows,
+  // ShutdownLocked only succeeds when error is Cancelled. We could remove these
+  // requirements if we changed the FdNode lifetime model so that:
+  //   1. FdNodes and their underlying socket handles remain alive for
+  //      the lifetime of the resolver.
+  //   2. Orphaning the resolver triggers shutdown and subsequent cleanup for
+  //      all FdNodes and socket handles.
+  GRPC_MUST_USE_RESULT virtual bool ShutdownLocked(absl::Status error) = 0;
   // Get the underlying ares_socket_t that this was created from
   virtual ares_socket_t GetWrappedAresSocketLocked() = 0;
   // A unique name, for logging
@@ -60,8 +73,14 @@ class GrpcPolledFd {
 class GrpcPolledFdFactory {
  public:
   virtual ~GrpcPolledFdFactory() {}
+  // Optionally initializes the GrpcPolledFdFactory with a grpc_core::Mutex*
+  // for synchronization between the AresResolver and the GrpcPolledFds. The
+  // Windows implementation overrides this.
+  virtual void Initialize(grpc_core::Mutex* mutex,
+                          EventEngine* event_engine) = 0;
   // Creates a new wrapped fd for the current platform
-  virtual GrpcPolledFd* NewGrpcPolledFdLocked(ares_socket_t as) = 0;
+  virtual std::unique_ptr<GrpcPolledFd> NewGrpcPolledFdLocked(
+      ares_socket_t as) = 0;
   // Optionally configures the ares channel after creation
   virtual void ConfigureAresChannelLocked(ares_channel channel) = 0;
 };
diff --git a/src/core/lib/event_engine/memory_allocator.cc b/src/core/lib/event_engine/memory_allocator.cc
deleted file mode 100644
index 69ece21c2944a..0000000000000
--- a/src/core/lib/event_engine/memory_allocator.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 <grpc/support/port_platform.h>
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <memory>
-#include <new>
-#include <utility>
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-
-#include "src/core/lib/slice/slice_refcount.h"
-
-namespace grpc_event_engine {
-namespace experimental {
-
-namespace {
-
-// Reference count for a slice allocated by MemoryAllocator::MakeSlice.
-// Takes care of releasing memory back when the slice is destroyed.
-class SliceRefCount : public grpc_slice_refcount {
- public:
-  SliceRefCount(std::shared_ptr<internal::MemoryAllocatorImpl> allocator,
-                size_t size)
-      : grpc_slice_refcount(Destroy),
-        allocator_(std::move(allocator)),
-        size_(size) {
-    // Nothing to do here.
-  }
-  ~SliceRefCount() { allocator_->Release(size_); }
-
- private:
-  static void Destroy(grpc_slice_refcount* p) {
-    auto* rc = static_cast<SliceRefCount*>(p);
-    rc->~SliceRefCount();
-    free(rc);
-  }
-
-  std::shared_ptr<internal::MemoryAllocatorImpl> allocator_;
-  size_t size_;
-};
-
-}  // namespace
-
-grpc_slice MemoryAllocator::MakeSlice(MemoryRequest request) {
-  auto size = Reserve(request.Increase(sizeof(SliceRefCount)));
-  void* p = malloc(size);
-  new (p) SliceRefCount(allocator_, size);
-  grpc_slice slice;
-  slice.refcount = static_cast<SliceRefCount*>(p);
-  slice.data.refcounted.bytes =
-      static_cast<uint8_t*>(p) + sizeof(SliceRefCount);
-  slice.data.refcounted.length = size - sizeof(SliceRefCount);
-  return slice;
-}
-
-}  // namespace experimental
-}  // namespace grpc_event_engine
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 a159cbb6101c7..de420eb58f2fc 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
@@ -367,10 +367,7 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler)
   ForkPollerListAddPoller(this);
 }
 
-void Epoll1Poller::Shutdown() {
-  ForkPollerListRemovePoller(this);
-  delete this;
-}
+void Epoll1Poller::Shutdown() { ForkPollerListRemovePoller(this); }
 
 void Epoll1Poller::Close() {
   grpc_core::MutexLock lock(&mu_);
@@ -564,10 +561,10 @@ void Epoll1Poller::Kick() {
   GPR_ASSERT(wakeup_fd_->Wakeup().ok());
 }
 
-Epoll1Poller* MakeEpoll1Poller(Scheduler* scheduler) {
+std::shared_ptr<Epoll1Poller> MakeEpoll1Poller(Scheduler* scheduler) {
   static bool kEpoll1PollerSupported = InitEpoll1PollerLinux();
   if (kEpoll1PollerSupported) {
-    return new Epoll1Poller(scheduler);
+    return std::make_shared<Epoll1Poller>(scheduler);
   }
   return nullptr;
 }
@@ -624,7 +621,9 @@ void Epoll1Poller::Kick() { grpc_core::Crash("unimplemented"); }
 
 // If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return
 // nullptr.
-Epoll1Poller* MakeEpoll1Poller(Scheduler* /*scheduler*/) { return nullptr; }
+std::shared_ptr<Epoll1Poller> MakeEpoll1Poller(Scheduler* /*scheduler*/) {
+  return nullptr;
+}
 
 void Epoll1Poller::PrepareFork() {}
 
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 207e13b7676c0..cd7fc887d6365 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
@@ -27,7 +27,6 @@
 
 #include <grpc/event_engine/event_engine.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/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
@@ -47,7 +46,7 @@ namespace experimental {
 class Epoll1EventHandle;
 
 // Definition of epoll1 based poller.
-class Epoll1Poller : public PosixEventPoller, public Forkable {
+class Epoll1Poller : public PosixEventPoller {
  public:
   explicit Epoll1Poller(Scheduler* scheduler);
   EventHandle* CreateHandle(int fd, absl::string_view name,
@@ -131,7 +130,7 @@ class Epoll1Poller : public PosixEventPoller, public Forkable {
 
 // Return an instance of a epoll1 based poller tied to the specified event
 // engine.
-Epoll1Poller* MakeEpoll1Poller(Scheduler* scheduler);
+std::shared_ptr<Epoll1Poller> MakeEpoll1Poller(Scheduler* scheduler);
 
 }  // namespace experimental
 }  // namespace grpc_event_engine
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 57c7e6ec6a6ea..dc5503a1e740c 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
@@ -73,13 +73,13 @@ using Events = absl::InlinedVector<PollEventHandle*, 5>;
 
 class PollEventHandle : public EventHandle {
  public:
-  PollEventHandle(int fd, PollPoller* poller)
+  PollEventHandle(int fd, std::shared_ptr<PollPoller> poller)
       : fd_(fd),
         pending_actions_(0),
         fork_fd_list_(this),
         poller_handles_list_(this),
-        poller_(poller),
         scheduler_(poller->GetScheduler()),
+        poller_(std::move(poller)),
         is_orphaned_(false),
         is_shutdown_(false),
         closed_(false),
@@ -92,11 +92,10 @@ class PollEventHandle : public EventHandle {
         read_closure_(reinterpret_cast<PosixEngineClosure*>(kClosureNotReady)),
         write_closure_(
             reinterpret_cast<PosixEngineClosure*>(kClosureNotReady)) {
-    poller_->Ref();
     grpc_core::MutexLock lock(&poller_->mu_);
     poller_->PollerHandlesListAddHandle(this);
   }
-  PollPoller* Poller() override { return poller_; }
+  PollPoller* Poller() override { return poller_.get(); }
   bool SetPendingActions(bool pending_read, bool pending_write) {
     pending_actions_ |= pending_read;
     if (pending_write) {
@@ -184,7 +183,6 @@ class PollEventHandle : public EventHandle {
       if (on_done_ != nullptr) {
         scheduler_->Run(on_done_);
       }
-      poller_->Unref();
       delete this;
     }
   }
@@ -210,8 +208,8 @@ class PollEventHandle : public EventHandle {
   int pending_actions_;
   PollPoller::HandlesList fork_fd_list_;
   PollPoller::HandlesList poller_handles_list_;
-  PollPoller* poller_;
   Scheduler* scheduler_;
+  std::shared_ptr<PollPoller> poller_;
   bool is_orphaned_;
   bool is_shutdown_;
   bool closed_;
@@ -343,7 +341,7 @@ EventHandle* PollPoller::CreateHandle(int fd, absl::string_view /*name*/,
   // Avoid unused-parameter warning for debug-only parameter
   (void)track_err;
   GPR_DEBUG_ASSERT(track_err == false);
-  PollEventHandle* handle = new PollEventHandle(fd, this);
+  PollEventHandle* handle = new PollEventHandle(fd, shared_from_this());
   ForkFdListAddHandle(handle);
   // We need to send a kick to the thread executing Work(..) so that it can
   // add this new Fd into the list of Fds to poll.
@@ -828,10 +826,7 @@ Poller::WorkResult PollPoller::Work(
   return was_kicked_ext ? Poller::WorkResult::kKicked : Poller::WorkResult::kOk;
 }
 
-void PollPoller::Shutdown() {
-  ForkPollerListRemovePoller(this);
-  Unref();
-}
+void PollPoller::Shutdown() { ForkPollerListRemovePoller(this); }
 
 void PollPoller::PrepareFork() { Kick(); }
 // TODO(vigneshbabu): implement
@@ -844,10 +839,11 @@ void PollPoller::Close() {
   closed_ = true;
 }
 
-PollPoller* MakePollPoller(Scheduler* scheduler, bool use_phony_poll) {
+std::shared_ptr<PollPoller> MakePollPoller(Scheduler* scheduler,
+                                           bool use_phony_poll) {
   static bool kPollPollerSupported = InitPollPollerPosix();
   if (kPollPollerSupported) {
-    return new PollPoller(scheduler, use_phony_poll);
+    return std::make_shared<PollPoller>(scheduler, use_phony_poll);
   }
   return nullptr;
 }
@@ -885,8 +881,8 @@ void PollPoller::Kick() { grpc_core::Crash("unimplemented"); }
 
 // If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return
 // nullptr.
-PollPoller* MakePollPoller(Scheduler* /*scheduler*/,
-                           bool /* use_phony_poll */) {
+std::shared_ptr<PollPoller> MakePollPoller(Scheduler* /*scheduler*/,
+                                           bool /* use_phony_poll */) {
   return nullptr;
 }
 
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 582991b7c7afc..25e66a611ac5f 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
@@ -17,7 +17,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <atomic>
 #include <memory>
 #include <string>
 
@@ -27,7 +26,6 @@
 
 #include <grpc/event_engine/event_engine.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/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
@@ -39,7 +37,8 @@ namespace experimental {
 class PollEventHandle;
 
 // Definition of poll based poller.
-class PollPoller : public PosixEventPoller, public Forkable {
+class PollPoller : public PosixEventPoller,
+                   public std::enable_shared_from_this<PollPoller> {
  public:
   explicit PollPoller(Scheduler* scheduler);
   PollPoller(Scheduler* scheduler, bool use_phony_poll);
@@ -63,12 +62,6 @@ class PollPoller : public PosixEventPoller, public Forkable {
   void Close();
 
  private:
-  void Ref() { ref_count_.fetch_add(1, std::memory_order_relaxed); }
-  void Unref() {
-    if (ref_count_.fetch_sub(1, std::memory_order_acq_rel) == 1) {
-      delete this;
-    }
-  }
   void KickExternal(bool ext);
   void PollerHandlesListAddHandle(PollEventHandle* handle)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
@@ -84,7 +77,6 @@ class PollPoller : public PosixEventPoller, public Forkable {
   };
   grpc_core::Mutex mu_;
   Scheduler* scheduler_;
-  std::atomic<int> ref_count_{1};
   bool use_phony_poll_;
   bool was_kicked_ ABSL_GUARDED_BY(mu_);
   bool was_kicked_ext_ ABSL_GUARDED_BY(mu_);
@@ -98,7 +90,8 @@ class PollPoller : public PosixEventPoller, public Forkable {
 // It use_phony_poll is true, it implies that the poller is declared
 // non-polling and any attempt to schedule a blocking poll will result in a
 // crash failure.
-PollPoller* MakePollPoller(Scheduler* scheduler, bool use_phony_poll);
+std::shared_ptr<PollPoller> MakePollPoller(Scheduler* scheduler,
+                                           bool use_phony_poll);
 
 }  // namespace experimental
 }  // namespace grpc_event_engine
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 c0985d5cfd83d..bcdd866c909ea 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller.h
+++ b/src/core/lib/event_engine/posix_engine/event_poller.h
@@ -24,6 +24,7 @@
 
 #include <grpc/event_engine/event_engine.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"
 
@@ -86,7 +87,8 @@ class EventHandle {
   virtual ~EventHandle() = default;
 };
 
-class PosixEventPoller : public grpc_event_engine::experimental::Poller {
+class PosixEventPoller : public grpc_event_engine::experimental::Poller,
+                         public Forkable {
  public:
   // Return an opaque handle to perform actions on the provided file descriptor.
   virtual EventHandle* CreateHandle(int fd, absl::string_view name,
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 c028d62b7a73d..eb567e81f5c4b 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
@@ -14,15 +14,18 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
 #include <string>
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.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"
 #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
+#include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/iomgr/port.h"
 
 namespace grpc_event_engine {
@@ -30,15 +33,25 @@ namespace experimental {
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 namespace {
+// TODO(yijiem): this object is thread-unsafe, if we are creating pollers in
+// multiple threads (e.g. multiple event engines) or if we are creating pollers
+// while we are forking then we will run into issues.
+grpc_core::NoDestruct<ObjectGroupForkHandler> g_poller_fork_manager;
+
+class PollerForkCallbackMethods {
+ public:
+  static void Prefork() { g_poller_fork_manager->Prefork(); }
+  static void PostforkParent() { g_poller_fork_manager->PostforkParent(); }
+  static void PostforkChild() { g_poller_fork_manager->PostforkChild(); }
+};
 
 bool PollStrategyMatches(absl::string_view strategy, absl::string_view want) {
   return strategy == "all" || strategy == want;
 }
-
 }  // namespace
 
-PosixEventPoller* MakeDefaultPoller(Scheduler* scheduler) {
-  PosixEventPoller* poller = nullptr;
+std::shared_ptr<PosixEventPoller> MakeDefaultPoller(Scheduler* scheduler) {
+  std::shared_ptr<PosixEventPoller> poller;
   auto strings =
       absl::StrSplit(grpc_core::ConfigVars::Get().PollStrategy(), ',');
   for (auto it = strings.begin(); it != strings.end() && poller == nullptr;
@@ -55,12 +68,16 @@ PosixEventPoller* MakeDefaultPoller(Scheduler* scheduler) {
       poller = MakePollPoller(scheduler, /*use_phony_poll=*/true);
     }
   }
+  g_poller_fork_manager->RegisterForkable(
+      poller, PollerForkCallbackMethods::Prefork,
+      PollerForkCallbackMethods::PostforkParent,
+      PollerForkCallbackMethods::PostforkChild);
   return poller;
 }
 
 #else  // GRPC_POSIX_SOCKET_TCP
 
-PosixEventPoller* MakeDefaultPoller(Scheduler* /*scheduler*/) {
+std::shared_ptr<PosixEventPoller> MakeDefaultPoller(Scheduler* /*scheduler*/) {
   return nullptr;
 }
 
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 c02dd17ab5985..bfde1904d9cbf 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
@@ -17,6 +17,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 namespace grpc_event_engine {
 namespace experimental {
 
@@ -25,7 +27,7 @@ class Scheduler;
 
 // Return an instance of an event poller which is tied to the specified
 // scheduler.
-PosixEventPoller* MakeDefaultPoller(Scheduler* scheduler);
+std::shared_ptr<PosixEventPoller> MakeDefaultPoller(Scheduler* scheduler);
 
 }  // namespace experimental
 }  // namespace grpc_event_engine
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 c6eed183233d2..3feea096e847d 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
@@ -17,6 +17,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/port.h"
 
 #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
@@ -42,7 +47,6 @@
 #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/lib/event_engine/posix_engine/tcp_socket_utils.h"
-#include "src/core/lib/iomgr/error.h"
 
 namespace grpc_event_engine {
 namespace experimental {
@@ -80,8 +84,9 @@ class GrpcPolledFdPosix : public GrpcPolledFd {
            bytes_available > 0;
   }
 
-  void ShutdownLocked(grpc_error_handle error) override {
+  bool ShutdownLocked(absl::Status error) override {
     handle_->ShutdownHandle(error);
+    return true;
   }
 
   ares_socket_t GetWrappedAresSocketLocked() override { return as_; }
@@ -105,9 +110,12 @@ class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory {
     }
   }
 
-  GrpcPolledFd* NewGrpcPolledFdLocked(ares_socket_t as) override {
+  void Initialize(grpc_core::Mutex*, EventEngine*) override {}
+
+  std::unique_ptr<GrpcPolledFd> NewGrpcPolledFdLocked(
+      ares_socket_t as) override {
     owned_fds_.insert(as);
-    return new GrpcPolledFdPosix(
+    return std::make_unique<GrpcPolledFdPosix>(
         as,
         poller_->CreateHandle(as, "c-ares socket", poller_->CanTrackErrors()));
   }
diff --git a/src/core/lib/event_engine/posix_engine/native_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
new file mode 100644
index 0000000000000..79a9489d66189
--- /dev/null
+++ b/src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
@@ -0,0 +1,131 @@
+// Copyright 2023 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 <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/port.h"
+
+#ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
+
+#include <netdb.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#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_dns_resolver.h"
+#include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/host_port.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+namespace {
+
+absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
+LookupHostnameBlocking(absl::string_view name, absl::string_view default_port) {
+  struct addrinfo hints;
+  struct addrinfo *result = nullptr, *resp;
+  std::string host;
+  std::string port;
+  // parse name, splitting it into host and port parts
+  grpc_core::SplitHostPort(name, &host, &port);
+  if (host.empty()) {
+    return absl::InvalidArgumentError(absl::StrCat("Unparseable name: ", name));
+  }
+  if (port.empty()) {
+    if (default_port.empty()) {
+      return absl::InvalidArgumentError(
+          absl::StrFormat("No port in name %s or default_port argument", name));
+    }
+    port = std::string(default_port);
+  }
+  // Call getaddrinfo
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;      // ipv4 or ipv6
+  hints.ai_socktype = SOCK_STREAM;  // stream socket
+  hints.ai_flags = AI_PASSIVE;      // for wildcard IP address
+  int s = getaddrinfo(host.c_str(), port.c_str(), &hints, &result);
+  if (s != 0) {
+    // Retry if well-known service name is recognized
+    const char* svc[][2] = {{"http", "80"}, {"https", "443"}};
+    for (size_t i = 0; i < GPR_ARRAY_SIZE(svc); i++) {
+      if (port == svc[i][0]) {
+        s = getaddrinfo(host.c_str(), svc[i][1], &hints, &result);
+        break;
+      }
+    }
+  }
+  if (s != 0) {
+    return absl::UnknownError(absl::StrFormat(
+        "Address lookup failed for %s os_error: %s syscall: getaddrinfo", name,
+        gai_strerror(s)));
+  }
+  // Success path: fill in addrs
+  std::vector<EventEngine::ResolvedAddress> addresses;
+  for (resp = result; resp != nullptr; resp = resp->ai_next) {
+    addresses.emplace_back(resp->ai_addr, resp->ai_addrlen);
+  }
+  if (result) {
+    freeaddrinfo(result);
+  }
+  return addresses;
+}
+
+}  // namespace
+
+NativeDNSResolver::NativeDNSResolver(std::shared_ptr<EventEngine> event_engine)
+    : event_engine_(std::move(event_engine)) {}
+
+void NativeDNSResolver::LookupHostname(
+    EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
+    absl::string_view name, absl::string_view default_port) {
+  event_engine_->Run(
+      [name, default_port, on_resolved = std::move(on_resolved)]() mutable {
+        on_resolved(LookupHostnameBlocking(name, default_port));
+      });
+}
+
+void NativeDNSResolver::LookupSRV(
+    EventEngine::DNSResolver::LookupSRVCallback on_resolved,
+    absl::string_view /* name */) {
+  // Not supported
+  event_engine_->Run([on_resolved = std::move(on_resolved)]() mutable {
+    on_resolved(absl::UnimplementedError(
+        "The Native resolver does not support looking up SRV records"));
+  });
+}
+
+void NativeDNSResolver::LookupTXT(
+    EventEngine::DNSResolver::LookupTXTCallback on_resolved,
+    absl::string_view /* name */) {
+  // Not supported
+  event_engine_->Run([on_resolved = std::move(on_resolved)]() mutable {
+    on_resolved(absl::UnimplementedError(
+        "The Native resolver does not support looking up TXT records"));
+  });
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
diff --git a/src/core/lib/event_engine/posix_engine/native_dns_resolver.h b/src/core/lib/event_engine/posix_engine/native_dns_resolver.h
new file mode 100644
index 0000000000000..411b090ab64e2
--- /dev/null
+++ b/src/core/lib/event_engine/posix_engine/native_dns_resolver.h
@@ -0,0 +1,61 @@
+// Copyright 2023 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.
+
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_H
+
+#include <grpc/support/port_platform.h>
+
+#include <memory>
+
+#include "absl/strings/string_view.h"
+
+#include "src/core/lib/iomgr/port.h"
+
+#ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+// An asynchronous DNS resolver which uses the native platform's getaddrinfo
+// API. Only supports A/AAAA records.
+class NativeDNSResolver : public RefCountedDNSResolverInterface {
+ public:
+  explicit NativeDNSResolver(std::shared_ptr<EventEngine> event_engine);
+
+  void LookupHostname(
+      EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
+      absl::string_view name, absl::string_view default_port) override;
+
+  void LookupSRV(EventEngine::DNSResolver::LookupSRVCallback on_resolved,
+                 absl::string_view name) override;
+
+  void LookupTXT(EventEngine::DNSResolver::LookupTXTCallback on_resolved,
+                 absl::string_view name) override;
+
+  void Orphan() override { delete this; }
+
+ private:
+  std::shared_ptr<EventEngine> event_engine_;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_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 e373b1d6ebf78..a5a4ee1b40fce 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc
@@ -28,6 +28,7 @@
 #include "absl/cleanup/cleanup.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
+#include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 
 #include <grpc/event_engine/event_engine.h>
@@ -36,11 +37,15 @@
 #include <grpc/support/cpu.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/config/config_vars.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"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h"
+#include "src/core/lib/event_engine/posix_engine/native_dns_resolver.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
@@ -48,6 +53,7 @@
 #include "src/core/lib/event_engine/utils.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/sync.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
@@ -77,6 +83,28 @@ using namespace std::chrono_literals;
 namespace grpc_event_engine {
 namespace experimental {
 
+namespace {
+
+grpc_core::NoDestruct<ObjectGroupForkHandler> g_timer_fork_manager;
+
+class TimerForkCallbackMethods {
+ public:
+  static void Prefork() { g_timer_fork_manager->Prefork(); }
+  static void PostforkParent() { g_timer_fork_manager->PostforkParent(); }
+  static void PostforkChild() { g_timer_fork_manager->PostforkChild(); }
+};
+
+bool ShouldUseAresDnsResolver() {
+#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
+  auto resolver_env = grpc_core::ConfigVars::Get().DnsResolver();
+  return resolver_env.empty() || absl::EqualsIgnoreCase(resolver_env, "ares");
+#else   // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
+  return false;
+#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
+}
+
+}  // namespace
+
 #ifdef GRPC_POSIX_SOCKET_TCP
 
 void AsyncConnect::Start(EventEngine::Duration timeout) {
@@ -303,8 +331,9 @@ PosixEnginePollerManager::PosixEnginePollerManager(
       executor_(std::move(executor)),
       trigger_shutdown_called_(false) {}
 
-PosixEnginePollerManager::PosixEnginePollerManager(PosixEventPoller* poller)
-    : poller_(poller),
+PosixEnginePollerManager::PosixEnginePollerManager(
+    std::shared_ptr<PosixEventPoller> poller)
+    : poller_(std::move(poller)),
       poller_state_(PollerState::kExternal),
       executor_(nullptr),
       trigger_shutdown_called_(false) {
@@ -343,10 +372,14 @@ PosixEnginePollerManager::~PosixEnginePollerManager() {
   }
 }
 
-PosixEventEngine::PosixEventEngine(PosixEventPoller* poller)
+PosixEventEngine::PosixEventEngine(std::shared_ptr<PosixEventPoller> poller)
     : connection_shards_(std::max(2 * gpr_cpu_num_cores(), 1u)),
-      executor_(MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u))),
-      timer_manager_(executor_) {
+      executor_(MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 4u, 16u))),
+      timer_manager_(std::make_shared<TimerManager>(executor_)) {
+  g_timer_fork_manager->RegisterForkable(
+      timer_manager_, TimerForkCallbackMethods::Prefork,
+      TimerForkCallbackMethods::PostforkParent,
+      TimerForkCallbackMethods::PostforkChild);
 #if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
   poller_manager_ = std::make_shared<PosixEnginePollerManager>(poller);
 #endif
@@ -354,8 +387,12 @@ PosixEventEngine::PosixEventEngine(PosixEventPoller* poller)
 
 PosixEventEngine::PosixEventEngine()
     : connection_shards_(std::max(2 * gpr_cpu_num_cores(), 1u)),
-      executor_(MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u))),
-      timer_manager_(executor_) {
+      executor_(MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 4u, 16u))),
+      timer_manager_(std::make_shared<TimerManager>(executor_)) {
+  g_timer_fork_manager->RegisterForkable(
+      timer_manager_, TimerForkCallbackMethods::Prefork,
+      TimerForkCallbackMethods::PostforkParent,
+      TimerForkCallbackMethods::PostforkChild);
 #if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
   poller_manager_ = std::make_shared<PosixEnginePollerManager>(executor_);
   // The threadpool must be instantiated after the poller otherwise, the
@@ -435,7 +472,7 @@ PosixEventEngine::~PosixEventEngine() {
     }
     GPR_ASSERT(GPR_LIKELY(known_handles_.empty()));
   }
-  timer_manager_.Shutdown();
+  timer_manager_->Shutdown();
 #if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
   if (poller_manager_ != nullptr) {
     poller_manager_->TriggerShutdown();
@@ -448,7 +485,7 @@ bool PosixEventEngine::Cancel(EventEngine::TaskHandle handle) {
   grpc_core::MutexLock lock(&mu_);
   if (!known_handles_.contains(handle)) return false;
   auto* cd = reinterpret_cast<ClosureData*>(handle.keys[0]);
-  bool r = timer_manager_.TimerCancel(&cd->timer);
+  bool r = timer_manager_->TimerCancel(&cd->timer);
   known_handles_.erase(handle);
   if (r) delete cd;
   return r;
@@ -478,7 +515,7 @@ EventEngine::TaskHandle PosixEventEngine::RunAfterInternal(
     Run(std::move(cb));
     return TaskHandle::kInvalid;
   }
-  auto when_ts = ToTimestamp(timer_manager_.Now(), when);
+  auto when_ts = ToTimestamp(timer_manager_->Now(), when);
   auto* cd = new ClosureData;
   cd->cb = std::move(cb);
   cd->engine = this;
@@ -489,53 +526,58 @@ EventEngine::TaskHandle PosixEventEngine::RunAfterInternal(
   cd->handle = handle;
   GRPC_EVENT_ENGINE_TRACE("PosixEventEngine:%p scheduling callback:%s", this,
                           HandleToString(handle).c_str());
-  timer_manager_.TimerInit(&cd->timer, when_ts, cd);
+  timer_manager_->TimerInit(&cd->timer, when_ts, cd);
   return handle;
 }
 
-#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
-
 PosixEventEngine::PosixDNSResolver::PosixDNSResolver(
-    grpc_core::OrphanablePtr<AresResolver> ares_resolver)
-    : ares_resolver_(std::move(ares_resolver)) {}
+    grpc_core::OrphanablePtr<RefCountedDNSResolverInterface> dns_resolver)
+    : dns_resolver_(std::move(dns_resolver)) {}
 
 void PosixEventEngine::PosixDNSResolver::LookupHostname(
     LookupHostnameCallback on_resolve, absl::string_view name,
     absl::string_view default_port) {
-  ares_resolver_->LookupHostname(name, default_port, std::move(on_resolve));
+  dns_resolver_->LookupHostname(std::move(on_resolve), name, default_port);
 }
 
 void PosixEventEngine::PosixDNSResolver::LookupSRV(LookupSRVCallback on_resolve,
                                                    absl::string_view name) {
-  ares_resolver_->LookupSRV(name, std::move(on_resolve));
+  dns_resolver_->LookupSRV(std::move(on_resolve), name);
 }
 
 void PosixEventEngine::PosixDNSResolver::LookupTXT(LookupTXTCallback on_resolve,
                                                    absl::string_view name) {
-  ares_resolver_->LookupTXT(name, std::move(on_resolve));
+  dns_resolver_->LookupTXT(std::move(on_resolve), name);
 }
 
-#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
-
 absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>>
 PosixEventEngine::GetDNSResolver(
-    const EventEngine::DNSResolver::ResolverOptions& options) {
-#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
-  auto ares_resolver = AresResolver::CreateAresResolver(
-      options.dns_server,
-      std::make_unique<GrpcPolledFdFactoryPosix>(poller_manager_->Poller()),
-      shared_from_this());
-  if (!ares_resolver.ok()) {
-    return ares_resolver.status();
+    GRPC_UNUSED const EventEngine::DNSResolver::ResolverOptions& options) {
+#ifndef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
+  grpc_core::Crash("Unable to get DNS resolver for this platform.");
+#else  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
+  // If c-ares is supported on the platform, build according to user's
+  // configuration.
+  if (ShouldUseAresDnsResolver()) {
+#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
+    GRPC_EVENT_ENGINE_DNS_TRACE("PosixEventEngine:%p creating AresResolver",
+                                this);
+    auto ares_resolver = AresResolver::CreateAresResolver(
+        options.dns_server,
+        std::make_unique<GrpcPolledFdFactoryPosix>(poller_manager_->Poller()),
+        shared_from_this());
+    if (!ares_resolver.ok()) {
+      return ares_resolver.status();
+    }
+    return std::make_unique<PosixEventEngine::PosixDNSResolver>(
+        std::move(*ares_resolver));
+#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
   }
+  GRPC_EVENT_ENGINE_DNS_TRACE("PosixEventEngine:%p creating NativeDNSResolver",
+                              this);
   return std::make_unique<PosixEventEngine::PosixDNSResolver>(
-      std::move(*ares_resolver));
-#else   // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
-  // TODO(yijiem): Implement a basic A/AAAA-only native resolver in
-  // PosixEventEngine.
-  (void)options;
-  grpc_core::Crash("unimplemented");
-#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
+      grpc_core::MakeOrphanable<NativeDNSResolver>(shared_from_this()));
+#endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
 }
 
 bool PosixEventEngine::IsWorkerThread() { grpc_core::Crash("unimplemented"); }
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 bd28bde9509f5..c025d46c6c895 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.h
@@ -34,11 +34,11 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.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.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
+#include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -104,9 +104,10 @@ class PosixEnginePollerManager
  public:
   explicit PosixEnginePollerManager(std::shared_ptr<ThreadPool> executor);
   explicit PosixEnginePollerManager(
-      grpc_event_engine::experimental::PosixEventPoller* poller);
+      std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller>
+          poller);
   grpc_event_engine::experimental::PosixEventPoller* Poller() {
-    return poller_;
+    return poller_.get();
   }
 
   ThreadPool* Executor() { return executor_.get(); }
@@ -124,7 +125,7 @@ class PosixEnginePollerManager
 
  private:
   enum class PollerState { kExternal, kOk, kShuttingDown };
-  grpc_event_engine::experimental::PosixEventPoller* poller_ = nullptr;
+  std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller> poller_;
   std::atomic<PollerState> poller_state_{PollerState::kOk};
   std::shared_ptr<ThreadPool> executor_;
   bool trigger_shutdown_called_;
@@ -140,11 +141,8 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
  public:
   class PosixDNSResolver : public EventEngine::DNSResolver {
    public:
-    PosixDNSResolver() = delete;
-#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
     explicit PosixDNSResolver(
-        grpc_core::OrphanablePtr<AresResolver> ares_resolver);
-#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
+        grpc_core::OrphanablePtr<RefCountedDNSResolverInterface> dns_resolver);
     void LookupHostname(LookupHostnameCallback on_resolve,
                         absl::string_view name,
                         absl::string_view default_port) override;
@@ -153,18 +151,18 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
     void LookupTXT(LookupTXTCallback on_resolve,
                    absl::string_view name) override;
 
-#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
    private:
-    grpc_core::OrphanablePtr<AresResolver> ares_resolver_;
-#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_TCP)
+    grpc_core::OrphanablePtr<RefCountedDNSResolverInterface> dns_resolver_;
   };
 
 #ifdef GRPC_POSIX_SOCKET_TCP
-  // Constructs an EventEngine which does not own the poller. Do not call this
-  // constructor directly. Instead use the MakeTestOnlyPosixEventEngine static
-  // method. Its expected to be used only in tests.
+  // Constructs an EventEngine which has a shared ownership of the poller. Do
+  // not call this constructor directly. Instead use the
+  // MakeTestOnlyPosixEventEngine static method. Its expected to be used only in
+  // tests.
   explicit PosixEventEngine(
-      grpc_event_engine::experimental::PosixEventPoller* poller);
+      std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller>
+          poller);
   PosixEventEngine();
 #else   // GRPC_POSIX_SOCKET_TCP
   PosixEventEngine();
@@ -200,7 +198,7 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
   bool CancelConnect(ConnectionHandle handle) override;
   bool IsWorkerThread() override;
   absl::StatusOr<std::unique_ptr<DNSResolver>> GetDNSResolver(
-      const DNSResolver::ResolverOptions& options) override;
+      GRPC_UNUSED const DNSResolver::ResolverOptions& options) override;
   void Run(Closure* closure) override;
   void Run(absl::AnyInvocable<void()> closure) override;
   // Caution!! The timer implementation cannot create any fds. See #20418.
@@ -210,14 +208,15 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
   bool Cancel(TaskHandle handle) override;
 
 #ifdef GRPC_POSIX_SOCKET_TCP
-  // The posix EventEngine returned by this method would not own the poller
-  // and would not be in-charge of driving the poller by calling its Work(..)
-  // method. Instead its upto the test to drive the poller. The returned posix
-  // EventEngine will also not attempt to shutdown the poller since it does not
-  // own it.
+  // The posix EventEngine returned by this method would have a shared ownership
+  // of the poller and would not be in-charge of driving the poller by calling
+  // its Work(..) method. Instead its upto the test to drive the poller. The
+  // returned posix EventEngine will also not attempt to shutdown the poller
+  // since it does not own it.
   static std::shared_ptr<PosixEventEngine> MakeTestOnlyPosixEventEngine(
-      grpc_event_engine::experimental::PosixEventPoller* test_only_poller) {
-    return std::make_shared<PosixEventEngine>(test_only_poller);
+      std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller>
+          test_only_poller) {
+    return std::make_shared<PosixEventEngine>(std::move(test_only_poller));
   }
 #endif  // GRPC_POSIX_SOCKET_TCP
 
@@ -255,7 +254,7 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
   TaskHandleSet known_handles_ ABSL_GUARDED_BY(mu_);
   std::atomic<intptr_t> aba_token_{0};
   std::shared_ptr<ThreadPool> executor_;
-  TimerManager timer_manager_;
+  std::shared_ptr<TimerManager> timer_manager_;
 #ifdef GRPC_POSIX_SOCKET_TCP
   std::shared_ptr<PosixEnginePollerManager> poller_manager_;
 #endif  // GRPC_POSIX_SOCKET_TCP
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 8c2745c02b27e..ed2321b297100 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
@@ -25,6 +25,8 @@
 
 #include "absl/cleanup/cleanup.h"
 #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/log.h>
@@ -44,8 +46,6 @@
 #include <netinet/in.h>  // IWYU pragma: keep
 #include <sys/socket.h>  // IWYU pragma: keep
 #include <unistd.h>      // IWYU pragma: keep
-
-#include "absl/strings/str_cat.h"
 #endif
 
 namespace grpc_event_engine {
@@ -176,8 +176,16 @@ absl::Status PrepareSocket(const PosixTcpOptions& options,
       GRPC_FD_SERVER_LISTENER_USAGE, options));
 
   if (bind(fd, socket.addr.address(), socket.addr.size()) < 0) {
+    auto sockaddr_str = ResolvedAddressToString(socket.addr);
+    if (!sockaddr_str.ok()) {
+      gpr_log(GPR_ERROR, "Could not convert sockaddr to string: %s",
+              sockaddr_str.status().ToString().c_str());
+      sockaddr_str = "<unparsable>";
+    }
+    sockaddr_str = absl::StrReplaceAll(*sockaddr_str, {{"\0", "@"}});
     return absl::FailedPreconditionError(
-        absl::StrCat("Error in bind: ", std::strerror(errno)));
+        absl::StrCat("Error in bind for address '", *sockaddr_str,
+                     "': ", std::strerror(errno)));
   }
 
   if (listen(fd, GetMaxAcceptQueueSize()) < 0) {
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 845e48cdf4168..76e1b0a57e199 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
@@ -25,6 +25,7 @@
 #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 "src/core/lib/gpr/useful.h"
@@ -75,6 +76,7 @@ int AdjustValue(int default_value, int min_value, int max_value,
   return *actual_value;
 }
 
+#ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 // The default values for TCP_USER_TIMEOUT are currently configured to be in
 // line with the default values of KEEPALIVE_TIMEOUT as proposed in
 // https://github.com/grpc/proposal/blob/master/A18-tcp-user-timeout.md */
@@ -83,8 +85,6 @@ int kDefaultServerUserTimeoutMs = 20000;
 bool kDefaultClientUserTimeoutEnabled = false;
 bool kDefaultServerUserTimeoutEnabled = true;
 
-#ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
-
 absl::Status ErrorForFd(
     int fd, const experimental::EventEngine::ResolvedAddress& addr) {
   if (fd >= 0) return absl::OkStatus();
@@ -210,6 +210,13 @@ PosixTcpOptions TcpOptionsFromEndpointConfig(const EndpointConfig& config) {
     options.socket_mutator =
         grpc_socket_mutator_ref(static_cast<grpc_socket_mutator*>(value));
   }
+  value =
+      config.GetVoidPointer(GRPC_ARG_EVENT_ENGINE_USE_MEMORY_ALLOCATOR_FACTORY);
+  if (value != nullptr) {
+    options.memory_allocator_factory =
+        static_cast<grpc_event_engine::experimental::MemoryAllocatorFactory*>(
+            value);
+  }
   return options;
 }
 
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 278e70ddbddbd..83b52be657c85 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
@@ -26,6 +26,7 @@
 
 #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/log.h>
 
@@ -75,6 +76,8 @@ struct PosixTcpOptions {
   int dscp = kDscpNotSet;
   grpc_core::RefCountedPtr<grpc_core::ResourceQuota> resource_quota;
   struct grpc_socket_mutator* socket_mutator = nullptr;
+  grpc_event_engine::experimental::MemoryAllocatorFactory*
+      memory_allocator_factory = nullptr;
   PosixTcpOptions() = default;
   // Move ctor
   PosixTcpOptions(PosixTcpOptions&& other) noexcept {
@@ -89,6 +92,8 @@ struct PosixTcpOptions {
     }
     socket_mutator = std::exchange(other.socket_mutator, nullptr);
     resource_quota = std::move(other.resource_quota);
+    memory_allocator_factory =
+        std::exchange(other.memory_allocator_factory, nullptr);
     CopyIntegerOptions(other);
     return *this;
   }
@@ -98,6 +103,7 @@ struct PosixTcpOptions {
       socket_mutator = grpc_socket_mutator_ref(other.socket_mutator);
     }
     resource_quota = other.resource_quota;
+    memory_allocator_factory = other.memory_allocator_factory;
     CopyIntegerOptions(other);
   }
   // Copy assignment
@@ -113,6 +119,7 @@ struct PosixTcpOptions {
       socket_mutator = grpc_socket_mutator_ref(other.socket_mutator);
     }
     resource_quota = other.resource_quota;
+    memory_allocator_factory = other.memory_allocator_factory;
     CopyIntegerOptions(other);
     return *this;
   }
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 2962f7a2eb990..4df2dc7ba2803 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.cc
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc
@@ -30,7 +30,6 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/thd.h"
 
 static thread_local bool g_timer_thread;
 
@@ -67,41 +66,32 @@ bool TimerManager::WaitUntil(grpc_core::Timestamp next) {
 }
 
 void TimerManager::MainLoop() {
-  for (;;) {
-    grpc_core::Timestamp next = grpc_core::Timestamp::InfFuture();
-    absl::optional<std::vector<experimental::EventEngine::Closure*>>
-        check_result = timer_list_->TimerCheck(&next);
-    GPR_ASSERT(check_result.has_value() &&
-               "ERROR: More than one MainLoop is running.");
-    if (!check_result->empty()) {
-      RunSomeTimers(std::move(*check_result));
-      continue;
-    }
-    if (!WaitUntil(next)) break;
+  grpc_core::Timestamp next = grpc_core::Timestamp::InfFuture();
+  absl::optional<std::vector<experimental::EventEngine::Closure*>>
+      check_result = timer_list_->TimerCheck(&next);
+  GPR_ASSERT(check_result.has_value() &&
+             "ERROR: More than one MainLoop is running.");
+  bool timers_found = !check_result->empty();
+  if (timers_found) {
+    RunSomeTimers(std::move(*check_result));
   }
-  main_loop_exit_signal_->Notify();
+  thread_pool_->Run([this, next, timers_found]() {
+    if (!timers_found && !WaitUntil(next)) {
+      main_loop_exit_signal_->Notify();
+      return;
+    }
+    MainLoop();
+  });
 }
 
 bool TimerManager::IsTimerManagerThread() { return g_timer_thread; }
 
-void TimerManager::StartMainLoopThread() {
-  main_thread_ = grpc_core::Thread(
-      "timer_manager",
-      [](void* arg) {
-        auto self = static_cast<TimerManager*>(arg);
-        self->MainLoop();
-      },
-      this, nullptr,
-      grpc_core::Thread::Options().set_tracked(false).set_joinable(false));
-  main_thread_.Start();
-}
-
 TimerManager::TimerManager(
     std::shared_ptr<grpc_event_engine::experimental::ThreadPool> thread_pool)
     : host_(this), thread_pool_(std::move(thread_pool)) {
   timer_list_ = std::make_unique<TimerList>(&host_);
   main_loop_exit_signal_.emplace();
-  StartMainLoopThread();
+  thread_pool_->Run([this]() { MainLoop(); });
 }
 
 grpc_core::Timestamp TimerManager::Host::Now() {
@@ -162,7 +152,7 @@ void TimerManager::RestartPostFork() {
   }
   shutdown_ = false;
   main_loop_exit_signal_.emplace();
-  StartMainLoopThread();
+  thread_pool_->Run([this]() { MainLoop(); });
 }
 
 void TimerManager::PrepareFork() { Shutdown(); }
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 89d547a5ce7a0..5cd634c51b09f 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.h
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.h
@@ -36,7 +36,6 @@
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/gprpp/notification.h"
 #include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/gprpp/time.h"
 
 namespace grpc_event_engine {
@@ -80,7 +79,6 @@ class TimerManager final : public grpc_event_engine::experimental::Forkable {
     TimerManager* const timer_manager_;
   };
 
-  void StartMainLoopThread();
   void RestartPostFork();
   void MainLoop();
   void RunSomeTimers(std::vector<experimental::EventEngine::Closure*> timers);
@@ -103,7 +101,6 @@ class TimerManager final : public grpc_event_engine::experimental::Forkable {
   uint64_t wakeups_ ABSL_GUARDED_BY(mu_) = false;
   // actual timer implementation
   std::unique_ptr<TimerList> timer_list_;
-  grpc_core::Thread main_thread_;
   std::shared_ptr<grpc_event_engine::experimental::ThreadPool> thread_pool_;
   absl::optional<grpc_core::Notification> main_loop_exit_signal_;
 };
diff --git a/src/core/lib/event_engine/query_extensions.h b/src/core/lib/event_engine/query_extensions.h
new file mode 100644
index 0000000000000..2ef15ccfdab6f
--- /dev/null
+++ b/src/core/lib/event_engine/query_extensions.h
@@ -0,0 +1,70 @@
+// Copyright 2023 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_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/strings/string_view.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+namespace grpc_event_engine {
+namespace experimental {
+
+namespace endpoint_detail {
+
+template <typename Querying, typename... Es>
+struct QueryExtensionRecursion;
+
+template <typename Querying, typename E, typename... Es>
+struct QueryExtensionRecursion<Querying, E, Es...> {
+  static void* Query(absl::string_view id, Querying* p) {
+    if (id == E::EndpointExtensionName()) return static_cast<E*>(p);
+    return QueryExtensionRecursion<Querying, Es...>::Query(id, p);
+  }
+};
+
+template <typename Querying>
+struct QueryExtensionRecursion<Querying> {
+  static void* Query(absl::string_view, Querying*) { return nullptr; }
+};
+
+}  // namespace endpoint_detail
+
+// A helper class to derive from some set of base classes and export
+// QueryExtension for them all.
+// Endpoint implementations which need to support different extensions just need
+// to derive from ExtendedEndpoint class.
+template <typename... Exports>
+class ExtendedEndpoint : public EventEngine::Endpoint, public Exports... {
+ public:
+  void* QueryExtension(absl::string_view id) override {
+    return endpoint_detail::QueryExtensionRecursion<ExtendedEndpoint,
+                                                    Exports...>::Query(id,
+                                                                       this);
+  }
+};
+
+/// A helper method which returns a valid pointer if the extension is supported
+/// by the endpoint.
+template <typename T>
+T* QueryExtension(EventEngine::Endpoint* endpoint) {
+  return static_cast<T*>(endpoint->QueryExtension(T::EndpointExtensionName()));
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
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
new file mode 100644
index 0000000000000..645788e9a833f
--- /dev/null
+++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
@@ -0,0 +1,55 @@
+// Copyright 2023 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.
+
+#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 <grpc/support/port_platform.h>
+
+#include <stdint.h>
+
+#include "absl/strings/string_view.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/gprpp/orphanable.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+class RefCountedDNSResolverInterface
+    : public grpc_core::InternallyRefCounted<RefCountedDNSResolverInterface> {
+ public:
+  explicit RefCountedDNSResolverInterface(const char* trace = nullptr,
+                                          intptr_t initial_refcount = 1)
+      : grpc_core::InternallyRefCounted<RefCountedDNSResolverInterface>(
+            trace, initial_refcount) {}
+
+  virtual void LookupHostname(
+      EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
+      absl::string_view name, absl::string_view default_port) = 0;
+
+  virtual void LookupSRV(
+      EventEngine::DNSResolver::LookupSRVCallback on_resolved,
+      absl::string_view name) = 0;
+
+  virtual void LookupTXT(
+      EventEngine::DNSResolver::LookupTXTCallback on_resolved,
+      absl::string_view name) = 0;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H
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 228271517c833..f25a74a05f8f0 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
@@ -17,18 +17,32 @@
 
 #include <memory>
 
-#include <grpc/support/cpu.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"
-#include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/no_destruct.h"
 
 namespace grpc_event_engine {
 namespace experimental {
 
-std::shared_ptr<ThreadPool> MakeThreadPool(size_t /* reserve_threads */) {
-  return std::make_shared<WorkStealingThreadPool>(
-      grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
+namespace {
+grpc_core::NoDestruct<ObjectGroupForkHandler> g_thread_pool_fork_manager;
+
+class ThreadPoolForkCallbackMethods {
+ public:
+  static void Prefork() { g_thread_pool_fork_manager->Prefork(); }
+  static void PostforkParent() { g_thread_pool_fork_manager->PostforkParent(); }
+  static void PostforkChild() { g_thread_pool_fork_manager->PostforkChild(); }
+};
+}  // namespace
+
+std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads) {
+  auto thread_pool = std::make_shared<WorkStealingThreadPool>(reserve_threads);
+  g_thread_pool_fork_manager->RegisterForkable(
+      thread_pool, ThreadPoolForkCallbackMethods::Prefork,
+      ThreadPoolForkCallbackMethods::PostforkParent,
+      ThreadPoolForkCallbackMethods::PostforkChild);
+  return thread_pool;
 }
 
 }  // namespace experimental
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 5b28f3c7b919a..b0356bbe24e5f 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
@@ -213,6 +213,7 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::StartThread() {
 }
 
 void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Quiesce() {
+  gpr_log(GPR_INFO, "WorkStealingThreadPoolImpl::Quiesce");
   SetShutdown(true);
   // Wait until all threads have exited.
   // Note that if this is a threadpool thread then we won't exit this thread
@@ -258,6 +259,7 @@ bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::IsQuiesced() {
 }
 
 void WorkStealingThreadPool::WorkStealingThreadPoolImpl::PrepareFork() {
+  gpr_log(GPR_INFO, "WorkStealingThreadPoolImpl::PrepareFork");
   SetForking(true);
   work_signal_.SignalAll();
   living_thread_count_.BlockUntilThreadCount(0, "forking");
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
new file mode 100644
index 0000000000000..7a8992404a6c9
--- /dev/null
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
@@ -0,0 +1,823 @@
+// Copyright 2023 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 <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
+
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+
+#include <winsock2.h>
+
+#include <ares.h>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.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"
+#include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h"
+#include "src/core/lib/event_engine/windows/win_socket.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/slice/slice.h"
+
+// TODO(apolcyn): remove this hack after fixing upstream.
+// Our grpc/c-ares code on Windows uses the ares_set_socket_functions API,
+// which uses "struct iovec" type, which on Windows is defined inside of
+// a c-ares header that is not public.
+// See https://github.com/c-ares/c-ares/issues/206.
+struct iovec {
+  void* iov_base;
+  size_t iov_len;
+};
+
+namespace grpc_event_engine {
+namespace experimental {
+namespace {
+
+constexpr int kRecvFromSourceAddrSize = 200;
+constexpr int kReadBufferSize = 4192;
+
+grpc_slice FlattenIovec(const struct iovec* iov, int iov_count) {
+  int total = 0;
+  for (int i = 0; i < iov_count; i++) {
+    total += iov[i].iov_len;
+  }
+  grpc_slice out = GRPC_SLICE_MALLOC(total);
+  size_t cur = 0;
+  for (int i = 0; i < iov_count; i++) {
+    for (size_t k = 0; k < iov[i].iov_len; k++) {
+      GRPC_SLICE_START_PTR(out)
+      [cur++] = (static_cast<char*>(iov[i].iov_base))[k];
+    }
+  }
+  return out;
+}
+
+}  // namespace
+
+// c-ares reads and takes action on the error codes of the
+// "virtual socket operations" in this file, via the WSAGetLastError
+// APIs. If code in this file wants to set a specific WSA error that
+// c-ares should read, it must do so by calling SetWSAError() on the
+// WSAErrorContext instance passed to it. A WSAErrorContext must only be
+// instantiated at the top of the virtual socket function callstack.
+class WSAErrorContext {
+ public:
+  explicit WSAErrorContext(){};
+
+  ~WSAErrorContext() {
+    if (error_ != 0) {
+      WSASetLastError(error_);
+    }
+  }
+
+  // Disallow copy and assignment operators
+  WSAErrorContext(const WSAErrorContext&) = delete;
+  WSAErrorContext& operator=(const WSAErrorContext&) = delete;
+
+  void SetWSAError(int error) { error_ = error; }
+
+ private:
+  int error_ = 0;
+};
+
+// c-ares creates its own sockets and is meant to read them when readable and
+// write them when writeable. To fit this socket usage model into the grpc
+// windows poller (which gives notifications when attempted reads and writes
+// are actually fulfilled rather than possible), this GrpcPolledFdWindows
+// class takes advantage of the ares_set_socket_functions API and acts as a
+// virtual socket. It holds its own read and write buffers which are written
+// to and read from c-ares and are used with the grpc windows poller, and it,
+// e.g., manufactures virtual socket error codes when it e.g. needs to tell
+// the c-ares library to wait for an async read.
+class GrpcPolledFdWindows : public GrpcPolledFd {
+ public:
+  GrpcPolledFdWindows(std::unique_ptr<WinSocket> winsocket,
+                      grpc_core::Mutex* mu, int address_family, int socket_type,
+                      EventEngine* event_engine)
+      : name_(absl::StrFormat("c-ares socket: %" PRIdPTR,
+                              winsocket->raw_socket())),
+        address_family_(address_family),
+        socket_type_(socket_type),
+        mu_(mu),
+        winsocket_(std::move(winsocket)),
+        read_buf_(grpc_empty_slice()),
+        write_buf_(grpc_empty_slice()),
+        outer_read_closure_([this]() { OnIocpReadable(); }),
+        outer_write_closure_([this]() { OnIocpWriteable(); }),
+        on_tcp_connect_locked_([this]() { OnTcpConnect(); }),
+        event_engine_(event_engine) {}
+
+  ~GrpcPolledFdWindows() override {
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| ~GrpcPolledFdWindows shutdown_called_: %d ", GetName(),
+        shutdown_called_);
+    grpc_core::CSliceUnref(read_buf_);
+    grpc_core::CSliceUnref(write_buf_);
+    GPR_ASSERT(read_closure_ == nullptr);
+    GPR_ASSERT(write_closure_ == nullptr);
+    if (!shutdown_called_) {
+      winsocket_->Shutdown(DEBUG_LOCATION, "~GrpcPolledFdWindows");
+    }
+  }
+
+  void RegisterForOnReadableLocked(
+      absl::AnyInvocable<void(absl::Status)> read_closure) override {
+    GPR_ASSERT(read_closure_ == nullptr);
+    read_closure_ = std::move(read_closure);
+    grpc_core::CSliceUnref(read_buf_);
+    GPR_ASSERT(!read_buf_has_data_);
+    read_buf_ = GRPC_SLICE_MALLOC(kReadBufferSize);
+    if (connect_done_) {
+      ContinueRegisterForOnReadableLocked();
+    } else {
+      GPR_ASSERT(pending_continue_register_for_on_readable_locked_ == false);
+      pending_continue_register_for_on_readable_locked_ = true;
+    }
+  }
+
+  void RegisterForOnWriteableLocked(
+      absl::AnyInvocable<void(absl::Status)> write_closure) override {
+    if (socket_type_ == SOCK_DGRAM) {
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| RegisterForOnWriteableLocked called", GetName());
+    } else {
+      GPR_ASSERT(socket_type_ == SOCK_STREAM);
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| RegisterForOnWriteableLocked called tcp_write_state_: %d "
+          "connect_done_: %d",
+          GetName(), tcp_write_state_, connect_done_);
+    }
+    GPR_ASSERT(write_closure_ == nullptr);
+    write_closure_ = std::move(write_closure);
+    if (!connect_done_) {
+      GPR_ASSERT(!pending_continue_register_for_on_writeable_locked_);
+      pending_continue_register_for_on_writeable_locked_ = true;
+    } else {
+      ContinueRegisterForOnWriteableLocked();
+    }
+  }
+
+  bool IsFdStillReadableLocked() override { return read_buf_has_data_; }
+
+  bool ShutdownLocked(absl::Status error) override {
+    GPR_ASSERT(!shutdown_called_);
+    if (!absl::IsCancelled(error)) {
+      return false;
+    }
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| ShutdownLocked", GetName());
+    shutdown_called_ = true;
+    // The socket is disconnected and closed here since this is an external
+    // cancel request, e.g. a timeout. c-ares shouldn't do anything on the
+    // socket after this point except calling close which should then destroy
+    // the GrpcPolledFdWindows object.
+    winsocket_->Shutdown(DEBUG_LOCATION, "GrpcPolledFdWindows::ShutdownLocked");
+    return true;
+  }
+
+  ares_socket_t GetWrappedAresSocketLocked() override {
+    return winsocket_->raw_socket();
+  }
+
+  const char* GetName() const override { return name_.c_str(); }
+
+  ares_ssize_t RecvFrom(WSAErrorContext* wsa_error_ctx, void* data,
+                        ares_socket_t data_len, int /* flags */,
+                        struct sockaddr* from, ares_socklen_t* from_len) {
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| RecvFrom called read_buf_has_data:%d Current read buf "
+        "length:|%d|",
+        GetName(), read_buf_has_data_, GRPC_SLICE_LENGTH(read_buf_));
+    if (!read_buf_has_data_) {
+      wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
+      return -1;
+    }
+    ares_ssize_t bytes_read = 0;
+    for (size_t i = 0; i < GRPC_SLICE_LENGTH(read_buf_) && i < data_len; i++) {
+      (static_cast<char*>(data))[i] = GRPC_SLICE_START_PTR(read_buf_)[i];
+      bytes_read++;
+    }
+    read_buf_ = grpc_slice_sub_no_ref(read_buf_, bytes_read,
+                                      GRPC_SLICE_LENGTH(read_buf_));
+    if (GRPC_SLICE_LENGTH(read_buf_) == 0) {
+      read_buf_has_data_ = false;
+    }
+    // c-ares overloads this recv_from virtual socket function to receive
+    // data on both UDP and TCP sockets, and from is nullptr for TCP.
+    if (from != nullptr) {
+      GPR_ASSERT(*from_len <= recv_from_source_addr_len_);
+      memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
+      *from_len = recv_from_source_addr_len_;
+    }
+    return bytes_read;
+  }
+
+  ares_ssize_t SendV(WSAErrorContext* wsa_error_ctx, const struct iovec* iov,
+                     int iov_count) {
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| SendV called connect_done_:%d wsa_connect_error_:%d",
+        GetName(), connect_done_, wsa_connect_error_);
+    if (!connect_done_) {
+      wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
+      return -1;
+    }
+    if (wsa_connect_error_ != 0) {
+      wsa_error_ctx->SetWSAError(wsa_connect_error_);
+      return -1;
+    }
+    switch (socket_type_) {
+      case SOCK_DGRAM:
+        return SendVUDP(wsa_error_ctx, iov, iov_count);
+      case SOCK_STREAM:
+        return SendVTCP(wsa_error_ctx, iov, iov_count);
+      default:
+        abort();
+    }
+  }
+
+  int Connect(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target,
+              ares_socklen_t target_len) {
+    switch (socket_type_) {
+      case SOCK_DGRAM:
+        return ConnectUDP(wsa_error_ctx, target, target_len);
+      case SOCK_STREAM:
+        return ConnectTCP(wsa_error_ctx, target, target_len);
+      default:
+        grpc_core::Crash(
+            absl::StrFormat("Unknown socket_type_: %d", socket_type_));
+    }
+  }
+
+ private:
+  enum WriteState {
+    WRITE_IDLE,
+    WRITE_REQUESTED,
+    WRITE_PENDING,
+    WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY,
+  };
+
+  void ScheduleAndNullReadClosure(absl::Status error) {
+    event_engine_->Run([read_closure = std::move(read_closure_),
+                        error]() mutable { read_closure(error); });
+    read_closure_ = nullptr;
+  }
+
+  void ScheduleAndNullWriteClosure(absl::Status error) {
+    event_engine_->Run([write_closure = std::move(write_closure_),
+                        error]() mutable { write_closure(error); });
+    write_closure_ = nullptr;
+  }
+
+  void ContinueRegisterForOnReadableLocked() {
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| ContinueRegisterForOnReadableLocked "
+        "wsa_connect_error_:%d",
+        GetName(), wsa_connect_error_);
+    GPR_ASSERT(connect_done_);
+    if (wsa_connect_error_ != 0) {
+      ScheduleAndNullReadClosure(GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
+      return;
+    }
+    WSABUF buffer;
+    buffer.buf = reinterpret_cast<char*>(GRPC_SLICE_START_PTR(read_buf_));
+    buffer.len = GRPC_SLICE_LENGTH(read_buf_);
+    recv_from_source_addr_len_ = sizeof(recv_from_source_addr_);
+    DWORD flags = 0;
+    winsocket_->NotifyOnRead(&outer_read_closure_);
+    if (WSARecvFrom(winsocket_->raw_socket(), &buffer, 1, nullptr, &flags,
+                    reinterpret_cast<sockaddr*>(recv_from_source_addr_),
+                    &recv_from_source_addr_len_,
+                    winsocket_->read_info()->overlapped(), nullptr) != 0) {
+      int wsa_last_error = WSAGetLastError();
+      char* msg = gpr_format_message(wsa_last_error);
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| ContinueRegisterForOnReadableLocked WSARecvFrom error "
+          "code:|%d| "
+          "msg:|%s|",
+          GetName(), wsa_last_error, msg);
+      gpr_free(msg);
+      if (wsa_last_error != WSA_IO_PENDING) {
+        winsocket_->UnregisterReadCallback();
+        ScheduleAndNullReadClosure(
+            GRPC_WSA_ERROR(wsa_last_error, "WSARecvFrom"));
+        return;
+      }
+    }
+  }
+
+  void ContinueRegisterForOnWriteableLocked() {
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| ContinueRegisterForOnWriteableLocked "
+        "wsa_connect_error_:%d",
+        GetName(), wsa_connect_error_);
+    GPR_ASSERT(connect_done_);
+    if (wsa_connect_error_ != 0) {
+      ScheduleAndNullWriteClosure(
+          GRPC_WSA_ERROR(wsa_connect_error_, "connect"));
+      return;
+    }
+    if (socket_type_ == SOCK_DGRAM) {
+      ScheduleAndNullWriteClosure(absl::OkStatus());
+      return;
+    }
+    GPR_ASSERT(socket_type_ == SOCK_STREAM);
+    int wsa_error_code = 0;
+    switch (tcp_write_state_) {
+      case WRITE_IDLE:
+        ScheduleAndNullWriteClosure(absl::OkStatus());
+        break;
+      case WRITE_REQUESTED:
+        tcp_write_state_ = WRITE_PENDING;
+        winsocket_->NotifyOnWrite(&outer_write_closure_);
+        if (SendWriteBuf(nullptr, winsocket_->write_info()->overlapped(),
+                         &wsa_error_code) != 0) {
+          winsocket_->UnregisterWriteCallback();
+          ScheduleAndNullWriteClosure(
+              GRPC_WSA_ERROR(wsa_error_code, "WSASend (overlapped)"));
+          return;
+        }
+        break;
+      case WRITE_PENDING:
+      case WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY:
+        grpc_core::Crash(
+            absl::StrFormat("Invalid tcp_write_state_: %d", tcp_write_state_));
+    }
+  }
+
+  int SendWriteBuf(LPDWORD bytes_sent_ptr, LPWSAOVERLAPPED overlapped,
+                   int* wsa_error_code) {
+    WSABUF buf;
+    buf.len = GRPC_SLICE_LENGTH(write_buf_);
+    buf.buf = reinterpret_cast<char*>(GRPC_SLICE_START_PTR(write_buf_));
+    DWORD flags = 0;
+    int out = WSASend(winsocket_->raw_socket(), &buf, 1, bytes_sent_ptr, flags,
+                      overlapped, nullptr);
+    *wsa_error_code = WSAGetLastError();
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| SendWriteBuf WSASend buf.len:%d *bytes_sent_ptr:%d "
+        "overlapped:%p "
+        "return:%d *wsa_error_code:%d",
+        GetName(), buf.len, bytes_sent_ptr != nullptr ? *bytes_sent_ptr : 0,
+        overlapped, out, *wsa_error_code);
+    return out;
+  }
+
+  ares_ssize_t SendVUDP(WSAErrorContext* wsa_error_ctx, const struct iovec* iov,
+                        int iov_count) {
+    // c-ares doesn't handle retryable errors on writes of UDP sockets.
+    // Therefore, the sendv handler for UDP sockets must only attempt
+    // to write everything inline.
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| SendVUDP called", GetName());
+    GPR_ASSERT(GRPC_SLICE_LENGTH(write_buf_) == 0);
+    grpc_core::CSliceUnref(write_buf_);
+    write_buf_ = FlattenIovec(iov, iov_count);
+    DWORD bytes_sent = 0;
+    int wsa_error_code = 0;
+    if (SendWriteBuf(&bytes_sent, nullptr, &wsa_error_code) != 0) {
+      grpc_core::CSliceUnref(write_buf_);
+      write_buf_ = grpc_empty_slice();
+      wsa_error_ctx->SetWSAError(wsa_error_code);
+      char* msg = gpr_format_message(wsa_error_code);
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| SendVUDP SendWriteBuf error code:%d msg:|%s|", GetName(),
+          wsa_error_code, msg);
+      gpr_free(msg);
+      return -1;
+    }
+    write_buf_ = grpc_slice_sub_no_ref(write_buf_, bytes_sent,
+                                       GRPC_SLICE_LENGTH(write_buf_));
+    return bytes_sent;
+  }
+
+  ares_ssize_t SendVTCP(WSAErrorContext* wsa_error_ctx, const struct iovec* iov,
+                        int iov_count) {
+    // The "sendv" handler on TCP sockets buffers up write
+    // requests and returns an artificial WSAEWOULDBLOCK. Writing that buffer
+    // out in the background, and making further send progress in general, will
+    // happen as long as c-ares continues to show interest in writeability on
+    // this fd.
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:|%s| SendVTCP called tcp_write_state_:%d",
+                                 GetName(), tcp_write_state_);
+    switch (tcp_write_state_) {
+      case WRITE_IDLE:
+        tcp_write_state_ = WRITE_REQUESTED;
+        grpc_core::CSliceUnref(write_buf_);
+        write_buf_ = FlattenIovec(iov, iov_count);
+        wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
+        return -1;
+      case WRITE_REQUESTED:
+      case WRITE_PENDING:
+        wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
+        return -1;
+      case WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY:
+        // c-ares is retrying a send on data that we previously returned
+        // WSAEWOULDBLOCK for, but then subsequently wrote out in the
+        // background. Right now, we assume that c-ares is retrying the same
+        // send again. If c-ares still needs to send even more data, we'll get
+        // to it eventually.
+        grpc_slice currently_attempted = FlattenIovec(iov, iov_count);
+        GPR_ASSERT(GRPC_SLICE_LENGTH(currently_attempted) >=
+                   GRPC_SLICE_LENGTH(write_buf_));
+        ares_ssize_t total_sent = 0;
+        for (size_t i = 0; i < GRPC_SLICE_LENGTH(write_buf_); i++) {
+          GPR_ASSERT(GRPC_SLICE_START_PTR(currently_attempted)[i] ==
+                     GRPC_SLICE_START_PTR(write_buf_)[i]);
+          total_sent++;
+        }
+        grpc_core::CSliceUnref(currently_attempted);
+        tcp_write_state_ = WRITE_IDLE;
+        return total_sent;
+    }
+    grpc_core::Crash(
+        absl::StrFormat("Unknown tcp_write_state_: %d", tcp_write_state_));
+  }
+
+  void OnTcpConnect() {
+    grpc_core::MutexLock lock(mu_);
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:%s InnerOnTcpConnectLocked "
+        "pending_register_for_readable:%d"
+        " pending_register_for_writeable:%d",
+        GetName(), pending_continue_register_for_on_readable_locked_,
+        pending_continue_register_for_on_writeable_locked_);
+    GPR_ASSERT(!connect_done_);
+    connect_done_ = true;
+    GPR_ASSERT(wsa_connect_error_ == 0);
+    if (shutdown_called_) {
+      wsa_connect_error_ = WSA_OPERATION_ABORTED;
+    } else {
+      DWORD transferred_bytes = 0;
+      DWORD flags;
+      BOOL wsa_success = WSAGetOverlappedResult(
+          winsocket_->raw_socket(), winsocket_->write_info()->overlapped(),
+          &transferred_bytes, FALSE, &flags);
+      GPR_ASSERT(transferred_bytes == 0);
+      if (!wsa_success) {
+        wsa_connect_error_ = WSAGetLastError();
+        char* msg = gpr_format_message(wsa_connect_error_);
+        GRPC_ARES_RESOLVER_TRACE_LOG(
+            "fd:%s InnerOnTcpConnectLocked WSA overlapped result code:%d "
+            "msg:|%s|",
+            GetName(), wsa_connect_error_, msg);
+        gpr_free(msg);
+      }
+    }
+    if (pending_continue_register_for_on_readable_locked_) {
+      ContinueRegisterForOnReadableLocked();
+    }
+    if (pending_continue_register_for_on_writeable_locked_) {
+      ContinueRegisterForOnWriteableLocked();
+    }
+  }
+
+  int ConnectUDP(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target,
+                 ares_socklen_t target_len) {
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectUDP", GetName());
+    GPR_ASSERT(!connect_done_);
+    GPR_ASSERT(wsa_connect_error_ == 0);
+    SOCKET s = winsocket_->raw_socket();
+    int out =
+        WSAConnect(s, target, target_len, nullptr, nullptr, nullptr, nullptr);
+    wsa_connect_error_ = WSAGetLastError();
+    wsa_error_ctx->SetWSAError(wsa_connect_error_);
+    connect_done_ = true;
+    char* msg = gpr_format_message(wsa_connect_error_);
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s WSAConnect error code:|%d| msg:|%s|",
+                                 GetName(), wsa_connect_error_, msg);
+    gpr_free(msg);
+    // c-ares expects a posix-style connect API
+    return out == 0 ? 0 : -1;
+  }
+
+  int ConnectTCP(WSAErrorContext* wsa_error_ctx, const struct sockaddr* target,
+                 ares_socklen_t target_len) {
+    GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectTCP", GetName());
+    LPFN_CONNECTEX ConnectEx;
+    GUID guid = WSAID_CONNECTEX;
+    DWORD ioctl_num_bytes;
+    SOCKET s = winsocket_->raw_socket();
+    if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
+                 &ConnectEx, sizeof(ConnectEx), &ioctl_num_bytes, nullptr,
+                 nullptr) != 0) {
+      int wsa_last_error = WSAGetLastError();
+      wsa_error_ctx->SetWSAError(wsa_last_error);
+      char* msg = gpr_format_message(wsa_last_error);
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:%s WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER) error code:%d "
+          "msg:|%s|",
+          GetName(), wsa_last_error, msg);
+      gpr_free(msg);
+      connect_done_ = true;
+      wsa_connect_error_ = wsa_last_error;
+      return -1;
+    }
+    grpc_resolved_address wildcard4_addr;
+    grpc_resolved_address wildcard6_addr;
+    grpc_sockaddr_make_wildcards(0, &wildcard4_addr, &wildcard6_addr);
+    grpc_resolved_address* local_address = nullptr;
+    if (address_family_ == AF_INET) {
+      local_address = &wildcard4_addr;
+    } else {
+      local_address = &wildcard6_addr;
+    }
+    if (bind(s, reinterpret_cast<struct sockaddr*>(local_address->addr),
+             static_cast<int>(local_address->len)) != 0) {
+      int wsa_last_error = WSAGetLastError();
+      wsa_error_ctx->SetWSAError(wsa_last_error);
+      char* msg = gpr_format_message(wsa_last_error);
+      GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s bind error code:%d msg:|%s|",
+                                   GetName(), wsa_last_error, msg);
+      gpr_free(msg);
+      connect_done_ = true;
+      wsa_connect_error_ = wsa_last_error;
+      return -1;
+    }
+    int out = 0;
+    // Register an async OnTcpConnect callback here since it is required by the
+    // WinSocket API.
+    winsocket_->NotifyOnWrite(&on_tcp_connect_locked_);
+    if (ConnectEx(s, target, target_len, nullptr, 0, nullptr,
+                  winsocket_->write_info()->overlapped()) == 0) {
+      out = -1;
+      int wsa_last_error = WSAGetLastError();
+      wsa_error_ctx->SetWSAError(wsa_last_error);
+      char* msg = gpr_format_message(wsa_last_error);
+      GRPC_ARES_RESOLVER_TRACE_LOG("fd:%s ConnectEx error code:%d msg:|%s|",
+                                   GetName(), wsa_last_error, msg);
+      gpr_free(msg);
+      if (wsa_last_error == WSA_IO_PENDING) {
+        // c-ares only understands WSAEINPROGRESS and EWOULDBLOCK error codes on
+        // connect, but an async connect on IOCP socket will give
+        // WSA_IO_PENDING, so we need to convert.
+        wsa_error_ctx->SetWSAError(WSAEWOULDBLOCK);
+      } else {
+        winsocket_->UnregisterWriteCallback();
+        // By returning a non-retryable error to c-ares at this point,
+        // we're aborting the possibility of any future operations on this fd.
+        connect_done_ = true;
+        wsa_connect_error_ = wsa_last_error;
+        return -1;
+      }
+    }
+    return out;
+  }
+
+  // TODO(apolcyn): improve this error handling to be less conversative.
+  // An e.g. ECONNRESET error here should result in errors when
+  // c-ares reads from this socket later, but it shouldn't necessarily cancel
+  // the entire resolution attempt. Doing so will allow the "inject broken
+  // nameserver list" test to pass on Windows.
+  void OnIocpReadable() {
+    grpc_core::MutexLock lock(mu_);
+    absl::Status error;
+    if (winsocket_->read_info()->result().wsa_error != 0) {
+      // WSAEMSGSIZE would be due to receiving more data
+      // than our read buffer's fixed capacity. Assume that
+      // the connection is TCP and read the leftovers
+      // in subsequent c-ares reads.
+      if (winsocket_->read_info()->result().wsa_error != WSAEMSGSIZE) {
+        error = GRPC_WSA_ERROR(winsocket_->read_info()->result().wsa_error,
+                               "OnIocpReadableInner");
+        GRPC_ARES_RESOLVER_TRACE_LOG(
+            "fd:|%s| OnIocpReadableInner winsocket_->read_info.wsa_error "
+            "code:|%d| msg:|%s|",
+            GetName(), winsocket_->read_info()->result().wsa_error,
+            grpc_core::StatusToString(error).c_str());
+      }
+    }
+    if (error.ok()) {
+      read_buf_ = grpc_slice_sub_no_ref(
+          read_buf_, 0, winsocket_->read_info()->result().bytes_transferred);
+      read_buf_has_data_ = true;
+    } else {
+      grpc_core::CSliceUnref(read_buf_);
+      read_buf_ = grpc_empty_slice();
+    }
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| OnIocpReadable finishing. read buf length now:|%d|", GetName(),
+        GRPC_SLICE_LENGTH(read_buf_));
+    ScheduleAndNullReadClosure(error);
+  }
+
+  void OnIocpWriteable() {
+    grpc_core::MutexLock lock(mu_);
+    GRPC_ARES_RESOLVER_TRACE_LOG("OnIocpWriteableInner. fd:|%s|", GetName());
+    GPR_ASSERT(socket_type_ == SOCK_STREAM);
+    absl::Status error;
+    if (winsocket_->write_info()->result().wsa_error != 0) {
+      error = GRPC_WSA_ERROR(winsocket_->write_info()->result().wsa_error,
+                             "OnIocpWriteableInner");
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| OnIocpWriteableInner. winsocket_->write_info.wsa_error "
+          "code:|%d| msg:|%s|",
+          GetName(), winsocket_->write_info()->result().wsa_error,
+          grpc_core::StatusToString(error).c_str());
+    }
+    GPR_ASSERT(tcp_write_state_ == WRITE_PENDING);
+    if (error.ok()) {
+      tcp_write_state_ = WRITE_WAITING_FOR_VERIFICATION_UPON_RETRY;
+      write_buf_ = grpc_slice_sub_no_ref(
+          write_buf_, 0, winsocket_->write_info()->result().bytes_transferred);
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "fd:|%s| OnIocpWriteableInner. bytes transferred:%d", GetName(),
+          winsocket_->write_info()->result().bytes_transferred);
+    } else {
+      grpc_core::CSliceUnref(write_buf_);
+      write_buf_ = grpc_empty_slice();
+    }
+    ScheduleAndNullWriteClosure(error);
+  }
+
+  const std::string name_;
+  const int address_family_;
+  const int socket_type_;
+  grpc_core::Mutex* mu_;
+  std::unique_ptr<WinSocket> winsocket_;
+  char recv_from_source_addr_[kRecvFromSourceAddrSize];
+  ares_socklen_t recv_from_source_addr_len_;
+  grpc_slice read_buf_;
+  bool read_buf_has_data_ = false;
+  grpc_slice write_buf_;
+  absl::AnyInvocable<void(absl::Status)> read_closure_;
+  absl::AnyInvocable<void(absl::Status)> write_closure_;
+  AnyInvocableClosure outer_read_closure_;
+  AnyInvocableClosure outer_write_closure_;
+  bool shutdown_called_ = false;
+  // State related to TCP sockets
+  AnyInvocableClosure on_tcp_connect_locked_;
+  bool connect_done_ = false;
+  int wsa_connect_error_ = 0;
+  WriteState tcp_write_state_ = WRITE_IDLE;
+  // We don't run register_for_{readable,writeable} logic until
+  // a socket is connected. In the interim, we queue readable/writeable
+  // registrations with the following state.
+  bool pending_continue_register_for_on_readable_locked_ = false;
+  bool pending_continue_register_for_on_writeable_locked_ = false;
+  // This pointer is initialized from the stored pointer inside the shared
+  // pointer owned by the AresResolver and should be valid at the time of use.
+  EventEngine* event_engine_;
+};
+
+// These virtual socket functions are called from within the c-ares
+// library. These methods generally dispatch those socket calls to the
+// appropriate methods. The virtual "socket" and "close" methods are
+// special and instead create/add and remove/destroy GrpcPolledFdWindows
+// objects.
+class CustomSockFuncs {
+ public:
+  static ares_socket_t Socket(int af, int type, int protocol, void* user_data) {
+    if (type != SOCK_DGRAM && type != SOCK_STREAM) {
+      GRPC_ARES_RESOLVER_TRACE_LOG("Socket called with invalid socket type:%d",
+                                   type);
+      return INVALID_SOCKET;
+    }
+    GrpcPolledFdFactoryWindows* self =
+        static_cast<GrpcPolledFdFactoryWindows*>(user_data);
+    SOCKET s = WSASocket(af, type, protocol, nullptr, 0,
+                         IOCP::GetDefaultSocketFlags());
+    if (s == INVALID_SOCKET) {
+      GRPC_ARES_RESOLVER_TRACE_LOG(
+          "WSASocket failed with params af:%d type:%d protocol:%d", af, type,
+          protocol);
+      return INVALID_SOCKET;
+    }
+    if (type == SOCK_STREAM) {
+      absl::Status error = PrepareSocket(s);
+      if (!error.ok()) {
+        GRPC_ARES_RESOLVER_TRACE_LOG("WSAIoctl failed with error: %s",
+                                     grpc_core::StatusToString(error).c_str());
+        return INVALID_SOCKET;
+      }
+    }
+    auto polled_fd = std::make_unique<GrpcPolledFdWindows>(
+        self->iocp_->Watch(s), self->mu_, af, type, self->event_engine_);
+    GRPC_ARES_RESOLVER_TRACE_LOG(
+        "fd:|%s| created with params af:%d type:%d protocol:%d",
+        polled_fd->GetName(), af, type, protocol);
+    GPR_ASSERT(self->sockets_.insert({s, std::move(polled_fd)}).second);
+    return s;
+  }
+
+  static int Connect(ares_socket_t as, const struct sockaddr* target,
+                     ares_socklen_t target_len, void* user_data) {
+    WSAErrorContext wsa_error_ctx;
+    GrpcPolledFdFactoryWindows* self =
+        static_cast<GrpcPolledFdFactoryWindows*>(user_data);
+    auto it = self->sockets_.find(as);
+    GPR_ASSERT(it != self->sockets_.end());
+    return it->second->Connect(&wsa_error_ctx, target, target_len);
+  }
+
+  static ares_ssize_t SendV(ares_socket_t as, const struct iovec* iov,
+                            int iovec_count, void* user_data) {
+    WSAErrorContext wsa_error_ctx;
+    GrpcPolledFdFactoryWindows* self =
+        static_cast<GrpcPolledFdFactoryWindows*>(user_data);
+    auto it = self->sockets_.find(as);
+    GPR_ASSERT(it != self->sockets_.end());
+    return it->second->SendV(&wsa_error_ctx, iov, iovec_count);
+  }
+
+  static ares_ssize_t RecvFrom(ares_socket_t as, void* data, size_t data_len,
+                               int flags, struct sockaddr* from,
+                               ares_socklen_t* from_len, void* user_data) {
+    WSAErrorContext wsa_error_ctx;
+    GrpcPolledFdFactoryWindows* self =
+        static_cast<GrpcPolledFdFactoryWindows*>(user_data);
+    auto it = self->sockets_.find(as);
+    GPR_ASSERT(it != self->sockets_.end());
+    return it->second->RecvFrom(&wsa_error_ctx, data, data_len, flags, from,
+                                from_len);
+  }
+
+  static int CloseSocket(SOCKET s, void*) {
+    GRPC_ARES_RESOLVER_TRACE_LOG("c-ares socket: %d CloseSocket", s);
+    return 0;
+  }
+};
+
+// Adapter to hold the ownership of GrpcPolledFdWindows internally.
+class GrpcPolledFdWrapper : public GrpcPolledFd {
+ public:
+  explicit GrpcPolledFdWrapper(GrpcPolledFdWindows* polled_fd)
+      : polled_fd_(polled_fd) {}
+
+  void RegisterForOnReadableLocked(
+      absl::AnyInvocable<void(absl::Status)> read_closure) override {
+    polled_fd_->RegisterForOnReadableLocked(std::move(read_closure));
+  }
+
+  void RegisterForOnWriteableLocked(
+      absl::AnyInvocable<void(absl::Status)> write_closure) override {
+    polled_fd_->RegisterForOnWriteableLocked(std::move(write_closure));
+  }
+
+  bool IsFdStillReadableLocked() override {
+    return polled_fd_->IsFdStillReadableLocked();
+  }
+
+  bool ShutdownLocked(absl::Status error) override {
+    return polled_fd_->ShutdownLocked(error);
+  }
+
+  ares_socket_t GetWrappedAresSocketLocked() override {
+    return polled_fd_->GetWrappedAresSocketLocked();
+  }
+
+  const char* GetName() const override { return polled_fd_->GetName(); }
+
+ private:
+  GrpcPolledFdWindows* polled_fd_;
+};
+
+GrpcPolledFdFactoryWindows::GrpcPolledFdFactoryWindows(IOCP* iocp)
+    : iocp_(iocp) {}
+
+GrpcPolledFdFactoryWindows::~GrpcPolledFdFactoryWindows() {}
+
+void GrpcPolledFdFactoryWindows::Initialize(grpc_core::Mutex* mutex,
+                                            EventEngine* event_engine) {
+  mu_ = mutex;
+  event_engine_ = event_engine;
+}
+
+std::unique_ptr<GrpcPolledFd> GrpcPolledFdFactoryWindows::NewGrpcPolledFdLocked(
+    ares_socket_t as) {
+  auto it = sockets_.find(as);
+  GPR_ASSERT(it != sockets_.end());
+  return std::make_unique<GrpcPolledFdWrapper>(it->second.get());
+}
+
+void GrpcPolledFdFactoryWindows::ConfigureAresChannelLocked(
+    ares_channel channel) {
+  static const struct ares_socket_functions kCustomSockFuncs = {
+      /*asocket=*/&CustomSockFuncs::Socket,
+      /*aclose=*/&CustomSockFuncs::CloseSocket,
+      /*aconnect=*/&CustomSockFuncs::Connect,
+      /*arecvfrom=*/&CustomSockFuncs::RecvFrom,
+      /*asendv=*/&CustomSockFuncs::SendV,
+  };
+  ares_set_socket_functions(channel, &kCustomSockFuncs, this);
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
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
new file mode 100644
index 0000000000000..eda3330cb917a
--- /dev/null
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
@@ -0,0 +1,75 @@
+// Copyright 2023 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.
+
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_GRPC_POLLED_FD_WINDOWS_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_GRPC_POLLED_FD_WINDOWS_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
+
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+
+#include <memory>
+
+#include <ares.h>
+
+#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"
+#include "src/core/lib/event_engine/windows/win_socket.h"
+#include "src/core/lib/gprpp/sync.h"
+
+struct iovec;
+
+namespace grpc_event_engine {
+namespace experimental {
+
+class GrpcPolledFdWindows;
+
+class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory {
+ public:
+  explicit GrpcPolledFdFactoryWindows(IOCP* iocp);
+  ~GrpcPolledFdFactoryWindows() override;
+
+  void Initialize(grpc_core::Mutex* mutex, EventEngine* event_engine) override;
+  std::unique_ptr<GrpcPolledFd> NewGrpcPolledFdLocked(
+      ares_socket_t as) override;
+  void ConfigureAresChannelLocked(ares_channel channel) override;
+
+ private:
+  friend class CustomSockFuncs;
+
+  // The mutex is owned by the AresResolver which owns this object.
+  grpc_core::Mutex* mu_;
+  // The IOCP object is owned by the WindowsEngine whose ownership is shared by
+  // the AresResolver.
+  IOCP* iocp_;
+  // This pointer is initialized from the stored pointer inside the shared
+  // pointer owned by the AresResolver which owns this object.
+  EventEngine* event_engine_;
+  std::map<SOCKET, std::unique_ptr<GrpcPolledFdWindows>> sockets_;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_GRPC_POLLED_FD_WINDOWS_H
diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc
index 3bf3df7bb86e1..2512026703945 100644
--- a/src/core/lib/event_engine/windows/windows_engine.cc
+++ b/src/core/lib/event_engine/windows/windows_engine.cc
@@ -35,6 +35,7 @@
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/trace.h"
 #include "src/core/lib/event_engine/utils.h"
+#include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
 #include "src/core/lib/event_engine/windows/windows_endpoint.h"
 #include "src/core/lib/event_engine/windows/windows_engine.h"
@@ -99,7 +100,7 @@ struct WindowsEventEngine::TimerClosure final : public EventEngine::Closure {
 
 WindowsEventEngine::WindowsEventEngine()
     : thread_pool_(
-          MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u))),
+          MakeThreadPool(grpc_core::Clamp(gpr_cpu_num_cores(), 4u, 16u))),
       iocp_(thread_pool_.get()),
       timer_manager_(thread_pool_),
       iocp_worker_(thread_pool_.get(), &iocp_) {
@@ -194,10 +195,49 @@ EventEngine::TaskHandle WindowsEventEngine::RunAfterInternal(
   return handle;
 }
 
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+
+WindowsEventEngine::WindowsDNSResolver::WindowsDNSResolver(
+    grpc_core::OrphanablePtr<AresResolver> ares_resolver)
+    : ares_resolver_(std::move(ares_resolver)) {}
+
+void WindowsEventEngine::WindowsDNSResolver::LookupHostname(
+    LookupHostnameCallback on_resolve, absl::string_view name,
+    absl::string_view default_port) {
+  ares_resolver_->LookupHostname(std::move(on_resolve), name, default_port);
+}
+
+void WindowsEventEngine::WindowsDNSResolver::LookupSRV(
+    LookupSRVCallback on_resolve, absl::string_view name) {
+  ares_resolver_->LookupSRV(std::move(on_resolve), name);
+}
+
+void WindowsEventEngine::WindowsDNSResolver::LookupTXT(
+    LookupTXTCallback on_resolve, absl::string_view name) {
+  ares_resolver_->LookupTXT(std::move(on_resolve), name);
+}
+
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+
 absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>>
 WindowsEventEngine::GetDNSResolver(
-    EventEngine::DNSResolver::ResolverOptions const& /*options*/) {
+    EventEngine::DNSResolver::ResolverOptions const& options) {
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+  auto ares_resolver = AresResolver::CreateAresResolver(
+      options.dns_server,
+      std::make_unique<GrpcPolledFdFactoryWindows>(poller()),
+      shared_from_this());
+  if (!ares_resolver.ok()) {
+    return ares_resolver.status();
+  }
+  return std::make_unique<WindowsEventEngine::WindowsDNSResolver>(
+      std::move(*ares_resolver));
+#else   // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+  // TODO(yijiem): Implement a basic A/AAAA-only native resolver in
+  // WindowsEventEngine.
+  (void)options;
   grpc_core::Crash("unimplemented");
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 }
 
 bool WindowsEventEngine::IsWorkerThread() { grpc_core::Crash("unimplemented"); }
diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h
index f9211e46177eb..150e7facf3fda 100644
--- a/src/core/lib/event_engine/windows/windows_engine.h
+++ b/src/core/lib/event_engine/windows/windows_engine.h
@@ -13,8 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_WINDOWS_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_WINDOWS_ENGINE_H
+
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
+
 #ifdef GPR_WINDOWS
 
 #include <memory>
@@ -28,6 +31,7 @@
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/slice_buffer.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"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
@@ -47,7 +51,11 @@ class WindowsEventEngine : public EventEngine,
  public:
   class WindowsDNSResolver : public EventEngine::DNSResolver {
    public:
-    ~WindowsDNSResolver() override;
+    WindowsDNSResolver() = delete;
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+    explicit WindowsDNSResolver(
+        grpc_core::OrphanablePtr<AresResolver> ares_resolver);
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
     void LookupHostname(LookupHostnameCallback on_resolve,
                         absl::string_view name,
                         absl::string_view default_port) override;
@@ -55,6 +63,11 @@ class WindowsEventEngine : public EventEngine,
                    absl::string_view name) override;
     void LookupTXT(LookupTXTCallback on_resolve,
                    absl::string_view name) override;
+
+#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
+   private:
+    grpc_core::OrphanablePtr<AresResolver> ares_resolver_;
+#endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
   };
 
   WindowsEventEngine();
diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc
index 28cec78598e43..29964bb7575a4 100644
--- a/src/core/lib/experiments/config.cc
+++ b/src/core/lib/experiments/config.cc
@@ -135,6 +135,19 @@ GPR_ATTRIBUTE_NOINLINE Experiments LoadExperimentsFromConfigVariable() {
               std::string(experiment).c_str());
     }
   }
+  for (size_t i = 0; i < kNumExperiments; i++) {
+    // If required experiments are not enabled, disable this one too.
+    for (size_t j = 0; j < g_experiment_metadata[i].num_required_experiments;
+         j++) {
+      // Require that we can check dependent requirements with a linear sweep
+      // (implies the experiments generator must DAG sort the experiments)
+      GPR_ASSERT(g_experiment_metadata[i].required_experiments[j] < i);
+      if (!experiments
+               .enabled[g_experiment_metadata[i].required_experiments[j]]) {
+        experiments.enabled[i] = false;
+      }
+    }
+  }
   return experiments;
 }
 
diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h
index e93382634b709..a36083cbcc3e5 100644
--- a/src/core/lib/experiments/config.h
+++ b/src/core/lib/experiments/config.h
@@ -18,6 +18,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <stddef.h>
+#include <stdint.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
@@ -30,6 +31,8 @@ struct ExperimentMetadata {
   const char* name;
   const char* description;
   const char* additional_constaints;
+  const uint8_t* required_experiments;
+  uint8_t num_required_experiments;
   bool default_value;
   bool allow_in_fuzzing_config;
 };
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index e25d090fd50f5..d44fdac9f7216 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/experiments/experiments.h"
 
+#include <stdint.h>
+
 #ifndef GRPC_EXPERIMENTS_ARE_FINAL
 
 #if defined(GRPC_CFSTREAM)
 namespace {
-const char* const description_block_excessive_requests_before_settings_ack =
-    "If set, block excessive requests before receiving SETTINGS ACK.";
-const char* const
-    additional_constraints_block_excessive_requests_before_settings_ack = "{}";
 const char* const description_call_status_override_on_cancellation =
     "Avoid overriding call status of successfully finished calls if it races "
     "with cancellation.";
@@ -34,22 +32,11 @@ const char* const additional_constraints_call_status_override_on_cancellation =
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
-const char* const description_chttp2_batch_requests =
-    "Cap the number of requests received by one transport read prior to "
-    "offload.";
-const char* const additional_constraints_chttp2_batch_requests = "{}";
-const char* const description_chttp2_offload_on_rst_stream =
-    "Offload work on RST_STREAM.";
-const char* const additional_constraints_chttp2_offload_on_rst_stream = "{}";
 const char* const description_client_idleness =
     "If enabled, client channel idleness is enabled by default.";
 const char* const additional_constraints_client_idleness = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
-const char* const description_combiner_offload_to_event_engine =
-    "Offload Combiner work onto the EventEngine instead of the Executor.";
-const char* const additional_constraints_combiner_offload_to_event_engine =
-    "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -73,10 +60,6 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_lazier_stream_updates =
-    "Allow streams to consume up to 50% of the incoming window before we force "
-    "send a flow control update.";
-const char* const additional_constraints_lazier_stream_updates = "{}";
 const char* const description_memory_pressure_controller =
     "New memory pressure controller";
 const char* const additional_constraints_memory_pressure_controller = "{}";
@@ -106,10 +89,6 @@ const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_happy_eyeballs =
     "Use Happy Eyeballs in pick_first.";
 const char* const additional_constraints_pick_first_happy_eyeballs = "{}";
-const char* const description_ping_on_rst_stream =
-    "Send a ping on receiving some RST_STREAM frames on the server (proportion "
-    "configurable via grpc.http2.ping_on_rst_stream_percent channel arg).";
-const char* const additional_constraints_ping_on_rst_stream = "{}";
 const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -150,20 +129,8 @@ const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
     "{}";
-const char* const description_separate_ping_from_keepalive =
-    "Keep a different keepalive timeout (resolution is seeing data after "
-    "sending a ping) from a ping timeout (resolution is getting a ping ack "
-    "after sending a ping) The first can be short and determines liveness. The "
-    "second can be longer and determines protocol correctness.";
-const char* const additional_constraints_separate_ping_from_keepalive = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_settings_timeout =
-    "If set, use the settings timeout to send settings frame to the peer.";
-const char* const additional_constraints_settings_timeout = "{}";
-const char* const description_tarpit =
-    "If set, tarpit invalid requests for some amount of time";
-const char* const additional_constraints_tarpit = "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -189,12 +156,14 @@ const char* const description_work_serializer_dispatch =
     "callback, instead of running things inline in the first thread that "
     "successfully enqueues work.";
 const char* const additional_constraints_work_serializer_dispatch = "{}";
-const char* const description_write_size_cap =
-    "Limit outgoing writes proportional to the target write size";
-const char* const additional_constraints_write_size_cap = "{}";
 const char* const description_write_size_policy =
     "Try to size writes such that they don't create too large of a backlog";
 const char* const additional_constraints_write_size_policy = "{}";
+const char* const description_write_size_cap =
+    "Limit outgoing writes proportional to the target write size";
+const char* const additional_constraints_write_size_cap = "{}";
+const uint8_t required_experiments_write_size_cap[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdWriteSizePolicy)};
 const char* const description_wrr_delegate_to_pick_first =
     "Change WRR code to delegate to pick_first as per dualstack backend "
     "design.";
@@ -209,119 +178,106 @@ const bool kDefaultForDebugOnly = true;
 namespace grpc_core {
 
 const ExperimentMetadata g_experiment_metadata[] = {
-    {"block_excessive_requests_before_settings_ack",
-     description_block_excessive_requests_before_settings_ack,
-     additional_constraints_block_excessive_requests_before_settings_ack, true,
-     true},
     {"call_status_override_on_cancellation",
      description_call_status_override_on_cancellation,
-     additional_constraints_call_status_override_on_cancellation,
+     additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
     {"canary_client_privacy", description_canary_client_privacy,
-     additional_constraints_canary_client_privacy, false, false},
-    {"chttp2_batch_requests", description_chttp2_batch_requests,
-     additional_constraints_chttp2_batch_requests, true, true},
-    {"chttp2_offload_on_rst_stream", description_chttp2_offload_on_rst_stream,
-     additional_constraints_chttp2_offload_on_rst_stream, true, true},
+     additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
-     additional_constraints_client_idleness, true, true},
+     additional_constraints_client_idleness, nullptr, 0, true, true},
     {"client_privacy", description_client_privacy,
-     additional_constraints_client_privacy, false, false},
-    {"combiner_offload_to_event_engine",
-     description_combiner_offload_to_event_engine,
-     additional_constraints_combiner_offload_to_event_engine, true, true},
+     additional_constraints_client_privacy, nullptr, 0, false, false},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, false, true},
     {"event_engine_dns", description_event_engine_dns,
-     additional_constraints_event_engine_dns, false, false},
+     additional_constraints_event_engine_dns, nullptr, 0, false, false},
     {"event_engine_listener", description_event_engine_listener,
-     additional_constraints_event_engine_listener, false, true},
+     additional_constraints_event_engine_listener, nullptr, 0, false, true},
     {"free_large_allocator", description_free_large_allocator,
-     additional_constraints_free_large_allocator, false, true},
+     additional_constraints_free_large_allocator, nullptr, 0, false, true},
     {"http2_stats_fix", description_http2_stats_fix,
-     additional_constraints_http2_stats_fix, true, true},
+     additional_constraints_http2_stats_fix, nullptr, 0, true, true},
     {"keepalive_fix", description_keepalive_fix,
-     additional_constraints_keepalive_fix, false, false},
+     additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
-     additional_constraints_keepalive_server_fix, false, false},
-    {"lazier_stream_updates", description_lazier_stream_updates,
-     additional_constraints_lazier_stream_updates, true, true},
+     additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
     {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, false, true},
+     additional_constraints_memory_pressure_controller, nullptr, 0, false,
+     true},
     {"monitoring_experiment", description_monitoring_experiment,
-     additional_constraints_monitoring_experiment, true, true},
+     additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
-     false, true},
+     nullptr, 0, false, true},
     {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, true, true},
+     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
-     additional_constraints_peer_state_based_framing, false, true},
+     additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, true, true},
+     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
-     additional_constraints_pick_first_happy_eyeballs, true, true},
-    {"ping_on_rst_stream", description_ping_on_rst_stream,
-     additional_constraints_ping_on_rst_stream, true, true},
+     additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, false, true},
+     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
-     additional_constraints_promise_based_inproc_transport, false, false},
+     additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
+     false},
     {"promise_based_server_call", description_promise_based_server_call,
-     additional_constraints_promise_based_server_call, false, true},
+     additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, false, true},
+     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
-     additional_constraints_registered_method_lookup_in_transport, true, true},
+     additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
+     true, true},
     {"registered_methods_map", description_registered_methods_map,
-     additional_constraints_registered_methods_map, false, true},
+     additional_constraints_registered_methods_map, nullptr, 0, false, true},
     {"rfc_max_concurrent_streams", description_rfc_max_concurrent_streams,
-     additional_constraints_rfc_max_concurrent_streams, false, true},
+     additional_constraints_rfc_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"round_robin_delegate_to_pick_first",
      description_round_robin_delegate_to_pick_first,
-     additional_constraints_round_robin_delegate_to_pick_first, true, true},
-    {"rstpit", description_rstpit, additional_constraints_rstpit, false, true},
+     additional_constraints_round_robin_delegate_to_pick_first, nullptr, 0,
+     true, true},
+    {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0,
+     false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
-     additional_constraints_schedule_cancellation_over_write, false, true},
-    {"separate_ping_from_keepalive", description_separate_ping_from_keepalive,
-     additional_constraints_separate_ping_from_keepalive, true, true},
+     additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
+     true},
     {"server_privacy", description_server_privacy,
-     additional_constraints_server_privacy, false, false},
-    {"settings_timeout", description_settings_timeout,
-     additional_constraints_settings_timeout, true, true},
-    {"tarpit", description_tarpit, additional_constraints_tarpit, true, true},
+     additional_constraints_server_privacy, nullptr, 0, false, false},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
-     additional_constraints_tcp_frame_size_tuning, false, true},
+     additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
-     additional_constraints_tcp_rcv_lowat, false, true},
+     additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true},
     {"trace_record_callops", description_trace_record_callops,
-     additional_constraints_trace_record_callops, false, true},
+     additional_constraints_trace_record_callops, nullptr, 0, false, true},
     {"unconstrained_max_quota_buffer_size",
      description_unconstrained_max_quota_buffer_size,
-     additional_constraints_unconstrained_max_quota_buffer_size, false, true},
+     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, true, true},
+     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
+     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
-     additional_constraints_work_serializer_dispatch, false, true},
-    {"write_size_cap", description_write_size_cap,
-     additional_constraints_write_size_cap, true, true},
+     additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
     {"write_size_policy", description_write_size_policy,
-     additional_constraints_write_size_policy, true, true},
+     additional_constraints_write_size_policy, nullptr, 0, true, true},
+    {"write_size_cap", description_write_size_cap,
+     additional_constraints_write_size_cap, required_experiments_write_size_cap,
+     1, true, true},
     {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
-     additional_constraints_wrr_delegate_to_pick_first, true, true},
+     additional_constraints_wrr_delegate_to_pick_first, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
 
 #elif defined(GPR_WINDOWS)
 namespace {
-const char* const description_block_excessive_requests_before_settings_ack =
-    "If set, block excessive requests before receiving SETTINGS ACK.";
-const char* const
-    additional_constraints_block_excessive_requests_before_settings_ack = "{}";
 const char* const description_call_status_override_on_cancellation =
     "Avoid overriding call status of successfully finished calls if it races "
     "with cancellation.";
@@ -330,22 +286,11 @@ const char* const additional_constraints_call_status_override_on_cancellation =
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
-const char* const description_chttp2_batch_requests =
-    "Cap the number of requests received by one transport read prior to "
-    "offload.";
-const char* const additional_constraints_chttp2_batch_requests = "{}";
-const char* const description_chttp2_offload_on_rst_stream =
-    "Offload work on RST_STREAM.";
-const char* const additional_constraints_chttp2_offload_on_rst_stream = "{}";
 const char* const description_client_idleness =
     "If enabled, client channel idleness is enabled by default.";
 const char* const additional_constraints_client_idleness = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
-const char* const description_combiner_offload_to_event_engine =
-    "Offload Combiner work onto the EventEngine instead of the Executor.";
-const char* const additional_constraints_combiner_offload_to_event_engine =
-    "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -369,10 +314,6 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_lazier_stream_updates =
-    "Allow streams to consume up to 50% of the incoming window before we force "
-    "send a flow control update.";
-const char* const additional_constraints_lazier_stream_updates = "{}";
 const char* const description_memory_pressure_controller =
     "New memory pressure controller";
 const char* const additional_constraints_memory_pressure_controller = "{}";
@@ -402,10 +343,6 @@ const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_happy_eyeballs =
     "Use Happy Eyeballs in pick_first.";
 const char* const additional_constraints_pick_first_happy_eyeballs = "{}";
-const char* const description_ping_on_rst_stream =
-    "Send a ping on receiving some RST_STREAM frames on the server (proportion "
-    "configurable via grpc.http2.ping_on_rst_stream_percent channel arg).";
-const char* const additional_constraints_ping_on_rst_stream = "{}";
 const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -446,20 +383,8 @@ const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
     "{}";
-const char* const description_separate_ping_from_keepalive =
-    "Keep a different keepalive timeout (resolution is seeing data after "
-    "sending a ping) from a ping timeout (resolution is getting a ping ack "
-    "after sending a ping) The first can be short and determines liveness. The "
-    "second can be longer and determines protocol correctness.";
-const char* const additional_constraints_separate_ping_from_keepalive = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_settings_timeout =
-    "If set, use the settings timeout to send settings frame to the peer.";
-const char* const additional_constraints_settings_timeout = "{}";
-const char* const description_tarpit =
-    "If set, tarpit invalid requests for some amount of time";
-const char* const additional_constraints_tarpit = "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -485,12 +410,14 @@ const char* const description_work_serializer_dispatch =
     "callback, instead of running things inline in the first thread that "
     "successfully enqueues work.";
 const char* const additional_constraints_work_serializer_dispatch = "{}";
-const char* const description_write_size_cap =
-    "Limit outgoing writes proportional to the target write size";
-const char* const additional_constraints_write_size_cap = "{}";
 const char* const description_write_size_policy =
     "Try to size writes such that they don't create too large of a backlog";
 const char* const additional_constraints_write_size_policy = "{}";
+const char* const description_write_size_cap =
+    "Limit outgoing writes proportional to the target write size";
+const char* const additional_constraints_write_size_cap = "{}";
+const uint8_t required_experiments_write_size_cap[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdWriteSizePolicy)};
 const char* const description_wrr_delegate_to_pick_first =
     "Change WRR code to delegate to pick_first as per dualstack backend "
     "design.";
@@ -505,119 +432,106 @@ const bool kDefaultForDebugOnly = true;
 namespace grpc_core {
 
 const ExperimentMetadata g_experiment_metadata[] = {
-    {"block_excessive_requests_before_settings_ack",
-     description_block_excessive_requests_before_settings_ack,
-     additional_constraints_block_excessive_requests_before_settings_ack, true,
-     true},
     {"call_status_override_on_cancellation",
      description_call_status_override_on_cancellation,
-     additional_constraints_call_status_override_on_cancellation,
+     additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
     {"canary_client_privacy", description_canary_client_privacy,
-     additional_constraints_canary_client_privacy, false, false},
-    {"chttp2_batch_requests", description_chttp2_batch_requests,
-     additional_constraints_chttp2_batch_requests, true, true},
-    {"chttp2_offload_on_rst_stream", description_chttp2_offload_on_rst_stream,
-     additional_constraints_chttp2_offload_on_rst_stream, true, true},
+     additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
-     additional_constraints_client_idleness, true, true},
+     additional_constraints_client_idleness, nullptr, 0, true, true},
     {"client_privacy", description_client_privacy,
-     additional_constraints_client_privacy, false, false},
-    {"combiner_offload_to_event_engine",
-     description_combiner_offload_to_event_engine,
-     additional_constraints_combiner_offload_to_event_engine, true, true},
+     additional_constraints_client_privacy, nullptr, 0, false, false},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, false, true},
     {"event_engine_dns", description_event_engine_dns,
-     additional_constraints_event_engine_dns, false, false},
+     additional_constraints_event_engine_dns, nullptr, 0, false, false},
     {"event_engine_listener", description_event_engine_listener,
-     additional_constraints_event_engine_listener, true, true},
+     additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
-     additional_constraints_free_large_allocator, false, true},
+     additional_constraints_free_large_allocator, nullptr, 0, false, true},
     {"http2_stats_fix", description_http2_stats_fix,
-     additional_constraints_http2_stats_fix, true, true},
+     additional_constraints_http2_stats_fix, nullptr, 0, true, true},
     {"keepalive_fix", description_keepalive_fix,
-     additional_constraints_keepalive_fix, false, false},
+     additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
-     additional_constraints_keepalive_server_fix, false, false},
-    {"lazier_stream_updates", description_lazier_stream_updates,
-     additional_constraints_lazier_stream_updates, true, true},
+     additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
     {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, false, true},
+     additional_constraints_memory_pressure_controller, nullptr, 0, false,
+     true},
     {"monitoring_experiment", description_monitoring_experiment,
-     additional_constraints_monitoring_experiment, true, true},
+     additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
-     false, true},
+     nullptr, 0, false, true},
     {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, true, true},
+     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
-     additional_constraints_peer_state_based_framing, false, true},
+     additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, true, true},
+     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
-     additional_constraints_pick_first_happy_eyeballs, true, true},
-    {"ping_on_rst_stream", description_ping_on_rst_stream,
-     additional_constraints_ping_on_rst_stream, true, true},
+     additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, false, true},
+     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
-     additional_constraints_promise_based_inproc_transport, false, false},
+     additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
+     false},
     {"promise_based_server_call", description_promise_based_server_call,
-     additional_constraints_promise_based_server_call, false, true},
+     additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, false, true},
+     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
-     additional_constraints_registered_method_lookup_in_transport, true, true},
+     additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
+     true, true},
     {"registered_methods_map", description_registered_methods_map,
-     additional_constraints_registered_methods_map, false, true},
+     additional_constraints_registered_methods_map, nullptr, 0, false, true},
     {"rfc_max_concurrent_streams", description_rfc_max_concurrent_streams,
-     additional_constraints_rfc_max_concurrent_streams, false, true},
+     additional_constraints_rfc_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"round_robin_delegate_to_pick_first",
      description_round_robin_delegate_to_pick_first,
-     additional_constraints_round_robin_delegate_to_pick_first, true, true},
-    {"rstpit", description_rstpit, additional_constraints_rstpit, false, true},
+     additional_constraints_round_robin_delegate_to_pick_first, nullptr, 0,
+     true, true},
+    {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0,
+     false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
-     additional_constraints_schedule_cancellation_over_write, false, true},
-    {"separate_ping_from_keepalive", description_separate_ping_from_keepalive,
-     additional_constraints_separate_ping_from_keepalive, true, true},
+     additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
+     true},
     {"server_privacy", description_server_privacy,
-     additional_constraints_server_privacy, false, false},
-    {"settings_timeout", description_settings_timeout,
-     additional_constraints_settings_timeout, true, true},
-    {"tarpit", description_tarpit, additional_constraints_tarpit, true, true},
+     additional_constraints_server_privacy, nullptr, 0, false, false},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
-     additional_constraints_tcp_frame_size_tuning, false, true},
+     additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
-     additional_constraints_tcp_rcv_lowat, false, true},
+     additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true},
     {"trace_record_callops", description_trace_record_callops,
-     additional_constraints_trace_record_callops, false, true},
+     additional_constraints_trace_record_callops, nullptr, 0, false, true},
     {"unconstrained_max_quota_buffer_size",
      description_unconstrained_max_quota_buffer_size,
-     additional_constraints_unconstrained_max_quota_buffer_size, false, true},
+     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, true, true},
+     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
+     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
-     additional_constraints_work_serializer_dispatch, false, true},
-    {"write_size_cap", description_write_size_cap,
-     additional_constraints_write_size_cap, true, true},
+     additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
     {"write_size_policy", description_write_size_policy,
-     additional_constraints_write_size_policy, true, true},
+     additional_constraints_write_size_policy, nullptr, 0, true, true},
+    {"write_size_cap", description_write_size_cap,
+     additional_constraints_write_size_cap, required_experiments_write_size_cap,
+     1, true, true},
     {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
-     additional_constraints_wrr_delegate_to_pick_first, true, true},
+     additional_constraints_wrr_delegate_to_pick_first, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
 
 #else
 namespace {
-const char* const description_block_excessive_requests_before_settings_ack =
-    "If set, block excessive requests before receiving SETTINGS ACK.";
-const char* const
-    additional_constraints_block_excessive_requests_before_settings_ack = "{}";
 const char* const description_call_status_override_on_cancellation =
     "Avoid overriding call status of successfully finished calls if it races "
     "with cancellation.";
@@ -626,22 +540,11 @@ const char* const additional_constraints_call_status_override_on_cancellation =
 const char* const description_canary_client_privacy =
     "If set, canary client privacy";
 const char* const additional_constraints_canary_client_privacy = "{}";
-const char* const description_chttp2_batch_requests =
-    "Cap the number of requests received by one transport read prior to "
-    "offload.";
-const char* const additional_constraints_chttp2_batch_requests = "{}";
-const char* const description_chttp2_offload_on_rst_stream =
-    "Offload work on RST_STREAM.";
-const char* const additional_constraints_chttp2_offload_on_rst_stream = "{}";
 const char* const description_client_idleness =
     "If enabled, client channel idleness is enabled by default.";
 const char* const additional_constraints_client_idleness = "{}";
 const char* const description_client_privacy = "If set, client privacy";
 const char* const additional_constraints_client_privacy = "{}";
-const char* const description_combiner_offload_to_event_engine =
-    "Offload Combiner work onto the EventEngine instead of the Executor.";
-const char* const additional_constraints_combiner_offload_to_event_engine =
-    "{}";
 const char* const description_event_engine_client =
     "Use EventEngine clients instead of iomgr's grpc_tcp_client";
 const char* const additional_constraints_event_engine_client = "{}";
@@ -665,10 +568,6 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_lazier_stream_updates =
-    "Allow streams to consume up to 50% of the incoming window before we force "
-    "send a flow control update.";
-const char* const additional_constraints_lazier_stream_updates = "{}";
 const char* const description_memory_pressure_controller =
     "New memory pressure controller";
 const char* const additional_constraints_memory_pressure_controller = "{}";
@@ -698,10 +597,6 @@ const char* const additional_constraints_pending_queue_cap = "{}";
 const char* const description_pick_first_happy_eyeballs =
     "Use Happy Eyeballs in pick_first.";
 const char* const additional_constraints_pick_first_happy_eyeballs = "{}";
-const char* const description_ping_on_rst_stream =
-    "Send a ping on receiving some RST_STREAM frames on the server (proportion "
-    "configurable via grpc.http2.ping_on_rst_stream_percent channel arg).";
-const char* const additional_constraints_ping_on_rst_stream = "{}";
 const char* const description_promise_based_client_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
@@ -742,20 +637,8 @@ const char* const description_schedule_cancellation_over_write =
     "Allow cancellation op to be scheduled over a write";
 const char* const additional_constraints_schedule_cancellation_over_write =
     "{}";
-const char* const description_separate_ping_from_keepalive =
-    "Keep a different keepalive timeout (resolution is seeing data after "
-    "sending a ping) from a ping timeout (resolution is getting a ping ack "
-    "after sending a ping) The first can be short and determines liveness. The "
-    "second can be longer and determines protocol correctness.";
-const char* const additional_constraints_separate_ping_from_keepalive = "{}";
 const char* const description_server_privacy = "If set, server privacy";
 const char* const additional_constraints_server_privacy = "{}";
-const char* const description_settings_timeout =
-    "If set, use the settings timeout to send settings frame to the peer.";
-const char* const additional_constraints_settings_timeout = "{}";
-const char* const description_tarpit =
-    "If set, tarpit invalid requests for some amount of time";
-const char* const additional_constraints_tarpit = "{}";
 const char* const description_tcp_frame_size_tuning =
     "If set, enables TCP to use RPC size estimation made by higher layers. TCP "
     "would not indicate completion of a read operation until a specified "
@@ -781,12 +664,14 @@ const char* const description_work_serializer_dispatch =
     "callback, instead of running things inline in the first thread that "
     "successfully enqueues work.";
 const char* const additional_constraints_work_serializer_dispatch = "{}";
-const char* const description_write_size_cap =
-    "Limit outgoing writes proportional to the target write size";
-const char* const additional_constraints_write_size_cap = "{}";
 const char* const description_write_size_policy =
     "Try to size writes such that they don't create too large of a backlog";
 const char* const additional_constraints_write_size_policy = "{}";
+const char* const description_write_size_cap =
+    "Limit outgoing writes proportional to the target write size";
+const char* const additional_constraints_write_size_cap = "{}";
+const uint8_t required_experiments_write_size_cap[] = {
+    static_cast<uint8_t>(grpc_core::kExperimentIdWriteSizePolicy)};
 const char* const description_wrr_delegate_to_pick_first =
     "Change WRR code to delegate to pick_first as per dualstack backend "
     "design.";
@@ -801,109 +686,100 @@ const bool kDefaultForDebugOnly = true;
 namespace grpc_core {
 
 const ExperimentMetadata g_experiment_metadata[] = {
-    {"block_excessive_requests_before_settings_ack",
-     description_block_excessive_requests_before_settings_ack,
-     additional_constraints_block_excessive_requests_before_settings_ack, true,
-     true},
     {"call_status_override_on_cancellation",
      description_call_status_override_on_cancellation,
-     additional_constraints_call_status_override_on_cancellation,
+     additional_constraints_call_status_override_on_cancellation, nullptr, 0,
      kDefaultForDebugOnly, true},
     {"canary_client_privacy", description_canary_client_privacy,
-     additional_constraints_canary_client_privacy, false, false},
-    {"chttp2_batch_requests", description_chttp2_batch_requests,
-     additional_constraints_chttp2_batch_requests, true, true},
-    {"chttp2_offload_on_rst_stream", description_chttp2_offload_on_rst_stream,
-     additional_constraints_chttp2_offload_on_rst_stream, true, true},
+     additional_constraints_canary_client_privacy, nullptr, 0, false, false},
     {"client_idleness", description_client_idleness,
-     additional_constraints_client_idleness, true, true},
+     additional_constraints_client_idleness, nullptr, 0, true, true},
     {"client_privacy", description_client_privacy,
-     additional_constraints_client_privacy, false, false},
-    {"combiner_offload_to_event_engine",
-     description_combiner_offload_to_event_engine,
-     additional_constraints_combiner_offload_to_event_engine, true, true},
+     additional_constraints_client_privacy, nullptr, 0, false, false},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, false, true},
     {"event_engine_dns", description_event_engine_dns,
-     additional_constraints_event_engine_dns, false, false},
+     additional_constraints_event_engine_dns, nullptr, 0, false, false},
     {"event_engine_listener", description_event_engine_listener,
-     additional_constraints_event_engine_listener, true, true},
+     additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
-     additional_constraints_free_large_allocator, false, true},
+     additional_constraints_free_large_allocator, nullptr, 0, false, true},
     {"http2_stats_fix", description_http2_stats_fix,
-     additional_constraints_http2_stats_fix, true, true},
+     additional_constraints_http2_stats_fix, nullptr, 0, true, true},
     {"keepalive_fix", description_keepalive_fix,
-     additional_constraints_keepalive_fix, false, false},
+     additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
-     additional_constraints_keepalive_server_fix, false, false},
-    {"lazier_stream_updates", description_lazier_stream_updates,
-     additional_constraints_lazier_stream_updates, true, true},
+     additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
     {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, false, true},
+     additional_constraints_memory_pressure_controller, nullptr, 0, false,
+     true},
     {"monitoring_experiment", description_monitoring_experiment,
-     additional_constraints_monitoring_experiment, true, true},
+     additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
-     false, true},
+     nullptr, 0, false, true},
     {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, true, true},
+     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
-     additional_constraints_peer_state_based_framing, false, true},
+     additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
-     additional_constraints_pending_queue_cap, true, true},
+     additional_constraints_pending_queue_cap, nullptr, 0, true, true},
     {"pick_first_happy_eyeballs", description_pick_first_happy_eyeballs,
-     additional_constraints_pick_first_happy_eyeballs, true, true},
-    {"ping_on_rst_stream", description_ping_on_rst_stream,
-     additional_constraints_ping_on_rst_stream, true, true},
+     additional_constraints_pick_first_happy_eyeballs, nullptr, 0, true, true},
     {"promise_based_client_call", description_promise_based_client_call,
-     additional_constraints_promise_based_client_call, false, true},
+     additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_inproc_transport",
      description_promise_based_inproc_transport,
-     additional_constraints_promise_based_inproc_transport, false, false},
+     additional_constraints_promise_based_inproc_transport, nullptr, 0, false,
+     false},
     {"promise_based_server_call", description_promise_based_server_call,
-     additional_constraints_promise_based_server_call, false, true},
+     additional_constraints_promise_based_server_call, nullptr, 0, false, true},
     {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, false, true},
+     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
-     additional_constraints_registered_method_lookup_in_transport, true, true},
+     additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
+     true, true},
     {"registered_methods_map", description_registered_methods_map,
-     additional_constraints_registered_methods_map, false, true},
+     additional_constraints_registered_methods_map, nullptr, 0, false, true},
     {"rfc_max_concurrent_streams", description_rfc_max_concurrent_streams,
-     additional_constraints_rfc_max_concurrent_streams, false, true},
+     additional_constraints_rfc_max_concurrent_streams, nullptr, 0, false,
+     true},
     {"round_robin_delegate_to_pick_first",
      description_round_robin_delegate_to_pick_first,
-     additional_constraints_round_robin_delegate_to_pick_first, true, true},
-    {"rstpit", description_rstpit, additional_constraints_rstpit, false, true},
+     additional_constraints_round_robin_delegate_to_pick_first, nullptr, 0,
+     true, true},
+    {"rstpit", description_rstpit, additional_constraints_rstpit, nullptr, 0,
+     false, true},
     {"schedule_cancellation_over_write",
      description_schedule_cancellation_over_write,
-     additional_constraints_schedule_cancellation_over_write, false, true},
-    {"separate_ping_from_keepalive", description_separate_ping_from_keepalive,
-     additional_constraints_separate_ping_from_keepalive, true, true},
+     additional_constraints_schedule_cancellation_over_write, nullptr, 0, false,
+     true},
     {"server_privacy", description_server_privacy,
-     additional_constraints_server_privacy, false, false},
-    {"settings_timeout", description_settings_timeout,
-     additional_constraints_settings_timeout, true, true},
-    {"tarpit", description_tarpit, additional_constraints_tarpit, true, true},
+     additional_constraints_server_privacy, nullptr, 0, false, false},
     {"tcp_frame_size_tuning", description_tcp_frame_size_tuning,
-     additional_constraints_tcp_frame_size_tuning, false, true},
+     additional_constraints_tcp_frame_size_tuning, nullptr, 0, false, true},
     {"tcp_rcv_lowat", description_tcp_rcv_lowat,
-     additional_constraints_tcp_rcv_lowat, false, true},
+     additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true},
     {"trace_record_callops", description_trace_record_callops,
-     additional_constraints_trace_record_callops, false, true},
+     additional_constraints_trace_record_callops, nullptr, 0, false, true},
     {"unconstrained_max_quota_buffer_size",
      description_unconstrained_max_quota_buffer_size,
-     additional_constraints_unconstrained_max_quota_buffer_size, false, true},
+     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, true, true},
+     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
+     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
-     additional_constraints_work_serializer_dispatch, false, true},
-    {"write_size_cap", description_write_size_cap,
-     additional_constraints_write_size_cap, true, true},
+     additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
     {"write_size_policy", description_write_size_policy,
-     additional_constraints_write_size_policy, true, true},
+     additional_constraints_write_size_policy, nullptr, 0, true, true},
+    {"write_size_cap", description_write_size_cap,
+     additional_constraints_write_size_cap, required_experiments_write_size_cap,
+     1, true, true},
     {"wrr_delegate_to_pick_first", description_wrr_delegate_to_pick_first,
-     additional_constraints_wrr_delegate_to_pick_first, true, true},
+     additional_constraints_wrr_delegate_to_pick_first, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index c317312278b85..1b023557b33d0 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -57,8 +57,6 @@ namespace grpc_core {
 #ifdef GRPC_EXPERIMENTS_ARE_FINAL
 
 #if defined(GRPC_CFSTREAM)
-#define GRPC_EXPERIMENT_IS_INCLUDED_BLOCK_EXCESSIVE_REQUESTS_BEFORE_SETTINGS_ACK
-inline bool IsBlockExcessiveRequestsBeforeSettingsAckEnabled() { return true; }
 #ifndef NDEBUG
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 #endif
@@ -70,15 +68,9 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
 #endif
 }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_BATCH_REQUESTS
-inline bool IsChttp2BatchRequestsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_OFFLOAD_ON_RST_STREAM
-inline bool IsChttp2OffloadOnRstStreamEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_COMBINER_OFFLOAD_TO_EVENT_ENGINE
-inline bool IsCombinerOffloadToEventEngineEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 inline bool IsEventEngineListenerEnabled() { return false; }
@@ -87,8 +79,6 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_LAZIER_STREAM_UPDATES
-inline bool IsLazierStreamUpdatesEnabled() { return true; }
 inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -100,8 +90,6 @@ inline bool IsPeerStateBasedFramingEnabled() { return false; }
 inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PING_ON_RST_STREAM
-inline bool IsPingOnRstStreamEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
@@ -114,13 +102,7 @@ inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
 inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SEPARATE_PING_FROM_KEEPALIVE
-inline bool IsSeparatePingFromKeepaliveEnabled() { return true; }
 inline bool IsServerPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SETTINGS_TIMEOUT
-inline bool IsSettingsTimeoutEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TARPIT
-inline bool IsTarpitEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
@@ -128,16 +110,14 @@ 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_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
 inline bool IsWriteSizePolicyEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
+inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
 inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 
 #elif defined(GPR_WINDOWS)
-#define GRPC_EXPERIMENT_IS_INCLUDED_BLOCK_EXCESSIVE_REQUESTS_BEFORE_SETTINGS_ACK
-inline bool IsBlockExcessiveRequestsBeforeSettingsAckEnabled() { return true; }
 #ifndef NDEBUG
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 #endif
@@ -149,15 +129,9 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
 #endif
 }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_BATCH_REQUESTS
-inline bool IsChttp2BatchRequestsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_OFFLOAD_ON_RST_STREAM
-inline bool IsChttp2OffloadOnRstStreamEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_COMBINER_OFFLOAD_TO_EVENT_ENGINE
-inline bool IsCombinerOffloadToEventEngineEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
@@ -167,8 +141,6 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_LAZIER_STREAM_UPDATES
-inline bool IsLazierStreamUpdatesEnabled() { return true; }
 inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -180,8 +152,6 @@ inline bool IsPeerStateBasedFramingEnabled() { return false; }
 inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PING_ON_RST_STREAM
-inline bool IsPingOnRstStreamEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
@@ -194,13 +164,7 @@ inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
 inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SEPARATE_PING_FROM_KEEPALIVE
-inline bool IsSeparatePingFromKeepaliveEnabled() { return true; }
 inline bool IsServerPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SETTINGS_TIMEOUT
-inline bool IsSettingsTimeoutEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TARPIT
-inline bool IsTarpitEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
@@ -208,16 +172,14 @@ 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_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
 inline bool IsWriteSizePolicyEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
+inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
 inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 
 #else
-#define GRPC_EXPERIMENT_IS_INCLUDED_BLOCK_EXCESSIVE_REQUESTS_BEFORE_SETTINGS_ACK
-inline bool IsBlockExcessiveRequestsBeforeSettingsAckEnabled() { return true; }
 #ifndef NDEBUG
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 #endif
@@ -229,15 +191,9 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
 #endif
 }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_BATCH_REQUESTS
-inline bool IsChttp2BatchRequestsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_OFFLOAD_ON_RST_STREAM
-inline bool IsChttp2OffloadOnRstStreamEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_COMBINER_OFFLOAD_TO_EVENT_ENGINE
-inline bool IsCombinerOffloadToEventEngineEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
@@ -247,8 +203,6 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_LAZIER_STREAM_UPDATES
-inline bool IsLazierStreamUpdatesEnabled() { return true; }
 inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
@@ -260,8 +214,6 @@ inline bool IsPeerStateBasedFramingEnabled() { return false; }
 inline bool IsPendingQueueCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PING_ON_RST_STREAM
-inline bool IsPingOnRstStreamEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
@@ -274,13 +226,7 @@ inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
 inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SEPARATE_PING_FROM_KEEPALIVE
-inline bool IsSeparatePingFromKeepaliveEnabled() { return true; }
 inline bool IsServerPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SETTINGS_TIMEOUT
-inline bool IsSettingsTimeoutEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_TARPIT
-inline bool IsTarpitEnabled() { return true; }
 inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
@@ -288,24 +234,20 @@ 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_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
 inline bool IsWriteSizePolicyEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
+inline bool IsWriteSizeCapEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
 inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 #endif
 
 #else
 enum ExperimentIds {
-  kExperimentIdBlockExcessiveRequestsBeforeSettingsAck,
   kExperimentIdCallStatusOverrideOnCancellation,
   kExperimentIdCanaryClientPrivacy,
-  kExperimentIdChttp2BatchRequests,
-  kExperimentIdChttp2OffloadOnRstStream,
   kExperimentIdClientIdleness,
   kExperimentIdClientPrivacy,
-  kExperimentIdCombinerOffloadToEventEngine,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
   kExperimentIdEventEngineListener,
@@ -313,7 +255,6 @@ enum ExperimentIds {
   kExperimentIdHttp2StatsFix,
   kExperimentIdKeepaliveFix,
   kExperimentIdKeepaliveServerFix,
-  kExperimentIdLazierStreamUpdates,
   kExperimentIdMemoryPressureController,
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
@@ -321,7 +262,6 @@ enum ExperimentIds {
   kExperimentIdPeerStateBasedFraming,
   kExperimentIdPendingQueueCap,
   kExperimentIdPickFirstHappyEyeballs,
-  kExperimentIdPingOnRstStream,
   kExperimentIdPromiseBasedClientCall,
   kExperimentIdPromiseBasedInprocTransport,
   kExperimentIdPromiseBasedServerCall,
@@ -332,26 +272,18 @@ enum ExperimentIds {
   kExperimentIdRoundRobinDelegateToPickFirst,
   kExperimentIdRstpit,
   kExperimentIdScheduleCancellationOverWrite,
-  kExperimentIdSeparatePingFromKeepalive,
   kExperimentIdServerPrivacy,
-  kExperimentIdSettingsTimeout,
-  kExperimentIdTarpit,
   kExperimentIdTcpFrameSizeTuning,
   kExperimentIdTcpRcvLowat,
   kExperimentIdTraceRecordCallops,
   kExperimentIdUnconstrainedMaxQuotaBufferSize,
   kExperimentIdWorkSerializerClearsTimeCache,
   kExperimentIdWorkSerializerDispatch,
-  kExperimentIdWriteSizeCap,
   kExperimentIdWriteSizePolicy,
+  kExperimentIdWriteSizeCap,
   kExperimentIdWrrDelegateToPickFirst,
   kNumExperiments
 };
-#define GRPC_EXPERIMENT_IS_INCLUDED_BLOCK_EXCESSIVE_REQUESTS_BEFORE_SETTINGS_ACK
-inline bool IsBlockExcessiveRequestsBeforeSettingsAckEnabled() {
-  return IsExperimentEnabled(
-      kExperimentIdBlockExcessiveRequestsBeforeSettingsAck);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
 inline bool IsCallStatusOverrideOnCancellationEnabled() {
   return IsExperimentEnabled(kExperimentIdCallStatusOverrideOnCancellation);
@@ -360,14 +292,6 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() {
 inline bool IsCanaryClientPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_BATCH_REQUESTS
-inline bool IsChttp2BatchRequestsEnabled() {
-  return IsExperimentEnabled(kExperimentIdChttp2BatchRequests);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_CHTTP2_OFFLOAD_ON_RST_STREAM
-inline bool IsChttp2OffloadOnRstStreamEnabled() {
-  return IsExperimentEnabled(kExperimentIdChttp2OffloadOnRstStream);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
 inline bool IsClientIdlenessEnabled() {
   return IsExperimentEnabled(kExperimentIdClientIdleness);
@@ -376,10 +300,6 @@ inline bool IsClientIdlenessEnabled() {
 inline bool IsClientPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdClientPrivacy);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_COMBINER_OFFLOAD_TO_EVENT_ENGINE
-inline bool IsCombinerOffloadToEventEngineEnabled() {
-  return IsExperimentEnabled(kExperimentIdCombinerOffloadToEventEngine);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
 inline bool IsEventEngineClientEnabled() {
   return IsExperimentEnabled(kExperimentIdEventEngineClient);
@@ -408,10 +328,6 @@ inline bool IsKeepaliveFixEnabled() {
 inline bool IsKeepaliveServerFixEnabled() {
   return IsExperimentEnabled(kExperimentIdKeepaliveServerFix);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_LAZIER_STREAM_UPDATES
-inline bool IsLazierStreamUpdatesEnabled() {
-  return IsExperimentEnabled(kExperimentIdLazierStreamUpdates);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_MEMORY_PRESSURE_CONTROLLER
 inline bool IsMemoryPressureControllerEnabled() {
   return IsExperimentEnabled(kExperimentIdMemoryPressureController);
@@ -440,10 +356,6 @@ inline bool IsPendingQueueCapEnabled() {
 inline bool IsPickFirstHappyEyeballsEnabled() {
   return IsExperimentEnabled(kExperimentIdPickFirstHappyEyeballs);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PING_ON_RST_STREAM
-inline bool IsPingOnRstStreamEnabled() {
-  return IsExperimentEnabled(kExperimentIdPingOnRstStream);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_CLIENT_CALL
 inline bool IsPromiseBasedClientCallEnabled() {
   return IsExperimentEnabled(kExperimentIdPromiseBasedClientCall);
@@ -484,22 +396,10 @@ inline bool IsRstpitEnabled() {
 inline bool IsScheduleCancellationOverWriteEnabled() {
   return IsExperimentEnabled(kExperimentIdScheduleCancellationOverWrite);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SEPARATE_PING_FROM_KEEPALIVE
-inline bool IsSeparatePingFromKeepaliveEnabled() {
-  return IsExperimentEnabled(kExperimentIdSeparatePingFromKeepalive);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_PRIVACY
 inline bool IsServerPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdServerPrivacy);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_SETTINGS_TIMEOUT
-inline bool IsSettingsTimeoutEnabled() {
-  return IsExperimentEnabled(kExperimentIdSettingsTimeout);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_TARPIT
-inline bool IsTarpitEnabled() {
-  return IsExperimentEnabled(kExperimentIdTarpit);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING
 inline bool IsTcpFrameSizeTuningEnabled() {
   return IsExperimentEnabled(kExperimentIdTcpFrameSizeTuning);
@@ -524,14 +424,14 @@ inline bool IsWorkSerializerClearsTimeCacheEnabled() {
 inline bool IsWorkSerializerDispatchEnabled() {
   return IsExperimentEnabled(kExperimentIdWorkSerializerDispatch);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() {
-  return IsExperimentEnabled(kExperimentIdWriteSizeCap);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
 inline bool IsWriteSizePolicyEnabled() {
   return IsExperimentEnabled(kExperimentIdWriteSizePolicy);
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
+inline bool IsWriteSizeCapEnabled() {
+  return IsExperimentEnabled(kExperimentIdWriteSizeCap);
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
 inline bool IsWrrDelegateToPickFirstEnabled() {
   return IsExperimentEnabled(kExperimentIdWrrDelegateToPickFirst);
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index aacf254bafdce..e3b89572e4388 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -22,6 +22,10 @@
 # allow_in_fuzzing_config: optional boolean (true if not specified)
 #              if false, this experiment will not be included in fuzzers that
 #              explore the config space
+# requires:    A list of names of experiments that this experiment depends on.
+#              Defaults to the empty list.
+#              If any of the experiments in the required list is determined to
+#              be disabled at runtime, this experiment is disabled at runtime.
 #
 # Well known test tags:
 #   core_end2end_test:   all tests, fixtures in the core end2end suite
@@ -33,12 +37,6 @@
 
 # This file only defines the experiments. Refer to rollouts.yaml for the rollout
 # state of each experiment.
-- name: block_excessive_requests_before_settings_ack
-  description:
-    If set, block excessive requests before receiving SETTINGS ACK.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: [bad_client_test]
 - name: call_status_override_on_cancellation
   description:
     Avoid overriding call status of successfully finished calls if it races with
@@ -53,21 +51,9 @@
   owner: alishananda@google.com
   test_tags: []
   allow_in_fuzzing_config: false
-- name: chttp2_batch_requests
-  description:
-    Cap the number of requests received by one transport read prior to offload.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: ["cpp_end2end_test", "flow_control_test"]
-- name: chttp2_offload_on_rst_stream
-  description:
-    Offload work on RST_STREAM.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: ["cpp_end2end_test", "flow_control_test"]
 - name: client_idleness
   description: If enabled, client channel idleness is enabled by default.
-  expiry: 2023/12/15
+  expiry: 2024/03/15
   owner: roth@google.com
   test_tags: []
 - name: client_privacy
@@ -77,12 +63,6 @@
   owner: alishananda@google.com
   test_tags: []
   allow_in_fuzzing_config: false
-- name: combiner_offload_to_event_engine
-  description:
-    Offload Combiner work onto the EventEngine instead of the Executor.
-  expiry: 2024/01/15
-  owner: hork@google.com
-  test_tags: []
 - name: event_engine_client
   description: Use EventEngine clients instead of iomgr's grpc_tcp_client
   expiry: 2024/01/21
@@ -127,13 +107,6 @@
   owner: yashkt@google.com
   test_tags: []
   allow_in_fuzzing_config: false
-- name: lazier_stream_updates
-  description:
-    Allow streams to consume up to 50% of the incoming window before we
-    force send a flow control update.
-  expiry: 2024/01/23
-  owner: ctiller@google.com
-  test_tags: [flow_control_test]
 - name: memory_pressure_controller
   description: New memory pressure controller
   expiry: 2024/05/05
@@ -179,16 +152,9 @@
 - name: pick_first_happy_eyeballs
   description:
     Use Happy Eyeballs in pick_first.
-  expiry: 2023/12/15
+  expiry: 2024/03/15
   owner: roth@google.com
   test_tags: ["lb_unit_test", "cpp_lb_end2end_test", "xds_end2end_test"]
-- name: ping_on_rst_stream
-  description:
-    Send a ping on receiving some RST_STREAM frames on the server
-    (proportion configurable via grpc.http2.ping_on_rst_stream_percent channel arg).
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: []
 - name: promise_based_client_call
   description:
     If set, use the new gRPC promise based call code when it's appropriate
@@ -241,7 +207,7 @@
   description:
     Change round_robin code to delegate to pick_first as per dualstack
     backend design.
-  expiry: 2023/12/15
+  expiry: 2024/03/15
   owner: roth@google.com
   test_tags: ["lb_unit_test", "cpp_lb_end2end_test", "xds_end2end_test"]
 - name: rstpit
@@ -255,15 +221,6 @@
   expiry: 2024/01/01
   owner: vigneshbabu@google.com
   test_tags: []
-- name: separate_ping_from_keepalive
-  description:
-    Keep a different keepalive timeout (resolution is seeing data after sending a ping)
-    from a ping timeout (resolution is getting a ping ack after sending a ping)
-    The first can be short and determines liveness.
-    The second can be longer and determines protocol correctness.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: []
 - name: server_privacy
   description:
     If set, server privacy
@@ -271,18 +228,6 @@
   owner: alishananda@google.com
   test_tags: []
   allow_in_fuzzing_config: false
-- name: settings_timeout
-  description:
-    If set, use the settings timeout to send settings frame to the peer.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: []
-- name: tarpit
-  description:
-    If set, tarpit invalid requests for some amount of time
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: [bad_client_test]
 - name: tcp_frame_size_tuning
   description:
     If set, enables TCP to use RPC size estimation made by higher layers.
@@ -327,6 +272,7 @@
   expiry: 2024/03/03
   owner: ctiller@google.com
   test_tags: [flow_control_test]
+  requires: [write_size_policy]
 - name: write_size_policy
   description:
     Try to size writes such that they don't create too large of a backlog
@@ -337,6 +283,6 @@
   description:
     Change WRR code to delegate to pick_first as per dualstack
     backend design.
-  expiry: 2023/12/15
+  expiry: 2024/03/15
   owner: roth@google.com
   test_tags: ["lb_unit_test", "cpp_lb_end2end_test", "xds_end2end_test"]
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index a22c3e07a2519..160a12e55a01a 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -22,6 +22,10 @@
 #              - debug   - the experiment defaults to on in debug builds,
 #                          off in release builds in all platforms.
 #              - true    - the experiment defaults to on in all platforms.
+# requires:    A list of names of experiments that this experiment depends on.
+#              Defaults to the empty list.
+#              If any of the experiments in the required list is determined to
+#              be disabled at runtime, this experiment is disabled at runtime.
 #
 # [OR] the default can be platform specific:
 #  -----------------------------------------
@@ -36,22 +40,14 @@
 #
 # Supported platforms: ios, windows, posix
 
-- name: block_excessive_requests_before_settings_ack
-  default: true
 - name: call_status_override_on_cancellation
   default: debug
 - name: canary_client_privacy
   default: false
-- name: chttp2_batch_requests
-  default: true
-- name: chttp2_offload_on_rst_stream
-  default: true
 - name: client_idleness
   default: true
 - name: client_privacy
   default: false
-- name: combiner_offload_to_event_engine
-  default: true
 - name: event_engine_client
   default:
     # not tested on iOS at all
@@ -78,14 +74,10 @@
   default: false
 - name: http2_stats_fix
   default: true
-- name: jitter_max_idle
-  default: true
 - name: keepalive_fix
   default: false
 - name: keepalive_server_fix
   default: false
-- name: lazier_stream_updates
-  default: true
 - name: memory_pressure_controller
   default: false
 - name: monitoring_experiment
@@ -98,8 +90,6 @@
   default: true
 - name: pick_first_happy_eyeballs
   default: true
-- name: ping_on_rst_stream
-  default: true
 - name: promise_based_client_call
   default: false
 - name: promise_based_server_call
@@ -118,14 +108,8 @@
   default: false
 - name: schedule_cancellation_over_write
   default: false
-- name: separate_ping_from_keepalive
-  default: true
 - name: server_privacy
   default: false
-- name: settings_timeout
-  default: true
-- name: tarpit
-  default: true
 - name: tcp_frame_size_tuning
   default: false
 - name: tcp_rcv_lowat
diff --git a/src/core/lib/gprpp/directory_reader.h b/src/core/lib/gprpp/directory_reader.h
new file mode 100644
index 0000000000000..0f0bbcf0b0c97
--- /dev/null
+++ b/src/core/lib/gprpp/directory_reader.h
@@ -0,0 +1,48 @@
+//
+//
+// Copyright 2023 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_LIB_GPRPP_DIRECTORY_READER_H
+#define GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H
+
+#include <grpc/support/port_platform.h>
+
+#include <memory>
+
+#include "absl/functional/function_ref.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+
+namespace grpc_core {
+
+class DirectoryReader {
+ public:
+  virtual ~DirectoryReader() = default;
+  // Returns the name of the directory being read.
+  virtual absl::string_view Name() const = 0;
+  // Calls callback for each name in the directory except for "." and "..".
+  // Returns non-OK if there was an error reading the directory.
+  virtual absl::Status ForEach(
+      absl::FunctionRef<void(absl::string_view)> callback) = 0;
+};
+
+std::unique_ptr<DirectoryReader> MakeDirectoryReader(
+    absl::string_view filename);
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H
\ No newline at end of file
diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h
index 86319429e5c2d..5a77ad46b452c 100644
--- a/src/core/lib/gprpp/orphanable.h
+++ b/src/core/lib/gprpp/orphanable.h
@@ -108,6 +108,17 @@ class InternallyRefCounted : public Orphanable {
     }
   }
 
+  GRPC_MUST_USE_RESULT RefCountedPtr<Child> RefIfNonZero() {
+    return RefCountedPtr<Child>(refs_.RefIfNonZero() ? static_cast<Child*>(this)
+                                                     : nullptr);
+  }
+  GRPC_MUST_USE_RESULT RefCountedPtr<Child> RefIfNonZero(
+      const DebugLocation& location, const char* reason) {
+    return RefCountedPtr<Child>(refs_.RefIfNonZero(location, reason)
+                                    ? static_cast<Child*>(this)
+                                    : nullptr);
+  }
+
  private:
   void IncrementRefCount() { refs_.Ref(); }
   void IncrementRefCount(const DebugLocation& location, const char* reason) {
diff --git a/src/core/lib/gprpp/posix/directory_reader.cc b/src/core/lib/gprpp/posix/directory_reader.cc
new file mode 100644
index 0000000000000..ecdf3c68c6671
--- /dev/null
+++ b/src/core/lib/gprpp/posix/directory_reader.cc
@@ -0,0 +1,82 @@
+//
+//
+// Copyright 2023 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 <memory>
+
+#include "absl/functional/function_ref.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+
+#if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \
+    defined(GPR_APPLE)
+
+#include <dirent.h>
+
+#include <string>
+
+#include "src/core/lib/gprpp/directory_reader.h"
+
+namespace grpc_core {
+
+namespace {
+const char kSkipEntriesSelf[] = ".";
+const char kSkipEntriesParent[] = "..";
+}  // namespace
+
+class DirectoryReaderImpl : public DirectoryReader {
+ public:
+  explicit DirectoryReaderImpl(absl::string_view directory_path)
+      : directory_path_(directory_path) {}
+  absl::string_view Name() const override { return directory_path_; }
+  absl::Status ForEach(absl::FunctionRef<void(absl::string_view)>) override;
+
+ private:
+  const std::string directory_path_;
+};
+
+std::unique_ptr<DirectoryReader> MakeDirectoryReader(
+    absl::string_view filename) {
+  return std::make_unique<DirectoryReaderImpl>(filename);
+}
+
+absl::Status DirectoryReaderImpl::ForEach(
+    absl::FunctionRef<void(absl::string_view)> callback) {
+  // Open the dir for reading
+  DIR* directory = opendir(directory_path_.c_str());
+  if (directory == nullptr) {
+    return absl::InternalError("Could not read crl directory.");
+  }
+  struct dirent* directory_entry;
+  // Iterate over everything in the directory
+  while ((directory_entry = readdir(directory)) != nullptr) {
+    const absl::string_view file_name = directory_entry->d_name;
+    // Skip "." and ".."
+    if (file_name == kSkipEntriesParent || file_name == kSkipEntriesSelf) {
+      continue;
+    }
+    // Call the callback with this filename
+    callback(file_name);
+  }
+  closedir(directory);
+  return absl::OkStatus();
+}
+}  // namespace grpc_core
+
+#endif  // GPR_LINUX || GPR_ANDROID || GPR_FREEBSD || GPR_APPLE
diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h
index cdf692c5ce7df..5eaf5cda0f1fb 100644
--- a/src/core/lib/gprpp/ref_counted.h
+++ b/src/core/lib/gprpp/ref_counted.h
@@ -219,7 +219,7 @@ class NonPolymorphicRefCount {
 // Default behavior: Delete the object.
 struct UnrefDelete {
   template <typename T>
-  void operator()(T* p) {
+  void operator()(T* p) const {
     delete p;
   }
 };
@@ -231,7 +231,7 @@ struct UnrefDelete {
 // later by identifying entries for which RefIfNonZero() returns null.
 struct UnrefNoDelete {
   template <typename T>
-  void operator()(T* /*p*/) {}
+  void operator()(T* /*p*/) const {}
 };
 
 // Call the object's dtor but do not delete it.  This is useful for cases
@@ -239,7 +239,7 @@ struct UnrefNoDelete {
 // arena).
 struct UnrefCallDtor {
   template <typename T>
-  void operator()(T* p) {
+  void operator()(T* p) const {
     p->~T();
   }
 };
@@ -279,32 +279,44 @@ class RefCounted : public Impl {
   // Note: Depending on the Impl used, this dtor can be implicitly virtual.
   ~RefCounted() = default;
 
+  // Ref() for mutable types.
   GRPC_MUST_USE_RESULT RefCountedPtr<Child> Ref() {
     IncrementRefCount();
     return RefCountedPtr<Child>(static_cast<Child*>(this));
   }
-
   GRPC_MUST_USE_RESULT RefCountedPtr<Child> Ref(const DebugLocation& location,
                                                 const char* reason) {
     IncrementRefCount(location, reason);
     return RefCountedPtr<Child>(static_cast<Child*>(this));
   }
 
+  // Ref() for const types.
+  GRPC_MUST_USE_RESULT RefCountedPtr<const Child> Ref() const {
+    IncrementRefCount();
+    return RefCountedPtr<const Child>(static_cast<const Child*>(this));
+  }
+  GRPC_MUST_USE_RESULT RefCountedPtr<const Child> Ref(
+      const DebugLocation& location, const char* reason) const {
+    IncrementRefCount(location, reason);
+    return RefCountedPtr<const Child>(static_cast<const Child*>(this));
+  }
+
   // TODO(roth): Once all of our code is converted to C++ and can use
   // RefCountedPtr<> instead of manual ref-counting, make this method
   // private, since it will only be used by RefCountedPtr<>, which is a
   // friend of this class.
-  void Unref() {
+  void Unref() const {
     if (GPR_UNLIKELY(refs_.Unref())) {
-      unref_behavior_(static_cast<Child*>(this));
+      unref_behavior_(static_cast<const Child*>(this));
     }
   }
-  void Unref(const DebugLocation& location, const char* reason) {
+  void Unref(const DebugLocation& location, const char* reason) const {
     if (GPR_UNLIKELY(refs_.Unref(location, reason))) {
-      unref_behavior_(static_cast<Child*>(this));
+      unref_behavior_(static_cast<const Child*>(this));
     }
   }
 
+  // RefIfNonZero() for mutable types.
   GRPC_MUST_USE_RESULT RefCountedPtr<Child> RefIfNonZero() {
     return RefCountedPtr<Child>(refs_.RefIfNonZero() ? static_cast<Child*>(this)
                                                      : nullptr);
@@ -316,6 +328,18 @@ class RefCounted : public Impl {
                                     : nullptr);
   }
 
+  // RefIfNonZero() for const types.
+  GRPC_MUST_USE_RESULT RefCountedPtr<const Child> RefIfNonZero() const {
+    return RefCountedPtr<const Child>(
+        refs_.RefIfNonZero() ? static_cast<const Child*>(this) : nullptr);
+  }
+  GRPC_MUST_USE_RESULT RefCountedPtr<const Child> RefIfNonZero(
+      const DebugLocation& location, const char* reason) const {
+    return RefCountedPtr<const Child>(refs_.RefIfNonZero(location, reason)
+                                          ? static_cast<const Child*>(this)
+                                          : nullptr);
+  }
+
   // Not copyable nor movable.
   RefCounted(const RefCounted&) = delete;
   RefCounted& operator=(const RefCounted&) = delete;
@@ -336,12 +360,13 @@ class RefCounted : public Impl {
   template <typename T>
   friend class RefCountedPtr;
 
-  void IncrementRefCount() { refs_.Ref(); }
-  void IncrementRefCount(const DebugLocation& location, const char* reason) {
+  void IncrementRefCount() const { refs_.Ref(); }
+  void IncrementRefCount(const DebugLocation& location,
+                         const char* reason) const {
     refs_.Ref(location, reason);
   }
 
-  RefCount refs_;
+  mutable RefCount refs_;
   GPR_NO_UNIQUE_ADDRESS UnrefBehavior unref_behavior_;
 };
 
diff --git a/src/core/lib/gprpp/ref_counted_string.h b/src/core/lib/gprpp/ref_counted_string.h
index 62fb15ded9815..dbe32b113da01 100644
--- a/src/core/lib/gprpp/ref_counted_string.h
+++ b/src/core/lib/gprpp/ref_counted_string.h
@@ -104,6 +104,19 @@ inline bool operator==(const RefCountedStringValue& lhs,
   return lhs.as_string_view() == rhs.as_string_view();
 }
 
+inline bool operator!=(const RefCountedStringValue& lhs,
+                       absl::string_view rhs) {
+  return lhs.as_string_view() != rhs;
+}
+inline bool operator!=(absl::string_view lhs,
+                       const RefCountedStringValue& rhs) {
+  return lhs != rhs.as_string_view();
+}
+inline bool operator!=(const RefCountedStringValue& lhs,
+                       const RefCountedStringValue& rhs) {
+  return lhs.as_string_view() != rhs.as_string_view();
+}
+
 inline bool operator<(const RefCountedStringValue& lhs, absl::string_view rhs) {
   return lhs.as_string_view() < rhs;
 }
diff --git a/src/core/lib/gprpp/windows/directory_reader.cc b/src/core/lib/gprpp/windows/directory_reader.cc
new file mode 100644
index 0000000000000..790e213e789a3
--- /dev/null
+++ b/src/core/lib/gprpp/windows/directory_reader.cc
@@ -0,0 +1,80 @@
+//
+//
+// Copyright 2023 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>
+
+#if defined(GPR_WINDOWS)
+
+#include <sys/stat.h>
+#include <windows.h>
+
+#include <string>
+#include <vector>
+
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/gprpp/directory_reader.h"
+namespace grpc_core {
+
+namespace {
+const char kSkipEntriesSelf[] = ".";
+const char kSkipEntriesParent[] = "..";
+}  // namespace
+
+class DirectoryReaderImpl : public DirectoryReader {
+ public:
+  explicit DirectoryReaderImpl(absl::string_view directory_path)
+      : directory_path_(directory_path) {}
+  absl::string_view Name() const override { return directory_path_; }
+  absl::Status ForEach(absl::FunctionRef<void(absl::string_view)>) override;
+
+ private:
+  const std::string directory_path_;
+};
+
+std::unique_ptr<DirectoryReader> MakeDirectoryReader(
+    absl::string_view filename) {
+  return std::make_unique<DirectoryReaderImpl>(filename);
+}
+
+// Reference for reading directory in Windows:
+// https://stackoverflow.com/questions/612097/how-can-i-get-the-list-of-files-in-a-directory-using-c-or-c
+// https://learn.microsoft.com/en-us/windows/win32/fileio/listing-the-files-in-a-directory
+absl::Status DirectoryReaderImpl::ForEach(
+    absl::FunctionRef<void(absl::string_view)> callback) {
+  std::string search_path = absl::StrCat(directory_path_, "/*");
+  WIN32_FIND_DATAA find_data;
+  HANDLE hFind = ::FindFirstFileA(search_path.c_str(), &find_data);
+  if (hFind == INVALID_HANDLE_VALUE) {
+    return absl::InternalError("Could not read crl directory.");
+  }
+  do {
+    if (!(find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
+      callback(find_data.cFileName);
+    }
+  } while (::FindNextFileA(hFind, &find_data));
+  ::FindClose(hFind);
+  return absl::OkStatus();
+}
+
+}  // namespace grpc_core
+
+#endif  // GPR_WINDOWS
diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc
index e29c6fcbe35b4..0d77bb579d4cb 100644
--- a/src/core/lib/iomgr/combiner.cc
+++ b/src/core/lib/iomgr/combiner.cc
@@ -51,19 +51,11 @@ static void combiner_finally_exec(grpc_core::Combiner* lock,
                                   grpc_closure* closure,
                                   grpc_error_handle error);
 
-// TODO(ctiller): delete this when the combiner_offload_to_event_engine
-// experiment is removed.
-static void offload(void* arg, grpc_error_handle error);
-
 grpc_core::Combiner* grpc_combiner_create(
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>
         event_engine) {
   grpc_core::Combiner* lock = new grpc_core::Combiner();
-  if (grpc_core::IsCombinerOffloadToEventEngineEnabled()) {
-    lock->event_engine = event_engine;
-  } else {
-    GRPC_CLOSURE_INIT(&lock->offload, offload, lock, nullptr);
-  }
+  lock->event_engine = event_engine;
   gpr_ref_init(&lock->refs, 1);
   gpr_atm_no_barrier_store(&lock->state, STATE_UNORPHANED);
   grpc_closure_list_init(&lock->final_list);
@@ -173,27 +165,18 @@ static void move_next() {
   }
 }
 
-static void offload(void* arg, grpc_error_handle /*error*/) {
-  grpc_core::Combiner* lock = static_cast<grpc_core::Combiner*>(arg);
-  push_last_on_exec_ctx(lock);
-}
-
 static void queue_offload(grpc_core::Combiner* lock) {
   move_next();
   // Make the combiner look uncontended by storing a non-null value here, so
   // that we don't immediately offload again.
   gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 1);
   GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p queue_offload", lock));
-  if (grpc_core::IsCombinerOffloadToEventEngineEnabled()) {
-    lock->event_engine->Run([lock] {
-      grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
-      grpc_core::ExecCtx exec_ctx(0);
-      push_last_on_exec_ctx(lock);
-      exec_ctx.Flush();
-    });
-  } else {
-    grpc_core::Executor::Run(&lock->offload, absl::OkStatus());
-  }
+  lock->event_engine->Run([lock] {
+    grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
+    grpc_core::ExecCtx exec_ctx(0);
+    push_last_on_exec_ctx(lock);
+    exec_ctx.Flush();
+  });
 }
 
 bool grpc_combiner_continue_exec_ctx() {
@@ -215,33 +198,14 @@ bool grpc_combiner_continue_exec_ctx() {
                               grpc_core::ExecCtx::Get()->IsReadyToFinish(),
                               lock->time_to_execute_final_list));
 
-  if (grpc_core::IsCombinerOffloadToEventEngineEnabled()) {
-    // offload only if both (1) the combiner is contended and has more than one
-    // closure to execute, and (2) the current execution context needs to finish
-    // as soon as possible
-    if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish()) {
-      // this execution context wants to move on: schedule remaining work to be
-      // picked up on the executor
-      queue_offload(lock);
-      return true;
-    }
-  } else {
-    // TODO(ctiller): delete this when the combiner_offload_to_event_engine
-    // experiment is removed.
-
-    // offload only if all the following conditions are true:
-    // 1. the combiner is contended and has more than one closure to execute
-    // 2. the current execution context needs to finish as soon as possible
-    // 3. the current thread is not a worker for any background poller
-    // 4. the DEFAULT executor is threaded
-    if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish() &&
-        !grpc_iomgr_platform_is_any_background_poller_thread() &&
-        grpc_core::Executor::IsThreadedDefault()) {
-      // this execution context wants to move on: schedule remaining work to be
-      // picked up on the executor
-      queue_offload(lock);
-      return true;
-    }
+  // offload only if both (1) the combiner is contended and has more than one
+  // closure to execute, and (2) the current execution context needs to finish
+  // as soon as possible
+  if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish()) {
+    // this execution context wants to move on: schedule remaining work to be
+    // picked up on the executor
+    queue_offload(lock);
+    return true;
   }
 
   if (!lock->time_to_execute_final_list ||
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
index 341fe1e577655..b1e8fdf890490 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
@@ -69,6 +69,8 @@ class EventEngineEndpointWrapper {
   explicit EventEngineEndpointWrapper(
       std::unique_ptr<EventEngine::Endpoint> endpoint);
 
+  EventEngine::Endpoint* endpoint() { return endpoint_.get(); }
+
   int Fd() {
     grpc_core::MutexLock lock(&mu_);
     return fd_;
@@ -428,6 +430,17 @@ bool grpc_is_event_engine_endpoint(grpc_endpoint* ep) {
   return ep->vtable == &grpc_event_engine_endpoint_vtable;
 }
 
+EventEngine::Endpoint* grpc_get_wrapped_event_engine_endpoint(
+    grpc_endpoint* ep) {
+  if (!grpc_is_event_engine_endpoint(ep)) {
+    return nullptr;
+  }
+  auto* eeep =
+      reinterpret_cast<EventEngineEndpointWrapper::grpc_event_engine_endpoint*>(
+          ep);
+  return eeep->wrapper->endpoint();
+}
+
 void grpc_event_engine_endpoint_destroy_and_release_fd(
     grpc_endpoint* ep, int* fd, grpc_closure* on_release_fd) {
   auto* eeep =
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.h b/src/core/lib/iomgr/event_engine_shims/endpoint.h
index bc018f1e4d71d..efd57c6ea6d2b 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.h
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.h
@@ -31,6 +31,11 @@ grpc_endpoint* grpc_event_engine_endpoint_create(
 /// Returns true if the passed endpoint is an event engine shim endpoint.
 bool grpc_is_event_engine_endpoint(grpc_endpoint* ep);
 
+/// Returns the wrapped event engine endpoint if the given grpc_endpoint is an
+/// event engine shim endpoint. Otherwise it returns nullptr.
+EventEngine::Endpoint* grpc_get_wrapped_event_engine_endpoint(
+    grpc_endpoint* ep);
+
 /// Destroys the passed in event engine shim endpoint and schedules the
 /// asynchronous execution of the on_release_fd callback. The int pointer fd is
 /// set to the underlying endpoint's file descriptor.
diff --git a/src/core/lib/load_balancing/lb_policy.h b/src/core/lib/load_balancing/lb_policy.h
index 2422339274e97..a36280c163b24 100644
--- a/src/core/lib/load_balancing/lb_policy.h
+++ b/src/core/lib/load_balancing/lb_policy.h
@@ -346,7 +346,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
   struct UpdateArgs {
     /// A list of endpoints, each with one or more address, or an error
     /// indicating a failure to obtain the list of addresses.
-    absl::StatusOr<EndpointAddressesList> addresses;
+    absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses;
     /// The LB policy config.
     RefCountedPtr<Config> config;
     /// A human-readable note providing context about the name resolution that
diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc
index 7beaeb1c7040d..60024b536cb67 100644
--- a/src/core/lib/promise/activity.cc
+++ b/src/core/lib/promise/activity.cc
@@ -25,7 +25,6 @@
 #include "absl/strings/str_join.h"
 
 #include "src/core/lib/gprpp/atomic_utils.h"
-#include "src/core/lib/gprpp/crash.h"
 
 namespace grpc_core {
 
@@ -84,7 +83,23 @@ class FreestandingActivity::Handle final : public Wakeable {
   }
 
   void WakeupAsync(WakeupMask) override ABSL_LOCKS_EXCLUDED(mu_) {
-    Crash("not implemented");
+    mu_.Lock();
+    // Note that activity refcount can drop to zero, but we could win the lock
+    // against DropActivity, so we need to only increase activities refcount if
+    // it is non-zero.
+    if (activity_ && activity_->RefIfNonzero()) {
+      FreestandingActivity* activity = activity_;
+      mu_.Unlock();
+      // Activity still exists and we have a reference: wake it up, which will
+      // drop the ref.
+      activity->WakeupAsync(0);
+    } else {
+      // Could not get the activity - it's either gone or going. No need to wake
+      // it up!
+      mu_.Unlock();
+    }
+    // Drop the ref to the handle (we have one ref = one wakeup semantics).
+    Unref();
   }
 
   void Drop(WakeupMask) override { Unref(); }
diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
index 4325207d93dc7..a05ddab8afb8e 100644
--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@@ -32,7 +32,6 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/construct_destruct.h"
-#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/sync.h"
@@ -502,7 +501,7 @@ class PromiseActivity final
   // the activity to an external threadpool to run. If the activity is already
   // running on this thread, a note is taken of such and the activity is
   // repolled if it doesn't complete.
-  void Wakeup(WakeupMask) final {
+  void Wakeup(WakeupMask m) final {
     // If there is an active activity, but hey it's us, flag that and we'll loop
     // in RunLoop (that's calling from above here!).
     if (Activity::is_current()) {
@@ -511,6 +510,10 @@ class PromiseActivity final
       WakeupComplete();
       return;
     }
+    WakeupAsync(m);
+  }
+
+  void WakeupAsync(WakeupMask) final {
     if (!wakeup_scheduled_.exchange(true, std::memory_order_acq_rel)) {
       // Can't safely run, so ask to run later.
       this->ScheduleWakeup();
@@ -520,8 +523,6 @@ class PromiseActivity final
     }
   }
 
-  void WakeupAsync(WakeupMask) final { Crash("not implemented"); }
-
   // Drop a wakeup
   void Drop(WakeupMask) final { this->WakeupComplete(); }
 
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h
index 486653856e35e..4bec366164294 100644
--- a/src/core/lib/promise/detail/promise_like.h
+++ b/src/core/lib/promise/detail/promise_like.h
@@ -68,6 +68,10 @@ class PromiseLike {
  private:
   GPR_NO_UNIQUE_ADDRESS F f_;
 
+  static_assert(!std::is_void<typename std::result_of<F()>::type>::value,
+                "PromiseLike cannot be used with a function that returns void "
+                "- return Empty{} instead");
+
  public:
   // NOLINTNEXTLINE - internal detail that drastically simplifies calling code.
   PromiseLike(F&& f) : f_(std::forward<F>(f)) {}
diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h
new file mode 100644
index 0000000000000..8c31c8a162542
--- /dev/null
+++ b/src/core/lib/promise/inter_activity_latch.h
@@ -0,0 +1,98 @@
+// 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_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>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/str_cat.h"
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/poll.h"
+#include "src/core/lib/promise/trace.h"
+#include "src/core/lib/promise/wait_set.h"
+
+namespace grpc_core {
+
+// A latch providing true cross activity wakeups
+template <typename T>
+class InterActivityLatch;
+
+template <>
+class InterActivityLatch<void> {
+ public:
+  InterActivityLatch() = default;
+  InterActivityLatch(const InterActivityLatch&) = delete;
+  InterActivityLatch& operator=(const InterActivityLatch&) = delete;
+
+  // Produce a promise to wait for this latch.
+  auto Wait() {
+    return [this]() -> Poll<Empty> {
+      MutexLock lock(&mu_);
+      if (grpc_trace_promise_primitives.enabled()) {
+        gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(),
+                StateString().c_str());
+      }
+      if (is_set_) {
+        return Empty{};
+      } else {
+        return waiters_.AddPending(Activity::current()->MakeNonOwningWaker());
+      }
+    };
+  }
+
+  // Set the latch.
+  void Set() {
+    MutexLock lock(&mu_);
+    if (grpc_trace_promise_primitives.enabled()) {
+      gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str());
+    }
+    is_set_ = true;
+    waiters_.WakeupAsync();
+  }
+
+  bool IsSet() const ABSL_LOCKS_EXCLUDED(mu_) {
+    MutexLock lock(&mu_);
+    return is_set_;
+  }
+
+ private:
+  std::string DebugTag() {
+    return absl::StrCat(Activity::current()->DebugTag(),
+                        " INTER_ACTIVITY_LATCH[0x",
+                        reinterpret_cast<uintptr_t>(this), "]: ");
+  }
+
+  std::string StateString() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+    return absl::StrCat("is_set:", is_set_);
+  }
+
+  mutable Mutex mu_;
+  // True if we have a value set, false otherwise.
+  bool is_set_ = false;
+  WaitSet waiters_ ABSL_GUARDED_BY(mu_);
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H
diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h
index e90a61192b5ba..a7594fb26a2a3 100644
--- a/src/core/lib/promise/inter_activity_pipe.h
+++ b/src/core/lib/promise/inter_activity_pipe.h
@@ -83,6 +83,11 @@ class InterActivityPipe {
       on_available.Wakeup();
     }
 
+    bool IsClosed() {
+      MutexLock lock(&mu_);
+      return closed_;
+    }
+
    private:
     Mutex mu_;
     std::array<T, kQueueSize> queue_ ABSL_GUARDED_BY(mu_);
@@ -108,6 +113,12 @@ class InterActivityPipe {
       if (center_ != nullptr) center_->MarkClosed();
     }
 
+    bool IsClose() { return center_->IsClosed(); }
+
+    void MarkClose() {
+      if (center_ != nullptr) center_->MarkClosed();
+    }
+
     auto Push(T value) {
       return [center = center_, value = std::move(value)]() mutable {
         return center->Push(value);
diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h
index a8f911809f5ee..4ade84b893992 100644
--- a/src/core/lib/promise/latch.h
+++ b/src/core/lib/promise/latch.h
@@ -37,6 +37,7 @@ namespace grpc_core {
 // Initially the Latch is unset.
 // It can be waited upon by the Wait method, which produces a Promise that
 // resolves when the Latch is Set to a value of type T.
+// Latches only work correctly within a single activity.
 template <typename T>
 class Latch {
  public:
@@ -204,6 +205,9 @@ class Latch<void> {
   IntraActivityWaiter waiter_;
 };
 
+template <typename T>
+using LatchWaitPromise = decltype(std::declval<Latch<T>>().Wait());
+
 // A Latch that can have its value observed by outside threads, but only waited
 // upon from inside a single activity.
 template <typename T>
@@ -268,9 +272,6 @@ class ExternallyObservableLatch<void> {
   IntraActivityWaiter waiter_;
 };
 
-template <typename T>
-using LatchWaitPromise = decltype(std::declval<Latch<T>>().Wait());
-
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_PROMISE_LATCH_H
diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h
index 8525739068fc3..c12544282f672 100644
--- a/src/core/lib/promise/mpsc.h
+++ b/src/core/lib/promise/mpsc.h
@@ -107,6 +107,12 @@ class Center : public RefCounted<Center<T>> {
     receiver_closed_ = true;
   }
 
+  // Return whether the receiver is closed.
+  bool IsClosed() {
+    MutexLock lock(&mu_);
+    return receiver_closed_;
+  }
+
  private:
   Mutex mu_;
   const size_t max_queued_;
@@ -164,6 +170,10 @@ class MpscReceiver {
   ~MpscReceiver() {
     if (center_ != nullptr) center_->ReceiverClosed();
   }
+  bool IsClosed() { return center_->IsClosed(); }
+  void MarkClosed() {
+    if (center_ != nullptr) center_->ReceiverClosed();
+  }
   MpscReceiver(const MpscReceiver&) = delete;
   MpscReceiver& operator=(const MpscReceiver&) = delete;
   // Only movable until it's first polled, and so we don't need to contend with
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index 040afbfe9a3b2..275d06445a426 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -247,7 +247,7 @@ bool Party::RunParty() {
     }
     // Poll the participant.
     currently_polling_ = i;
-    bool done = participant->Poll();
+    bool done = participant->PollParticipantPromise();
     currently_polling_ = kNotPolling;
     if (done) {
       if (!name.empty()) {
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index 493a00925d1f1..1ff098f3aa309 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -24,6 +24,7 @@
 #include <string>
 #include <utility>
 
+#include "absl/base/attributes.h"
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 
@@ -38,6 +39,7 @@
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
+#include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/trace.h"
 #include "src/core/lib/resource_quota/arena.h"
 
@@ -298,7 +300,7 @@ class Party : public Activity, private Wakeable {
     explicit Participant(absl::string_view name) : name_(name) {}
     // Poll the participant. Return true if complete.
     // Participant should take care of its own deallocation in this case.
-    virtual bool Poll() = 0;
+    virtual bool PollParticipantPromise() = 0;
 
     // Destroy the participant before finishing.
     virtual void Destroy() = 0;
@@ -330,6 +332,9 @@ class Party : public Activity, private Wakeable {
   void Spawn(absl::string_view name, Factory promise_factory,
              OnComplete on_complete);
 
+  template <typename Factory>
+  auto SpawnWaitable(absl::string_view name, Factory factory);
+
   void Orphan() final { Crash("unused"); }
 
   // Activity implementation: not allowed to be overridden by derived types.
@@ -414,7 +419,7 @@ class Party : public Activity, private Wakeable {
       }
     }
 
-    bool Poll() override {
+    bool PollParticipantPromise() override {
       if (!started_) {
         auto p = factory_.Make();
         Destruct(&factory_);
@@ -441,6 +446,89 @@ class Party : public Activity, private Wakeable {
     bool started_ = false;
   };
 
+  template <typename SuppliedFactory>
+  class PromiseParticipantImpl final
+      : public RefCounted<PromiseParticipantImpl<SuppliedFactory>,
+                          NonPolymorphicRefCount>,
+        public Participant {
+    using Factory = promise_detail::OncePromiseFactory<void, SuppliedFactory>;
+    using Promise = typename Factory::Promise;
+    using Result = typename Promise::Result;
+
+   public:
+    PromiseParticipantImpl(absl::string_view name,
+                           SuppliedFactory promise_factory)
+        : Participant(name) {
+      Construct(&factory_, std::move(promise_factory));
+    }
+
+    ~PromiseParticipantImpl() {
+      switch (state_.load(std::memory_order_acquire)) {
+        case State::kFactory:
+          Destruct(&factory_);
+          break;
+        case State::kPromise:
+          Destruct(&promise_);
+          break;
+        case State::kResult:
+          Destruct(&result_);
+          break;
+      }
+    }
+
+    // Inside party poll: drive from factory -> promise -> result
+    bool PollParticipantPromise() override {
+      switch (state_.load(std::memory_order_relaxed)) {
+        case State::kFactory: {
+          auto p = factory_.Make();
+          Destruct(&factory_);
+          Construct(&promise_, std::move(p));
+          state_.store(State::kPromise, std::memory_order_relaxed);
+        }
+          ABSL_FALLTHROUGH_INTENDED;
+        case State::kPromise: {
+          auto p = promise_();
+          if (auto* r = p.value_if_ready()) {
+            Destruct(&promise_);
+            Construct(&result_, std::move(*r));
+            state_.store(State::kResult, std::memory_order_release);
+            waiter_.Wakeup();
+            this->Unref();
+            return true;
+          }
+          return false;
+        }
+        case State::kResult:
+          Crash(
+              "unreachable: promises should not be repolled after completion");
+      }
+    }
+
+    // Outside party poll: check whether the spawning party has completed this
+    // promise.
+    Poll<Result> PollCompletion() {
+      switch (state_.load(std::memory_order_acquire)) {
+        case State::kFactory:
+        case State::kPromise:
+          return Pending{};
+        case State::kResult:
+          return std::move(result_);
+      }
+    }
+
+    void Destroy() override { this->Unref(); }
+
+   private:
+    enum class State : uint8_t { kFactory, kPromise, kResult };
+    union {
+      GPR_NO_UNIQUE_ADDRESS Factory factory_;
+      GPR_NO_UNIQUE_ADDRESS Promise promise_;
+      GPR_NO_UNIQUE_ADDRESS Result result_;
+    };
+    Waker waiter_{Activity::current()->MakeOwningWaker()};
+    std::atomic<State> state_{State::kFactory};
+  };
+
   // Notification that the party has finished and this instance can be deleted.
   // Derived types should arrange to call CancelRemainingParticipants during
   // this sequence.
@@ -502,6 +590,17 @@ void Party::Spawn(absl::string_view name, Factory promise_factory,
                           std::move(on_complete));
 }
 
+template <typename Factory>
+auto Party::SpawnWaitable(absl::string_view name, Factory promise_factory) {
+  auto participant = MakeRefCounted<PromiseParticipantImpl<Factory>>(
+      name, std::move(promise_factory));
+  Participant* p = participant->Ref().release();
+  AddParticipants(&p, 1);
+  return [participant = std::move(participant)]() mutable {
+    return participant->PollCompletion();
+  };
+}
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_PROMISE_PARTY_H
diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h
new file mode 100644
index 0000000000000..80129eeb995e8
--- /dev/null
+++ b/src/core/lib/promise/promise_mutex.h
@@ -0,0 +1,92 @@
+// Copyright 2023 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_LIB_PROMISE_PROMISE_MUTEX_H
+#define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
+
+#include <grpc/support/port_platform.h>
+
+#include <utility>
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/poll.h"
+
+namespace grpc_core {
+
+// A mutex that can be used to synchronize access to a value within one
+// activity.
+template <typename T>
+class PromiseMutex {
+ public:
+  class Lock {
+   public:
+    Lock() {}
+    ~Lock() {
+      if (mutex_ != nullptr) {
+        GPR_ASSERT(mutex_->locked_);
+        mutex_->locked_ = false;
+        mutex_->waiter_.Wake();
+      }
+    }
+
+    Lock(Lock&& other) noexcept
+        : mutex_(std::exchange(other.mutex_, nullptr)) {}
+    Lock& operator=(Lock&& other) noexcept {
+      std::swap(mutex_, other.mutex_);
+      return *this;
+    }
+
+    Lock(const Lock&) = delete;
+    Lock& operator=(const Lock&) noexcept = delete;
+
+    T* operator->() {
+      GPR_DEBUG_ASSERT(mutex_ != nullptr);
+      return &mutex_->value_;
+    }
+    T& operator*() {
+      GPR_DEBUG_ASSERT(mutex_ != nullptr);
+      return mutex_->value_;
+    }
+
+   private:
+    friend class PromiseMutex;
+    explicit Lock(PromiseMutex* mutex) : mutex_(mutex) {
+      GPR_DEBUG_ASSERT(!mutex_->locked_);
+      mutex_->locked_ = true;
+    }
+    PromiseMutex* mutex_ = nullptr;
+  };
+
+  PromiseMutex() = default;
+  explicit PromiseMutex(T value) : value_(std::move(value)) {}
+  ~PromiseMutex() { GPR_DEBUG_ASSERT(!locked_); }
+
+  auto Acquire() {
+    return [this]() -> Poll<Lock> {
+      if (locked_) return waiter_.pending();
+      return Lock(this);
+    };
+  }
+
+ private:
+  bool locked_ = false;
+  IntraActivityWaiter waiter_;
+  GPR_NO_UNIQUE_ADDRESS T value_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h
new file mode 100644
index 0000000000000..54019d387408a
--- /dev/null
+++ b/src/core/lib/promise/status_flag.h
@@ -0,0 +1,127 @@
+// Copyright 2023 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_LIB_PROMISE_STATUS_FLAG_H
+#define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
+
+#include "src/core/lib/promise/detail/status.h"
+
+namespace grpc_core {
+
+struct Failure {};
+struct Success {};
+
+inline bool IsStatusOk(Failure) { return false; }
+inline bool IsStatusOk(Success) { return true; }
+
+template <>
+struct StatusCastImpl<absl::Status, Success> {
+  static absl::Status Cast(Success) { return absl::OkStatus(); }
+};
+
+template <>
+struct StatusCastImpl<absl::Status, const Success&> {
+  static absl::Status Cast(Success) { return absl::OkStatus(); }
+};
+
+// A boolean representing whether an operation succeeded (true) or failed
+// (false).
+class StatusFlag {
+ public:
+  explicit StatusFlag(bool value) : value_(value) {}
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  StatusFlag(Failure) : value_(false) {}
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  StatusFlag(Success) : value_(true) {}
+
+  bool ok() const { return value_; }
+
+ private:
+  bool value_;
+};
+
+inline bool IsStatusOk(const StatusFlag& flag) { return flag.ok(); }
+
+template <>
+struct StatusCastImpl<absl::Status, StatusFlag> {
+  static absl::Status Cast(StatusFlag flag) {
+    return flag.ok() ? absl::OkStatus() : absl::CancelledError();
+  }
+};
+
+template <>
+struct StatusCastImpl<absl::Status, const StatusFlag&> {
+  static absl::Status Cast(StatusFlag flag) {
+    return flag.ok() ? absl::OkStatus() : absl::CancelledError();
+  }
+};
+
+// A value if an operation was successful, or a failure flag if not.
+template <typename T>
+class ValueOrFailure {
+ public:
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  ValueOrFailure(T value) : value_(std::move(value)) {}
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  ValueOrFailure(Failure) {}
+
+  static ValueOrFailure FromOptional(absl::optional<T> value) {
+    return ValueOrFailure{std::move(value)};
+  }
+
+  bool ok() const { return value_.has_value(); }
+
+  const T& value() const { return value_.value(); }
+  T& value() { return value_.value(); }
+  const T& operator*() const { return *value_; }
+  T& operator*() { return *value_; }
+
+ private:
+  absl::optional<T> value_;
+};
+
+template <typename T>
+inline bool IsStatusOk(const ValueOrFailure<T>& value) {
+  return value.ok();
+}
+
+template <typename T>
+inline T TakeValue(ValueOrFailure<T>&& value) {
+  return std::move(value.value());
+}
+
+template <typename T>
+struct StatusCastImpl<absl::Status, ValueOrFailure<T>> {
+  static absl::Status Cast(const ValueOrFailure<T> flag) {
+    return flag.ok() ? absl::OkStatus() : absl::CancelledError();
+  }
+};
+
+template <typename T>
+struct StatusCastImpl<absl::StatusOr<T>, ValueOrFailure<T>> {
+  static absl::StatusOr<T> Cast(ValueOrFailure<T> value) {
+    return value.ok() ? absl::StatusOr<T>(std::move(value.value()))
+                      : absl::CancelledError();
+  }
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
\ No newline at end of file
diff --git a/src/core/lib/promise/wait_set.h b/src/core/lib/promise/wait_set.h
index 2f978e5750ade..bf1adc6c1c299 100644
--- a/src/core/lib/promise/wait_set.h
+++ b/src/core/lib/promise/wait_set.h
@@ -69,6 +69,12 @@ class WaitSet final {
     return ret;
   }
 
+  void WakeupAsync() {
+    while (!pending_.empty()) {
+      pending_.extract(pending_.begin()).value().WakeupAsync();
+    }
+  }
+
  private:
   // Handles to activities that need to be awoken.
   WakerSet pending_;
diff --git a/src/core/lib/resolver/endpoint_addresses.cc b/src/core/lib/resolver/endpoint_addresses.cc
index 7995163ad5d8f..7b5f4c0a329a8 100644
--- a/src/core/lib/resolver/endpoint_addresses.cc
+++ b/src/core/lib/resolver/endpoint_addresses.cc
@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/core/lib/resolver/endpoint_addresses.h b/src/core/lib/resolver/endpoint_addresses.h
index 9d0d7c6edb8c4..5746df19c5b43 100644
--- a/src/core/lib/resolver/endpoint_addresses.h
+++ b/src/core/lib/resolver/endpoint_addresses.h
@@ -23,8 +23,11 @@
 
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "absl/functional/function_ref.h"
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
@@ -64,6 +67,9 @@ class EndpointAddresses {
   bool operator==(const EndpointAddresses& other) const {
     return Cmp(other) == 0;
   }
+  bool operator!=(const EndpointAddresses& other) const {
+    return Cmp(other) != 0;
+  }
   bool operator<(const EndpointAddresses& other) const {
     return Cmp(other) < 0;
   }
@@ -111,6 +117,48 @@ class EndpointAddressSet {
   std::set<grpc_resolved_address, ResolvedAddressLessThan> addresses_;
 };
 
+// An iterator interface for endpoints.
+class EndpointAddressesIterator {
+ public:
+  virtual ~EndpointAddressesIterator() = default;
+
+  // Invokes callback once for each endpoint.
+  virtual void ForEach(
+      absl::FunctionRef<void(const EndpointAddresses&)> callback) const = 0;
+};
+
+// Iterator over a fixed list of endpoints.
+class EndpointAddressesListIterator : public EndpointAddressesIterator {
+ public:
+  explicit EndpointAddressesListIterator(EndpointAddressesList endpoints)
+      : endpoints_(std::move(endpoints)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    for (const auto& endpoint : endpoints_) {
+      callback(endpoint);
+    }
+  }
+
+ private:
+  EndpointAddressesList endpoints_;
+};
+
+// Iterator that returns only a single endpoint.
+class SingleEndpointIterator : public EndpointAddressesIterator {
+ public:
+  explicit SingleEndpointIterator(EndpointAddresses endpoint)
+      : endpoint_(std::move(endpoint)) {}
+
+  void ForEach(absl::FunctionRef<void(const EndpointAddresses&)> callback)
+      const override {
+    callback(endpoint_);
+  }
+
+ private:
+  EndpointAddresses endpoint_;
+};
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_RESOLVER_ENDPOINT_ADDRESSES_H
diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
index 6335a54c484fd..0e63e45b4df6e 100644
--- a/src/core/lib/resource_quota/memory_quota.cc
+++ b/src/core/lib/resource_quota/memory_quota.cc
@@ -20,11 +20,19 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
 #include <tuple>
+#include <utility>
 
 #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 "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/mpscq.h"
@@ -34,6 +42,7 @@
 #include "src/core/lib/promise/race.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/resource_quota/trace.h"
+#include "src/core/lib/slice/slice_refcount.h"
 
 namespace grpc_core {
 
@@ -90,6 +99,39 @@ class MemoryQuotaTracker {
   Mutex mu_;
   std::vector<std::weak_ptr<BasicMemoryQuota>> quotas_ ABSL_GUARDED_BY(mu_);
 };
+
+// Reference count for a slice allocated by MemoryAllocator::MakeSlice.
+// Takes care of releasing memory back when the slice is destroyed.
+class SliceRefCount : public grpc_slice_refcount {
+ public:
+  SliceRefCount(
+      std::shared_ptr<
+          grpc_event_engine::experimental::internal::MemoryAllocatorImpl>
+          allocator,
+      size_t size)
+      : grpc_slice_refcount(Destroy),
+        allocator_(std::move(allocator)),
+        size_(size) {
+    // Nothing to do here.
+  }
+  ~SliceRefCount() {
+    allocator_->Release(size_);
+    allocator_.reset();
+  }
+
+ private:
+  static void Destroy(grpc_slice_refcount* p) {
+    auto* rc = static_cast<SliceRefCount*>(p);
+    rc->~SliceRefCount();
+    free(rc);
+  }
+
+  std::shared_ptr<
+      grpc_event_engine::experimental::internal::MemoryAllocatorImpl>
+      allocator_;
+  size_t size_;
+};
+
 }  // namespace
 
 //
@@ -337,6 +379,18 @@ void GrpcMemoryAllocatorImpl::Replenish() {
   free_bytes_.fetch_add(amount, std::memory_order_acq_rel);
 }
 
+grpc_slice GrpcMemoryAllocatorImpl::MakeSlice(MemoryRequest request) {
+  auto size = Reserve(request.Increase(sizeof(SliceRefCount)));
+  void* p = malloc(size);
+  new (p) SliceRefCount(shared_from_this(), size);
+  grpc_slice slice;
+  slice.refcount = static_cast<SliceRefCount*>(p);
+  slice.data.refcounted.bytes =
+      static_cast<uint8_t*>(p) + sizeof(SliceRefCount);
+  slice.data.refcounted.length = size - sizeof(SliceRefCount);
+  return slice;
+}
+
 //
 // BasicMemoryQuota
 //
diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h
index a76f2594d206c..4f38b8dd32d3d 100644
--- a/src/core/lib/resource_quota/memory_quota.h
+++ b/src/core/lib/resource_quota/memory_quota.h
@@ -400,6 +400,12 @@ class GrpcMemoryAllocatorImpl final : public EventEngineMemoryAllocatorImpl {
   // Returns the number of bytes reserved.
   size_t Reserve(MemoryRequest request) override;
 
+  /// Allocate a slice, using MemoryRequest to size the number of returned
+  /// bytes. For a variable length request, check the returned slice length to
+  /// verify how much memory was allocated. Takes care of reserving memory for
+  /// any relevant control structures also.
+  grpc_slice MakeSlice(MemoryRequest request) override;
+
   // Release some bytes that were previously reserved.
   void Release(size_t n) override {
     // Add the released memory to our free bytes counter... if this increases
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h
index 625593c5772bd..3e28060fa2534 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.h
+++ b/src/core/lib/security/credentials/composite/composite_credentials.h
@@ -55,7 +55,7 @@ class grpc_composite_channel_credentials : public grpc_channel_credentials {
 
   grpc_core::RefCountedPtr<grpc_channel_credentials>
   duplicate_without_call_credentials() override {
-    return inner_creds_;
+    return inner_creds_->duplicate_without_call_credentials();
   }
 
   grpc_core::RefCountedPtr<grpc_channel_security_connector>
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 68ddaaeb903c9..cd7d117b28ee8 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
@@ -525,4 +525,8 @@ void AwsExternalAccountCredentials::FinishRetrieveSubjectToken(
   }
 }
 
+absl::string_view AwsExternalAccountCredentials::CredentialSourceType() {
+  return "aws";
+}
+
 }  // namespace grpc_core
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 e8adc02452f8e..a3a41236615e7 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
@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/http/httpcli.h"
@@ -72,6 +74,8 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials {
 
   void AddMetadataRequestHeaders(grpc_http_request* request);
 
+  absl::string_view CredentialSourceType() override;
+
   std::string audience_;
   OrphanablePtr<HttpRequest> http_request_;
 
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 93228dbca4eb7..3ffd2acb0ef94 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/external_account_credentials.cc
@@ -26,6 +26,7 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
@@ -53,7 +54,6 @@
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/url_external_account_credentials.h"
 #include "src/core/lib/security/util/json_util.h"
-#include "src/core/lib/slice/b64.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \
@@ -271,6 +271,20 @@ std::string ExternalAccountCredentials::debug_string() {
                          grpc_oauth2_token_fetcher_credentials::debug_string());
 }
 
+std::string ExternalAccountCredentials::MetricsHeaderValue() {
+  return absl::StrFormat(
+      "gl-cpp/unknown auth/%s google-byoid-sdk source/%s sa-impersonation/%v "
+      "config-lifetime/%v",
+      grpc_version_string(), CredentialSourceType(),
+      !options_.service_account_impersonation_url.empty(),
+      options_.service_account_impersonation.token_lifetime_seconds !=
+          IMPERSONATED_CRED_DEFAULT_LIFETIME_IN_SECONDS);
+}
+
+absl::string_view ExternalAccountCredentials::CredentialSourceType() {
+  return "unknown";
+}
+
 // The token fetching flow:
 // 1. Retrieve subject token - Subclass's RetrieveSubjectToken() gets called
 // and the subject token is received in OnRetrieveSubjectTokenInternal().
@@ -317,27 +331,21 @@ void ExternalAccountCredentials::ExchangeToken(
   }
   grpc_http_request request;
   memset(&request, 0, sizeof(grpc_http_request));
-  grpc_http_header* headers = nullptr;
-  if (!options_.client_id.empty() && !options_.client_secret.empty()) {
-    request.hdr_count = 2;
-    headers = static_cast<grpc_http_header*>(
-        gpr_malloc(sizeof(grpc_http_header) * request.hdr_count));
-    headers[0].key = gpr_strdup("Content-Type");
-    headers[0].value = gpr_strdup("application/x-www-form-urlencoded");
+  const bool add_authorization_header =
+      !options_.client_id.empty() && !options_.client_secret.empty();
+  request.hdr_count = add_authorization_header ? 3 : 2;
+  auto* headers = static_cast<grpc_http_header*>(
+      gpr_malloc(sizeof(grpc_http_header) * request.hdr_count));
+  headers[0].key = gpr_strdup("Content-Type");
+  headers[0].value = gpr_strdup("application/x-www-form-urlencoded");
+  headers[1].key = gpr_strdup("x-goog-api-client");
+  headers[1].value = gpr_strdup(MetricsHeaderValue().c_str());
+  if (add_authorization_header) {
     std::string raw_cred =
         absl::StrFormat("%s:%s", options_.client_id, options_.client_secret);
-    char* encoded_cred =
-        grpc_base64_encode(raw_cred.c_str(), raw_cred.length(), 0, 0);
-    std::string str = absl::StrFormat("Basic %s", std::string(encoded_cred));
-    headers[1].key = gpr_strdup("Authorization");
-    headers[1].value = gpr_strdup(str.c_str());
-    gpr_free(encoded_cred);
-  } else {
-    request.hdr_count = 1;
-    headers = static_cast<grpc_http_header*>(
-        gpr_malloc(sizeof(grpc_http_header) * request.hdr_count));
-    headers[0].key = gpr_strdup("Content-Type");
-    headers[0].value = gpr_strdup("application/x-www-form-urlencoded");
+    std::string str = absl::StrFormat("Basic %s", absl::Base64Escape(raw_cred));
+    headers[2].key = gpr_strdup("Authorization");
+    headers[2].value = gpr_strdup(str.c_str());
   }
   request.hdrs = headers;
   std::vector<std::string> body_parts;
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 bcbd33b272bef..13749db8567a7 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/external_account_credentials.h
@@ -101,6 +101,10 @@ class ExternalAccountCredentials
       HTTPRequestContext* ctx, const Options& options,
       std::function<void(std::string, grpc_error_handle)> cb) = 0;
 
+  virtual absl::string_view CredentialSourceType();
+
+  std::string MetricsHeaderValue();
+
  private:
   // This method implements the common token fetch logic and it will be called
   // when grpc_oauth2_token_fetcher_credentials request a new access token.
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 e70131bfeef2b..0fb3ce5091d09 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
@@ -137,4 +137,8 @@ void FileExternalAccountCredentials::RetrieveSubjectToken(
   cb(std::string(content), absl::OkStatus());
 }
 
+absl::string_view FileExternalAccountCredentials::CredentialSourceType() {
+  return "file";
+}
+
 }  // namespace grpc_core
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 40f0e9f23f485..c8cf12177bda0 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
@@ -23,6 +23,8 @@
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
+
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
@@ -44,6 +46,8 @@ class FileExternalAccountCredentials final : public ExternalAccountCredentials {
       HTTPRequestContext* ctx, const Options& options,
       std::function<void(std::string, grpc_error_handle)> cb) override;
 
+  absl::string_view CredentialSourceType() override;
+
   // Fields of credential source
   std::string file_;
   std::string format_type_;
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 0e4cb8afba17b..4b977c045ee23 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
@@ -240,4 +240,8 @@ void UrlExternalAccountCredentials::FinishRetrieveSubjectToken(
   }
 }
 
+absl::string_view UrlExternalAccountCredentials::CredentialSourceType() {
+  return "url";
+}
+
 }  // namespace grpc_core
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 71b734e591e0a..9331412d32190 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
@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/http/httpcli.h"
@@ -48,6 +50,8 @@ class UrlExternalAccountCredentials final : public ExternalAccountCredentials {
       HTTPRequestContext* ctx, const Options& options,
       std::function<void(std::string, grpc_error_handle)> cb) override;
 
+  absl::string_view CredentialSourceType() override;
+
   static void OnRetrieveSubjectToken(void* arg, grpc_error_handle error);
   void OnRetrieveSubjectTokenInternal(grpc_error_handle error);
 
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 22ccf7ebd74a8..d9f2527a33cfc 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
@@ -39,7 +39,6 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
-#include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 
@@ -55,8 +54,6 @@
 struct grpc_tls_certificate_provider
     : public grpc_core::RefCounted<grpc_tls_certificate_provider> {
  public:
-  virtual grpc_pollset_set* interested_parties() const { return nullptr; }
-
   virtual grpc_core::RefCountedPtr<grpc_tls_certificate_distributor>
   distributor() const = 0;
 
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 ff25d73c28c38..c3f525471970e 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
@@ -22,8 +22,11 @@
 
 #include <limits.h>
 
+// IWYU pragma: no_include <ratio>
 #include <memory>
+#include <type_traits>
 #include <utility>
+#include <vector>
 
 // IWYU pragma: no_include <openssl/mem.h>
 #include <openssl/bio.h>
@@ -35,15 +38,25 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 #include "absl/types/span.h"
 
 #include <grpc/support/log.h>
 
+#include "src/core/lib/event_engine/default_event_engine.h"
+#include "src/core/lib/gprpp/directory_reader.h"
+#include "src/core/lib/gprpp/load_file.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/slice/slice.h"
+
 namespace grpc_core {
 namespace experimental {
 
 namespace {
 std::string IssuerFromCrl(X509_CRL* crl) {
+  if (crl == nullptr) {
+    return "";
+  }
   char* buf = X509_NAME_oneline(X509_CRL_get_issuer(crl), nullptr, 0);
   std::string ret;
   if (buf != nullptr) {
@@ -53,6 +66,20 @@ std::string IssuerFromCrl(X509_CRL* crl) {
   return ret;
 }
 
+absl::StatusOr<std::shared_ptr<Crl>> ReadCrlFromFile(
+    const std::string& crl_path) {
+  absl::StatusOr<Slice> crl_slice = LoadFile(crl_path, false);
+  if (!crl_slice.ok()) {
+    return crl_slice.status();
+  }
+  absl::StatusOr<std::unique_ptr<Crl>> crl =
+      Crl::Parse(crl_slice->as_string_view());
+  if (!crl.ok()) {
+    return crl.status();
+  }
+  return crl;
+}
+
 }  // namespace
 
 absl::StatusOr<std::unique_ptr<Crl>> Crl::Parse(absl::string_view crl_string) {
@@ -114,5 +141,98 @@ std::shared_ptr<Crl> StaticCrlProvider::GetCrl(
   return it->second;
 }
 
+absl::StatusOr<std::shared_ptr<CrlProvider>> CreateDirectoryReloaderCrlProvider(
+    absl::string_view directory, std::chrono::seconds refresh_duration,
+    std::function<void(absl::Status)> reload_error_callback) {
+  if (refresh_duration < std::chrono::seconds(60)) {
+    return absl::InvalidArgumentError("Refresh duration minimum is 60 seconds");
+  }
+  auto provider = std::make_shared<DirectoryReloaderCrlProvider>(
+      refresh_duration, reload_error_callback,
+      grpc_event_engine::experimental::GetDefaultEventEngine(),
+      MakeDirectoryReader(directory));
+  // This could be slow to do at startup, but we want to
+  // make sure it's done before the provider is used.
+  provider->UpdateAndStartTimer();
+  return provider;
+}
+
+DirectoryReloaderCrlProvider::~DirectoryReloaderCrlProvider() {
+  if (refresh_handle_.has_value()) {
+    event_engine_->Cancel(refresh_handle_.value());
+  }
+}
+
+void DirectoryReloaderCrlProvider::UpdateAndStartTimer() {
+  absl::Status status = Update();
+  if (!status.ok() && reload_error_callback_ != nullptr) {
+    reload_error_callback_(status);
+  }
+  std::weak_ptr<DirectoryReloaderCrlProvider> self = shared_from_this();
+  refresh_handle_ =
+      event_engine_->RunAfter(refresh_duration_, [self = std::move(self)]() {
+        ApplicationCallbackExecCtx callback_exec_ctx;
+        ExecCtx exec_ctx;
+        if (std::shared_ptr<DirectoryReloaderCrlProvider> valid_ptr =
+                self.lock()) {
+          valid_ptr->UpdateAndStartTimer();
+        }
+      });
+}
+
+absl::Status DirectoryReloaderCrlProvider::Update() {
+  absl::flat_hash_map<std::string, std::shared_ptr<Crl>> new_crls;
+  std::vector<std::string> files_with_errors;
+  absl::Status status = crl_directory_->ForEach([&](absl::string_view file) {
+    std::string file_path = absl::StrCat(crl_directory_->Name(), "/", file);
+    // Build a map of new_crls to update to. If all files successful, do a
+    // full swap of the map. Otherwise update in place.
+    absl::StatusOr<std::shared_ptr<Crl>> crl = ReadCrlFromFile(file_path);
+    if (!crl.ok()) {
+      files_with_errors.push_back(
+          absl::StrCat(file_path, ": ", crl.status().ToString()));
+      return;
+    }
+    // Now we have a good CRL to update in our map.
+    // It's not safe to say crl->Issuer() on the LHS and std::move(crl) on the
+    // RHS, because C++ does not guarantee which of those will be executed
+    // first.
+    std::string issuer((*crl)->Issuer());
+    new_crls[std::move(issuer)] = std::move(*crl);
+  });
+  if (!status.ok()) {
+    return status;
+  }
+  MutexLock lock(&mu_);
+  if (!files_with_errors.empty()) {
+    // Need to make sure CRLs we read successfully into new_crls are still
+    // in-place updated in crls_.
+    for (auto& kv : new_crls) {
+      std::shared_ptr<Crl>& crl = kv.second;
+      // It's not safe to say crl->Issuer() on the LHS and std::move(crl) on the
+      // RHS, because C++ does not guarantee which of those will be executed
+      // first.
+      std::string issuer(crl->Issuer());
+      crls_[std::move(issuer)] = std::move(crl);
+    }
+    return absl::UnknownError(absl::StrCat(
+        "Errors reading the following files in the CRL directory: [",
+        absl::StrJoin(files_with_errors, "; "), "]"));
+  } else {
+    crls_ = std::move(new_crls);
+  }
+  return absl::OkStatus();
+}
+
+std::shared_ptr<Crl> DirectoryReloaderCrlProvider::GetCrl(
+    const CertificateInfo& certificate_info) {
+  MutexLock lock(&mu_);
+  auto it = crls_.find(certificate_info.Issuer());
+  if (it == crls_.end()) {
+    return nullptr;
+  }
+  return it->second;
+}
+
 }  // namespace experimental
 }  // namespace grpc_core
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 75039d9a790ac..d1ea0c09661ee 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
@@ -21,18 +21,29 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <chrono>
+#include <functional>
 #include <memory>
+#include <optional>
 #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 "src/core/lib/gprpp/directory_reader.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/gprpp/time.h"
+
 namespace grpc_core {
 namespace experimental {
 
@@ -77,6 +88,45 @@ class CertificateInfoImpl : public CertificateInfo {
   const std::string issuer_;
 };
 
+// Defining this here lets us hide implementation details (and includes) from
+// the header in include
+class DirectoryReloaderCrlProvider
+    : public CrlProvider,
+      public std::enable_shared_from_this<DirectoryReloaderCrlProvider> {
+ public:
+  DirectoryReloaderCrlProvider(
+      std::chrono::seconds duration, std::function<void(absl::Status)> callback,
+      std::shared_ptr<grpc_event_engine::experimental::EventEngine>
+          event_engine,
+      std::shared_ptr<DirectoryReader> directory_impl)
+      : refresh_duration_(Duration::FromSecondsAsDouble(duration.count())),
+        reload_error_callback_(std::move(callback)),
+        event_engine_(std::move(event_engine)),
+        crl_directory_(std::move(directory_impl)) {}
+
+  ~DirectoryReloaderCrlProvider() override;
+  std::shared_ptr<Crl> GetCrl(const CertificateInfo& certificate_info) override;
+  // Reads the configured directory and updates the internal crls_ map, called
+  // asynchronously by event engine then schedules the timer for the next
+  // update.
+  void UpdateAndStartTimer();
+
+ private:
+  // Reads the configured directory and updates the internal crls_ map, called
+  // asynchronously by event engine.
+  absl::Status Update();
+  Duration refresh_duration_;
+  std::function<void(::absl::Status)> reload_error_callback_;
+  std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine_;
+  std::shared_ptr<DirectoryReader> crl_directory_;
+  // guards the crls_ map
+  Mutex mu_;
+  absl::flat_hash_map<::std::string, ::std::shared_ptr<Crl>> crls_
+      ABSL_GUARDED_BY(mu_);
+  absl::optional<grpc_event_engine::experimental::EventEngine::TaskHandle>
+      refresh_handle_;
+};
+
 }  // namespace experimental
 }  // namespace grpc_core
 
diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc
index 01abfb28230b1..b0b907ac503d1 100644
--- a/src/core/lib/security/security_connector/ssl_utils.cc
+++ b/src/core/lib/security/security_connector/ssl_utils.cc
@@ -417,7 +417,7 @@ grpc_security_status grpc_ssl_tsi_client_handshaker_factory_init(
     tsi_ssl_client_handshaker_factory** handshaker_factory) {
   const char* root_certs;
   const tsi_ssl_root_certs_store* root_store;
-  if (pem_root_certs == nullptr) {
+  if (pem_root_certs == nullptr && !skip_server_certificate_verification) {
     gpr_log(GPR_INFO,
             "No root certificates specified; use ones stored in system default "
             "locations instead");
@@ -436,7 +436,6 @@ grpc_security_status grpc_ssl_tsi_client_handshaker_factory_init(
                            pem_key_cert_pair->private_key != nullptr &&
                            pem_key_cert_pair->cert_chain != nullptr;
   tsi_ssl_client_handshaker_options options;
-  GPR_DEBUG_ASSERT(root_certs != nullptr);
   options.pem_root_certs = root_certs;
   options.root_store = root_store;
   options.alpn_protocols =
diff --git a/src/core/lib/surface/call_trace.cc b/src/core/lib/surface/call_trace.cc
index 163418f5083fb..d9b544ee1f9d6 100644
--- a/src/core/lib/surface/call_trace.cc
+++ b/src/core/lib/surface/call_trace.cc
@@ -77,7 +77,8 @@ const grpc_channel_filter* PromiseTracingFilterFor(
                   return r;
                 };
               },
-              grpc_channel_next_op, /* sizeof_call_data: */ 0,
+              /* init_call: */ nullptr, grpc_channel_next_op,
+              /* sizeof_call_data: */ 0,
               // init_call_elem:
               [](grpc_call_element*, const grpc_call_element_args*) {
                 return absl::OkStatus();
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index f8e6d6832651f..5535ece6f2652 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -32,7 +32,6 @@
 #include "src/core/ext/filters/client_channel/backup_poller.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/gprpp/fork.h"
@@ -96,7 +95,6 @@ static void do_basic_init(void) {
   gpr_time_init();
   grpc_core::PrintExperimentsList();
   grpc_core::Fork::GlobalInit();
-  grpc_event_engine::experimental::RegisterForkHandlers();
   grpc_fork_handlers_auto_register();
   grpc_tracer_init();
   grpc_client_channel_global_init_backup_polling();
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index 76d61e889df73..b2d1be8fea52b 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -262,6 +262,7 @@ class Server::RealRequestMatcherFilterStack : public RequestMatcherInterface {
     for (LockedMultiProducerSingleConsumerQueue& queue : requests_per_cq_) {
       GPR_ASSERT(queue.Pop() == nullptr);
     }
+    GPR_ASSERT(pending_.empty());
   }
 
   void ZombifyPending() override {
@@ -301,6 +302,8 @@ class Server::RealRequestMatcherFilterStack : public RequestMatcherInterface {
           MutexLock lock(&server_->mu_call_);
           while (!pending_.empty() &&
                  pending_.front().Age() > server_->max_time_in_pending_queue_) {
+            pending_.front().calld->SetState(CallData::CallState::ZOMBIED);
+            pending_.front().calld->KillZombie();
             pending_.pop();
           }
           if (!pending_.empty()) {
@@ -754,6 +757,7 @@ class ChannelBroadcaster {
 const grpc_channel_filter Server::kServerTopFilter = {
     Server::CallData::StartTransportStreamOpBatch,
     Server::ChannelData::MakeCallPromise,
+    /* init_call: */ nullptr,
     grpc_channel_next_op,
     sizeof(Server::CallData),
     Server::CallData::InitCallElement,
@@ -835,9 +839,9 @@ void Server::Start() {
   if (unregistered_request_matcher_ == nullptr) {
     unregistered_request_matcher_ = make_real_request_matcher();
   }
-  for (std::unique_ptr<RegisteredMethod>& rm : registered_methods_) {
-    if (rm->matcher == nullptr) {
-      rm->matcher = make_real_request_matcher();
+  for (auto& rm : registered_methods_) {
+    if (rm.second->matcher == nullptr) {
+      rm.second->matcher = make_real_request_matcher();
     }
   }
   {
@@ -924,20 +928,11 @@ void Server::RegisterCompletionQueue(grpc_completion_queue* cq) {
   cqs_.push_back(cq);
 }
 
-namespace {
-
-bool streq(const std::string& a, const char* b) {
-  return (a.empty() && b == nullptr) ||
-         ((b != nullptr) && !strcmp(a.c_str(), b));
-}
-
-}  // namespace
-
 Server::RegisteredMethod* Server::RegisterMethod(
     const char* method, const char* host,
     grpc_server_register_method_payload_handling payload_handling,
     uint32_t flags) {
-  if (IsRegisteredMethodsMapEnabled() && started_) {
+  if (started_) {
     Crash("Attempting to register method after server started");
   }
 
@@ -946,21 +941,21 @@ Server::RegisteredMethod* Server::RegisterMethod(
             "grpc_server_register_method method string cannot be NULL");
     return nullptr;
   }
-  for (std::unique_ptr<RegisteredMethod>& m : registered_methods_) {
-    if (streq(m->method, method) && streq(m->host, host)) {
-      gpr_log(GPR_ERROR, "duplicate registration for %s@%s", method,
-              host ? host : "*");
-      return nullptr;
-    }
+  auto key = std::make_pair(host ? host : "", method);
+  if (registered_methods_.find(key) != registered_methods_.end()) {
+    gpr_log(GPR_ERROR, "duplicate registration for %s@%s", method,
+            host ? host : "*");
+    return nullptr;
   }
   if (flags != 0) {
     gpr_log(GPR_ERROR, "grpc_server_register_method invalid flags 0x%08x",
             flags);
     return nullptr;
   }
-  registered_methods_.emplace_back(std::make_unique<RegisteredMethod>(
-      method, host, payload_handling, flags));
-  return registered_methods_.back().get();
+  auto it = registered_methods_.emplace(
+      key, std::make_unique<RegisteredMethod>(method, host, payload_handling,
+                                              flags));
+  return it.first->second.get();
 }
 
 void Server::DoneRequestEvent(void* req, grpc_cq_completion* /*c*/) {
@@ -1011,9 +1006,9 @@ void Server::KillPendingWorkLocked(grpc_error_handle error) {
   if (started_) {
     unregistered_request_matcher_->KillRequests(error);
     unregistered_request_matcher_->ZombifyPending();
-    for (std::unique_ptr<RegisteredMethod>& rm : registered_methods_) {
-      rm->matcher->KillRequests(error);
-      rm->matcher->ZombifyPending();
+    for (auto& rm : registered_methods_) {
+      rm.second->matcher->KillRequests(error);
+      rm.second->matcher->ZombifyPending();
     }
   }
 }
@@ -1248,7 +1243,6 @@ class Server::ChannelData::ConnectivityWatcher
 //
 
 Server::ChannelData::~ChannelData() {
-  old_registered_methods_.reset();
   if (server_ != nullptr) {
     if (server_->channelz_node_ != nullptr && channelz_socket_uuid_ != 0) {
       server_->channelz_node_->RemoveChildSocket(channelz_socket_uuid_);
@@ -1272,50 +1266,6 @@ void Server::ChannelData::InitTransport(RefCountedPtr<Server> server,
   channel_ = channel;
   cq_idx_ = cq_idx;
   channelz_socket_uuid_ = channelz_socket_uuid;
-  // Build a lookup table phrased in terms of mdstr's in this channels context
-  // to quickly find registered methods.
-  size_t num_registered_methods = server_->registered_methods_.size();
-  if (!IsRegisteredMethodsMapEnabled() && num_registered_methods > 0) {
-    uint32_t max_probes = 0;
-    size_t slots = 2 * num_registered_methods;
-    old_registered_methods_ =
-        std::make_unique<std::vector<ChannelRegisteredMethod>>(slots);
-    for (std::unique_ptr<RegisteredMethod>& rm : server_->registered_methods_) {
-      Slice host;
-      Slice method = Slice::FromExternalString(rm->method);
-      const bool has_host = !rm->host.empty();
-      if (has_host) {
-        host = Slice::FromExternalString(rm->host);
-      }
-      uint32_t hash = MixHash32(has_host ? host.Hash() : 0, method.Hash());
-      uint32_t probes = 0;
-      for (probes = 0; (*old_registered_methods_)[(hash + probes) % slots]
-                           .server_registered_method != nullptr;
-           probes++) {
-      }
-      if (probes > max_probes) max_probes = probes;
-      ChannelRegisteredMethod* crm =
-          &(*old_registered_methods_)[(hash + probes) % slots];
-      crm->server_registered_method = rm.get();
-      crm->flags = rm->flags;
-      crm->has_host = has_host;
-      if (has_host) {
-        crm->host = std::move(host);
-      }
-      crm->method = std::move(method);
-    }
-    GPR_ASSERT(slots <= UINT32_MAX);
-    registered_method_max_probes_ = max_probes;
-  } else if (IsRegisteredMethodsMapEnabled()) {
-    for (std::unique_ptr<RegisteredMethod>& rm : server_->registered_methods_) {
-      auto key = std::make_pair(!rm->host.empty() ? rm->host : "", rm->method);
-      registered_methods_.emplace(
-          key, std::make_unique<ChannelRegisteredMethod>(
-                   rm.get(), rm->flags, /*has_host=*/!rm->host.empty(),
-                   Slice::FromExternalString(rm->method),
-                   Slice::FromExternalString(rm->host)));
-    }
-  }
   // Publish channel.
   {
     MutexLock lock(&server_->mu_global_);
@@ -1327,7 +1277,10 @@ void Server::ChannelData::InitTransport(RefCountedPtr<Server> server,
   op->set_accept_stream = true;
   op->set_accept_stream_fn = AcceptStream;
   if (IsRegisteredMethodLookupInTransportEnabled()) {
-    op->set_registered_method_matcher_fn = SetRegisteredMethodOnMetadata;
+    op->set_registered_method_matcher_fn = [](void* arg,
+                                              ClientMetadata* metadata) {
+      static_cast<ChannelData*>(arg)->SetRegisteredMethodOnMetadata(*metadata);
+    };
   }
   // op->set_registered_method_matcher_fn = Registered
   op->set_accept_stream_user_data = this;
@@ -1338,75 +1291,41 @@ void Server::ChannelData::InitTransport(RefCountedPtr<Server> server,
   transport->PerformOp(op);
 }
 
-Server::ChannelRegisteredMethod* Server::ChannelData::GetRegisteredMethod(
-    const grpc_slice& host, const grpc_slice& path) {
-  if (old_registered_methods_ == nullptr) return nullptr;
-  // TODO(ctiller): unify these two searches
-  // check for an exact match with host
-  uint32_t hash = MixHash32(grpc_slice_hash(host), grpc_slice_hash(path));
-  for (size_t i = 0; i <= registered_method_max_probes_; i++) {
-    ChannelRegisteredMethod* rm = &(
-        *old_registered_methods_)[(hash + i) % old_registered_methods_->size()];
-    if (rm->server_registered_method == nullptr) break;
-    if (!rm->has_host) continue;
-    if (rm->host != host) continue;
-    if (rm->method != path) continue;
-    return rm;
-  }
-  // check for a wildcard method definition (no host set)
-  hash = MixHash32(0, grpc_slice_hash(path));
-  for (size_t i = 0; i <= registered_method_max_probes_; i++) {
-    ChannelRegisteredMethod* rm = &(
-        *old_registered_methods_)[(hash + i) % old_registered_methods_->size()];
-    if (rm->server_registered_method == nullptr) break;
-    if (rm->has_host) continue;
-    if (rm->method != path) continue;
-    return rm;
-  }
-  return nullptr;
-}
-
-Server::ChannelRegisteredMethod* Server::ChannelData::GetRegisteredMethod(
+Server::RegisteredMethod* Server::ChannelData::GetRegisteredMethod(
     const absl::string_view& host, const absl::string_view& path) {
-  if (registered_methods_.empty()) return nullptr;
+  if (server_->registered_methods_.empty()) return nullptr;
   // check for an exact match with host
-  auto it = registered_methods_.find(std::make_pair(host, path));
-  if (it != registered_methods_.end()) {
+  auto it = server_->registered_methods_.find(std::make_pair(host, path));
+  if (it != server_->registered_methods_.end()) {
     return it->second.get();
   }
   // check for wildcard method definition (no host set)
-  it = registered_methods_.find(std::make_pair("", path));
-  if (it != registered_methods_.end()) {
+  it = server_->registered_methods_.find(std::make_pair("", path));
+  if (it != server_->registered_methods_.end()) {
     return it->second.get();
   }
   return nullptr;
 }
 
 void Server::ChannelData::SetRegisteredMethodOnMetadata(
-    void* arg, ServerMetadata* metadata) {
-  auto* chand = static_cast<Server::ChannelData*>(arg);
-  auto* authority = metadata->get_pointer(HttpAuthorityMetadata());
+    ClientMetadata& metadata) {
+  auto* authority = metadata.get_pointer(HttpAuthorityMetadata());
   if (authority == nullptr) {
-    authority = metadata->get_pointer(HostMetadata());
+    authority = metadata.get_pointer(HostMetadata());
     if (authority == nullptr) {
       // Authority not being set is an RPC error.
       return;
     }
   }
-  auto* path = metadata->get_pointer(HttpPathMetadata());
+  auto* path = metadata.get_pointer(HttpPathMetadata());
   if (path == nullptr) {
     // Path not being set would result in an RPC error.
     return;
   }
-  ChannelRegisteredMethod* method;
-  if (!IsRegisteredMethodsMapEnabled()) {
-    method = chand->GetRegisteredMethod(authority->c_slice(), path->c_slice());
-  } else {
-    method = chand->GetRegisteredMethod(authority->as_string_view(),
-                                        path->as_string_view());
-  }
+  RegisteredMethod* method =
+      GetRegisteredMethod(authority->as_string_view(), path->as_string_view());
   // insert in metadata
-  metadata->Set(GrpcRegisteredMethod(), method);
+  metadata.Set(GrpcRegisteredMethod(), method);
 }
 
 void Server::ChannelData::AcceptStream(void* arg, Transport* /*transport*/,
@@ -1475,24 +1394,20 @@ ArenaPromise<ServerMetadataHandle> Server::ChannelData::MakeCallPromise(
   Timestamp deadline = GetContext<CallContext>()->deadline();
   // Find request matcher.
   RequestMatcherInterface* matcher;
-  ChannelRegisteredMethod* rm = nullptr;
+  RegisteredMethod* rm = nullptr;
   if (IsRegisteredMethodLookupInTransportEnabled()) {
-    rm = static_cast<ChannelRegisteredMethod*>(
+    rm = static_cast<RegisteredMethod*>(
         call_args.client_initial_metadata->get(GrpcRegisteredMethod())
             .value_or(nullptr));
   } else {
-    if (!IsRegisteredMethodsMapEnabled()) {
-      rm = chand->GetRegisteredMethod(host_ptr->c_slice(), path->c_slice());
-    } else {
-      rm = chand->GetRegisteredMethod(host_ptr->as_string_view(),
-                                      path->as_string_view());
-    }
+    rm = chand->GetRegisteredMethod(host_ptr->as_string_view(),
+                                    path->as_string_view());
   }
   ArenaPromise<absl::StatusOr<NextResult<MessageHandle>>>
       maybe_read_first_message([] { return NextResult<MessageHandle>(); });
   if (rm != nullptr) {
-    matcher = rm->server_registered_method->matcher.get();
-    switch (rm->server_registered_method->payload_handling) {
+    matcher = rm->matcher.get();
+    switch (rm->payload_handling) {
       case GRPC_SRM_PAYLOAD_NONE:
         break;
       case GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER:
@@ -1746,22 +1661,18 @@ void Server::CallData::StartNewRpc(grpc_call_element* elem) {
   grpc_server_register_method_payload_handling payload_handling =
       GRPC_SRM_PAYLOAD_NONE;
   if (path_.has_value() && host_.has_value()) {
-    ChannelRegisteredMethod* rm;
+    RegisteredMethod* rm;
     if (IsRegisteredMethodLookupInTransportEnabled()) {
-      rm = static_cast<ChannelRegisteredMethod*>(
+      rm = static_cast<RegisteredMethod*>(
           recv_initial_metadata_->get(GrpcRegisteredMethod())
               .value_or(nullptr));
     } else {
-      if (!IsRegisteredMethodsMapEnabled()) {
-        rm = chand->GetRegisteredMethod(host_->c_slice(), path_->c_slice());
-      } else {
-        rm = chand->GetRegisteredMethod(host_->as_string_view(),
-                                        path_->as_string_view());
-      }
+      rm = chand->GetRegisteredMethod(host_->as_string_view(),
+                                      path_->as_string_view());
     }
     if (rm != nullptr) {
-      matcher_ = rm->server_registered_method->matcher.get();
-      payload_handling = rm->server_registered_method->payload_handling;
+      matcher_ = rm->matcher.get();
+      payload_handling = rm->payload_handling;
     }
   }
   // Start recv_message op if needed.
diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h
index f5999bcda30ed..226fb9fc1329a 100644
--- a/src/core/lib/surface/server.h
+++ b/src/core/lib/surface/server.h
@@ -211,26 +211,6 @@ class Server : public InternallyRefCounted<Server>,
  private:
   struct RequestedCall;
 
-  struct ChannelRegisteredMethod {
-    ChannelRegisteredMethod() = default;
-    ChannelRegisteredMethod(RegisteredMethod* server_registered_method_arg,
-                            uint32_t flags_arg, bool has_host_arg,
-                            Slice method_arg, Slice host_arg)
-        : server_registered_method(server_registered_method_arg),
-          flags(flags_arg),
-          has_host(has_host_arg),
-          method(std::move(method_arg)),
-          host(std::move(host_arg)) {}
-
-    ~ChannelRegisteredMethod() = default;
-
-    RegisteredMethod* server_registered_method = nullptr;
-    uint32_t flags;
-    bool has_host;
-    Slice method;
-    Slice host;
-  };
-
   class RequestMatcherInterface;
   class RealRequestMatcherFilterStack;
   class RealRequestMatcherPromises;
@@ -251,11 +231,8 @@ class Server : public InternallyRefCounted<Server>,
     Channel* channel() const { return channel_.get(); }
     size_t cq_idx() const { return cq_idx_; }
 
-    ChannelRegisteredMethod* GetRegisteredMethod(const grpc_slice& host,
-                                                 const grpc_slice& path);
-
-    ChannelRegisteredMethod* GetRegisteredMethod(const absl::string_view& host,
-                                                 const absl::string_view& path);
+    RegisteredMethod* GetRegisteredMethod(const absl::string_view& host,
+                                          const absl::string_view& path);
     // Filter vtable functions.
     static grpc_error_handle InitChannelElement(
         grpc_channel_element* elem, grpc_channel_element_args* args);
@@ -268,43 +245,18 @@ class Server : public InternallyRefCounted<Server>,
 
     static void AcceptStream(void* arg, Transport* /*transport*/,
                              const void* transport_server_data);
-    static void SetRegisteredMethodOnMetadata(void* arg,
-                                              ServerMetadata* metadata);
+    void SetRegisteredMethodOnMetadata(ClientMetadata& metadata);
 
     void Destroy() ABSL_EXCLUSIVE_LOCKS_REQUIRED(server_->mu_global_);
 
     static void FinishDestroy(void* arg, grpc_error_handle error);
 
-    struct StringViewStringViewPairHash
-        : absl::flat_hash_set<
-              std::pair<absl::string_view, absl::string_view>>::hasher {
-      using is_transparent = void;
-    };
-
-    struct StringViewStringViewPairEq
-        : std::equal_to<std::pair<absl::string_view, absl::string_view>> {
-      using is_transparent = void;
-    };
-
     RefCountedPtr<Server> server_;
     RefCountedPtr<Channel> channel_;
     // The index into Server::cqs_ of the CQ used as a starting point for
     // where to publish new incoming calls.
     size_t cq_idx_;
     absl::optional<std::list<ChannelData*>::iterator> list_position_;
-    // A hash-table of the methods and hosts of the registered methods.
-    // TODO(vjpai): Convert this to an STL map type as opposed to a direct
-    // bucket implementation. (Consider performance impact, hash function to
-    // use, etc.)
-    std::unique_ptr<std::vector<ChannelRegisteredMethod>>
-        old_registered_methods_;
-    // Map of registered methods.
-    absl::flat_hash_map<std::pair<std::string, std::string> /*host, method*/,
-                        std::unique_ptr<ChannelRegisteredMethod>,
-                        StringViewStringViewPairHash,
-                        StringViewStringViewPairEq>
-        registered_methods_;
-    uint32_t registered_method_max_probes_;
     grpc_closure finish_destroy_channel_closure_;
     intptr_t channelz_socket_uuid_;
   };
@@ -413,6 +365,17 @@ class Server : public InternallyRefCounted<Server>,
     grpc_cq_completion completion;
   };
 
+  struct StringViewStringViewPairHash
+      : absl::flat_hash_set<
+            std::pair<absl::string_view, absl::string_view>>::hasher {
+    using is_transparent = void;
+  };
+
+  struct StringViewStringViewPairEq
+      : std::equal_to<std::pair<absl::string_view, absl::string_view>> {
+    using is_transparent = void;
+  };
+
   static void ListenerDestroyDone(void* arg, grpc_error_handle error);
 
   static void DoneShutdownEvent(void* server,
@@ -498,7 +461,11 @@ class Server : public InternallyRefCounted<Server>,
   bool starting_ ABSL_GUARDED_BY(mu_global_) = false;
   CondVar starting_cv_;
 
-  std::vector<std::unique_ptr<RegisteredMethod>> registered_methods_;
+  // Map of registered methods.
+  absl::flat_hash_map<std::pair<std::string, std::string> /*host, method*/,
+                      std::unique_ptr<RegisteredMethod>,
+                      StringViewStringViewPairHash, StringViewStringViewPairEq>
+      registered_methods_;
 
   // Request matcher for unregistered methods.
   std::unique_ptr<RequestMatcherInterface> unregistered_request_matcher_;
diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc
index e3000e5d51f45..8e4af533e1625 100644
--- a/src/core/lib/surface/version.cc
+++ b/src/core/lib/surface/version.cc
@@ -23,6 +23,6 @@
 
 #include <grpc/grpc.h>
 
-const char* grpc_version_string(void) { return "36.0.0"; }
+const char* grpc_version_string(void) { return "37.0.0"; }
 
-const char* grpc_g_stands_for(void) { return "gjallarhorn"; }
+const char* grpc_g_stands_for(void) { return "grand"; }
diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc
index 23e8117128db1..546f21ac64ceb 100644
--- a/src/core/lib/transport/bdp_estimator.cc
+++ b/src/core/lib/transport/bdp_estimator.cc
@@ -30,12 +30,12 @@ grpc_core::TraceFlag grpc_bdp_estimator_trace(false, "bdp_estimator");
 namespace grpc_core {
 
 BdpEstimator::BdpEstimator(absl::string_view name)
-    : ping_state_(PingState::UNSCHEDULED),
-      accumulator_(0),
+    : accumulator_(0),
       estimate_(65536),
       ping_start_time_(gpr_time_0(GPR_CLOCK_MONOTONIC)),
       inter_ping_delay_(Duration::Milliseconds(100)),  // start at 100ms
       stable_estimate_count_(0),
+      ping_state_(PingState::UNSCHEDULED),
       bw_est_(0),
       name_(name) {}
 
diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h
index 870f0dc47f3be..619b07f75df15 100644
--- a/src/core/lib/transport/bdp_estimator.h
+++ b/src/core/lib/transport/bdp_estimator.h
@@ -81,13 +81,13 @@ class BdpEstimator {
  private:
   enum class PingState { UNSCHEDULED, SCHEDULED, STARTED };
 
-  PingState ping_state_;
   int64_t accumulator_;
   int64_t estimate_;
   // when was the current ping started?
   gpr_timespec ping_start_time_;
   Duration inter_ping_delay_;
   int stable_estimate_count_;
+  PingState ping_state_;
   double bw_est_;
   absl::string_view name_;
 };
diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h
index 4b5e3d250b0d6..6bb12289d5aed 100644
--- a/src/core/lib/transport/metadata_batch.h
+++ b/src/core/lib/transport/metadata_batch.h
@@ -40,6 +40,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/compression/compression_internal.h"
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/chunked_vector.h"
 #include "src/core/lib/gprpp/if_list.h"
 #include "src/core/lib/gprpp/packed_table.h"
@@ -647,7 +648,10 @@ class ParseHelper {
       absl::string_view key) {
     return ParsedMetadata<Container>(
         typename ParsedMetadata<Container>::FromSlicePair{},
-        Slice::FromCopiedString(key), std::move(value_), transport_size_);
+        Slice::FromCopiedString(key),
+        will_keep_past_request_lifetime_ ? value_.TakeUniquelyOwned()
+                                         : std::move(value_),
+        transport_size_);
   }
 
  private:
diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc
index 660d183a6474d..e9bc70a2e16b2 100644
--- a/src/core/lib/transport/promise_endpoint.cc
+++ b/src/core/lib/transport/promise_endpoint.cc
@@ -46,10 +46,10 @@ PromiseEndpoint::PromiseEndpoint(
 }
 
 PromiseEndpoint::~PromiseEndpoint() {
-  // Last write result has not been polled.
-  GPR_ASSERT(!write_result_.has_value());
-  // Last read result has not been polled.
-  GPR_ASSERT(!read_result_.has_value());
+  // Promise endpoint close when last write result has not been polled.
+  write_result_.reset();
+  // Promise endpoint close when last read result has not been polled.
+  read_result_.reset();
 }
 
 const grpc_event_engine::experimental::EventEngine::ResolvedAddress&
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h
index 3b011fcb4871e..6e0eab972f0cb 100644
--- a/src/core/lib/transport/timeout_encoding.h
+++ b/src/core/lib/transport/timeout_encoding.h
@@ -61,8 +61,8 @@ class Timeout {
   static Timeout FromMinutes(int64_t minutes);
   static Timeout FromHours(int64_t hours);
 
-  uint16_t value_;
-  Unit unit_;
+  uint16_t value_ = 0;
+  Unit unit_ = Unit::kNanoseconds;
 };
 
 absl::optional<Duration> ParseTimeout(const Slice& text);
diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h
index 6f451a9ae4be4..f34692c8ddc0a 100644
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@@ -55,7 +55,10 @@
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/latch.h"
+#include "src/core/lib/promise/party.h"
 #include "src/core/lib/promise/pipe.h"
+#include "src/core/lib/promise/race.h"
+#include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/connectivity_state.h"
@@ -228,6 +231,254 @@ struct CallArgs {
 using NextPromiseFactory =
     std::function<ArenaPromise<ServerMetadataHandle>(CallArgs)>;
 
+// The common middle part of a call - a reference is held by each of
+// CallInitiator and CallHandler - which provide interfaces that are appropriate
+// for each side of a call.
+// The spine will ultimately host the pipes, filters, and context for one part
+// of a call: ie top-half client channel, sub channel call, server call.
+// TODO(ctiller): eventually drop this when we don't need to reference into
+// legacy promise calls anymore
+class CallSpineInterface {
+ public:
+  virtual ~CallSpineInterface() = default;
+  virtual Pipe<ClientMetadataHandle>& client_initial_metadata() = 0;
+  virtual Pipe<ServerMetadataHandle>& server_initial_metadata() = 0;
+  virtual Pipe<MessageHandle>& client_to_server_messages() = 0;
+  virtual Pipe<MessageHandle>& server_to_client_messages() = 0;
+  virtual Pipe<ServerMetadataHandle>& server_trailing_metadata() = 0;
+  virtual Latch<ServerMetadataHandle>& cancel_latch() = 0;
+  virtual Party& party() = 0;
+  virtual void IncrementRefCount() = 0;
+  virtual void Unref() = 0;
+
+  // Cancel the call with the given metadata.
+  // Regarding the `MUST_USE_RESULT absl::nullopt_t`:
+  // Most cancellation calls right now happen in pipe interceptors;
+  // there `nullopt` indicates terminate processing of this pipe and close with
+  // error.
+  // It's convenient then to have the Cancel operation (setting the latch to
+  // terminate the call) be the last thing that occurs in a pipe interceptor,
+  // and this construction supports that (and has helped the author not write
+  // some bugs).
+  GRPC_MUST_USE_RESULT absl::nullopt_t Cancel(ServerMetadataHandle metadata) {
+    GPR_DEBUG_ASSERT(Activity::current() == &party());
+    auto& c = cancel_latch();
+    if (c.is_set()) return absl::nullopt;
+    c.Set(std::move(metadata));
+    return absl::nullopt;
+  }
+
+  auto WaitForCancel() {
+    GPR_DEBUG_ASSERT(Activity::current() == &party());
+    return cancel_latch().Wait();
+  }
+
+  // Wrap a promise so that if it returns failure it automatically cancels
+  // the rest of the call.
+  // The resulting (returned) promise will resolve to Empty.
+  template <typename Promise>
+  auto CancelIfFails(Promise promise) {
+    GPR_DEBUG_ASSERT(Activity::current() == &party());
+    using P = promise_detail::PromiseLike<Promise>;
+    using ResultType = typename P::Result;
+    return Map(std::move(promise), [this](ResultType r) {
+      if (!IsStatusOk(r)) {
+        std::ignore = Cancel(StatusCast<ServerMetadataHandle>(std::move(r)));
+      }
+      return Empty{};
+    });
+  }
+
+  // Spawn a promise that returns Empty{} and save some boilerplate handling
+  // that detail.
+  template <typename PromiseFactory>
+  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
+    party().Spawn(name, std::move(promise_factory), [](Empty) {});
+  }
+
+  // Spawn a promise that returns some status-like type; if the status
+  // represents failure automatically cancel the rest of the call.
+  template <typename PromiseFactory>
+  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
+    using FactoryType =
+        promise_detail::OncePromiseFactory<void, PromiseFactory>;
+    using PromiseType = typename FactoryType::Promise;
+    using ResultType = typename PromiseType::Result;
+    static_assert(
+        std::is_same<bool,
+                     decltype(IsStatusOk(std::declval<ResultType>()))>::value,
+        "SpawnGuarded promise must return a status-like object");
+    party().Spawn(name, std::move(promise_factory), [this](ResultType r) {
+      if (!IsStatusOk(r)) {
+        std::ignore = Cancel(StatusCast<ServerMetadataHandle>(std::move(r)));
+      }
+    });
+  }
+};
+
+class CallSpine final : public CallSpineInterface {
+ public:
+  Pipe<ClientMetadataHandle>& client_initial_metadata() override {
+    return client_initial_metadata_;
+  }
+  Pipe<ServerMetadataHandle>& server_initial_metadata() override {
+    return server_initial_metadata_;
+  }
+  Pipe<MessageHandle>& client_to_server_messages() override {
+    return client_to_server_messages_;
+  }
+  Pipe<MessageHandle>& server_to_client_messages() override {
+    return server_to_client_messages_;
+  }
+  Pipe<ServerMetadataHandle>& server_trailing_metadata() override {
+    return server_trailing_metadata_;
+  }
+  Latch<ServerMetadataHandle>& cancel_latch() override { return cancel_latch_; }
+  Party& party() override { Crash("unimplemented"); }
+  void IncrementRefCount() override { Crash("unimplemented"); }
+  void Unref() override { Crash("unimplemented"); }
+
+ private:
+  // Initial metadata from client to server
+  Pipe<ClientMetadataHandle> client_initial_metadata_;
+  // Initial metadata from server to client
+  Pipe<ServerMetadataHandle> server_initial_metadata_;
+  // Messages travelling from the application to the transport.
+  Pipe<MessageHandle> client_to_server_messages_;
+  // Messages travelling from the transport to the application.
+  Pipe<MessageHandle> server_to_client_messages_;
+  // Trailing metadata from server to client
+  Pipe<ServerMetadataHandle> server_trailing_metadata_;
+  // Latch that can be set to terminate the call
+  Latch<ServerMetadataHandle> cancel_latch_;
+};
+
+class CallInitiator {
+ public:
+  explicit CallInitiator(RefCountedPtr<CallSpine> spine)
+      : spine_(std::move(spine)) {}
+
+  auto PushClientInitialMetadata(ClientMetadataHandle md) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Map(spine_->client_initial_metadata().sender.Push(std::move(md)),
+               [](bool ok) { return StatusFlag(ok); });
+  }
+
+  auto PullServerInitialMetadata() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Map(spine_->server_initial_metadata().receiver.Next(),
+               [](NextResult<ClientMetadataHandle> md)
+                   -> ValueOrFailure<ClientMetadataHandle> {
+                 if (!md.has_value()) return Failure{};
+                 return std::move(*md);
+               });
+  }
+
+  auto PullServerTrailingMetadata() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Race(spine_->WaitForCancel(),
+                Map(spine_->server_trailing_metadata().receiver.Next(),
+                    [spine = spine_](NextResult<ServerMetadataHandle> md)
+                        -> ServerMetadataHandle {
+                      GPR_ASSERT(md.has_value());
+                      return std::move(*md);
+                    }));
+  }
+
+  auto PullMessage() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return spine_->server_to_client_messages().receiver.Next();
+  }
+
+  auto PushMessage(MessageHandle message) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return spine_->client_to_server_messages().sender.Push(std::move(message));
+  }
+
+  template <typename Promise>
+  auto CancelIfFails(Promise promise) {
+    return spine_->CancelIfFails(std::move(promise));
+  }
+
+  template <typename PromiseFactory>
+  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
+    spine_->SpawnGuarded(name, std::move(promise_factory));
+  }
+
+  template <typename PromiseFactory>
+  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
+    spine_->SpawnInfallible(name, std::move(promise_factory));
+  }
+
+ private:
+  const RefCountedPtr<CallSpine> spine_;
+};
+
+class CallHandler {
+ public:
+  explicit CallHandler(RefCountedPtr<CallSpine> spine)
+      : spine_(std::move(spine)) {}
+
+  auto PullClientInitialMetadata() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Map(spine_->client_initial_metadata().receiver.Next(),
+               [](NextResult<ClientMetadataHandle> md)
+                   -> ValueOrFailure<ClientMetadataHandle> {
+                 if (!md.has_value()) return Failure{};
+                 return std::move(*md);
+               });
+  }
+
+  auto PushServerInitialMetadata(ClientMetadataHandle md) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Map(spine_->server_initial_metadata().sender.Push(std::move(md)),
+               [](bool ok) { return StatusFlag(ok); });
+  }
+
+  auto PushServerTrailingMetadata(ClientMetadataHandle md) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return Map(spine_->server_initial_metadata().sender.Push(std::move(md)),
+               [](bool ok) { return StatusFlag(ok); });
+  }
+
+  auto PullMessage() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return spine_->client_to_server_messages().receiver.Next();
+  }
+
+  auto PushMessage(MessageHandle message) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    return spine_->server_to_client_messages().sender.Push(std::move(message));
+  }
+
+  template <typename Promise>
+  auto CancelIfFails(Promise promise) {
+    return spine_->CancelIfFails(std::move(promise));
+  }
+
+  template <typename PromiseFactory>
+  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
+    spine_->SpawnGuarded(name, std::move(promise_factory));
+  }
+
+  template <typename PromiseFactory>
+  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
+    spine_->SpawnInfallible(name, std::move(promise_factory));
+  }
+
+ private:
+  const RefCountedPtr<CallSpine> spine_;
+};
+
+template <typename CallHalf>
+auto OutgoingMessages(CallHalf& h) {
+  struct Wrapper {
+    CallHalf& h;
+    auto Next() { return h.PullMessage(); }
+  };
+  return Wrapper{h};
+}
+
 }  // namespace grpc_core
 
 // forward declarations
@@ -633,9 +884,7 @@ class FilterStackTransport {
 
 class ClientTransport {
  public:
-  // Create a promise to execute one client call.
-  virtual ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args) = 0;
+  virtual void StartCall(CallHandler call_handler) = 0;
 
  protected:
   ~ClientTransport() = default;
@@ -643,10 +892,14 @@ class ClientTransport {
 
 class ServerTransport {
  public:
-  // Register the factory function for the filter stack part of a call
-  // promise.
-  void SetCallPromiseFactory(
-      absl::AnyInvocable<ArenaPromise<ServerMetadataHandle>(CallArgs) const>);
+  // AcceptFunction takes initial metadata for a new call and returns a
+  // CallInitiator object for it, for the transport to use to communicate with
+  // the CallHandler object passed to the application.
+  using AcceptFunction =
+      absl::AnyInvocable<absl::StatusOr<CallInitiator>(ClientMetadata&) const>;
+
+  // Called once slightly after transport setup to register the accept function.
+  virtual void SetAcceptFunction(AcceptFunction accept_function) = 0;
 
  protected:
   ~ServerTransport() = default;
diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc
index 8c491d5674702..77fc1f3834275 100644
--- a/src/core/tsi/ssl_transport_security.cc
+++ b/src/core/tsi/ssl_transport_security.cc
@@ -1752,7 +1752,10 @@ static tsi_result create_tsi_ssl_handshaker(SSL_CTX* ctx, int is_client,
   if (is_client) {
     int ssl_result;
     SSL_set_connect_state(ssl);
-    if (server_name_indication != nullptr) {
+    // Skip if the SNI looks like an IP address because IP addressed are not
+    // allowed as host names.
+    if (server_name_indication != nullptr &&
+        !looks_like_ip_address(server_name_indication)) {
       if (!SSL_set_tlsext_host_name(ssl, server_name_indication)) {
         gpr_log(GPR_ERROR, "Invalid server name indication %s.",
                 server_name_indication);
@@ -2061,7 +2064,8 @@ tsi_result tsi_create_ssl_client_handshaker_factory_with_options(
 
   if (factory == nullptr) return TSI_INVALID_ARGUMENT;
   *factory = nullptr;
-  if (options->pem_root_certs == nullptr && options->root_store == nullptr) {
+  if (options->pem_root_certs == nullptr && options->root_store == nullptr &&
+      !options->skip_server_certificate_verification) {
     return TSI_INVALID_ARGUMENT;
   }
 
@@ -2123,7 +2127,9 @@ tsi_result tsi_create_ssl_client_handshaker_factory_with_options(
       SSL_CTX_set_cert_store(ssl_context, options->root_store->store);
     }
 #endif
-    if (OPENSSL_VERSION_NUMBER < 0x10100000 || options->root_store == nullptr) {
+    if (OPENSSL_VERSION_NUMBER < 0x10100000 ||
+        (options->root_store == nullptr &&
+         options->pem_root_certs != nullptr)) {
       result = ssl_ctx_load_verification_certs(
           ssl_context, options->pem_root_certs, strlen(options->pem_root_certs),
           nullptr);
diff --git a/src/cpp/ext/csm/BUILD b/src/cpp/ext/csm/BUILD
index e6ec8d0fd4b77..30b83b8e4560b 100644
--- a/src/cpp/ext/csm/BUILD
+++ b/src/cpp/ext/csm/BUILD
@@ -48,7 +48,9 @@ grpc_cc_library(
         "google_cloud_cpp:opentelemetry",
         "otel/sdk/src/metrics",
         "otel/sdk:headers",
+        "upb_base_lib",
         "upb_lib",
+        "upb_mem_lib",
     ],
     language = "c++",
     visibility = ["//:__subpackages__"],
diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc
index 9ec5d24031f6e..fd198898d2f8a 100644
--- a/src/cpp/server/secure_server_credentials.cc
+++ b/src/cpp/server/secure_server_credentials.cc
@@ -36,15 +36,15 @@
 
 namespace grpc {
 
-void AuthMetadataProcessorAyncWrapper::Destroy(void* wrapper) {
-  auto* w = static_cast<AuthMetadataProcessorAyncWrapper*>(wrapper);
+void AuthMetadataProcessorAsyncWrapper::Destroy(void* wrapper) {
+  auto* w = static_cast<AuthMetadataProcessorAsyncWrapper*>(wrapper);
   delete w;
 }
 
-void AuthMetadataProcessorAyncWrapper::Process(
+void AuthMetadataProcessorAsyncWrapper::Process(
     void* wrapper, grpc_auth_context* context, const grpc_metadata* md,
     size_t num_md, grpc_process_auth_metadata_done_cb cb, void* user_data) {
-  auto* w = static_cast<AuthMetadataProcessorAyncWrapper*>(wrapper);
+  auto* w = static_cast<AuthMetadataProcessorAsyncWrapper*>(wrapper);
   if (!w->processor_) {
     // Early exit.
     cb(user_data, nullptr, 0, nullptr, 0, GRPC_STATUS_OK, nullptr);
@@ -52,8 +52,8 @@ void AuthMetadataProcessorAyncWrapper::Process(
   }
   if (w->processor_->IsBlocking()) {
     w->thread_pool_->Add([w, context, md, num_md, cb, user_data] {
-      w->AuthMetadataProcessorAyncWrapper::InvokeProcessor(context, md, num_md,
-                                                           cb, user_data);
+      w->AuthMetadataProcessorAsyncWrapper::InvokeProcessor(context, md, num_md,
+                                                            cb, user_data);
     });
   } else {
     // invoke directly.
@@ -61,7 +61,7 @@ void AuthMetadataProcessorAyncWrapper::Process(
   }
 }
 
-void AuthMetadataProcessorAyncWrapper::InvokeProcessor(
+void AuthMetadataProcessorAsyncWrapper::InvokeProcessor(
     grpc_auth_context* context, const grpc_metadata* md, size_t num_md,
     grpc_process_auth_metadata_done_cb cb, void* user_data) {
   AuthMetadataProcessor::InputMetadata metadata;
@@ -104,10 +104,10 @@ int SecureServerCredentials::AddPortToServer(const std::string& addr,
 
 void SecureServerCredentials::SetAuthMetadataProcessor(
     const std::shared_ptr<grpc::AuthMetadataProcessor>& processor) {
-  auto* wrapper = new grpc::AuthMetadataProcessorAyncWrapper(processor);
+  auto* wrapper = new grpc::AuthMetadataProcessorAsyncWrapper(processor);
   grpc_server_credentials_set_auth_metadata_processor(
-      creds_, {grpc::AuthMetadataProcessorAyncWrapper::Process,
-               grpc::AuthMetadataProcessorAyncWrapper::Destroy, wrapper});
+      creds_, {grpc::AuthMetadataProcessorAsyncWrapper::Process,
+               grpc::AuthMetadataProcessorAsyncWrapper::Destroy, wrapper});
 }
 
 std::shared_ptr<ServerCredentials> SslServerCredentials(
diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
index ca90a25f4f245..a62e51f2c24e3 100644
--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@@ -35,7 +35,7 @@ namespace grpc {
 
 class SecureServerCredentials;
 
-class AuthMetadataProcessorAyncWrapper final {
+class AuthMetadataProcessorAsyncWrapper final {
  public:
   static void Destroy(void* wrapper);
 
@@ -43,7 +43,7 @@ class AuthMetadataProcessorAyncWrapper final {
                       const grpc_metadata* md, size_t num_md,
                       grpc_process_auth_metadata_done_cb cb, void* user_data);
 
-  explicit AuthMetadataProcessorAyncWrapper(
+  explicit AuthMetadataProcessorAsyncWrapper(
       const std::shared_ptr<AuthMetadataProcessor>& processor)
       : processor_(processor) {
     if (processor && processor->IsBlocking()) {
@@ -78,7 +78,7 @@ class SecureServerCredentials final : public ServerCredentials {
   SecureServerCredentials* AsSecureServerCredentials() override { return this; }
 
   grpc_server_credentials* creds_;
-  std::unique_ptr<grpc::AuthMetadataProcessorAyncWrapper> processor_;
+  std::unique_ptr<grpc::AuthMetadataProcessorAsyncWrapper> processor_;
 };
 
 }  // namespace grpc
diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
index f02db4c2ab892..11a1cfa9faf2c 100644
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.60.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.24.3</GoogleProtobufVersion>
+    <GrpcCsharpVersion>2.61.0-dev</GrpcCsharpVersion>
+    <GoogleProtobufVersion>3.25.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
index 842a761bc8248..2a0a4515b76f6 100644
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.60.0-dev'
+  v = '1.61.0-dev'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC
@@ -100,7 +100,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = plugin
 
   # Restrict the protoc version to the one supported by this plugin.
-  s.dependency '!ProtoCompiler', '3.24.3'
+  s.dependency '!ProtoCompiler', '3.25.0'
 
   s.ios.deployment_target = '10.0'
   s.osx.deployment_target = '10.12'
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
index 3e650a7b2d9dd..684d14ea056f9 100644
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.60.0-dev'
+  v = '1.61.0-dev'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC
@@ -102,7 +102,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = plugin
 
   # Restrict the protoc version to the one supported by this plugin.
-  s.dependency '!ProtoCompiler', '3.24.3'
+  s.dependency '!ProtoCompiler', '3.25.0'
 
   s.ios.deployment_target = '10.0'
   s.osx.deployment_target = '10.12'
diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec
index 3644ca6580e7a..e931b00f0dbab 100644
--- a/src/objective-c/!ProtoCompiler.podspec
+++ b/src/objective-c/!ProtoCompiler.podspec
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler'
-  v = '3.24.3'
+  v = '3.25.0'
   s.version  = v
   s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
   s.description = <<-DESC
diff --git a/src/objective-c/GRPCClient/version.h b/src/objective-c/GRPCClient/version.h
index 82f8c5ae08a04..0d9beef527e19 100644
--- a/src/objective-c/GRPCClient/version.h
+++ b/src/objective-c/GRPCClient/version.h
@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.60.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.61.0-dev"
diff --git a/src/objective-c/PrivacyInfo.xcprivacy b/src/objective-c/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000000000..276f7610da6df
--- /dev/null
+++ b/src/objective-c/PrivacyInfo.xcprivacy
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/src/objective-c/RxLibrary/GRXConcurrentWriteable.m b/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
index 115195463de35..9686c7567a777 100644
--- a/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
+++ b/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
@@ -18,7 +18,7 @@
 
 #import "GRXConcurrentWriteable.h"
 
-#import <RxLibrary/GRXWriteable.h>
+#import "GRXWriteable.h"
 
 @interface GRXConcurrentWriteable ()
 // This is atomic so that cancellation can nillify it from any thread.
diff --git a/src/objective-c/RxLibrary/GRXMappingWriter.h b/src/objective-c/RxLibrary/GRXMappingWriter.h
index a344f9662285d..90a6e29ef21df 100644
--- a/src/objective-c/RxLibrary/GRXMappingWriter.h
+++ b/src/objective-c/RxLibrary/GRXMappingWriter.h
@@ -16,7 +16,7 @@
  *
  */
 
-#import "RxLibrary/GRXForwardingWriter.h"
+#import "GRXForwardingWriter.h"
 
 /** A "proxy" writer that transforms all the values of its input writer by using a mapping function.
  */
diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h
index 796b5cee691e8..f9576295fb4ac 100644
--- a/src/objective-c/tests/version.h
+++ b/src/objective-c/tests/version.h
@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.60.0-dev"
-#define GRPC_C_VERSION_STRING @"36.0.0"
+#define GRPC_OBJC_VERSION_STRING @"1.61.0-dev"
+#define GRPC_C_VERSION_STRING @"37.0.0"
diff --git a/src/php/composer.json b/src/php/composer.json
index 774bacbd8222f..3759c51b3cdb2 100644
--- a/src/php/composer.json
+++ b/src/php/composer.json
@@ -2,7 +2,7 @@
   "name": "grpc/grpc-dev",
   "description": "gRPC library for PHP - for Development use only",
   "license": "Apache-2.0",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "require": {
     "php": ">=7.0.0",
     "google/protobuf": "^v3.3.0"
diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h
index a5f408a4fddaa..c153307a14ce1 100644
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.60.0dev"
+#define PHP_GRPC_VERSION "1.61.0dev"
 
 #endif /* VERSION_H */
diff --git a/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php b/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php
index 0e2bbc8748d9b..4f0c5fee06643 100644
Binary files a/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php and b/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php differ
diff --git a/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Test.php b/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Test.php
index 00b82e5f66477..c06cf6712d098 100644
Binary files a/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Test.php and b/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Test.php differ
diff --git a/src/php/tests/interop/Grpc/Testing/HookRequest.php b/src/php/tests/interop/Grpc/Testing/HookRequest.php
new file mode 100644
index 0000000000000..defe0fdef4262
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/HookRequest.php
@@ -0,0 +1,146 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: src/proto/grpc/testing/messages.proto
+
+namespace Grpc\Testing;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>grpc.testing.HookRequest</code>
+ */
+class HookRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>.grpc.testing.HookRequest.HookRequestCommand command = 1;</code>
+     */
+    protected $command = 0;
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 2;</code>
+     */
+    protected $grpc_code_to_return = 0;
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 3;</code>
+     */
+    protected $grpc_status_description = '';
+    /**
+     * Server port to listen to
+     *
+     * Generated from protobuf field <code>int32 server_port = 4;</code>
+     */
+    protected $server_port = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $command
+     *     @type int $grpc_code_to_return
+     *     @type string $grpc_status_description
+     *     @type int $server_port
+     *           Server port to listen to
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Src\Proto\Grpc\Testing\Messages::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>.grpc.testing.HookRequest.HookRequestCommand command = 1;</code>
+     * @return int
+     */
+    public function getCommand()
+    {
+        return $this->command;
+    }
+
+    /**
+     * Generated from protobuf field <code>.grpc.testing.HookRequest.HookRequestCommand command = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setCommand($var)
+    {
+        GPBUtil::checkEnum($var, \Grpc\Testing\HookRequest\HookRequestCommand::class);
+        $this->command = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 2;</code>
+     * @return int
+     */
+    public function getGrpcCodeToReturn()
+    {
+        return $this->grpc_code_to_return;
+    }
+
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setGrpcCodeToReturn($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->grpc_code_to_return = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 3;</code>
+     * @return string
+     */
+    public function getGrpcStatusDescription()
+    {
+        return $this->grpc_status_description;
+    }
+
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setGrpcStatusDescription($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->grpc_status_description = $var;
+
+        return $this;
+    }
+
+    /**
+     * Server port to listen to
+     *
+     * Generated from protobuf field <code>int32 server_port = 4;</code>
+     * @return int
+     */
+    public function getServerPort()
+    {
+        return $this->server_port;
+    }
+
+    /**
+     * Server port to listen to
+     *
+     * Generated from protobuf field <code>int32 server_port = 4;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setServerPort($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->server_port = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/src/php/tests/interop/Grpc/Testing/HookRequest/HookRequestCommand.php b/src/php/tests/interop/Grpc/Testing/HookRequest/HookRequestCommand.php
new file mode 100644
index 0000000000000..060ea5af696c6
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/HookRequest/HookRequestCommand.php
@@ -0,0 +1,73 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: src/proto/grpc/testing/messages.proto
+
+namespace Grpc\Testing\HookRequest;
+
+use UnexpectedValueException;
+
+/**
+ * Protobuf type <code>grpc.testing.HookRequest.HookRequestCommand</code>
+ */
+class HookRequestCommand
+{
+    /**
+     * Default value
+     *
+     * Generated from protobuf enum <code>UNSPECIFIED = 0;</code>
+     */
+    const UNSPECIFIED = 0;
+    /**
+     * Start the HTTP endpoint
+     *
+     * Generated from protobuf enum <code>START = 1;</code>
+     */
+    const START = 1;
+    /**
+     * Stop
+     *
+     * Generated from protobuf enum <code>STOP = 2;</code>
+     */
+    const STOP = 2;
+    /**
+     * Return from HTTP GET/POST
+     *
+     * Generated from protobuf enum <code>RETURN = 3;</code>
+     */
+    const PBRETURN = 3;
+
+    private static $valueToName = [
+        self::UNSPECIFIED => 'UNSPECIFIED',
+        self::START => 'START',
+        self::STOP => 'STOP',
+        self::PBRETURN => 'RETURN',
+    ];
+
+    public static function name($value)
+    {
+        if (!isset(self::$valueToName[$value])) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no name defined for value %s', __CLASS__, $value));
+        }
+        return self::$valueToName[$value];
+    }
+
+
+    public static function value($name)
+    {
+        $const = __CLASS__ . '::' . strtoupper($name);
+        if (!defined($const)) {
+            $pbconst =  __CLASS__. '::PB' . strtoupper($name);
+            if (!defined($pbconst)) {
+                throw new UnexpectedValueException(sprintf(
+                        'Enum %s has no value defined for name %s', __CLASS__, $name));
+            }
+            return constant($pbconst);
+        }
+        return constant($const);
+    }
+}
+
+// Adding a class alias for backwards compatibility with the previous class name.
+class_alias(HookRequestCommand::class, \Grpc\Testing\HookRequest_HookRequestCommand::class);
+
diff --git a/src/php/tests/interop/Grpc/Testing/HookResponse.php b/src/php/tests/interop/Grpc/Testing/HookResponse.php
new file mode 100644
index 0000000000000..aa85ac49a3869
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/HookResponse.php
@@ -0,0 +1,31 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: src/proto/grpc/testing/messages.proto
+
+namespace Grpc\Testing;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>grpc.testing.HookResponse</code>
+ */
+class HookResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Src\Proto\Grpc\Testing\Messages::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/src/php/tests/interop/Grpc/Testing/HookServiceClient.php b/src/php/tests/interop/Grpc/Testing/HookServiceClient.php
new file mode 100644
index 0000000000000..19d22db9572d6
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/HookServiceClient.php
@@ -0,0 +1,84 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+// Original file comments:
+// Copyright 2015-2016 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.
+//
+// An integration test service that covers all the method signature permutations
+// of unary/streaming requests/responses.
+//
+namespace Grpc\Testing;
+
+/**
+ * Hook service. Used to keep Kubernetes from shutting the pod down.
+ */
+class HookServiceClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Sends a request that will "hang" until the return status is set by a call
+     * to a SetReturnStatus
+     * @param \Grpc\Testing\EmptyMessage $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Hook(\Grpc\Testing\EmptyMessage $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/grpc.testing.HookService/Hook',
+        $argument,
+        ['\Grpc\Testing\EmptyMessage', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Sets a return status for pending and upcoming calls to Hook
+     * @param \Grpc\Testing\SetReturnStatusRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function SetReturnStatus(\Grpc\Testing\SetReturnStatusRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/grpc.testing.HookService/SetReturnStatus',
+        $argument,
+        ['\Grpc\Testing\EmptyMessage', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Clears the return status. Incoming calls to Hook will "hang"
+     * @param \Grpc\Testing\EmptyMessage $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function ClearReturnStatus(\Grpc\Testing\EmptyMessage $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/grpc.testing.HookService/ClearReturnStatus',
+        $argument,
+        ['\Grpc\Testing\EmptyMessage', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/src/php/tests/interop/Grpc/Testing/HookServiceStub.php b/src/php/tests/interop/Grpc/Testing/HookServiceStub.php
new file mode 100644
index 0000000000000..b9590d34b5710
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/HookServiceStub.php
@@ -0,0 +1,104 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+// Original file comments:
+// Copyright 2015-2016 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.
+//
+// An integration test service that covers all the method signature permutations
+// of unary/streaming requests/responses.
+//
+namespace Grpc\Testing;
+
+/**
+ * Hook service. Used to keep Kubernetes from shutting the pod down.
+ */
+class HookServiceStub {
+
+    /**
+     * Sends a request that will "hang" until the return status is set by a call
+     * to a SetReturnStatus
+     * @param \Grpc\Testing\EmptyMessage $request client request
+     * @param \Grpc\ServerContext $context server request context
+     * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured
+     *     initial metadata (if any) and status (if not ok) should be set to $context
+     */
+    public function Hook(
+        \Grpc\Testing\EmptyMessage $request,
+        \Grpc\ServerContext $context
+    ): ?\Grpc\Testing\EmptyMessage {
+        $context->setStatus(\Grpc\Status::unimplemented());
+        return null;
+    }
+
+    /**
+     * Sets a return status for pending and upcoming calls to Hook
+     * @param \Grpc\Testing\SetReturnStatusRequest $request client request
+     * @param \Grpc\ServerContext $context server request context
+     * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured
+     *     initial metadata (if any) and status (if not ok) should be set to $context
+     */
+    public function SetReturnStatus(
+        \Grpc\Testing\SetReturnStatusRequest $request,
+        \Grpc\ServerContext $context
+    ): ?\Grpc\Testing\EmptyMessage {
+        $context->setStatus(\Grpc\Status::unimplemented());
+        return null;
+    }
+
+    /**
+     * Clears the return status. Incoming calls to Hook will "hang"
+     * @param \Grpc\Testing\EmptyMessage $request client request
+     * @param \Grpc\ServerContext $context server request context
+     * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured
+     *     initial metadata (if any) and status (if not ok) should be set to $context
+     */
+    public function ClearReturnStatus(
+        \Grpc\Testing\EmptyMessage $request,
+        \Grpc\ServerContext $context
+    ): ?\Grpc\Testing\EmptyMessage {
+        $context->setStatus(\Grpc\Status::unimplemented());
+        return null;
+    }
+
+    /**
+     * Get the method descriptors of the service for server registration
+     *
+     * @return array of \Grpc\MethodDescriptor for the service methods
+     */
+    public final function getMethodDescriptors(): array
+    {
+        return [
+            '/grpc.testing.HookService/Hook' => new \Grpc\MethodDescriptor(
+                $this,
+                'Hook',
+                '\Grpc\Testing\EmptyMessage',
+                \Grpc\MethodDescriptor::UNARY_CALL
+            ),
+            '/grpc.testing.HookService/SetReturnStatus' => new \Grpc\MethodDescriptor(
+                $this,
+                'SetReturnStatus',
+                '\Grpc\Testing\SetReturnStatusRequest',
+                \Grpc\MethodDescriptor::UNARY_CALL
+            ),
+            '/grpc.testing.HookService/ClearReturnStatus' => new \Grpc\MethodDescriptor(
+                $this,
+                'ClearReturnStatus',
+                '\Grpc\Testing\EmptyMessage',
+                \Grpc\MethodDescriptor::UNARY_CALL
+            ),
+        ];
+    }
+
+}
diff --git a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsRequest.php b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsRequest.php
index 182f213ee5d4f..74483da65d97e 100644
--- a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsRequest.php
+++ b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsRequest.php
@@ -26,7 +26,9 @@ class LoadBalancerStatsRequest extends \Google\Protobuf\Internal\Message
      */
     protected $timeout_sec = 0;
     /**
-     * response header+trailer we want the values of
+     * Response header + trailer metadata entries we want the values of.
+     * Matching of the keys is case-insensitive as per rfc7540#section-8.1.2
+     * * (asterisk) is a special value that will return all metadata entries
      *
      * Generated from protobuf field <code>repeated string metadata_keys = 3;</code>
      */
@@ -43,7 +45,9 @@ class LoadBalancerStatsRequest extends \Google\Protobuf\Internal\Message
      *     @type int $timeout_sec
      *           If num_rpcs have not completed within timeout_sec, return partial results.
      *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $metadata_keys
-     *           response header+trailer we want the values of
+     *           Response header + trailer metadata entries we want the values of.
+     *           Matching of the keys is case-insensitive as per rfc7540#section-8.1.2
+     *           * (asterisk) is a special value that will return all metadata entries
      * }
      */
     public function __construct($data = NULL) {
@@ -104,7 +108,9 @@ public function setTimeoutSec($var)
     }
 
     /**
-     * response header+trailer we want the values of
+     * Response header + trailer metadata entries we want the values of.
+     * Matching of the keys is case-insensitive as per rfc7540#section-8.1.2
+     * * (asterisk) is a special value that will return all metadata entries
      *
      * Generated from protobuf field <code>repeated string metadata_keys = 3;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
@@ -115,7 +121,9 @@ public function getMetadataKeys()
     }
 
     /**
-     * response header+trailer we want the values of
+     * Response header + trailer metadata entries we want the values of.
+     * Matching of the keys is case-insensitive as per rfc7540#section-8.1.2
+     * * (asterisk) is a special value that will return all metadata entries
      *
      * Generated from protobuf field <code>repeated string metadata_keys = 3;</code>
      * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
diff --git a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataEntry.php b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataEntry.php
index c984ddcebbe85..6219bd9b79988 100644
--- a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataEntry.php
+++ b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataEntry.php
@@ -14,13 +14,24 @@
 class MetadataEntry extends \Google\Protobuf\Internal\Message
 {
     /**
+     * Key, exactly as received from the server. Case may be different from what
+     * was requested in the LoadBalancerStatsRequest)
+     *
      * Generated from protobuf field <code>string key = 1;</code>
      */
     protected $key = '';
     /**
+     * Value, exactly as received from the server.
+     *
      * Generated from protobuf field <code>string value = 2;</code>
      */
     protected $value = '';
+    /**
+     * Metadata type
+     *
+     * Generated from protobuf field <code>.grpc.testing.LoadBalancerStatsResponse.MetadataType type = 3;</code>
+     */
+    protected $type = 0;
 
     /**
      * Constructor.
@@ -29,7 +40,12 @@ class MetadataEntry extends \Google\Protobuf\Internal\Message
      *     Optional. Data for populating the Message object.
      *
      *     @type string $key
+     *           Key, exactly as received from the server. Case may be different from what
+     *           was requested in the LoadBalancerStatsRequest)
      *     @type string $value
+     *           Value, exactly as received from the server.
+     *     @type int $type
+     *           Metadata type
      * }
      */
     public function __construct($data = NULL) {
@@ -38,6 +54,9 @@ public function __construct($data = NULL) {
     }
 
     /**
+     * Key, exactly as received from the server. Case may be different from what
+     * was requested in the LoadBalancerStatsRequest)
+     *
      * Generated from protobuf field <code>string key = 1;</code>
      * @return string
      */
@@ -47,6 +66,9 @@ public function getKey()
     }
 
     /**
+     * Key, exactly as received from the server. Case may be different from what
+     * was requested in the LoadBalancerStatsRequest)
+     *
      * Generated from protobuf field <code>string key = 1;</code>
      * @param string $var
      * @return $this
@@ -60,6 +82,8 @@ public function setKey($var)
     }
 
     /**
+     * Value, exactly as received from the server.
+     *
      * Generated from protobuf field <code>string value = 2;</code>
      * @return string
      */
@@ -69,6 +93,8 @@ public function getValue()
     }
 
     /**
+     * Value, exactly as received from the server.
+     *
      * Generated from protobuf field <code>string value = 2;</code>
      * @param string $var
      * @return $this
@@ -81,6 +107,32 @@ public function setValue($var)
         return $this;
     }
 
+    /**
+     * Metadata type
+     *
+     * Generated from protobuf field <code>.grpc.testing.LoadBalancerStatsResponse.MetadataType type = 3;</code>
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Metadata type
+     *
+     * Generated from protobuf field <code>.grpc.testing.LoadBalancerStatsResponse.MetadataType type = 3;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setType($var)
+    {
+        GPBUtil::checkEnum($var, \Grpc\Testing\LoadBalancerStatsResponse\MetadataType::class);
+        $this->type = $var;
+
+        return $this;
+    }
+
 }
 
 // Adding a class alias for backwards compatibility with the previous class name.
diff --git a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataType.php b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataType.php
new file mode 100644
index 0000000000000..54aed92fdb082
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/MetadataType.php
@@ -0,0 +1,56 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: src/proto/grpc/testing/messages.proto
+
+namespace Grpc\Testing\LoadBalancerStatsResponse;
+
+use UnexpectedValueException;
+
+/**
+ * Protobuf type <code>grpc.testing.LoadBalancerStatsResponse.MetadataType</code>
+ */
+class MetadataType
+{
+    /**
+     * Generated from protobuf enum <code>UNKNOWN = 0;</code>
+     */
+    const UNKNOWN = 0;
+    /**
+     * Generated from protobuf enum <code>INITIAL = 1;</code>
+     */
+    const INITIAL = 1;
+    /**
+     * Generated from protobuf enum <code>TRAILING = 2;</code>
+     */
+    const TRAILING = 2;
+
+    private static $valueToName = [
+        self::UNKNOWN => 'UNKNOWN',
+        self::INITIAL => 'INITIAL',
+        self::TRAILING => 'TRAILING',
+    ];
+
+    public static function name($value)
+    {
+        if (!isset(self::$valueToName[$value])) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no name defined for value %s', __CLASS__, $value));
+        }
+        return self::$valueToName[$value];
+    }
+
+
+    public static function value($name)
+    {
+        $const = __CLASS__ . '::' . strtoupper($name);
+        if (!defined($const)) {
+            throw new UnexpectedValueException(sprintf(
+                    'Enum %s has no value defined for name %s', __CLASS__, $name));
+        }
+        return constant($const);
+    }
+}
+
+// Adding a class alias for backwards compatibility with the previous class name.
+class_alias(MetadataType::class, \Grpc\Testing\LoadBalancerStatsResponse_MetadataType::class);
+
diff --git a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/RpcMetadata.php b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/RpcMetadata.php
index 41f814d6b7c15..24ddfa340a4c6 100644
--- a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/RpcMetadata.php
+++ b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsResponse/RpcMetadata.php
@@ -16,8 +16,6 @@ class RpcMetadata extends \Google\Protobuf\Internal\Message
     /**
      * metadata values for each rpc for the keys specified in
      * LoadBalancerStatsRequest.metadata_keys.
-     * metadata keys and values are returned exactly as was recieved
-     * from the server.
      *
      * Generated from protobuf field <code>repeated .grpc.testing.LoadBalancerStatsResponse.MetadataEntry metadata = 1;</code>
      */
@@ -32,8 +30,6 @@ class RpcMetadata extends \Google\Protobuf\Internal\Message
      *     @type array<\Grpc\Testing\LoadBalancerStatsResponse\MetadataEntry>|\Google\Protobuf\Internal\RepeatedField $metadata
      *           metadata values for each rpc for the keys specified in
      *           LoadBalancerStatsRequest.metadata_keys.
-     *           metadata keys and values are returned exactly as was recieved
-     *           from the server.
      * }
      */
     public function __construct($data = NULL) {
@@ -44,8 +40,6 @@ public function __construct($data = NULL) {
     /**
      * metadata values for each rpc for the keys specified in
      * LoadBalancerStatsRequest.metadata_keys.
-     * metadata keys and values are returned exactly as was recieved
-     * from the server.
      *
      * Generated from protobuf field <code>repeated .grpc.testing.LoadBalancerStatsResponse.MetadataEntry metadata = 1;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
@@ -58,8 +52,6 @@ public function getMetadata()
     /**
      * metadata values for each rpc for the keys specified in
      * LoadBalancerStatsRequest.metadata_keys.
-     * metadata keys and values are returned exactly as was recieved
-     * from the server.
      *
      * Generated from protobuf field <code>repeated .grpc.testing.LoadBalancerStatsResponse.MetadataEntry metadata = 1;</code>
      * @param array<\Grpc\Testing\LoadBalancerStatsResponse\MetadataEntry>|\Google\Protobuf\Internal\RepeatedField $var
diff --git a/src/php/tests/interop/Grpc/Testing/SetReturnStatusRequest.php b/src/php/tests/interop/Grpc/Testing/SetReturnStatusRequest.php
new file mode 100644
index 0000000000000..41b28ce7fc4e8
--- /dev/null
+++ b/src/php/tests/interop/Grpc/Testing/SetReturnStatusRequest.php
@@ -0,0 +1,87 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: src/proto/grpc/testing/messages.proto
+
+namespace Grpc\Testing;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Status that will be return to callers of the Hook method
+ *
+ * Generated from protobuf message <code>grpc.testing.SetReturnStatusRequest</code>
+ */
+class SetReturnStatusRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 1;</code>
+     */
+    protected $grpc_code_to_return = 0;
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 2;</code>
+     */
+    protected $grpc_status_description = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type int $grpc_code_to_return
+     *     @type string $grpc_status_description
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Src\Proto\Grpc\Testing\Messages::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 1;</code>
+     * @return int
+     */
+    public function getGrpcCodeToReturn()
+    {
+        return $this->grpc_code_to_return;
+    }
+
+    /**
+     * Generated from protobuf field <code>int32 grpc_code_to_return = 1;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setGrpcCodeToReturn($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->grpc_code_to_return = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 2;</code>
+     * @return string
+     */
+    public function getGrpcStatusDescription()
+    {
+        return $this->grpc_status_description;
+    }
+
+    /**
+     * Generated from protobuf field <code>string grpc_status_description = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setGrpcStatusDescription($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->grpc_status_description = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceClient.php b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceClient.php
index 9715493bd1167..5610983d189fd 100644
--- a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceClient.php
+++ b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceClient.php
@@ -63,4 +63,18 @@ public function SetNotServing(\Grpc\Testing\EmptyMessage $argument,
         $metadata, $options);
     }
 
+    /**
+     * @param \Grpc\Testing\HookRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function SendHookRequest(\Grpc\Testing\HookRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/grpc.testing.XdsUpdateHealthService/SendHookRequest',
+        $argument,
+        ['\Grpc\Testing\HookResponse', 'decode'],
+        $metadata, $options);
+    }
+
 }
diff --git a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php
index 07ff63ab2d3c7..759308b1a0027 100644
--- a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php
+++ b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php
@@ -54,6 +54,20 @@ public function SetNotServing(
         return null;
     }
 
+    /**
+     * @param \Grpc\Testing\HookRequest $request client request
+     * @param \Grpc\ServerContext $context server request context
+     * @return \Grpc\Testing\HookResponse for response data, null if if error occured
+     *     initial metadata (if any) and status (if not ok) should be set to $context
+     */
+    public function SendHookRequest(
+        \Grpc\Testing\HookRequest $request,
+        \Grpc\ServerContext $context
+    ): ?\Grpc\Testing\HookResponse {
+        $context->setStatus(\Grpc\Status::unimplemented());
+        return null;
+    }
+
     /**
      * Get the method descriptors of the service for server registration
      *
@@ -74,6 +88,12 @@ public final function getMethodDescriptors(): array
                 '\Grpc\Testing\EmptyMessage',
                 \Grpc\MethodDescriptor::UNARY_CALL
             ),
+            '/grpc.testing.XdsUpdateHealthService/SendHookRequest' => new \Grpc\MethodDescriptor(
+                $this,
+                'SendHookRequest',
+                '\Grpc\Testing\HookRequest',
+                \Grpc\MethodDescriptor::UNARY_CALL
+            ),
         ];
     }
 
diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD
index 0f7bbbecf63be..41ab62e76e2dc 100644
--- a/src/proto/grpc/testing/BUILD
+++ b/src/proto/grpc/testing/BUILD
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
-load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 licenses(["notice"])
 
diff --git a/src/proto/grpc/testing/xds/v3/BUILD b/src/proto/grpc/testing/xds/v3/BUILD
index 9c02b2a9f6c4b..f72941136cc45 100644
--- a/src/proto/grpc/testing/xds/v3/BUILD
+++ b/src/proto/grpc/testing/xds/v3/BUILD
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
 load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
+load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
 
 licenses(["notice"])
 
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
index 338dbd7d26540..98324c955f9ad 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
@@ -349,7 +349,7 @@ class Clean(setuptools.Command):
     ]
 
     _FILE_PATTERNS = (
-        "python_build",
+        "pyb",
         "src/python/grpcio/__pycache__/",
         "src/python/grpcio/grpc/_cython/cygrpc.cpp",
         "src/python/grpcio/grpc/_cython/*.so",
diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py
index e4b34123409f0..fef906e51d577 100644
--- a/src/python/grpcio/grpc/_channel.py
+++ b/src/python/grpcio/grpc/_channel.py
@@ -14,7 +14,6 @@
 """Invocation-side implementation of gRPC Python."""
 
 import copy
-from datetime import datetime
 import functools
 import logging
 import os
@@ -130,8 +129,8 @@ class _RPCState(object):
     cancelled: bool
     callbacks: List[NullaryCallbackType]
     fork_epoch: Optional[int]
-    rpc_start_time: Optional[datetime]
-    rpc_end_time: Optional[datetime]
+    rpc_start_time: Optional[float]  # In relative seconds
+    rpc_end_time: Optional[float]  # In relative seconds
     method: Optional[str]
 
     def __init__(
@@ -223,7 +222,7 @@ def _handle_event(
                     state.code = code
                     state.details = batch_operation.details()
                     state.debug_error_string = batch_operation.error_string()
-            state.rpc_end_time = datetime.utcnow()
+            state.rpc_end_time = time.perf_counter()
             _observability.maybe_record_rpc_latency(state)
             callbacks.extend(state.callbacks)
             state.callbacks = None
@@ -1122,7 +1121,7 @@ def _blocking(
         if state is None:
             raise rendezvous  # pylint: disable-msg=raising-bad-type
         else:
-            state.rpc_start_time = datetime.utcnow()
+            state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
             call = self._channel.segregated_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1193,7 +1192,7 @@ def future(
             raise rendezvous  # pylint: disable-msg=raising-bad-type
         else:
             event_handler = _event_handler(state, self._response_deserializer)
-            state.rpc_start_time = datetime.utcnow()
+            state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
             call = self._managed_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1277,7 +1276,7 @@ def __call__(  # pylint: disable=too-many-locals
             (cygrpc.ReceiveInitialMetadataOperation(_EMPTY_FLAGS),),
         )
         operations_and_tags = tuple((ops, None) for ops in operations)
-        state.rpc_start_time = datetime.utcnow()
+        state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
         call = self._channel.segregated_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1353,7 +1352,7 @@ def __call__(  # pylint: disable=too-many-locals
                 ),
                 (cygrpc.ReceiveInitialMetadataOperation(_EMPTY_FLAGS),),
             )
-            state.rpc_start_time = datetime.utcnow()
+            state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
             call = self._managed_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1412,7 +1411,7 @@ def _blocking(
         augmented_metadata = _compression.augment_metadata(
             metadata, compression
         )
-        state.rpc_start_time = datetime.utcnow()
+        state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
         call = self._channel.segregated_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1500,7 +1499,7 @@ def future(
         augmented_metadata = _compression.augment_metadata(
             metadata, compression
         )
-        state.rpc_start_time = datetime.utcnow()
+        state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
         call = self._managed_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
@@ -1578,7 +1577,7 @@ def __call__(
             (cygrpc.ReceiveInitialMetadataOperation(_EMPTY_FLAGS),),
         )
         event_handler = _event_handler(state, self._response_deserializer)
-        state.rpc_start_time = datetime.utcnow()
+        state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
         call = self._managed_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/_hooks.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/_hooks.pyx.pxi
index eb943e33b2e5d..c2b37594f95f3 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/_hooks.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/_hooks.pyx.pxi
@@ -19,6 +19,9 @@ cdef object _custom_op_on_c_call(int op, grpc_call *call):
 def install_context_from_request_call_event(RequestCallEvent event):
   maybe_save_server_trace_context(event)
 
+def install_context_from_request_call_event_aio(GrpcCallWrapper event):
+  pass
+
 def uninstall_context():
   pass
 
@@ -31,5 +34,8 @@ cdef class CensusContext:
 def set_census_context_on_call(_CallState call_state, CensusContext census_ctx):
   pass
 
+def set_instrumentation_context_on_call_aio(GrpcCallWrapper call_state, CensusContext census_ctx):
+  pass
+
 def get_deadline_from_context():
   return None
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi
index 1330fa79d372e..00c0a29c2ab3b 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi
@@ -295,12 +295,14 @@ cdef class _AioCall(GrpcCallWrapper):
 
     async def unary_unary(self,
                           bytes request,
-                          tuple outbound_initial_metadata):
+                          tuple outbound_initial_metadata,
+                          object context = None):
         """Performs a unary unary RPC.
 
         Args:
           request: the serialized requests in bytes.
           outbound_initial_metadata: optional outbound metadata.
+          context: instrumentation context.
         """
         cdef tuple ops
 
@@ -313,6 +315,8 @@ cdef class _AioCall(GrpcCallWrapper):
         cdef ReceiveMessageOperation receive_message_op = ReceiveMessageOperation(_EMPTY_FLAGS)
         cdef ReceiveStatusOnClientOperation receive_status_on_client_op = ReceiveStatusOnClientOperation(_EMPTY_FLAGS)
 
+        if context is not None:
+            set_instrumentation_context_on_call_aio(self, context)
         ops = (initial_metadata_op, send_message_op, send_close_op,
                receive_initial_metadata_op, receive_message_op,
                receive_status_on_client_op)
@@ -390,7 +394,8 @@ cdef class _AioCall(GrpcCallWrapper):
 
     async def initiate_unary_stream(self,
                            bytes request,
-                           tuple outbound_initial_metadata):
+                           tuple outbound_initial_metadata,
+                           object context = None):
         """Implementation of the start of a unary-stream call."""
         # Peer may prematurely end this RPC at any point. We need a corutine
         # that watches if the server sends the final status.
@@ -406,6 +411,8 @@ cdef class _AioCall(GrpcCallWrapper):
         cdef Operation send_close_op = SendCloseFromClientOperation(
             _EMPTY_FLAGS)
 
+        if context is not None:
+            set_instrumentation_context_on_call_aio(self, context)
         outbound_ops = (
             initial_metadata_op,
             send_message_op,
@@ -429,7 +436,8 @@ cdef class _AioCall(GrpcCallWrapper):
 
     async def stream_unary(self,
                            tuple outbound_initial_metadata,
-                           object metadata_sent_observer):
+                           object metadata_sent_observer,
+                           object context = None):
         """Actual implementation of the complete unary-stream call.
 
         Needs to pay extra attention to the raise mechanism. If we want to
@@ -460,6 +468,9 @@ cdef class _AioCall(GrpcCallWrapper):
         cdef tuple inbound_ops
         cdef ReceiveMessageOperation receive_message_op = ReceiveMessageOperation(_EMPTY_FLAGS)
         cdef ReceiveStatusOnClientOperation receive_status_on_client_op = ReceiveStatusOnClientOperation(_EMPTY_FLAGS)
+
+        if context is not None:
+            set_instrumentation_context_on_call_aio(self, context)
         inbound_ops = (receive_message_op, receive_status_on_client_op)
 
         # Executes all operations in one batch.
@@ -484,7 +495,8 @@ cdef class _AioCall(GrpcCallWrapper):
 
     async def initiate_stream_stream(self,
                            tuple outbound_initial_metadata,
-                           object metadata_sent_observer):
+                           object metadata_sent_observer,
+                           object context = None):
         """Actual implementation of the complete stream-stream call.
 
         Needs to pay extra attention to the raise mechanism. If we want to
@@ -495,6 +507,9 @@ cdef class _AioCall(GrpcCallWrapper):
         # that watches if the server sends the final status.
         status_task = self._loop.create_task(self._handle_status_once_received())
 
+        if context is not None:
+            set_instrumentation_context_on_call_aio(self, context)
+
         try:
             # Sends out initial_metadata ASAP.
             await _send_initial_metadata(self,
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi
index e191878c688a4..a21c1ec0082cc 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi
@@ -401,6 +401,7 @@ async def _finish_handler_with_unary_response(RPCState rpc_state,
     # Executes application logic
     cdef object response_message
     cdef _SyncServicerContext sync_servicer_context
+    install_context_from_request_call_event_aio(rpc_state)
 
     if _is_async_handler(unary_handler):
         # Run async method handlers in this coroutine
@@ -453,6 +454,7 @@ async def _finish_handler_with_unary_response(RPCState rpc_state,
     rpc_state.metadata_sent = True
     rpc_state.status_sent = True
     await execute_batch(rpc_state, finish_ops, loop)
+    uninstall_context()
 
 
 async def _finish_handler_with_stream_responses(RPCState rpc_state,
@@ -468,6 +470,7 @@ async def _finish_handler_with_stream_responses(RPCState rpc_state,
     """
     cdef object async_response_generator
     cdef object response_message
+    install_context_from_request_call_event_aio(rpc_state)
 
     if inspect.iscoroutinefunction(stream_handler):
         # Case 1: Coroutine async handler - using reader-writer API
@@ -521,6 +524,7 @@ async def _finish_handler_with_stream_responses(RPCState rpc_state,
     rpc_state.metadata_sent = True
     rpc_state.status_sent = True
     await execute_batch(rpc_state, finish_ops, loop)
+    uninstall_context()
 
 
 async def _handle_unary_unary_rpc(object method_handler,
diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py
index 246281c9f8fb7..0878cfbe7b7ab 100644
--- a/src/python/grpcio/grpc/_grpcio_metadata.py
+++ b/src/python/grpcio/grpc/_grpcio_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.60.0.dev0"""
+__version__ = """1.61.0.dev0"""
diff --git a/src/python/grpcio/grpc/_observability.py b/src/python/grpcio/grpc/_observability.py
index 1435b1be98c46..d4e8ce6ab7b27 100644
--- a/src/python/grpcio/grpc/_observability.py
+++ b/src/python/grpcio/grpc/_observability.py
@@ -278,6 +278,6 @@ def maybe_record_rpc_latency(state: "_channel._RPCState") -> None:
     with get_plugin() as plugin:
         if not (plugin and plugin.stats_enabled):
             return
-        rpc_latency = state.rpc_end_time - state.rpc_start_time
-        rpc_latency_ms = rpc_latency.total_seconds() * 1000
+        rpc_latency_s = state.rpc_end_time - state.rpc_start_time
+        rpc_latency_ms = rpc_latency_s * 1000
         plugin.record_rpc_latency(state.method, rpc_latency_ms, state.code)
diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py
index 595056136b766..4ea1d5e459784 100644
--- a/src/python/grpcio/grpc/_server.py
+++ b/src/python/grpcio/grpc/_server.py
@@ -579,7 +579,7 @@ def _call_behavior(
                                 exception.__traceback__,
                             )
                         )
-                    traceback.print_exc()
+                        traceback.print_exc()
                     _LOGGER.exception(details)
                     _abort(
                         state,
diff --git a/src/python/grpcio/grpc/aio/_call.py b/src/python/grpcio/grpc/aio/_call.py
index 2cdba27eb019d..82b0d3ce52211 100644
--- a/src/python/grpcio/grpc/aio/_call.py
+++ b/src/python/grpcio/grpc/aio/_call.py
@@ -561,6 +561,7 @@ def __init__(
             loop,
         )
         self._request = request
+        self._context = cygrpc.build_census_context()
         self._invocation_task = loop.create_task(self._invoke())
         self._init_unary_response_mixin(self._invocation_task)
 
@@ -574,7 +575,7 @@ async def _invoke(self) -> ResponseType:
         # https://github.com/python/cpython/blob/edad4d89e357c92f70c0324b937845d652b20afd/Lib/asyncio/tasks.py#L785
         try:
             serialized_response = await self._cython_call.unary_unary(
-                serialized_request, self._metadata
+                serialized_request, self._metadata, self._context
             )
         except asyncio.CancelledError:
             if not self.cancelled():
@@ -624,6 +625,7 @@ def __init__(
             loop,
         )
         self._request = request
+        self._context = cygrpc.build_census_context()
         self._send_unary_request_task = loop.create_task(
             self._send_unary_request()
         )
@@ -635,7 +637,7 @@ async def _send_unary_request(self) -> ResponseType:
         )
         try:
             await self._cython_call.initiate_unary_stream(
-                serialized_request, self._metadata
+                serialized_request, self._metadata, self._context
             )
         except asyncio.CancelledError:
             if not self.cancelled():
@@ -679,13 +681,14 @@ def __init__(
             loop,
         )
 
+        self._context = cygrpc.build_census_context()
         self._init_stream_request_mixin(request_iterator)
         self._init_unary_response_mixin(loop.create_task(self._conduct_rpc()))
 
     async def _conduct_rpc(self) -> ResponseType:
         try:
             serialized_response = await self._cython_call.stream_unary(
-                self._metadata, self._metadata_sent_observer
+                self._metadata, self._metadata_sent_observer, self._context
             )
         except asyncio.CancelledError:
             if not self.cancelled():
@@ -731,6 +734,7 @@ def __init__(
             response_deserializer,
             loop,
         )
+        self._context = cygrpc.build_census_context()
         self._initializer = self._loop.create_task(self._prepare_rpc())
         self._init_stream_request_mixin(request_iterator)
         self._init_stream_response_mixin(self._initializer)
@@ -743,7 +747,7 @@ async def _prepare_rpc(self):
         """
         try:
             await self._cython_call.initiate_stream_stream(
-                self._metadata, self._metadata_sent_observer
+                self._metadata, self._metadata_sent_observer, self._context
             )
         except asyncio.CancelledError:
             if not self.cancelled():
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 2ab962aaa531c..d6304bccbdca8 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -130,319 +130,319 @@
     'src/core/ext/transport/inproc/inproc_plugin.cc',
     'src/core/ext/transport/inproc/inproc_transport.cc',
     'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
-    'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c',
-    'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c',
-    'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
-    'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
-    'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
-    'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
-    'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
-    'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
-    'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
-    'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c',
-    'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c',
-    'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c',
-    'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c',
-    'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c',
-    'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c',
-    'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c',
-    'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
-    'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
-    'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c',
-    'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
-    'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c',
-    'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
-    'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
-    'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
-    'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
-    'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
-    'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
-    'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c',
-    'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c',
-    'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c',
-    'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c',
-    'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c',
-    'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c',
-    'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
-    'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
-    'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c',
-    'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
-    'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
-    'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
-    'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/http.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
-    'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c',
-    'src/core/ext/upb-generated/google/api/annotations.upb.c',
-    'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
-    'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
-    'src/core/ext/upb-generated/google/api/http.upb.c',
-    'src/core/ext/upb-generated/google/api/httpbody.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-    'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-    'src/core/ext/upb-generated/google/rpc/status.upb.c',
-    'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-    'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c',
-    'src/core/ext/upb-generated/udpa/annotations/migrate.upb.c',
-    'src/core/ext/upb-generated/udpa/annotations/security.upb.c',
-    'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
-    'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
-    'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
-    'src/core/ext/upb-generated/validate/validate.upb.c',
-    'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c',
-    'src/core/ext/upb-generated/xds/annotations/v3/security.upb.c',
-    'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c',
-    'src/core/ext/upb-generated/xds/annotations/v3/status.upb.c',
-    'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/cidr.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/extension.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
-    'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-    'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-    'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c',
-    'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c',
-    'src/core/ext/upb-generated/xds/type/v3/cel.upb.c',
-    'src/core/ext/upb-generated/xds/type/v3/range.upb.c',
-    'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-    'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
-    'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
-    'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
-    'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
-    'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
-    'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
-    'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
-    'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
-    'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c',
-    'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c',
+    '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/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',
+    'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c',
+    'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+    'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c',
+    'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c',
+    'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+    'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+    'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+    'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+    'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c',
+    '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/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+    'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+    'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+    'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c',
+    'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c',
+    'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c',
+    'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c',
+    'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c',
+    'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c',
+    'src/core/ext/upb-gen/validate/validate.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/core/v3/resource_name.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/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c',
+    'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
+    '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/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',
+    'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/api/http.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c',
+    'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c',
+    'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
+    'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c',
+    'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c',
+    'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c',
+    'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c',
+    'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c',
+    'src/core/ext/upbdefs-gen/validate/validate.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c',
+    'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c',
+    '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/ext/xds/certificate_provider_store.cc',
     'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
     'src/core/ext/xds/xds_api.cc',
@@ -508,12 +508,12 @@
     'src/core/lib/event_engine/default_event_engine_factory.cc',
     'src/core/lib/event_engine/event_engine.cc',
     'src/core/lib/event_engine/forkable.cc',
-    'src/core/lib/event_engine/memory_allocator.cc',
     'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc',
     'src/core/lib/event_engine/posix_engine/ev_poll_posix.cc',
     'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
     'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
     'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
+    'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
     'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
     'src/core/lib/event_engine/posix_engine/posix_engine.cc',
     'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -539,6 +539,7 @@
     'src/core/lib/event_engine/time_util.cc',
     'src/core/lib/event_engine/trace.cc',
     'src/core/lib/event_engine/utils.cc',
+    'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
     'src/core/lib/event_engine/windows/iocp.cc',
     'src/core/lib/event_engine/windows/win_socket.cc',
     'src/core/lib/event_engine/windows/windows_endpoint.cc',
@@ -582,6 +583,7 @@
     'src/core/lib/gprpp/load_file.cc',
     'src/core/lib/gprpp/mpscq.cc',
     'src/core/lib/gprpp/per_cpu.cc',
+    'src/core/lib/gprpp/posix/directory_reader.cc',
     'src/core/lib/gprpp/posix/env.cc',
     'src/core/lib/gprpp/posix/stat.cc',
     'src/core/lib/gprpp/posix/thd.cc',
@@ -593,6 +595,7 @@
     'src/core/lib/gprpp/time_averaged_stats.cc',
     'src/core/lib/gprpp/time_util.cc',
     'src/core/lib/gprpp/validation_errors.cc',
+    'src/core/lib/gprpp/windows/directory_reader.cc',
     'src/core/lib/gprpp/windows/env.cc',
     'src/core/lib/gprpp/windows/stat.cc',
     'src/core/lib/gprpp/windows/thd.cc',
@@ -1316,9 +1319,6 @@
     'third_party/re2/util/rune.cc',
     'third_party/re2/util/strutil.cc',
     'third_party/upb/upb/base/status.c',
-    'third_party/upb/upb/collections/array.c',
-    'third_party/upb/upb/collections/map.c',
-    'third_party/upb/upb/collections/map_sorter.c',
     'third_party/upb/upb/hash/common.c',
     'third_party/upb/upb/json/decode.c',
     'third_party/upb/upb/json/encode.c',
@@ -1329,6 +1329,9 @@
     'third_party/upb/upb/mem/alloc.c',
     'third_party/upb/upb/mem/arena.c',
     'third_party/upb/upb/message/accessors.c',
+    'third_party/upb/upb/message/array.c',
+    'third_party/upb/upb/message/map.c',
+    'third_party/upb/upb/message/map_sorter.c',
     'third_party/upb/upb/message/message.c',
     'third_party/upb/upb/mini_descriptor/build_enum.c',
     'third_party/upb/upb/mini_descriptor/decode.c',
@@ -1338,7 +1341,6 @@
     'third_party/upb/upb/mini_table/extension_registry.c',
     'third_party/upb/upb/mini_table/internal/message.c',
     'third_party/upb/upb/mini_table/message.c',
-    'third_party/upb/upb/reflection/def_builder.c',
     'third_party/upb/upb/reflection/def_pool.c',
     'third_party/upb/upb/reflection/def_type.c',
     'third_party/upb/upb/reflection/desc_state.c',
@@ -1348,6 +1350,8 @@
     'third_party/upb/upb/reflection/extension_range.c',
     'third_party/upb/upb/reflection/field_def.c',
     'third_party/upb/upb/reflection/file_def.c',
+    'third_party/upb/upb/reflection/internal/def_builder.c',
+    'third_party/upb/upb/reflection/internal/strdup2.c',
     'third_party/upb/upb/reflection/message.c',
     'third_party/upb/upb/reflection/message_def.c',
     'third_party/upb/upb/reflection/message_reserved_range.c',
diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py
index 3bd28105138bf..a82549b1dd658 100644
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_admin/grpc_version.py b/src/python/grpcio_admin/grpc_version.py
index 34ff73ffc2e54..953344d81c05c 100644
--- a/src/python/grpcio_admin/grpc_version.py
+++ b/src/python/grpcio_admin/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py
index 460e8b3ec68fd..1cac50e1c9cae 100644
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_csds/grpc_version.py b/src/python/grpcio_csds/grpc_version.py
index e9eb1c4b04e39..d3033c7128db4 100644
--- a/src/python/grpcio_csds/grpc_version.py
+++ b/src/python/grpcio_csds/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py
index 5f113326532a8..aaf86b43c40c3 100644
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py
index 28ad64a08c15e..bb056c9abe958 100644
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_status/grpc_version.py b/src/python/grpcio_status/grpc_version.py
index 741a4e2ca180d..0f107a38e4c9d 100644
--- a/src/python/grpcio_status/grpc_version.py
+++ b/src/python/grpcio_status/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py
index c9ddf97b431b5..46e15d7447563 100644
--- a/src/python/grpcio_testing/grpc_version.py
+++ b/src/python/grpcio_testing/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py
index 8e56fb6983dcd..3badf3ad39a26 100644
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
+VERSION = '1.61.0.dev0'
diff --git a/src/ruby/bin/math_pb.rb b/src/ruby/bin/math_pb.rb
index 35c2a9b3e31e0..205368e017254 100644
--- a/src/ruby/bin/math_pb.rb
+++ b/src/ruby/bin/math_pb.rb
@@ -11,7 +11,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb
index 58b49ea1367fc..1468a96a3bd84 100644
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.60.0.dev'
+  VERSION = '1.61.0.dev'
 end
diff --git a/src/ruby/nativedebug/version.rb b/src/ruby/nativedebug/version.rb
index 2cdfd263fe250..6a5c24b07846c 100644
--- a/src/ruby/nativedebug/version.rb
+++ b/src/ruby/nativedebug/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module NativeDebug
-    VERSION = '1.60.0.dev'
+    VERSION = '1.61.0.dev'
   end
 end
diff --git a/src/ruby/pb/grpc/health/v1/health_pb.rb b/src/ruby/pb/grpc/health/v1/health_pb.rb
index 0a676c2a99eb1..18ebf2cb75a97 100644
--- a/src/ruby/pb/grpc/health/v1/health_pb.rb
+++ b/src/ruby/pb/grpc/health/v1/health_pb.rb
@@ -11,7 +11,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb b/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb
index eb477f682d324..c5d290382831c 100644
--- a/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb
+++ b/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb
@@ -11,7 +11,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb b/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb
index d0faa68e12030..d714d0aa715c0 100644
--- a/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb
+++ b/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb
@@ -5,13 +5,13 @@
 require 'google/protobuf'
 
 
-descriptor_data = "\n%src/proto/grpc/testing/messages.proto\x12\x0cgrpc.testing\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"@\n\x07Payload\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x0c\n\x04\x62ody\x18\x02 \x01(\x0c\"+\n\nEchoStatus\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xc3\x03\n\rSimpleRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x15\n\rresponse_size\x18\x02 \x01(\x05\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x15\n\rfill_username\x18\x04 \x01(\x08\x12\x18\n\x10\x66ill_oauth_scope\x18\x05 \x01(\x08\x12\x34\n\x13response_compressed\x18\x06 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x32\n\x11\x65xpect_compressed\x18\x08 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x16\n\x0e\x66ill_server_id\x18\t \x01(\x08\x12\x1e\n\x16\x66ill_grpclb_route_type\x18\n \x01(\x08\x12;\n\x15orca_per_query_report\x18\x0b \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"\xbe\x01\n\x0eSimpleResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boauth_scope\x18\x03 \x01(\t\x12\x11\n\tserver_id\x18\x04 \x01(\t\x12\x38\n\x11grpclb_route_type\x18\x05 \x01(\x0e\x32\x1d.grpc.testing.GrpclbRouteType\x12\x10\n\x08hostname\x18\x06 \x01(\t\"w\n\x19StreamingInputCallRequest\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x32\n\x11\x65xpect_compressed\x18\x02 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"=\n\x1aStreamingInputCallResponse\x12\x1f\n\x17\x61ggregated_payload_size\x18\x01 \x01(\x05\"d\n\x12ResponseParameters\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\x13\n\x0binterval_us\x18\x02 \x01(\x05\x12+\n\ncompressed\x18\x03 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"\x9f\x02\n\x1aStreamingOutputCallRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12=\n\x13response_parameters\x18\x02 \x03(\x0b\x32 .grpc.testing.ResponseParameters\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x35\n\x0forca_oob_report\x18\x08 \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"E\n\x1bStreamingOutputCallResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\"3\n\x0fReconnectParams\x12 \n\x18max_reconnect_backoff_ms\x18\x01 \x01(\x05\"3\n\rReconnectInfo\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\nbackoff_ms\x18\x02 \x03(\x05\"X\n\x18LoadBalancerStatsRequest\x12\x10\n\x08num_rpcs\x18\x01 \x01(\x05\x12\x13\n\x0btimeout_sec\x18\x02 \x01(\x05\x12\x15\n\rmetadata_keys\x18\x03 \x03(\t\"\xb6\x07\n\x19LoadBalancerStatsResponse\x12M\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x37.grpc.testing.LoadBalancerStatsResponse.RpcsByPeerEntry\x12\x14\n\x0cnum_failures\x18\x02 \x01(\x05\x12Q\n\x0erpcs_by_method\x18\x03 \x03(\x0b\x32\x39.grpc.testing.LoadBalancerStatsResponse.RpcsByMethodEntry\x12W\n\x11metadatas_by_peer\x18\x04 \x03(\x0b\x32<.grpc.testing.LoadBalancerStatsResponse.MetadatasByPeerEntry\x1a+\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x1aV\n\x0bRpcMetadata\x12G\n\x08metadata\x18\x01 \x03(\x0b\x32\x35.grpc.testing.LoadBalancerStatsResponse.MetadataEntry\x1a[\n\x0eMetadataByPeer\x12I\n\x0crpc_metadata\x18\x01 \x03(\x0b\x32\x33.grpc.testing.LoadBalancerStatsResponse.RpcMetadata\x1a\x99\x01\n\nRpcsByPeer\x12X\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x42.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer.RpcsByPeerEntry\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1ag\n\x11RpcsByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x41\n\x05value\x18\x02 \x01(\x0b\x32\x32.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer:\x02\x38\x01\x1an\n\x14MetadatasByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x45\n\x05value\x18\x02 \x01(\x0b\x32\x36.grpc.testing.LoadBalancerStatsResponse.MetadataByPeer:\x02\x38\x01\"%\n#LoadBalancerAccumulatedStatsRequest\"\xd8\x07\n$LoadBalancerAccumulatedStatsResponse\x12v\n\x1anum_rpcs_started_by_method\x18\x01 \x03(\x0b\x32N.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsStartedByMethodEntryB\x02\x18\x01\x12z\n\x1cnum_rpcs_succeeded_by_method\x18\x02 \x03(\x0b\x32P.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsSucceededByMethodEntryB\x02\x18\x01\x12t\n\x19num_rpcs_failed_by_method\x18\x03 \x03(\x0b\x32M.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsFailedByMethodEntryB\x02\x18\x01\x12`\n\x10stats_per_method\x18\x04 \x03(\x0b\x32\x46.grpc.testing.LoadBalancerAccumulatedStatsResponse.StatsPerMethodEntry\x1a=\n\x1bNumRpcsStartedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a?\n\x1dNumRpcsSucceededByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a<\n\x1aNumRpcsFailedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\xae\x01\n\x0bMethodStats\x12\x14\n\x0crpcs_started\x18\x01 \x01(\x05\x12Z\n\x06result\x18\x02 \x03(\x0b\x32J.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats.ResultEntry\x1a-\n\x0bResultEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1au\n\x13StatsPerMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12M\n\x05value\x18\x02 \x01(\x0b\x32>.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats:\x02\x38\x01\"\xba\x02\n\x16\x43lientConfigureRequest\x12;\n\x05types\x18\x01 \x03(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12?\n\x08metadata\x18\x02 \x03(\x0b\x32-.grpc.testing.ClientConfigureRequest.Metadata\x12\x13\n\x0btimeout_sec\x18\x03 \x01(\x05\x1a\x62\n\x08Metadata\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\")\n\x07RpcType\x12\x0e\n\nEMPTY_CALL\x10\x00\x12\x0e\n\nUNARY_CALL\x10\x01\"\x19\n\x17\x43lientConfigureResponse\"\x19\n\nMemorySize\x12\x0b\n\x03rss\x18\x01 \x01(\x03\"\xb6\x02\n\x0eTestOrcaReport\x12\x17\n\x0f\x63pu_utilization\x18\x01 \x01(\x01\x12\x1a\n\x12memory_utilization\x18\x02 \x01(\x01\x12\x43\n\x0crequest_cost\x18\x03 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.RequestCostEntry\x12\x42\n\x0butilization\x18\x04 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.UtilizationEntry\x1a\x32\n\x10RequestCostEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x1a\x32\n\x10UtilizationEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01*\x1f\n\x0bPayloadType\x12\x10\n\x0c\x43OMPRESSABLE\x10\x00*o\n\x0fGrpclbRouteType\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_UNKNOWN\x10\x00\x12\x1e\n\x1aGRPCLB_ROUTE_TYPE_FALLBACK\x10\x01\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_BACKEND\x10\x02\x42\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
+descriptor_data = "\n%src/proto/grpc/testing/messages.proto\x12\x0cgrpc.testing\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"@\n\x07Payload\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x0c\n\x04\x62ody\x18\x02 \x01(\x0c\"+\n\nEchoStatus\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xc3\x03\n\rSimpleRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x15\n\rresponse_size\x18\x02 \x01(\x05\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x15\n\rfill_username\x18\x04 \x01(\x08\x12\x18\n\x10\x66ill_oauth_scope\x18\x05 \x01(\x08\x12\x34\n\x13response_compressed\x18\x06 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x32\n\x11\x65xpect_compressed\x18\x08 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x16\n\x0e\x66ill_server_id\x18\t \x01(\x08\x12\x1e\n\x16\x66ill_grpclb_route_type\x18\n \x01(\x08\x12;\n\x15orca_per_query_report\x18\x0b \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"\xbe\x01\n\x0eSimpleResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boauth_scope\x18\x03 \x01(\t\x12\x11\n\tserver_id\x18\x04 \x01(\t\x12\x38\n\x11grpclb_route_type\x18\x05 \x01(\x0e\x32\x1d.grpc.testing.GrpclbRouteType\x12\x10\n\x08hostname\x18\x06 \x01(\t\"w\n\x19StreamingInputCallRequest\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x32\n\x11\x65xpect_compressed\x18\x02 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"=\n\x1aStreamingInputCallResponse\x12\x1f\n\x17\x61ggregated_payload_size\x18\x01 \x01(\x05\"d\n\x12ResponseParameters\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\x13\n\x0binterval_us\x18\x02 \x01(\x05\x12+\n\ncompressed\x18\x03 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"\x9f\x02\n\x1aStreamingOutputCallRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12=\n\x13response_parameters\x18\x02 \x03(\x0b\x32 .grpc.testing.ResponseParameters\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x35\n\x0forca_oob_report\x18\x08 \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"E\n\x1bStreamingOutputCallResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\"3\n\x0fReconnectParams\x12 \n\x18max_reconnect_backoff_ms\x18\x01 \x01(\x05\"3\n\rReconnectInfo\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\nbackoff_ms\x18\x02 \x03(\x05\"X\n\x18LoadBalancerStatsRequest\x12\x10\n\x08num_rpcs\x18\x01 \x01(\x05\x12\x13\n\x0btimeout_sec\x18\x02 \x01(\x05\x12\x15\n\rmetadata_keys\x18\x03 \x03(\t\"\xb2\x08\n\x19LoadBalancerStatsResponse\x12M\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x37.grpc.testing.LoadBalancerStatsResponse.RpcsByPeerEntry\x12\x14\n\x0cnum_failures\x18\x02 \x01(\x05\x12Q\n\x0erpcs_by_method\x18\x03 \x03(\x0b\x32\x39.grpc.testing.LoadBalancerStatsResponse.RpcsByMethodEntry\x12W\n\x11metadatas_by_peer\x18\x04 \x03(\x0b\x32<.grpc.testing.LoadBalancerStatsResponse.MetadatasByPeerEntry\x1ao\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x42\n\x04type\x18\x03 \x01(\x0e\x32\x34.grpc.testing.LoadBalancerStatsResponse.MetadataType\x1aV\n\x0bRpcMetadata\x12G\n\x08metadata\x18\x01 \x03(\x0b\x32\x35.grpc.testing.LoadBalancerStatsResponse.MetadataEntry\x1a[\n\x0eMetadataByPeer\x12I\n\x0crpc_metadata\x18\x01 \x03(\x0b\x32\x33.grpc.testing.LoadBalancerStatsResponse.RpcMetadata\x1a\x99\x01\n\nRpcsByPeer\x12X\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x42.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer.RpcsByPeerEntry\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1ag\n\x11RpcsByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x41\n\x05value\x18\x02 \x01(\x0b\x32\x32.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer:\x02\x38\x01\x1an\n\x14MetadatasByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x45\n\x05value\x18\x02 \x01(\x0b\x32\x36.grpc.testing.LoadBalancerStatsResponse.MetadataByPeer:\x02\x38\x01\"6\n\x0cMetadataType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07INITIAL\x10\x01\x12\x0c\n\x08TRAILING\x10\x02\"%\n#LoadBalancerAccumulatedStatsRequest\"\xd8\x07\n$LoadBalancerAccumulatedStatsResponse\x12v\n\x1anum_rpcs_started_by_method\x18\x01 \x03(\x0b\x32N.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsStartedByMethodEntryB\x02\x18\x01\x12z\n\x1cnum_rpcs_succeeded_by_method\x18\x02 \x03(\x0b\x32P.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsSucceededByMethodEntryB\x02\x18\x01\x12t\n\x19num_rpcs_failed_by_method\x18\x03 \x03(\x0b\x32M.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsFailedByMethodEntryB\x02\x18\x01\x12`\n\x10stats_per_method\x18\x04 \x03(\x0b\x32\x46.grpc.testing.LoadBalancerAccumulatedStatsResponse.StatsPerMethodEntry\x1a=\n\x1bNumRpcsStartedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a?\n\x1dNumRpcsSucceededByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a<\n\x1aNumRpcsFailedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\xae\x01\n\x0bMethodStats\x12\x14\n\x0crpcs_started\x18\x01 \x01(\x05\x12Z\n\x06result\x18\x02 \x03(\x0b\x32J.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats.ResultEntry\x1a-\n\x0bResultEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1au\n\x13StatsPerMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12M\n\x05value\x18\x02 \x01(\x0b\x32>.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats:\x02\x38\x01\"\xba\x02\n\x16\x43lientConfigureRequest\x12;\n\x05types\x18\x01 \x03(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12?\n\x08metadata\x18\x02 \x03(\x0b\x32-.grpc.testing.ClientConfigureRequest.Metadata\x12\x13\n\x0btimeout_sec\x18\x03 \x01(\x05\x1a\x62\n\x08Metadata\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\")\n\x07RpcType\x12\x0e\n\nEMPTY_CALL\x10\x00\x12\x0e\n\nUNARY_CALL\x10\x01\"\x19\n\x17\x43lientConfigureResponse\"\x19\n\nMemorySize\x12\x0b\n\x03rss\x18\x01 \x01(\x03\"\xb6\x02\n\x0eTestOrcaReport\x12\x17\n\x0f\x63pu_utilization\x18\x01 \x01(\x01\x12\x1a\n\x12memory_utilization\x18\x02 \x01(\x01\x12\x43\n\x0crequest_cost\x18\x03 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.RequestCostEntry\x12\x42\n\x0butilization\x18\x04 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.UtilizationEntry\x1a\x32\n\x10RequestCostEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x1a\x32\n\x10UtilizationEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\"V\n\x16SetReturnStatusRequest\x12\x1b\n\x13grpc_code_to_return\x18\x01 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x02 \x01(\t\"\xe7\x01\n\x0bHookRequest\x12=\n\x07\x63ommand\x18\x01 \x01(\x0e\x32,.grpc.testing.HookRequest.HookRequestCommand\x12\x1b\n\x13grpc_code_to_return\x18\x02 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x03 \x01(\t\x12\x13\n\x0bserver_port\x18\x04 \x01(\x05\"F\n\x12HookRequestCommand\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\t\n\x05START\x10\x01\x12\x08\n\x04STOP\x10\x02\x12\n\n\x06RETURN\x10\x03\"\x0e\n\x0cHookResponse*\x1f\n\x0bPayloadType\x12\x10\n\x0c\x43OMPRESSABLE\x10\x00*o\n\x0fGrpclbRouteType\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_UNKNOWN\x10\x00\x12\x1e\n\x1aGRPCLB_ROUTE_TYPE_FALLBACK\x10\x01\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_BACKEND\x10\x02\x42\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
 
 pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
@@ -51,6 +51,7 @@ module Testing
     LoadBalancerStatsResponse::RpcMetadata = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcMetadata").msgclass
     LoadBalancerStatsResponse::MetadataByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.MetadataByPeer").msgclass
     LoadBalancerStatsResponse::RpcsByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcsByPeer").msgclass
+    LoadBalancerStatsResponse::MetadataType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.MetadataType").enummodule
     LoadBalancerAccumulatedStatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsRequest").msgclass
     LoadBalancerAccumulatedStatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsResponse").msgclass
     LoadBalancerAccumulatedStatsResponse::MethodStats = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats").msgclass
@@ -60,6 +61,10 @@ module Testing
     ClientConfigureResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.ClientConfigureResponse").msgclass
     MemorySize = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.MemorySize").msgclass
     TestOrcaReport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.TestOrcaReport").msgclass
+    SetReturnStatusRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.SetReturnStatusRequest").msgclass
+    HookRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookRequest").msgclass
+    HookRequest::HookRequestCommand = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookRequest.HookRequestCommand").enummodule
+    HookResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookResponse").msgclass
     PayloadType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.PayloadType").enummodule
     GrpclbRouteType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GrpclbRouteType").enummodule
   end
diff --git a/src/ruby/pb/src/proto/grpc/testing/test_pb.rb b/src/ruby/pb/src/proto/grpc/testing/test_pb.rb
index 4f1ae0874919a..241a5da718949 100644
--- a/src/ruby/pb/src/proto/grpc/testing/test_pb.rb
+++ b/src/ruby/pb/src/proto/grpc/testing/test_pb.rb
@@ -8,13 +8,13 @@
 require 'src/proto/grpc/testing/messages_pb'
 
 
-descriptor_data = "\n!src/proto/grpc/testing/test.proto\x12\x0cgrpc.testing\x1a\"src/proto/grpc/testing/empty.proto\x1a%src/proto/grpc/testing/messages.proto2\xcb\x05\n\x0bTestService\x12\x35\n\tEmptyCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x46\n\tUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12O\n\x12\x43\x61\x63heableUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12l\n\x13StreamingOutputCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse0\x01\x12i\n\x12StreamingInputCall\x12\'.grpc.testing.StreamingInputCallRequest\x1a(.grpc.testing.StreamingInputCallResponse(\x01\x12i\n\x0e\x46ullDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12i\n\x0eHalfDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2U\n\x14UnimplementedService\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2\x89\x01\n\x10ReconnectService\x12;\n\x05Start\x12\x1d.grpc.testing.ReconnectParams\x1a\x13.grpc.testing.Empty\x12\x38\n\x04Stop\x12\x13.grpc.testing.Empty\x1a\x1b.grpc.testing.ReconnectInfo2\x86\x02\n\x18LoadBalancerStatsService\x12\x63\n\x0eGetClientStats\x12&.grpc.testing.LoadBalancerStatsRequest\x1a\'.grpc.testing.LoadBalancerStatsResponse\"\x00\x12\x84\x01\n\x19GetClientAccumulatedStats\x12\x31.grpc.testing.LoadBalancerAccumulatedStatsRequest\x1a\x32.grpc.testing.LoadBalancerAccumulatedStatsResponse\"\x00\x32\x8b\x01\n\x16XdsUpdateHealthService\x12\x36\n\nSetServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x39\n\rSetNotServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2{\n\x1fXdsUpdateClientConfigureService\x12X\n\tConfigure\x12$.grpc.testing.ClientConfigureRequest\x1a%.grpc.testing.ClientConfigureResponseb\x06proto3"
+descriptor_data = "\n!src/proto/grpc/testing/test.proto\x12\x0cgrpc.testing\x1a\"src/proto/grpc/testing/empty.proto\x1a%src/proto/grpc/testing/messages.proto2\xcb\x05\n\x0bTestService\x12\x35\n\tEmptyCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x46\n\tUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12O\n\x12\x43\x61\x63heableUnaryCall\x12\x1b.grpc.testing.SimpleRequest\x1a\x1c.grpc.testing.SimpleResponse\x12l\n\x13StreamingOutputCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse0\x01\x12i\n\x12StreamingInputCall\x12\'.grpc.testing.StreamingInputCallRequest\x1a(.grpc.testing.StreamingInputCallResponse(\x01\x12i\n\x0e\x46ullDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12i\n\x0eHalfDuplexCall\x12(.grpc.testing.StreamingOutputCallRequest\x1a).grpc.testing.StreamingOutputCallResponse(\x01\x30\x01\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2U\n\x14UnimplementedService\x12=\n\x11UnimplementedCall\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2\x89\x01\n\x10ReconnectService\x12;\n\x05Start\x12\x1d.grpc.testing.ReconnectParams\x1a\x13.grpc.testing.Empty\x12\x38\n\x04Stop\x12\x13.grpc.testing.Empty\x1a\x1b.grpc.testing.ReconnectInfo2\x86\x02\n\x18LoadBalancerStatsService\x12\x63\n\x0eGetClientStats\x12&.grpc.testing.LoadBalancerStatsRequest\x1a\'.grpc.testing.LoadBalancerStatsResponse\"\x00\x12\x84\x01\n\x19GetClientAccumulatedStats\x12\x31.grpc.testing.LoadBalancerAccumulatedStatsRequest\x1a\x32.grpc.testing.LoadBalancerAccumulatedStatsResponse\"\x00\x32\xcc\x01\n\x0bHookService\x12\x30\n\x04Hook\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12L\n\x0fSetReturnStatus\x12$.grpc.testing.SetReturnStatusRequest\x1a\x13.grpc.testing.Empty\x12=\n\x11\x43learReturnStatus\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty2\xd5\x01\n\x16XdsUpdateHealthService\x12\x36\n\nSetServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12\x39\n\rSetNotServing\x12\x13.grpc.testing.Empty\x1a\x13.grpc.testing.Empty\x12H\n\x0fSendHookRequest\x12\x19.grpc.testing.HookRequest\x1a\x1a.grpc.testing.HookResponse2{\n\x1fXdsUpdateClientConfigureService\x12X\n\tConfigure\x12$.grpc.testing.ClientConfigureRequest\x1a%.grpc.testing.ClientConfigureResponseB\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
 
 pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb
index 55837a6dcffcc..062e79482bf9c 100644
--- a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb
+++ b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb
@@ -116,6 +116,27 @@ class Service
 
       Stub = Service.rpc_stub_class
     end
+    module HookService
+      # Hook service. Used to keep Kubernetes from shutting the pod down.
+      class Service
+
+        include ::GRPC::GenericService
+
+        self.marshal_class_method = :encode
+        self.unmarshal_class_method = :decode
+        self.service_name = 'grpc.testing.HookService'
+
+        # Sends a request that will "hang" until the return status is set by a call
+        # to a SetReturnStatus
+        rpc :Hook, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty
+        # Sets a return status for pending and upcoming calls to Hook
+        rpc :SetReturnStatus, ::Grpc::Testing::SetReturnStatusRequest, ::Grpc::Testing::Empty
+        # Clears the return status. Incoming calls to Hook will "hang"
+        rpc :ClearReturnStatus, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty
+      end
+
+      Stub = Service.rpc_stub_class
+    end
     module XdsUpdateHealthService
       # A service to remotely control health status of an xDS test server.
       class Service
@@ -128,6 +149,7 @@ class Service
 
         rpc :SetServing, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty
         rpc :SetNotServing, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty
+        rpc :SendHookRequest, ::Grpc::Testing::HookRequest, ::Grpc::Testing::HookResponse
       end
 
       Stub = Service.rpc_stub_class
diff --git a/src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb b/src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb
index 707cbf26b2848..1c7e09ad4d691 100644
--- a/src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb
@@ -13,7 +13,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/qps/src/proto/grpc/testing/control_pb.rb b/src/ruby/qps/src/proto/grpc/testing/control_pb.rb
index e29a5d7c21b5f..9eceb014fd250 100644
--- a/src/ruby/qps/src/proto/grpc/testing/control_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/control_pb.rb
@@ -15,7 +15,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb b/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb
index d0faa68e12030..d714d0aa715c0 100644
--- a/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb
@@ -5,13 +5,13 @@
 require 'google/protobuf'
 
 
-descriptor_data = "\n%src/proto/grpc/testing/messages.proto\x12\x0cgrpc.testing\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"@\n\x07Payload\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x0c\n\x04\x62ody\x18\x02 \x01(\x0c\"+\n\nEchoStatus\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xc3\x03\n\rSimpleRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x15\n\rresponse_size\x18\x02 \x01(\x05\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x15\n\rfill_username\x18\x04 \x01(\x08\x12\x18\n\x10\x66ill_oauth_scope\x18\x05 \x01(\x08\x12\x34\n\x13response_compressed\x18\x06 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x32\n\x11\x65xpect_compressed\x18\x08 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x16\n\x0e\x66ill_server_id\x18\t \x01(\x08\x12\x1e\n\x16\x66ill_grpclb_route_type\x18\n \x01(\x08\x12;\n\x15orca_per_query_report\x18\x0b \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"\xbe\x01\n\x0eSimpleResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boauth_scope\x18\x03 \x01(\t\x12\x11\n\tserver_id\x18\x04 \x01(\t\x12\x38\n\x11grpclb_route_type\x18\x05 \x01(\x0e\x32\x1d.grpc.testing.GrpclbRouteType\x12\x10\n\x08hostname\x18\x06 \x01(\t\"w\n\x19StreamingInputCallRequest\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x32\n\x11\x65xpect_compressed\x18\x02 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"=\n\x1aStreamingInputCallResponse\x12\x1f\n\x17\x61ggregated_payload_size\x18\x01 \x01(\x05\"d\n\x12ResponseParameters\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\x13\n\x0binterval_us\x18\x02 \x01(\x05\x12+\n\ncompressed\x18\x03 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"\x9f\x02\n\x1aStreamingOutputCallRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12=\n\x13response_parameters\x18\x02 \x03(\x0b\x32 .grpc.testing.ResponseParameters\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x35\n\x0forca_oob_report\x18\x08 \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"E\n\x1bStreamingOutputCallResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\"3\n\x0fReconnectParams\x12 \n\x18max_reconnect_backoff_ms\x18\x01 \x01(\x05\"3\n\rReconnectInfo\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\nbackoff_ms\x18\x02 \x03(\x05\"X\n\x18LoadBalancerStatsRequest\x12\x10\n\x08num_rpcs\x18\x01 \x01(\x05\x12\x13\n\x0btimeout_sec\x18\x02 \x01(\x05\x12\x15\n\rmetadata_keys\x18\x03 \x03(\t\"\xb6\x07\n\x19LoadBalancerStatsResponse\x12M\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x37.grpc.testing.LoadBalancerStatsResponse.RpcsByPeerEntry\x12\x14\n\x0cnum_failures\x18\x02 \x01(\x05\x12Q\n\x0erpcs_by_method\x18\x03 \x03(\x0b\x32\x39.grpc.testing.LoadBalancerStatsResponse.RpcsByMethodEntry\x12W\n\x11metadatas_by_peer\x18\x04 \x03(\x0b\x32<.grpc.testing.LoadBalancerStatsResponse.MetadatasByPeerEntry\x1a+\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x1aV\n\x0bRpcMetadata\x12G\n\x08metadata\x18\x01 \x03(\x0b\x32\x35.grpc.testing.LoadBalancerStatsResponse.MetadataEntry\x1a[\n\x0eMetadataByPeer\x12I\n\x0crpc_metadata\x18\x01 \x03(\x0b\x32\x33.grpc.testing.LoadBalancerStatsResponse.RpcMetadata\x1a\x99\x01\n\nRpcsByPeer\x12X\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x42.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer.RpcsByPeerEntry\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1ag\n\x11RpcsByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x41\n\x05value\x18\x02 \x01(\x0b\x32\x32.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer:\x02\x38\x01\x1an\n\x14MetadatasByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x45\n\x05value\x18\x02 \x01(\x0b\x32\x36.grpc.testing.LoadBalancerStatsResponse.MetadataByPeer:\x02\x38\x01\"%\n#LoadBalancerAccumulatedStatsRequest\"\xd8\x07\n$LoadBalancerAccumulatedStatsResponse\x12v\n\x1anum_rpcs_started_by_method\x18\x01 \x03(\x0b\x32N.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsStartedByMethodEntryB\x02\x18\x01\x12z\n\x1cnum_rpcs_succeeded_by_method\x18\x02 \x03(\x0b\x32P.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsSucceededByMethodEntryB\x02\x18\x01\x12t\n\x19num_rpcs_failed_by_method\x18\x03 \x03(\x0b\x32M.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsFailedByMethodEntryB\x02\x18\x01\x12`\n\x10stats_per_method\x18\x04 \x03(\x0b\x32\x46.grpc.testing.LoadBalancerAccumulatedStatsResponse.StatsPerMethodEntry\x1a=\n\x1bNumRpcsStartedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a?\n\x1dNumRpcsSucceededByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a<\n\x1aNumRpcsFailedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\xae\x01\n\x0bMethodStats\x12\x14\n\x0crpcs_started\x18\x01 \x01(\x05\x12Z\n\x06result\x18\x02 \x03(\x0b\x32J.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats.ResultEntry\x1a-\n\x0bResultEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1au\n\x13StatsPerMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12M\n\x05value\x18\x02 \x01(\x0b\x32>.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats:\x02\x38\x01\"\xba\x02\n\x16\x43lientConfigureRequest\x12;\n\x05types\x18\x01 \x03(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12?\n\x08metadata\x18\x02 \x03(\x0b\x32-.grpc.testing.ClientConfigureRequest.Metadata\x12\x13\n\x0btimeout_sec\x18\x03 \x01(\x05\x1a\x62\n\x08Metadata\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\")\n\x07RpcType\x12\x0e\n\nEMPTY_CALL\x10\x00\x12\x0e\n\nUNARY_CALL\x10\x01\"\x19\n\x17\x43lientConfigureResponse\"\x19\n\nMemorySize\x12\x0b\n\x03rss\x18\x01 \x01(\x03\"\xb6\x02\n\x0eTestOrcaReport\x12\x17\n\x0f\x63pu_utilization\x18\x01 \x01(\x01\x12\x1a\n\x12memory_utilization\x18\x02 \x01(\x01\x12\x43\n\x0crequest_cost\x18\x03 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.RequestCostEntry\x12\x42\n\x0butilization\x18\x04 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.UtilizationEntry\x1a\x32\n\x10RequestCostEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x1a\x32\n\x10UtilizationEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01*\x1f\n\x0bPayloadType\x12\x10\n\x0c\x43OMPRESSABLE\x10\x00*o\n\x0fGrpclbRouteType\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_UNKNOWN\x10\x00\x12\x1e\n\x1aGRPCLB_ROUTE_TYPE_FALLBACK\x10\x01\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_BACKEND\x10\x02\x42\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
+descriptor_data = "\n%src/proto/grpc/testing/messages.proto\x12\x0cgrpc.testing\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"@\n\x07Payload\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x0c\n\x04\x62ody\x18\x02 \x01(\x0c\"+\n\nEchoStatus\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\"\xc3\x03\n\rSimpleRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12\x15\n\rresponse_size\x18\x02 \x01(\x05\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x15\n\rfill_username\x18\x04 \x01(\x08\x12\x18\n\x10\x66ill_oauth_scope\x18\x05 \x01(\x08\x12\x34\n\x13response_compressed\x18\x06 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x32\n\x11\x65xpect_compressed\x18\x08 \x01(\x0b\x32\x17.grpc.testing.BoolValue\x12\x16\n\x0e\x66ill_server_id\x18\t \x01(\x08\x12\x1e\n\x16\x66ill_grpclb_route_type\x18\n \x01(\x08\x12;\n\x15orca_per_query_report\x18\x0b \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"\xbe\x01\n\x0eSimpleResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boauth_scope\x18\x03 \x01(\t\x12\x11\n\tserver_id\x18\x04 \x01(\t\x12\x38\n\x11grpclb_route_type\x18\x05 \x01(\x0e\x32\x1d.grpc.testing.GrpclbRouteType\x12\x10\n\x08hostname\x18\x06 \x01(\t\"w\n\x19StreamingInputCallRequest\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x32\n\x11\x65xpect_compressed\x18\x02 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"=\n\x1aStreamingInputCallResponse\x12\x1f\n\x17\x61ggregated_payload_size\x18\x01 \x01(\x05\"d\n\x12ResponseParameters\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\x13\n\x0binterval_us\x18\x02 \x01(\x05\x12+\n\ncompressed\x18\x03 \x01(\x0b\x32\x17.grpc.testing.BoolValue\"\x9f\x02\n\x1aStreamingOutputCallRequest\x12\x30\n\rresponse_type\x18\x01 \x01(\x0e\x32\x19.grpc.testing.PayloadType\x12=\n\x13response_parameters\x18\x02 \x03(\x0b\x32 .grpc.testing.ResponseParameters\x12&\n\x07payload\x18\x03 \x01(\x0b\x32\x15.grpc.testing.Payload\x12\x31\n\x0fresponse_status\x18\x07 \x01(\x0b\x32\x18.grpc.testing.EchoStatus\x12\x35\n\x0forca_oob_report\x18\x08 \x01(\x0b\x32\x1c.grpc.testing.TestOrcaReport\"E\n\x1bStreamingOutputCallResponse\x12&\n\x07payload\x18\x01 \x01(\x0b\x32\x15.grpc.testing.Payload\"3\n\x0fReconnectParams\x12 \n\x18max_reconnect_backoff_ms\x18\x01 \x01(\x05\"3\n\rReconnectInfo\x12\x0e\n\x06passed\x18\x01 \x01(\x08\x12\x12\n\nbackoff_ms\x18\x02 \x03(\x05\"X\n\x18LoadBalancerStatsRequest\x12\x10\n\x08num_rpcs\x18\x01 \x01(\x05\x12\x13\n\x0btimeout_sec\x18\x02 \x01(\x05\x12\x15\n\rmetadata_keys\x18\x03 \x03(\t\"\xb2\x08\n\x19LoadBalancerStatsResponse\x12M\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x37.grpc.testing.LoadBalancerStatsResponse.RpcsByPeerEntry\x12\x14\n\x0cnum_failures\x18\x02 \x01(\x05\x12Q\n\x0erpcs_by_method\x18\x03 \x03(\x0b\x32\x39.grpc.testing.LoadBalancerStatsResponse.RpcsByMethodEntry\x12W\n\x11metadatas_by_peer\x18\x04 \x03(\x0b\x32<.grpc.testing.LoadBalancerStatsResponse.MetadatasByPeerEntry\x1ao\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\x42\n\x04type\x18\x03 \x01(\x0e\x32\x34.grpc.testing.LoadBalancerStatsResponse.MetadataType\x1aV\n\x0bRpcMetadata\x12G\n\x08metadata\x18\x01 \x03(\x0b\x32\x35.grpc.testing.LoadBalancerStatsResponse.MetadataEntry\x1a[\n\x0eMetadataByPeer\x12I\n\x0crpc_metadata\x18\x01 \x03(\x0b\x32\x33.grpc.testing.LoadBalancerStatsResponse.RpcMetadata\x1a\x99\x01\n\nRpcsByPeer\x12X\n\x0crpcs_by_peer\x18\x01 \x03(\x0b\x32\x42.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer.RpcsByPeerEntry\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x31\n\x0fRpcsByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1ag\n\x11RpcsByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x41\n\x05value\x18\x02 \x01(\x0b\x32\x32.grpc.testing.LoadBalancerStatsResponse.RpcsByPeer:\x02\x38\x01\x1an\n\x14MetadatasByPeerEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x45\n\x05value\x18\x02 \x01(\x0b\x32\x36.grpc.testing.LoadBalancerStatsResponse.MetadataByPeer:\x02\x38\x01\"6\n\x0cMetadataType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07INITIAL\x10\x01\x12\x0c\n\x08TRAILING\x10\x02\"%\n#LoadBalancerAccumulatedStatsRequest\"\xd8\x07\n$LoadBalancerAccumulatedStatsResponse\x12v\n\x1anum_rpcs_started_by_method\x18\x01 \x03(\x0b\x32N.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsStartedByMethodEntryB\x02\x18\x01\x12z\n\x1cnum_rpcs_succeeded_by_method\x18\x02 \x03(\x0b\x32P.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsSucceededByMethodEntryB\x02\x18\x01\x12t\n\x19num_rpcs_failed_by_method\x18\x03 \x03(\x0b\x32M.grpc.testing.LoadBalancerAccumulatedStatsResponse.NumRpcsFailedByMethodEntryB\x02\x18\x01\x12`\n\x10stats_per_method\x18\x04 \x03(\x0b\x32\x46.grpc.testing.LoadBalancerAccumulatedStatsResponse.StatsPerMethodEntry\x1a=\n\x1bNumRpcsStartedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a?\n\x1dNumRpcsSucceededByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a<\n\x1aNumRpcsFailedByMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\xae\x01\n\x0bMethodStats\x12\x14\n\x0crpcs_started\x18\x01 \x01(\x05\x12Z\n\x06result\x18\x02 \x03(\x0b\x32J.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats.ResultEntry\x1a-\n\x0bResultEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1au\n\x13StatsPerMethodEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12M\n\x05value\x18\x02 \x01(\x0b\x32>.grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats:\x02\x38\x01\"\xba\x02\n\x16\x43lientConfigureRequest\x12;\n\x05types\x18\x01 \x03(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12?\n\x08metadata\x18\x02 \x03(\x0b\x32-.grpc.testing.ClientConfigureRequest.Metadata\x12\x13\n\x0btimeout_sec\x18\x03 \x01(\x05\x1a\x62\n\x08Metadata\x12:\n\x04type\x18\x01 \x01(\x0e\x32,.grpc.testing.ClientConfigureRequest.RpcType\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\")\n\x07RpcType\x12\x0e\n\nEMPTY_CALL\x10\x00\x12\x0e\n\nUNARY_CALL\x10\x01\"\x19\n\x17\x43lientConfigureResponse\"\x19\n\nMemorySize\x12\x0b\n\x03rss\x18\x01 \x01(\x03\"\xb6\x02\n\x0eTestOrcaReport\x12\x17\n\x0f\x63pu_utilization\x18\x01 \x01(\x01\x12\x1a\n\x12memory_utilization\x18\x02 \x01(\x01\x12\x43\n\x0crequest_cost\x18\x03 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.RequestCostEntry\x12\x42\n\x0butilization\x18\x04 \x03(\x0b\x32-.grpc.testing.TestOrcaReport.UtilizationEntry\x1a\x32\n\x10RequestCostEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x1a\x32\n\x10UtilizationEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\"V\n\x16SetReturnStatusRequest\x12\x1b\n\x13grpc_code_to_return\x18\x01 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x02 \x01(\t\"\xe7\x01\n\x0bHookRequest\x12=\n\x07\x63ommand\x18\x01 \x01(\x0e\x32,.grpc.testing.HookRequest.HookRequestCommand\x12\x1b\n\x13grpc_code_to_return\x18\x02 \x01(\x05\x12\x1f\n\x17grpc_status_description\x18\x03 \x01(\t\x12\x13\n\x0bserver_port\x18\x04 \x01(\x05\"F\n\x12HookRequestCommand\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\t\n\x05START\x10\x01\x12\x08\n\x04STOP\x10\x02\x12\n\n\x06RETURN\x10\x03\"\x0e\n\x0cHookResponse*\x1f\n\x0bPayloadType\x12\x10\n\x0c\x43OMPRESSABLE\x10\x00*o\n\x0fGrpclbRouteType\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_UNKNOWN\x10\x00\x12\x1e\n\x1aGRPCLB_ROUTE_TYPE_FALLBACK\x10\x01\x12\x1d\n\x19GRPCLB_ROUTE_TYPE_BACKEND\x10\x02\x42\x1d\n\x1bio.grpc.testing.integrationb\x06proto3"
 
 pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
@@ -51,6 +51,7 @@ module Testing
     LoadBalancerStatsResponse::RpcMetadata = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcMetadata").msgclass
     LoadBalancerStatsResponse::MetadataByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.MetadataByPeer").msgclass
     LoadBalancerStatsResponse::RpcsByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcsByPeer").msgclass
+    LoadBalancerStatsResponse::MetadataType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.MetadataType").enummodule
     LoadBalancerAccumulatedStatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsRequest").msgclass
     LoadBalancerAccumulatedStatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsResponse").msgclass
     LoadBalancerAccumulatedStatsResponse::MethodStats = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerAccumulatedStatsResponse.MethodStats").msgclass
@@ -60,6 +61,10 @@ module Testing
     ClientConfigureResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.ClientConfigureResponse").msgclass
     MemorySize = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.MemorySize").msgclass
     TestOrcaReport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.TestOrcaReport").msgclass
+    SetReturnStatusRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.SetReturnStatusRequest").msgclass
+    HookRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookRequest").msgclass
+    HookRequest::HookRequestCommand = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookRequest.HookRequestCommand").enummodule
+    HookResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.HookResponse").msgclass
     PayloadType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.PayloadType").enummodule
     GrpclbRouteType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GrpclbRouteType").enummodule
   end
diff --git a/src/ruby/qps/src/proto/grpc/testing/payloads_pb.rb b/src/ruby/qps/src/proto/grpc/testing/payloads_pb.rb
index e87bc874e2a78..d9f3189e9bca1 100644
--- a/src/ruby/qps/src/proto/grpc/testing/payloads_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/payloads_pb.rb
@@ -11,7 +11,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb
index bdb0d5d3c3223..075b6af2c84ff 100644
--- a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb
@@ -13,7 +13,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/qps/src/proto/grpc/testing/stats_pb.rb b/src/ruby/qps/src/proto/grpc/testing/stats_pb.rb
index 7051f22fdb1dd..3e55cf62f9043 100644
--- a/src/ruby/qps/src/proto/grpc/testing/stats_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/stats_pb.rb
@@ -11,7 +11,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb b/src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb
index be44d3155d169..2bc631d2c40b0 100644
--- a/src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb
+++ b/src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb
@@ -13,7 +13,7 @@
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb
index 619ce83d7a5f6..d14e6df41cfed 100644
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.60.0.dev'
+    VERSION = '1.61.0.dev'
   end
 end
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 1b4578f884417..914fe3b79424c 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -526,9 +526,9 @@
   # for DLL builds - and should be completely removed when source files are
   # generated with the necessary __declspec annotations.
   set(gRPC_UPB_GEN_DUPL_SRC
-    src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c
-    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-    src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c
+    src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
+    src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c
+    src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
   )
   set(gRPC_ADDITIONAL_DLL_SRC
     src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
diff --git a/templates/Package.swift.template b/templates/Package.swift.template
index 3261842b3ba3e..acff5e5cf25ef 100644
--- a/templates/Package.swift.template
+++ b/templates/Package.swift.template
@@ -62,8 +62,8 @@
             .headerSearchPath("third_party/upb/"),
             .headerSearchPath("third_party/utf8_range/"),
             .headerSearchPath("third_party/xxhash/"),
-            .headerSearchPath("src/core/ext/upb-generated/"),
-            .headerSearchPath("src/core/ext/upbdefs-generated/"),
+            .headerSearchPath("src/core/ext/upb-gen/"),
+            .headerSearchPath("src/core/ext/upbdefs-gen/"),
             .define("GRPC_ARES", to: "0"),
           ],
           linkerSettings: [
@@ -105,7 +105,7 @@
             .headerSearchPath("./"),
             .headerSearchPath("include/"),
             .headerSearchPath("third_party/upb/"),
-            .headerSearchPath("src/core/ext/upb-generated"),
+            .headerSearchPath("src/core/ext/upb-gen"),
           ]
         ),
         .testTarget(
diff --git a/templates/config.m4.template b/templates/config.m4.template
index 53daf66df603e..b87f23a0d567f 100644
--- a/templates/config.m4.template
+++ b/templates/config.m4.template
@@ -8,8 +8,8 @@
 
     dnl # --with-grpc -> add include path
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
-    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-generated)
-    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-generated)
+    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-gen)
+    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-gen)
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/abseil-cpp)
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/address_sorting/include)
diff --git a/templates/config.w32.template b/templates/config.w32.template
index 8503dd0b8b76e..c26c0f58f9f1c 100644
--- a/templates/config.w32.template
+++ b/templates/config.w32.template
@@ -34,8 +34,8 @@
       "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
       "/I"+configure_module_dirname+" "+
       "/I"+configure_module_dirname+"\\include "+
-      "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-generated "+
-      "/I"+configure_module_dirname+"\\src\\core\\ext\\upbdefs-generated "+
+      "/I"+configure_module_dirname+"\\src\\core\\ext\\upb-gen "+
+      "/I"+configure_module_dirname+"\\src\\core\\ext\\upbdefs-gen "+
       "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
       "/I"+configure_module_dirname+"\\third_party\\abseil-cpp "+
       "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include "+
diff --git a/templates/doc/bazel_support.md.template b/templates/doc/bazel_support.md.template
index bfa12915ab253..fe824274090df 100644
--- a/templates/doc/bazel_support.md.template
+++ b/templates/doc/bazel_support.md.template
@@ -36,8 +36,12 @@
   
   ${ '##' } Supported Versions
   
-  In general, gRPC supports building with the latest patch release of the two most
-  recent LTS versions of Bazel. However individual releases may have a broader
+  gRPC supports building with the latest stable release of Bazel,
+  as well as the previous major version release for at least 6 months
+  after it transitions into maintenance mode.
+  This is consistent with the supported build systems of
+  [the Google Foundational C++ Support Policy](https://opensource.google/documentation/policies/cplusplus-support).
+  However individual releases may have a broader
   compatibility range. The currently supported versions are captured by the
   following list:
 
diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template
index 51020aa19145b..739e2af928d83 100644
--- a/templates/gRPC-C++.podspec.template
+++ b/templates/gRPC-C++.podspec.template
@@ -137,8 +137,8 @@
     s.pod_target_xcconfig = {
       'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
       'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'${"\\"}
-          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-generated"'${"\\"}
-          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-generated"'${"\\"}
+          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'${"\\"}
+          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/re2"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/upb"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/xxhash"',
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index 6bdea60c5214d..626e67b4a7064 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -150,8 +150,8 @@
     s.pod_target_xcconfig = {
       'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
       'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'${"\\"}
-          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-generated"'${"\\"}
-          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-generated"'${"\\"}
+          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'${"\\"}
+          ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/re2"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/upb"'${"\\"}
           ' "$(PODS_TARGET_SRCROOT)/third_party/utf8_range"'${"\\"}
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index 735a0ab449c68..6bba4e1aa6c6c 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -34,6 +34,8 @@
       :tag => "v#{version}",
     }
 
+    s.resource = 'src/objective-c/PrivacyInfo.xcprivacy'
+
     name = 'GRPCClient'
     s.module_name = name
     s.header_dir = name
diff --git a/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template b/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template
deleted file mode 100644
index ecb4deef2839b..0000000000000
--- a/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template
+++ /dev/null
@@ -1,30 +0,0 @@
-%YAML 1.2
---- |
-  # 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.
-  
-  # Docker file for running IWYU.
-  # Updated: 2022-11-03
-
-  FROM silkeh/clang:16-bullseye
-
-  # Install prerequisites for the iwyu script
-  RUN apt-get update && apt-get install -y python3 jq git cmake python zlib1g-dev libtinfo-dev libclang-16-dev && apt-get clean
-  ADD iwyu.sh /
-
-  # When running locally, we'll be impersonating the current user, so we need
-  # to make the script runnable by everyone.
-  RUN chmod a+rx /iwyu.sh
-  
-  CMD ["echo 'Run with tools/distrib/iwyu.sh'"]
diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc
index 4f0af52b01621..384d1662ab24c 100644
--- a/test/core/bad_client/tests/initial_settings_frame.cc
+++ b/test/core/bad_client/tests/initial_settings_frame.cc
@@ -200,12 +200,10 @@ int main(int argc, char** argv) {
                            GRPC_BAD_CLIENT_DISCONNECT);
 
   // too many requests before the settings ack is sent should be cancelled
-  if (grpc_core::IsBlockExcessiveRequestsBeforeSettingsAckEnabled()) {
-    GRPC_RUN_BAD_CLIENT_TEST(single_request_verifier, nullptr,
-                             PFX_STR ZERO_SETTING_HDR FOOBAR_0 FOOBAR_2
-                                 SETTING_ACK RST_STREAM_1 RST_STREAM_3 FOOBAR_1,
-                             GRPC_BAD_CLIENT_MAX_CONCURRENT_REQUESTS_OF_ONE);
-  }
+  GRPC_RUN_BAD_CLIENT_TEST(single_request_verifier, nullptr,
+                           PFX_STR ZERO_SETTING_HDR FOOBAR_0 FOOBAR_2
+                               SETTING_ACK RST_STREAM_1 RST_STREAM_3 FOOBAR_1,
+                           GRPC_BAD_CLIENT_MAX_CONCURRENT_REQUESTS_OF_ONE);
 
   grpc_shutdown();
   return 0;
diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc
index 10a05d35e2637..fd035ccc12d46 100644
--- a/test/core/channel/channel_args_test.cc
+++ b/test/core/channel/channel_args_test.cc
@@ -209,6 +209,37 @@ TEST(ChannelArgsTest, GetNonOwningEventEngine) {
   ASSERT_EQ(p.use_count(), 2);
 }
 
+struct MutableValue : public RefCounted<MutableValue> {
+  static constexpr absl::string_view ChannelArgName() {
+    return "grpc.test.mutable_value";
+  }
+  static int ChannelArgsCompare(const MutableValue* a, const MutableValue* b) {
+    return a->i - b->i;
+  }
+  int i = 42;
+};
+
+struct ConstValue : public RefCounted<ConstValue> {
+  static constexpr absl::string_view ChannelArgName() {
+    return "grpc.test.const_value";
+  }
+  static constexpr bool ChannelArgUseConstPtr() { return true; };
+  static int ChannelArgsCompare(const ConstValue* a, const ConstValue* b) {
+    return a->i - b->i;
+  }
+  int i = 42;
+};
+
+TEST(ChannelArgsTest, SetObjectRespectsMutabilityConstraints) {
+  auto m = MakeRefCounted<MutableValue>();
+  auto c = MakeRefCounted<const ConstValue>();
+  auto args = ChannelArgs().SetObject(m).SetObject(c);
+  RefCountedPtr<MutableValue> m1 = args.GetObjectRef<MutableValue>();
+  RefCountedPtr<const ConstValue> c1 = args.GetObjectRef<ConstValue>();
+  EXPECT_EQ(m1.get(), m.get());
+  EXPECT_EQ(c1.get(), c.get());
+}
+
 }  // namespace grpc_core
 
 TEST(GrpcChannelArgsTest, Create) {
diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc
index 4e253b832d0f6..65d4466eff9bd 100644
--- a/test/core/channel/channel_stack_builder_test.cc
+++ b/test/core/channel/channel_stack_builder_test.cc
@@ -62,8 +62,8 @@ const grpc_channel_filter* FilterNamed(const char* name) {
       ->emplace(
           name,
           new grpc_channel_filter{
-              grpc_call_next_op, nullptr, grpc_channel_next_op, 0, CallInitFunc,
-              grpc_call_stack_ignore_set_pollset_or_pollset_set,
+              grpc_call_next_op, nullptr, nullptr, grpc_channel_next_op, 0,
+              CallInitFunc, grpc_call_stack_ignore_set_pollset_or_pollset_set,
               CallDestroyFunc, 0, ChannelInitFunc,
               [](grpc_channel_stack*, grpc_channel_element*) {},
               ChannelDestroyFunc, grpc_channel_next_get_info, name})
diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc
index 7ed34f60b6419..4054e6a8844f2 100644
--- a/test/core/channel/channel_stack_test.cc
+++ b/test/core/channel/channel_stack_test.cc
@@ -83,6 +83,7 @@ TEST(ChannelStackTest, CreateChannelStack) {
   const grpc_channel_filter filter = {
       call_func,
       nullptr,
+      nullptr,
       channel_func,
       sizeof(int),
       call_init_func,
diff --git a/test/core/client_channel/lb_policy/lb_policy_test_lib.h b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
index 81365410c483b..27d7f38285bcb 100644
--- a/test/core/client_channel/lb_policy/lb_policy_test_lib.h
+++ b/test/core/client_channel/lb_policy/lb_policy_test_lib.h
@@ -773,7 +773,8 @@ class LoadBalancingPolicyTest : public ::testing::Test {
       absl::Span<const EndpointAddresses> endpoints,
       RefCountedPtr<LoadBalancingPolicy::Config> config) {
     LoadBalancingPolicy::UpdateArgs update;
-    update.addresses.emplace(endpoints.begin(), endpoints.end());
+    update.addresses = std::make_shared<EndpointAddressesListIterator>(
+        EndpointAddressesList(endpoints.begin(), endpoints.end()));
     update.config = std::move(config);
     return update;
   }
diff --git a/test/core/client_channel/lb_policy/pick_first_test.cc b/test/core/client_channel/lb_policy/pick_first_test.cc
index 1039f2b432980..c0424a49c54b0 100644
--- a/test/core/client_channel/lb_policy/pick_first_test.cc
+++ b/test/core/client_channel/lb_policy/pick_first_test.cc
@@ -423,6 +423,102 @@ TEST_F(PickFirstTest, StaysInTransientFailureAfterAddressListUpdate) {
   }
 }
 
+// This tests a real-world bug in which PF ignored a resolver update if
+// it had just created the subchannels but had not yet seen their
+// initial connectivity state notification.
+TEST_F(PickFirstTest, ResolverUpdateBeforeLeavingIdle) {
+  constexpr std::array<absl::string_view, 2> kAddresses = {
+      "ipv4:127.0.0.1:443", "ipv4:127.0.0.1:444"};
+  constexpr std::array<absl::string_view, 2> kNewAddresses = {
+      "ipv4:127.0.0.1:445", "ipv4:127.0.0.1:446"};
+  // Send initial update containing two addresses.
+  absl::Status status = ApplyUpdate(
+      BuildUpdate(kAddresses, MakePickFirstConfig(false)), lb_policy());
+  EXPECT_TRUE(status.ok()) << status;
+  // LB policy should have created a subchannel for both addresses.
+  auto* subchannel = FindSubchannel(kAddresses[0]);
+  ASSERT_NE(subchannel, nullptr);
+  auto* subchannel2 = FindSubchannel(kAddresses[1]);
+  ASSERT_NE(subchannel2, nullptr);
+  // When the LB policy receives the first subchannel's initial connectivity
+  // state notification (IDLE), it will request a connection.
+  EXPECT_TRUE(subchannel->ConnectionRequested());
+  // This causes the subchannel to start to connect, so it reports CONNECTING.
+  subchannel->SetConnectivityState(GRPC_CHANNEL_CONNECTING);
+  // LB policy should have reported CONNECTING state.
+  ExpectConnectingUpdate();
+  // The second subchannel should not be connecting.
+  EXPECT_FALSE(subchannel2->ConnectionRequested());
+  // When the first subchannel becomes connected, it reports READY.
+  subchannel->SetConnectivityState(GRPC_CHANNEL_READY);
+  // The LB policy will report CONNECTING some number of times (doesn't
+  // matter how many) and then report READY.
+  auto picker = WaitForConnected();
+  ASSERT_NE(picker, nullptr);
+  // Picker should return the same subchannel repeatedly.
+  for (size_t i = 0; i < 3; ++i) {
+    EXPECT_EQ(ExpectPickComplete(picker.get()), kAddresses[0]);
+  }
+  // Now the connection is closed, so we go IDLE.
+  subchannel->SetConnectivityState(GRPC_CHANNEL_IDLE);
+  ExpectReresolutionRequest();
+  ExpectState(GRPC_CHANNEL_IDLE);
+  // Now we tell the LB policy to exit idle.  This causes it to create a
+  // new subchannel list from the original update.  However, before it
+  // can get the initial connectivity state notifications for those
+  // subchannels (i.e., before it can transition from IDLE to CONNECTING),
+  // we send a new update.
+  absl::Notification notification;
+  work_serializer_->Run(
+      [&]() {
+        // Inject second update into WorkSerializer queue before we
+        // exit idle, so that the second update gets run before the initial
+        // subchannel connectivity state notifications from the first update
+        // are delivered.
+        work_serializer_->Run(
+            [&]() {
+              // Second update.
+              absl::Status status = lb_policy()->UpdateLocked(
+                  BuildUpdate(kNewAddresses, MakePickFirstConfig(false)));
+              EXPECT_TRUE(status.ok()) << status;
+              // Trigger notification once all connectivity state
+              // notifications have been delivered.
+              work_serializer_->Run([&]() { notification.Notify(); },
+                                    DEBUG_LOCATION);
+            },
+            DEBUG_LOCATION);
+        // Exit idle.
+        lb_policy()->ExitIdleLocked();
+      },
+      DEBUG_LOCATION);
+  notification.WaitForNotification();
+  // The LB policy should have created subchannels for the new addresses.
+  auto* subchannel3 = FindSubchannel(kNewAddresses[0]);
+  ASSERT_NE(subchannel3, nullptr);
+  auto* subchannel4 = FindSubchannel(kNewAddresses[1]);
+  ASSERT_NE(subchannel4, nullptr);
+  // The LB policy will request a connection on the first new subchannel,
+  // none of the others.
+  EXPECT_TRUE(subchannel3->ConnectionRequested());
+  EXPECT_FALSE(subchannel->ConnectionRequested());
+  EXPECT_FALSE(subchannel2->ConnectionRequested());
+  EXPECT_FALSE(subchannel4->ConnectionRequested());
+  // The subchannel starts a connection attempt.
+  subchannel3->SetConnectivityState(GRPC_CHANNEL_CONNECTING);
+  // The LB policy should now report CONNECTING.
+  ExpectConnectingUpdate();
+  // The connection attempt succeeds.
+  subchannel3->SetConnectivityState(GRPC_CHANNEL_READY);
+  // The LB policy will report CONNECTING some number of times (doesn't
+  // matter how many) and then report READY.
+  picker = WaitForConnected();
+  ASSERT_NE(picker, nullptr);
+  // Picker should return the same subchannel repeatedly.
+  for (size_t i = 0; i < 3; ++i) {
+    EXPECT_EQ(ExpectPickComplete(picker.get()), kNewAddresses[0]);
+  }
+}
+
 TEST_F(PickFirstTest, HappyEyeballs) {
   if (!IsPickFirstHappyEyeballsEnabled()) return;
   // Send an update containing three addresses.
diff --git a/test/core/client_channel/lb_policy/xds_override_host_test.cc b/test/core/client_channel/lb_policy/xds_override_host_test.cc
index f3bf82fc6becc..7e9d45d7f6316 100644
--- a/test/core/client_channel/lb_policy/xds_override_host_test.cc
+++ b/test/core/client_channel/lb_policy/xds_override_host_test.cc
@@ -99,11 +99,13 @@ class XdsOverrideHostTest : public LoadBalancingPolicyTest {
                                                                   "HEALTHY"}) {
     LoadBalancingPolicy::UpdateArgs update;
     update.config = MakeXdsOverrideHostConfig(override_host_status);
-    update.addresses.emplace();
+    EndpointAddressesList endpoints;
     for (auto address_and_status : addresses_and_statuses) {
-      update.addresses->push_back(MakeAddressWithHealthStatus(
+      endpoints.push_back(MakeAddressWithHealthStatus(
           address_and_status.first, address_and_status.second));
     }
+    update.addresses =
+        std::make_shared<EndpointAddressesListIterator>(std::move(endpoints));
     EXPECT_EQ(ApplyUpdate(update, lb_policy()), absl::OkStatus());
   }
 
diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
index fc663837a8bf1..08f7e161a8fb0 100644
--- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
@@ -42,6 +42,7 @@
 #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"
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/notification.h"
@@ -409,6 +410,14 @@ static void test_cooldown() {
 }
 
 TEST(DnsResolverCooldownTest, MainTest) {
+  // TODO(yijiem): This test tests the cooldown behavior of the PollingResolver
+  // interface. To do that, it overrides the grpc_dns_lookup_hostname_ares
+  // function and overrides the iomgr's g_dns_resolver system. We would need to
+  // rewrite this test for EventEngine using a custom EE DNSResolver or adding
+  // to the resolver_fuzzer.
+  if (grpc_core::IsEventEngineDnsEnabled()) {
+    GTEST_SKIP() << "Not with event engine dns";
+  }
   grpc_init();
 
   auto work_serializer = std::make_shared<grpc_core::WorkSerializer>(
diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc
index a02bfa244188b..97f6ec587e10e 100644
--- a/test/core/client_channel/resolvers/fake_resolver_test.cc
+++ b/test/core/client_channel/resolvers/fake_resolver_test.cc
@@ -32,11 +32,10 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
+#include "absl/synchronization/notification.h"
 #include "gtest/gtest.h"
 
 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -54,180 +53,175 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "test/core/util/test_config.h"
 
-class ResultHandler : public grpc_core::Resolver::ResultHandler {
- public:
-  void SetExpectedAndEvent(grpc_core::Resolver::Result expected,
-                           gpr_event* ev) {
-    grpc_core::MutexLock lock(&mu_);
-    ASSERT_EQ(ev_, nullptr);
-    expected_ = std::move(expected);
-    ev_ = ev;
-  }
+namespace grpc_core {
+namespace testing {
 
-  void ReportResult(grpc_core::Resolver::Result actual) override {
-    grpc_core::MutexLock lock(&mu_);
-    ASSERT_NE(ev_, nullptr);
-    // We only check the addresses, because that's the only thing
-    // explicitly set by the test via
-    // FakeResolverResponseGenerator::SetResponse().
-    ASSERT_TRUE(actual.addresses.ok());
-    ASSERT_EQ(actual.addresses->size(), expected_.addresses->size());
-    for (size_t i = 0; i < expected_.addresses->size(); ++i) {
-      ASSERT_EQ((*actual.addresses)[i], (*expected_.addresses)[i]);
+class FakeResolverTest : public ::testing::Test {
+ protected:
+  class ResultHandler : public Resolver::ResultHandler {
+   public:
+    void SetExpectedAndNotification(Resolver::Result expected,
+                                    absl::Notification* notification) {
+      MutexLock lock(&mu_);
+      ASSERT_EQ(notification_, nullptr);
+      expected_ = std::move(expected);
+      notification_ = notification;
     }
-    gpr_event_set(ev_, reinterpret_cast<void*>(1));
-    ev_ = nullptr;
-  }
 
- private:
-  grpc_core::Mutex mu_;
-  grpc_core::Resolver::Result expected_ ABSL_GUARDED_BY(mu_);
-  gpr_event* ev_ ABSL_GUARDED_BY(mu_) = nullptr;
-};
+    void ReportResult(Resolver::Result actual) override {
+      MutexLock lock(&mu_);
+      ASSERT_NE(notification_, nullptr);
+      // TODO(roth): Check fields other than just the addresses.
+      // Note: No good way to compare result_health_callback.
+      ASSERT_TRUE(actual.addresses.ok());
+      ASSERT_EQ(actual.addresses->size(), expected_.addresses->size());
+      for (size_t i = 0; i < expected_.addresses->size(); ++i) {
+        ASSERT_EQ((*actual.addresses)[i], (*expected_.addresses)[i]);
+      }
+      notification_->Notify();
+      notification_ = nullptr;
+    }
 
-static grpc_core::OrphanablePtr<grpc_core::Resolver> build_fake_resolver(
-    std::shared_ptr<grpc_core::WorkSerializer> work_serializer,
-    grpc_core::FakeResolverResponseGenerator* response_generator,
-    std::unique_ptr<grpc_core::Resolver::ResultHandler> result_handler) {
-  grpc_core::ResolverFactory* factory = grpc_core::CoreConfiguration::Get()
-                                            .resolver_registry()
-                                            .LookupResolverFactory("fake");
-  grpc_arg generator_arg =
-      grpc_core::FakeResolverResponseGenerator::MakeChannelArg(
-          response_generator);
-  grpc_channel_args channel_args = {1, &generator_arg};
-  grpc_core::ResolverArgs args;
-  args.args = grpc_core::ChannelArgs::FromC(&channel_args);
-  args.work_serializer = std::move(work_serializer);
-  args.result_handler = std::move(result_handler);
-  grpc_core::OrphanablePtr<grpc_core::Resolver> resolver =
-      factory->CreateResolver(std::move(args));
-  return resolver;
-}
+   private:
+    Mutex mu_;
+    Resolver::Result expected_ ABSL_GUARDED_BY(mu_);
+    absl::Notification* notification_ ABSL_GUARDED_BY(mu_) = nullptr;
+  };
 
-// Create a new resolution containing 2 addresses.
-static grpc_core::Resolver::Result create_new_resolver_result() {
-  static size_t test_counter = 0;
-  const size_t num_addresses = 2;
-  // Create address list.
-  grpc_core::EndpointAddressesList addresses;
-  for (size_t i = 0; i < num_addresses; ++i) {
-    std::string uri_string = absl::StrFormat("ipv4:127.0.0.1:100%" PRIuPTR,
-                                             test_counter * num_addresses + i);
-    absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(uri_string);
-    EXPECT_TRUE(uri.ok());
-    grpc_resolved_address address;
-    EXPECT_TRUE(grpc_parse_uri(*uri, &address));
-    absl::InlinedVector<grpc_arg, 2> args_to_add;
-    addresses.emplace_back(address, grpc_core::ChannelArgs());
+  static OrphanablePtr<Resolver> BuildFakeResolver(
+      std::shared_ptr<WorkSerializer> work_serializer,
+      RefCountedPtr<FakeResolverResponseGenerator> response_generator,
+      std::unique_ptr<Resolver::ResultHandler> result_handler) {
+    ResolverFactory* factory =
+        CoreConfiguration::Get().resolver_registry().LookupResolverFactory(
+            "fake");
+    ResolverArgs args;
+    args.args = ChannelArgs().SetObject(std::move(response_generator));
+    args.work_serializer = std::move(work_serializer);
+    args.result_handler = std::move(result_handler);
+    return factory->CreateResolver(std::move(args));
   }
-  ++test_counter;
-  grpc_core::Resolver::Result result;
-  result.addresses = std::move(addresses);
-  return result;
-}
 
-TEST(FakeResolverTest, FakeResolver) {
-  grpc_core::ExecCtx exec_ctx;
-  std::shared_ptr<grpc_core::WorkSerializer> work_serializer =
-      std::make_shared<grpc_core::WorkSerializer>(
-          grpc_event_engine::experimental::GetDefaultEventEngine());
-  auto synchronously = [work_serializer](std::function<void()> do_this_thing) {
-    grpc_core::Notification notification;
-    work_serializer->Run(
-        [do_this_thing = std::move(do_this_thing), &notification]() mutable {
-          do_this_thing();
+  // Create a new resolution containing 2 addresses.
+  static Resolver::Result CreateResolverResult() {
+    static size_t test_counter = 0;
+    const size_t num_addresses = 2;
+    // Create address list.
+    EndpointAddressesList addresses;
+    for (size_t i = 0; i < num_addresses; ++i) {
+      std::string uri_string = absl::StrFormat(
+          "ipv4:127.0.0.1:100%" PRIuPTR, test_counter * num_addresses + i);
+      absl::StatusOr<URI> uri = URI::Parse(uri_string);
+      EXPECT_TRUE(uri.ok());
+      grpc_resolved_address address;
+      EXPECT_TRUE(grpc_parse_uri(*uri, &address));
+      absl::InlinedVector<grpc_arg, 2> args_to_add;
+      addresses.emplace_back(address, ChannelArgs());
+    }
+    ++test_counter;
+    Resolver::Result result;
+    result.addresses = std::move(addresses);
+    return result;
+  }
+
+  OrphanablePtr<Resolver> CreateResolver() {
+    result_handler_ = new ResultHandler();
+    return BuildFakeResolver(
+        work_serializer_, response_generator_,
+        std::unique_ptr<Resolver::ResultHandler>(result_handler_));
+  }
+
+  void RunSynchronously(std::function<void()> callback) {
+    Notification notification;
+    work_serializer_->Run(
+        [callback = std::move(callback), &notification]() {
+          callback();
           notification.Notify();
         },
         DEBUG_LOCATION);
     notification.WaitForNotification();
-  };
+  }
+
+  ExecCtx exec_ctx_;
+  std::shared_ptr<WorkSerializer> work_serializer_ =
+      std::make_shared<WorkSerializer>(
+          grpc_event_engine::experimental::GetDefaultEventEngine());
+  RefCountedPtr<FakeResolverResponseGenerator> response_generator_ =
+      MakeRefCounted<FakeResolverResponseGenerator>();
+  ResultHandler* result_handler_ = nullptr;
+};
+
+TEST_F(FakeResolverTest, WaitForResolverSet) {
+  EXPECT_FALSE(response_generator_->WaitForResolverSet(absl::Milliseconds(1)));
+  auto resolver = CreateResolver();
+  ASSERT_NE(resolver, nullptr);
+  EXPECT_TRUE(response_generator_->WaitForResolverSet(absl::Milliseconds(1)));
+}
+
+TEST_F(FakeResolverTest, ReturnResultBeforeResolverCreated) {
+  // Return result via response generator.
+  Resolver::Result result = CreateResolverResult();
+  response_generator_->SetResponseAsync(result);
+  // Create and start resolver.
+  auto resolver = CreateResolver();
+  ASSERT_NE(resolver, nullptr);
+  absl::Notification notification;
+  result_handler_->SetExpectedAndNotification(std::move(result), &notification);
+  RunSynchronously([resolver = resolver.get()] { resolver->StartLocked(); });
+  // Expect result.
+  ASSERT_TRUE(notification.WaitForNotificationWithTimeout(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+}
+
+TEST_F(FakeResolverTest, ReturnResultBeforeResolverStarted) {
   // Create resolver.
-  ResultHandler* result_handler = new ResultHandler();
-  grpc_core::RefCountedPtr<grpc_core::FakeResolverResponseGenerator>
-      response_generator =
-          grpc_core::MakeRefCounted<grpc_core::FakeResolverResponseGenerator>();
-  grpc_core::OrphanablePtr<grpc_core::Resolver> resolver = build_fake_resolver(
-      work_serializer, response_generator.get(),
-      std::unique_ptr<grpc_core::Resolver::ResultHandler>(result_handler));
-  ASSERT_NE(resolver.get(), nullptr);
-  synchronously([resolver = resolver.get()] { resolver->StartLocked(); });
-  // Test 1: normal resolution.
-  // next_results != NULL, reresolution_results == NULL.
-  // Expected response is next_results.
-  gpr_log(GPR_INFO, "TEST 1");
-  grpc_core::Resolver::Result result = create_new_resolver_result();
-  gpr_event ev1;
-  gpr_event_init(&ev1);
-  result_handler->SetExpectedAndEvent(result, &ev1);
-  response_generator->SetResponseSynchronously(std::move(result));
-  grpc_core::ExecCtx::Get()->Flush();
-  ASSERT_NE(gpr_event_wait(&ev1, grpc_timeout_seconds_to_deadline(5)), nullptr);
-  // Test 2: update resolution.
-  // next_results != NULL, reresolution_results == NULL.
-  // Expected response is next_results.
-  gpr_log(GPR_INFO, "TEST 2");
-  result = create_new_resolver_result();
-  gpr_event ev2;
-  gpr_event_init(&ev2);
-  result_handler->SetExpectedAndEvent(result, &ev2);
-  response_generator->SetResponseSynchronously(std::move(result));
-  grpc_core::ExecCtx::Get()->Flush();
-  ASSERT_NE(gpr_event_wait(&ev2, grpc_timeout_seconds_to_deadline(5)), nullptr);
-  // Test 3: normal re-resolution.
-  // next_results == NULL, reresolution_results != NULL.
-  // Expected response is reresolution_results.
-  gpr_log(GPR_INFO, "TEST 3");
-  grpc_core::Resolver::Result reresolution_result =
-      create_new_resolver_result();
-  gpr_event ev3;
-  gpr_event_init(&ev3);
-  result_handler->SetExpectedAndEvent(reresolution_result, &ev3);
-  // Set reresolution_results.
-  // No result will be returned until re-resolution is requested.
-  response_generator->SetReresolutionResponseSynchronously(reresolution_result);
-  grpc_core::ExecCtx::Get()->Flush();
-  // Trigger a re-resolution.
-  synchronously(
-      [resolver = resolver.get()] { resolver->RequestReresolutionLocked(); });
-  grpc_core::ExecCtx::Get()->Flush();
-  ASSERT_NE(gpr_event_wait(&ev3, grpc_timeout_seconds_to_deadline(5)), nullptr);
-  // Test 4: repeat re-resolution.
-  // next_results == NULL, reresolution_results != NULL.
-  // Expected response is reresolution_results.
-  gpr_log(GPR_INFO, "TEST 4");
-  gpr_event ev4;
-  gpr_event_init(&ev4);
-  result_handler->SetExpectedAndEvent(std::move(reresolution_result), &ev4);
-  // Trigger a re-resolution.
-  synchronously(
+  auto resolver = CreateResolver();
+  ASSERT_NE(resolver, nullptr);
+  Resolver::Result result = CreateResolverResult();
+  absl::Notification notification;
+  result_handler_->SetExpectedAndNotification(result, &notification);
+  // Return result via response generator.
+  response_generator_->SetResponseAsync(std::move(result));
+  // Start resolver.
+  RunSynchronously([resolver = resolver.get()] { resolver->StartLocked(); });
+  // Expect result.
+  ASSERT_TRUE(notification.WaitForNotificationWithTimeout(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+}
+
+TEST_F(FakeResolverTest, ReturnResult) {
+  // Create and start resolver.
+  auto resolver = CreateResolver();
+  ASSERT_NE(resolver, nullptr);
+  RunSynchronously([resolver = resolver.get()] { resolver->StartLocked(); });
+  Resolver::Result result = CreateResolverResult();
+  absl::Notification notification;
+  result_handler_->SetExpectedAndNotification(result, &notification);
+  // Return result via response generator.
+  response_generator_->SetResponseAsync(std::move(result));
+  // Expect result.
+  ASSERT_TRUE(notification.WaitForNotificationWithTimeout(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+}
+
+TEST_F(FakeResolverTest, WaitForReresolutionRequest) {
+  // Create and start resolver.
+  auto resolver = CreateResolver();
+  ASSERT_NE(resolver, nullptr);
+  RunSynchronously([resolver = resolver.get()] { resolver->StartLocked(); });
+  // No re-resolution requested yet.
+  EXPECT_FALSE(
+      response_generator_->WaitForReresolutionRequest(absl::Milliseconds(1)));
+  // Request re-resolution, then try again.
+  RunSynchronously(
       [resolver = resolver.get()] { resolver->RequestReresolutionLocked(); });
-  grpc_core::ExecCtx::Get()->Flush();
-  ASSERT_NE(gpr_event_wait(&ev4, grpc_timeout_seconds_to_deadline(5)), nullptr);
-  // Test 5: normal resolution.
-  // next_results != NULL, reresolution_results != NULL.
-  // Expected response is next_results.
-  gpr_log(GPR_INFO, "TEST 5");
-  result = create_new_resolver_result();
-  gpr_event ev5;
-  gpr_event_init(&ev5);
-  result_handler->SetExpectedAndEvent(result, &ev5);
-  response_generator->SetResponseSynchronously(std::move(result));
-  grpc_core::ExecCtx::Get()->Flush();
-  ASSERT_NE(gpr_event_wait(&ev5, grpc_timeout_seconds_to_deadline(5)), nullptr);
-  // Test 6: no-op.
-  // Requesting a new resolution without setting the response shouldn't trigger
-  // the resolution callback.
-  gpr_log(GPR_INFO, "TEST 6");
-  gpr_event ev6;
-  gpr_event_init(&ev6);
-  result_handler->SetExpectedAndEvent(grpc_core::Resolver::Result(), &ev6);
-  ASSERT_EQ(gpr_event_wait(&ev6, grpc_timeout_milliseconds_to_deadline(100)),
-            nullptr);
-  // Clean up.
-  resolver.reset();
+  EXPECT_TRUE(
+      response_generator_->WaitForReresolutionRequest(absl::Milliseconds(1)));
 }
 
+}  // namespace testing
+}  // namespace grpc_core
+
 int main(int argc, char** argv) {
   grpc::testing::TestEnvironment env(&argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD
index 939db44b584f9..01ebf2b961556 100644
--- a/test/core/end2end/BUILD
+++ b/test/core/end2end/BUILD
@@ -575,14 +575,23 @@ grpc_cc_test(
 grpc_cc_test(
     name = "no_server_test",
     srcs = ["no_server_test.cc"],
+    external_deps = [
+        "absl/status",
+        "absl/status:statusor",
+        "absl/time",
+    ],
     language = "C++",
     deps = [
         "cq_verifier",
+        "//:endpoint_addresses",
         "//:exec_ctx",
         "//:gpr",
         "//:grpc_public_hdrs",
+        "//:grpc_resolver",
         "//:grpc_resolver_fake",
         "//:ref_counted_ptr",
+        "//src/core:channel_args",
+        "//src/core:grpc_service_config",
         "//test/core/util:grpc_test_util",
     ],
 )
diff --git a/test/core/end2end/end2end_test_corpus/negative_deadline/5769288995635200 b/test/core/end2end/end2end_test_corpus/negative_deadline/5769288995635200
new file mode 100644
index 0000000000000..bb65fceedf8ac
--- /dev/null
+++ b/test/core/end2end/end2end_test_corpus/negative_deadline/5769288995635200
@@ -0,0 +1,11 @@
+test_id: 3
+event_engine_actions {
+  run_delay: 9851624184873214
+  run_delay: 1
+  run_delay: 1
+  run_delay: 0
+  run_delay: 53876069761024
+}
+config_vars {
+  experiments: 280384054960896
+}
diff --git a/test/core/end2end/fuzzers/server_fuzzer_corpus/5250991764078592 b/test/core/end2end/fuzzers/server_fuzzer_corpus/5250991764078592
new file mode 100644
index 0000000000000..780fc006e1a52
--- /dev/null
+++ b/test/core/end2end/fuzzers/server_fuzzer_corpus/5250991764078592
@@ -0,0 +1,76 @@
+network_input {
+  input_segments {
+    segments {
+      delay_ms: 10
+      client_prefix {
+      }
+    }
+    segments {
+      settings {
+      }
+    }
+    segments {
+      delay_ms: 16777217
+      header {
+        stream_id: 3
+        end_headers: true
+        simple_header {
+          grpc_timeout: "00m"
+          te: "trailers"
+          scheme: "http"
+          method: "POST"
+          authority: "foo"
+          path: "/req"
+        }
+      }
+    }
+    segments {
+      delay_ms: 10
+    }
+  }
+}
+api_actions {
+  sleep_ms: 16777266
+}
+api_actions {
+  request_call {
+  }
+}
+api_actions {
+  cancel_call {
+  }
+}
+api_actions {
+  poll_cq {
+  }
+}
+api_actions {
+  get_peer {
+  }
+}
+api_actions {
+  cancel_call {
+  }
+}
+api_actions {
+  create_call {
+    propagation_mask: 589824
+  }
+}
+channel_args {
+  args {
+    i: 0
+  }
+  args {
+    str: "~\177\177"
+  }
+  args {
+    str: "~\177\177"
+  }
+  args {
+    key: "0"
+  }
+  args {
+    key: "0"
+  }
+}
diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc
index 8172ae83bd882..59e25efc9ab2f 100644
--- a/test/core/end2end/no_server_test.cc
+++ b/test/core/end2end/no_server_test.cc
@@ -18,6 +18,12 @@
 
 #include <string.h>
 
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/time/time.h"
+
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/propagation_bits.h>
@@ -27,8 +33,12 @@
 #include <grpc/support/time.h>
 
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/lib/resolver/resolver.h"
+#include "src/core/lib/service_config/service_config.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/util/test_config.h"
 
@@ -43,13 +53,12 @@ void run_test(bool wait_for_ready) {
   grpc_core::RefCountedPtr<grpc_core::FakeResolverResponseGenerator>
       response_generator =
           grpc_core::MakeRefCounted<grpc_core::FakeResolverResponseGenerator>();
-  grpc_arg arg = grpc_core::FakeResolverResponseGenerator::MakeChannelArg(
-      response_generator.get());
-  grpc_channel_args args = {1, &arg};
+  auto args = grpc_core::ChannelArgs().SetObject(response_generator).ToC();
 
   // create a call, channel to a non existant server
   grpc_channel_credentials* creds = grpc_insecure_credentials_create();
-  grpc_channel* chan = grpc_channel_create("fake:nonexistant", creds, &args);
+  grpc_channel* chan =
+      grpc_channel_create("fake:nonexistant", creds, args.get());
   grpc_channel_credentials_release(creds);
   gpr_timespec deadline = grpc_timeout_seconds_to_deadline(2);
   grpc_call* call = grpc_channel_create_call(
@@ -80,9 +89,13 @@ void run_test(bool wait_for_ready) {
                                    grpc_core::CqVerifier::tag(1), nullptr));
 
   {
-    response_generator->WaitForResolverSet();
+    response_generator->WaitForResolverSet(
+        absl::Seconds(5 * grpc_test_slowdown_factor()));
     grpc_core::ExecCtx exec_ctx;
-    response_generator->SetFailure();
+    grpc_core::Resolver::Result result;
+    result.addresses = absl::UnavailableError("Resolver transient failure");
+    result.service_config = result.addresses.status();
+    response_generator->SetResponseSynchronously(std::move(result));
   }
 
   // verify that all tags get completed
diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc
index 751507495de05..91b917ced3b74 100644
--- a/test/core/end2end/tests/filter_causes_close.cc
+++ b/test/core/end2end/tests/filter_causes_close.cc
@@ -102,6 +102,7 @@ const grpc_channel_filter test_filter = {
       return Immediate(ServerMetadataFromStatus(
           absl::PermissionDeniedError("Failure that's not preventable.")));
     },
+    nullptr,
     grpc_channel_next_op,
     sizeof(call_data),
     init_call_elem,
diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc
index 8156384fbd64d..1da07e814e965 100644
--- a/test/core/end2end/tests/filter_context.cc
+++ b/test/core/end2end/tests/filter_context.cc
@@ -82,7 +82,7 @@ grpc_error_handle init_channel_elem(grpc_channel_element* /*elem*/,
 void destroy_channel_elem(grpc_channel_element* /*elem*/) {}
 
 const grpc_channel_filter test_filter = {
-    start_transport_stream_op_batch, nullptr, grpc_channel_next_op,
+    start_transport_stream_op_batch, nullptr, nullptr, grpc_channel_next_op,
     sizeof(call_data), init_call_elem,
     grpc_call_stack_ignore_set_pollset_or_pollset_set, destroy_call_elem, 0,
     init_channel_elem, grpc_channel_stack_no_post_init, destroy_channel_elem,
diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc
index a640bebc5f0e7..a160b38b60af6 100644
--- a/test/core/end2end/tests/filter_init_fails.cc
+++ b/test/core/end2end/tests/filter_init_fails.cc
@@ -80,7 +80,7 @@ const grpc_channel_filter test_filter = {
       return Immediate(ServerMetadataFromStatus(
           absl::PermissionDeniedError("access denied")));
     },
-    grpc_channel_next_op, 0, init_call_elem,
+    nullptr, grpc_channel_next_op, 0, init_call_elem,
     grpc_call_stack_ignore_set_pollset_or_pollset_set, destroy_call_elem, 0,
     init_channel_elem, grpc_channel_stack_no_post_init, destroy_channel_elem,
     grpc_channel_next_get_info,
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 85948b208c508..22de5660e0553 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
@@ -159,6 +159,7 @@ class FailSendOpsFilter {
 grpc_channel_filter FailSendOpsFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc
index 74e5f98bfc74c..befb2391ddea6 100644
--- a/test/core/end2end/tests/retry_recv_message_replay.cc
+++ b/test/core/end2end/tests/retry_recv_message_replay.cc
@@ -109,6 +109,7 @@ class FailFirstSendOpFilter {
 grpc_channel_filter FailFirstSendOpFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
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 8a277ff4b6dc4..7a43114ec3a2e 100644
--- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
+++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
@@ -104,6 +104,7 @@ class InjectStatusFilter {
 grpc_channel_filter InjectStatusFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc
index 3bb2715dc5ae4..2fdc38186944b 100644
--- a/test/core/end2end/tests/retry_send_op_fails.cc
+++ b/test/core/end2end/tests/retry_send_op_fails.cc
@@ -110,6 +110,7 @@ class FailFirstCallFilter {
 grpc_channel_filter FailFirstCallFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc
index 98d3f744d18df..091a800f210ca 100644
--- a/test/core/end2end/tests/retry_transparent_goaway.cc
+++ b/test/core/end2end/tests/retry_transparent_goaway.cc
@@ -116,6 +116,7 @@ class FailFirstCallFilter {
 grpc_channel_filter FailFirstCallFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
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 ceb374042475c..663fd6f610597 100644
--- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
+++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
@@ -104,6 +104,8 @@ CORE_END2END_TEST(RetryHttp2Test, RetryTransparentMaxConcurrentStreams) {
   EXPECT_EQ(server_status.status(), GRPC_STATUS_OK);
   EXPECT_EQ(server_status.message(), "xyz");
   // Destroy server and then restart it.
+  // TODO(hork): hack to solve PosixEventEngine Listener's async shutdown issue.
+  absl::SleepFor(absl::Milliseconds(250));
   InitServer(server_args);
   // Server should get the second call.
   auto s2 = RequestCall(201);
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 87542064ad4b5..05bf6c1ac1210 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
@@ -115,6 +115,7 @@ class FailFirstTenCallsFilter {
 grpc_channel_filter FailFirstTenCallsFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
diff --git a/test/core/event_engine/BUILD b/test/core/event_engine/BUILD
index 1442987828e16..1cdf7d24cd398 100644
--- a/test/core/event_engine/BUILD
+++ b/test/core/event_engine/BUILD
@@ -47,6 +47,7 @@ grpc_cc_test(
         "//:gpr",
         "//:gpr_platform",
         "//src/core:forkable",
+        "//src/core:no_destruct",
     ],
 )
 
@@ -231,3 +232,16 @@ grpc_cc_library(
         "//src/core:time",
     ],
 )
+
+grpc_cc_test(
+    name = "query_extensions_test",
+    srcs = ["query_extensions_test.cc"],
+    external_deps = ["gtest"],
+    language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:gpr_platform",
+        "//src/core:event_engine_query_extensions",
+    ],
+)
diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc
index 55f591c6ebe23..d299a447fdf7b 100644
--- a/test/core/event_engine/forkable_test.cc
+++ b/test/core/event_engine/forkable_test.cc
@@ -31,10 +31,20 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/config/config_vars.h"
+#include "src/core/lib/gprpp/no_destruct.h"
 
 namespace {
 using ::grpc_event_engine::experimental::Forkable;
-using ::grpc_event_engine::experimental::RegisterForkHandlers;
+using ::grpc_event_engine::experimental::ObjectGroupForkHandler;
+
+grpc_core::NoDestruct<ObjectGroupForkHandler> g_forkable_manager;
+
+class ForkCallbackMethods {
+ public:
+  static void Prefork() { g_forkable_manager->Prefork(); }
+  static void PostforkParent() { g_forkable_manager->PostforkParent(); }
+  static void PostforkChild() { g_forkable_manager->PostforkChild(); }
+};
 }  // namespace
 
 class ForkableTest : public testing::Test {};
@@ -77,16 +87,19 @@ TEST_F(ForkableTest, BasicPthreadAtForkOperations) {
     bool child_called_ = false;
   };
 
-  SomeForkable forkable;
+  auto forkable = std::make_shared<SomeForkable>();
+  g_forkable_manager->RegisterForkable(forkable, ForkCallbackMethods::Prefork,
+                                       ForkCallbackMethods::PostforkParent,
+                                       ForkCallbackMethods::PostforkChild);
   int child_pid = fork();
   ASSERT_NE(child_pid, -1);
   if (child_pid == 0) {
     gpr_log(GPR_DEBUG, "I am child pid: %d", getpid());
-    forkable.CheckChild();
+    forkable->CheckChild();
     exit(testing::Test::HasFailure());
   } else {
     gpr_log(GPR_DEBUG, "I am parent pid: %d", getpid());
-    forkable.CheckParent();
+    forkable->CheckParent();
     int status;
     gpr_log(GPR_DEBUG, "Waiting for child pid: %d", child_pid);
     do {
@@ -108,7 +121,7 @@ TEST_F(ForkableTest, NonPthreadManualForkOperations) {
   // Manually simulates a fork event for non-pthread-enabled environments
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
   // This platform does not need to exercise fork support manually.
-  GTEST_SKIP("Unnecessary test, this platform supports pthreads.");
+  GTEST_SKIP() << "Unnecessary test, this platform supports pthreads.";
 #endif
 
   class SomeForkable : public Forkable {
@@ -129,14 +142,25 @@ TEST_F(ForkableTest, NonPthreadManualForkOperations) {
     bool child_called_ = false;
   };
 
-  SomeForkable forkable;
-  forkable.AssertStates(/*prepare=*/false, /*parent=*/false, /*child=*/false);
-  grpc_event_engine::experimental::PrepareFork();
-  forkable.AssertStates(/*prepare=*/true, /*parent=*/false, /*child=*/false);
-  grpc_event_engine::experimental::PostforkParent();
-  forkable.AssertStates(/*prepare=*/true, /*parent=*/true, /*child=*/false);
-  grpc_event_engine::experimental::PostforkChild();
-  forkable.AssertStates(/*prepare=*/true, /*parent=*/true, /*child=*/true);
+  ObjectGroupForkHandler forkable_manager;
+  class NoopForkCallbackMethods {
+   public:
+    static void Prefork() {}
+    static void PostforkParent() {}
+    static void PostforkChild() {}
+  };
+  auto forkable = std::make_shared<SomeForkable>();
+  forkable_manager.RegisterForkable(forkable, NoopForkCallbackMethods::Prefork,
+                                    NoopForkCallbackMethods::PostforkParent,
+                                    NoopForkCallbackMethods::PostforkChild);
+  forkable->AssertStates(/*prepare=*/false, /*parent=*/false, /*child=*/false);
+  forkable_manager.Prefork();
+  forkable->AssertStates(/*prepare=*/true, /*parent=*/false, /*child=*/false);
+  forkable_manager.PostforkParent();
+  forkable->AssertStates(/*prepare=*/true, /*parent=*/true, /*child=*/false);
+  forkable_manager.Prefork();
+  forkable_manager.PostforkChild();
+  forkable->AssertStates(/*prepare=*/true, /*parent=*/true, /*child=*/true);
 }
 
 int main(int argc, char** argv) {
@@ -145,7 +169,6 @@ int main(int argc, char** argv) {
   grpc_core::ConfigVars::Overrides config_overrides;
   config_overrides.enable_fork_support = true;
   grpc_core::ConfigVars::SetOverrides(config_overrides);
-  RegisterForkHandlers();
   auto result = RUN_ALL_TESTS();
   return result;
 }
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 5f83f44c9ea8b..78e36a65d2a9e 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
@@ -48,7 +48,9 @@ namespace experimental {
 
 // EventEngine implementation to be used by fuzzers.
 // It's only allowed to have one FuzzingEventEngine instantiated at a time.
-class FuzzingEventEngine : public EventEngine {
+class FuzzingEventEngine
+    : public EventEngine,
+      public std::enable_shared_from_this<FuzzingEventEngine> {
  public:
   struct Options {
     Duration max_delay_run_after = std::chrono::seconds(30);
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 8f81cdf2639c0..927b4ec18f622 100644
--- a/test/core/event_engine/posix/event_poller_posix_test.cc
+++ b/test/core/event_engine/posix/event_poller_posix_test.cc
@@ -71,8 +71,8 @@
 #include "test/core/util/port.h"
 
 static gpr_mu g_mu;
-static grpc_event_engine::experimental::PosixEventPoller* g_event_poller =
-    nullptr;
+static std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller>
+    g_event_poller;
 
 // buffer size used to send and receive data.
 // 1024 is the minimal value to set TCP send and receive buffer.
@@ -695,7 +695,7 @@ TEST_F(EventPollerTest, TestMultipleHandles) {
   if (g_event_poller == nullptr) {
     return;
   }
-  Worker* worker = new Worker(Scheduler(), g_event_poller, kNumHandles,
+  Worker* worker = new Worker(Scheduler(), g_event_poller.get(), kNumHandles,
                               kNumWakeupsPerHandle);
   worker->Start();
   worker->Wait();
diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc
index 31852e8da7f42..d3cf0bf3e3943 100644
--- a/test/core/event_engine/posix/posix_endpoint_test.cc
+++ b/test/core/event_engine/posix/posix_endpoint_test.cc
@@ -221,10 +221,10 @@ class PosixEndpointTest : public ::testing::TestWithParam<bool> {
 
   std::shared_ptr<EventEngine> GetOracleEE() { return oracle_ee_; }
 
-  PosixEventPoller* PosixPoller() { return poller_; }
+  PosixEventPoller* PosixPoller() { return poller_.get(); }
 
  private:
-  PosixEventPoller* poller_;
+  std::shared_ptr<PosixEventPoller> poller_;
   std::unique_ptr<TestScheduler> scheduler_;
   std::shared_ptr<EventEngine> posix_ee_;
   std::shared_ptr<EventEngine> oracle_ee_;
diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc
new file mode 100644
index 0000000000000..712a496f38ce2
--- /dev/null
+++ b/test/core/event_engine/query_extensions_test.cc
@@ -0,0 +1,95 @@
+// Copyright 2023 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 "src/core/lib/event_engine/query_extensions.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 "src/core/lib/gprpp/crash.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+namespace {
+
+template <int i>
+class TestExtension {
+ public:
+  TestExtension() = default;
+  ~TestExtension() = default;
+
+  static std::string EndpointExtensionName() {
+    return "grpc.test.test_extension" + std::to_string(i);
+  }
+
+  int GetValue() const { return val_; }
+
+ private:
+  int val_ = i;
+};
+
+class ExtendedTestEndpoint
+    : public ExtendedEndpoint<TestExtension<0>, TestExtension<1>,
+                              TestExtension<2>> {
+ public:
+  ExtendedTestEndpoint() = default;
+  ~ExtendedTestEndpoint() override = default;
+  bool Read(absl::AnyInvocable<void(absl::Status)> /*on_read*/,
+            SliceBuffer* /*buffer*/, const ReadArgs* /*args*/) override {
+    grpc_core::Crash("Not implemented");
+  };
+  bool Write(absl::AnyInvocable<void(absl::Status)> /*on_writable*/,
+             SliceBuffer* /*data*/, const WriteArgs* /*args*/) override {
+    grpc_core::Crash("Not implemented");
+  }
+  /// Returns an address in the format described in DNSResolver. The returned
+  /// values are expected to remain valid for the life of the Endpoint.
+  const EventEngine::ResolvedAddress& GetPeerAddress() const override {
+    grpc_core::Crash("Not implemented");
+  }
+  const EventEngine::ResolvedAddress& GetLocalAddress() const override {
+    grpc_core::Crash("Not implemented");
+  };
+};
+
+TEST(QueryExtensionsTest, EndpointSupportsMultipleExtensions) {
+  ExtendedTestEndpoint endpoint;
+  TestExtension<0>* extension_0 = QueryExtension<TestExtension<0>>(&endpoint);
+  TestExtension<1>* extension_1 = QueryExtension<TestExtension<1>>(&endpoint);
+  TestExtension<2>* extension_2 = QueryExtension<TestExtension<2>>(&endpoint);
+
+  EXPECT_NE(extension_0, nullptr);
+  EXPECT_NE(extension_1, nullptr);
+  EXPECT_NE(extension_2, nullptr);
+
+  EXPECT_EQ(extension_0->GetValue(), 0);
+  EXPECT_EQ(extension_1->GetValue(), 1);
+  EXPECT_EQ(extension_2->GetValue(), 2);
+}
+}  // namespace
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/event_engine/test_suite/BUILD b/test/core/event_engine/test_suite/BUILD
index 385aa7bb6a2b2..7abf2c2bf9b09 100644
--- a/test/core/event_engine/test_suite/BUILD
+++ b/test/core/event_engine/test_suite/BUILD
@@ -56,6 +56,24 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "posix_event_engine_native_dns_test",
+    srcs = ["posix_event_engine_native_dns_test.cc"],
+    tags = [
+        "no_mac",
+        "no_windows",
+    ],
+    uses_event_engine = True,
+    uses_polling = True,
+    deps = [
+        "//:config_vars",
+        "//src/core:posix_event_engine",
+        "//test/core/event_engine:event_engine_test_utils",
+        "//test/core/event_engine/test_suite/posix:oracle_event_engine_posix",
+        "//test/core/event_engine/test_suite/tests:dns",
+    ],
+)
+
 grpc_cc_test(
     name = "thready_posix_event_engine_test",
     srcs = ["thready_posix_event_engine_test.cc"],
@@ -88,6 +106,7 @@ grpc_cc_test(
         "//src/core:windows_event_engine",
         "//test/core/event_engine:event_engine_test_utils",
         "//test/core/event_engine/test_suite/tests:client",
+        "//test/core/event_engine/test_suite/tests:dns",
         "//test/core/event_engine/test_suite/tests:server",
         "//test/core/event_engine/test_suite/tests:timer",
     ],
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
new file mode 100644
index 0000000000000..0f4ff26720bd5
--- /dev/null
+++ b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
@@ -0,0 +1,51 @@
+// Copyright 2023 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 <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"
+#include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h"
+#include "test/core/event_engine/test_suite/tests/dns_test.h"
+#include "test/core/util/test_config.h"
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  grpc::testing::TestEnvironment env(&argc, argv);
+  SetEventEngineFactories(
+      []() {
+        return std::make_unique<
+            grpc_event_engine::experimental::PosixEventEngine>();
+      },
+      []() {
+        return std::make_unique<
+            grpc_event_engine::experimental::PosixOracleEventEngine>();
+      });
+  // TODO(ctiller): EventEngine temporarily needs grpc to be initialized first
+  // until we clear out the iomgr shutdown code.
+  grpc_core::ConfigVars::Overrides overrides;
+  overrides.dns_resolver = "native";
+  grpc_core::ConfigVars::SetOverrides(overrides);
+  grpc_event_engine::experimental::InitDNSTests();
+  grpc_init();
+  int r = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return r;
+}
diff --git a/test/core/event_engine/test_suite/tests/BUILD b/test/core/event_engine/test_suite/tests/BUILD
index 4c187e2c5d4f4..87ebaab6dc223 100644
--- a/test/core/event_engine/test_suite/tests/BUILD
+++ b/test/core/event_engine/test_suite/tests/BUILD
@@ -76,6 +76,7 @@ grpc_cc_library(
         "//test/core/util:grpc_test_util_base",
         "//test/cpp/util:get_grpc_test_runfile_dir",
         "//test/cpp/util:test_util",
+        "//test/cpp/util/windows:manifest_file",
     ],
     alwayslink = 1,
 )
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 4c09f49846e78..587b7094f975e 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,8 @@
 // IWYU pragma: no_include <ratio>
 // IWYU pragma: no_include <arpa/inet.h>
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <memory>
@@ -33,7 +35,9 @@
 
 #include <grpc/event_engine/event_engine.h>
 
+#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
+#include "src/core/lib/gprpp/crash.h"  // IWYU pragma: keep
 #include "src/core/lib/gprpp/notification.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
@@ -42,6 +46,10 @@
 #include "test/cpp/util/get_grpc_test_runfile_dir.h"
 #include "test/cpp/util/subprocess.h"
 
+#ifdef GPR_WINDOWS
+#include "test/cpp/util/windows/manifest_file.h"
+#endif  // GPR_WINDOWS
+
 namespace grpc_event_engine {
 namespace experimental {
 
@@ -50,13 +58,6 @@ void InitDNSTests() {}
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
-#ifdef GPR_WINDOWS
-class EventEngineDNSTest : public EventEngineTest {};
-
-// TODO(yijiem): make the test run on Windows
-TEST_F(EventEngineDNSTest, TODO) {}
-#else
-
 namespace {
 
 using grpc_event_engine::experimental::EventEngine;
@@ -96,6 +97,15 @@ MATCHER(StatusCodeEq, "") {
   return std::get<0>(arg).code() == std::get<1>(arg);
 }
 
+#define SKIP_TEST_FOR_NATIVE_DNS_RESOLVER()                              \
+  do {                                                                   \
+    if (grpc_core::ConfigVars::Get().DnsResolver() == "native") {        \
+      GTEST_SKIP()                                                       \
+          << "This test specifies a target DNS server which the native " \
+             "DNS resolver does not support.";                           \
+    }                                                                    \
+  } while (0)
+
 }  // namespace
 
 class EventEngineDNSTest : public EventEngineTest {
@@ -109,13 +119,36 @@ class EventEngineDNSTest : public EventEngineTest {
     std::string health_check_path = kHealthCheckRelPath;
     absl::optional<std::string> runfile_dir = grpc::GetGrpcTestRunFileDir();
     if (runfile_dir.has_value()) {
-      // We sure need a portable filesystem lib for this to work on Windows.
       test_records_path = absl::StrJoin({*runfile_dir, test_records_path}, "/");
       dns_server_path = absl::StrJoin({*runfile_dir, dns_server_path}, "/");
       dns_resolver_path = absl::StrJoin({*runfile_dir, dns_resolver_path}, "/");
       tcp_connect_path = absl::StrJoin({*runfile_dir, tcp_connect_path}, "/");
       health_check_path = absl::StrJoin({*runfile_dir, health_check_path}, "/");
+#ifdef GPR_WINDOWS
+// TODO(yijiem): Misusing the GRPC_PORT_ISOLATED_RUNTIME preprocessor symbol as
+// an indication whether the test is running on RBE or not. Find a better way of
+// doing this.
+#ifndef GRPC_PORT_ISOLATED_RUNTIME
+      gpr_log(GPR_ERROR,
+              "You are invoking the test locally with Bazel, you may need to "
+              "invoke Bazel with --enable_runfiles=yes.");
+#endif  // GRPC_PORT_ISOLATED_RUNTIME
+      test_records_path = grpc::testing::NormalizeFilePath(test_records_path);
+      dns_server_path =
+          grpc::testing::NormalizeFilePath(dns_server_path + ".exe");
+      dns_resolver_path =
+          grpc::testing::NormalizeFilePath(dns_resolver_path + ".exe");
+      tcp_connect_path =
+          grpc::testing::NormalizeFilePath(tcp_connect_path + ".exe");
+      health_check_path =
+          grpc::testing::NormalizeFilePath(health_check_path + ".exe");
+#endif  // GPR_WINDOWS
     } else {
+#ifdef GPR_WINDOWS
+      grpc_core::Crash(
+          "The EventEngineDNSTest does not support running without Bazel on "
+          "Windows for now.");
+#endif  // GPR_WINDOWS
       // Invoke the .py scripts directly where they are in source code if we are
       // not running with bazel.
       dns_server_path += ".py";
@@ -141,8 +174,11 @@ class EventEngineDNSTest : public EventEngineTest {
         tcp_connect_path,
     });
     int status = health_check.Join();
-    // TODO(yijiem): make this portable for Windows
+#ifdef GPR_WINDOWS
+    ASSERT_EQ(status, 0);
+#else
     ASSERT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
+#endif  // GPR_WINDOWS
 #endif  // GRPC_IOS_EVENT_ENGINE_CLIENT
   }
 
@@ -201,6 +237,7 @@ EventEngineDNSTest::DNSServer EventEngineDNSTest::dns_server_;
 #ifndef GRPC_IOS_EVENT_ENGINE_CLIENT
 
 TEST_F(EventEngineDNSTest, QueryNXHostname) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupHostname(
       [this](auto result) {
@@ -216,6 +253,7 @@ TEST_F(EventEngineDNSTest, QueryNXHostname) {
 }
 
 TEST_F(EventEngineDNSTest, QueryWithIPLiteral) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupHostname(
       [this](auto result) {
@@ -231,6 +269,7 @@ TEST_F(EventEngineDNSTest, QueryWithIPLiteral) {
 }
 
 TEST_F(EventEngineDNSTest, QueryARecord) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupHostname(
       [this](auto result) {
@@ -248,6 +287,7 @@ TEST_F(EventEngineDNSTest, QueryARecord) {
 }
 
 TEST_F(EventEngineDNSTest, QueryAAAARecord) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupHostname(
       [this](auto result) {
@@ -268,6 +308,7 @@ TEST_F(EventEngineDNSTest, QueryAAAARecord) {
 }
 
 TEST_F(EventEngineDNSTest, TestAddressSorting) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupHostname(
       [this](auto result) {
@@ -285,6 +326,7 @@ TEST_F(EventEngineDNSTest, TestAddressSorting) {
 }
 
 TEST_F(EventEngineDNSTest, QuerySRVRecord) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   const SRVRecord kExpectedRecords[] = {
       {/*host=*/"ipv4-only-multi-target.dns-test.event-engine", /*port=*/1234,
        /*priority=*/0, /*weight=*/0},
@@ -303,6 +345,7 @@ TEST_F(EventEngineDNSTest, QuerySRVRecord) {
 }
 
 TEST_F(EventEngineDNSTest, QuerySRVRecordWithLocalhost) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupSRV(
       [this](auto result) {
@@ -315,6 +358,7 @@ TEST_F(EventEngineDNSTest, QuerySRVRecordWithLocalhost) {
 }
 
 TEST_F(EventEngineDNSTest, QueryTXTRecord) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   // clang-format off
   const std::string kExpectedRecord =
       "grpc_config=[{"
@@ -344,6 +388,7 @@ TEST_F(EventEngineDNSTest, QueryTXTRecord) {
 }
 
 TEST_F(EventEngineDNSTest, QueryTXTRecordWithLocalhost) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   auto dns_resolver = CreateDefaultDNSResolver();
   dns_resolver->LookupTXT(
       [this](auto result) {
@@ -356,6 +401,7 @@ TEST_F(EventEngineDNSTest, QueryTXTRecordWithLocalhost) {
 }
 
 TEST_F(EventEngineDNSTest, TestCancelActiveDNSQuery) {
+  SKIP_TEST_FOR_NATIVE_DNS_RESOLVER();
   const std::string name = "dont-care-since-wont-be-resolved.test.com:1234";
   auto dns_resolver = CreateDNSResolverWithNonResponsiveServer();
   dns_resolver->LookupHostname(
@@ -546,5 +592,3 @@ TEST_F(EventEngineDNSTest, UnparseableHostPortsBadLocalhostWithPort) {
                           &dns_resolver_signal_, "[localhost]:1");
 }
 // END
-
-#endif  // GPR_WINDOWS
diff --git a/test/core/experiments/fixtures/experiments.cc b/test/core/experiments/fixtures/experiments.cc
index 7d13644bb393b..37b5e9ad9d3bb 100644
--- a/test/core/experiments/fixtures/experiments.cc
+++ b/test/core/experiments/fixtures/experiments.cc
@@ -41,13 +41,14 @@ namespace grpc_core {
 
 const ExperimentMetadata g_test_experiment_metadata[] = {
     {"test_experiment_1", description_test_experiment_1,
-     additional_constraints_test_experiment_1, false, true},
+     additional_constraints_test_experiment_1, nullptr, 0, false, true},
     {"test_experiment_2", description_test_experiment_2,
-     additional_constraints_test_experiment_2, true, true},
+     additional_constraints_test_experiment_2, nullptr, 0, true, true},
     {"test_experiment_3", description_test_experiment_3,
-     additional_constraints_test_experiment_3, kDefaultForDebugOnly, true},
+     additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly,
+     true},
     {"test_experiment_4", description_test_experiment_4,
-     additional_constraints_test_experiment_4, true, true},
+     additional_constraints_test_experiment_4, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
@@ -73,13 +74,14 @@ namespace grpc_core {
 
 const ExperimentMetadata g_test_experiment_metadata[] = {
     {"test_experiment_1", description_test_experiment_1,
-     additional_constraints_test_experiment_1, false, true},
+     additional_constraints_test_experiment_1, nullptr, 0, false, true},
     {"test_experiment_2", description_test_experiment_2,
-     additional_constraints_test_experiment_2, false, true},
+     additional_constraints_test_experiment_2, nullptr, 0, false, true},
     {"test_experiment_3", description_test_experiment_3,
-     additional_constraints_test_experiment_3, kDefaultForDebugOnly, true},
+     additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly,
+     true},
     {"test_experiment_4", description_test_experiment_4,
-     additional_constraints_test_experiment_4, true, true},
+     additional_constraints_test_experiment_4, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
@@ -105,13 +107,16 @@ namespace grpc_core {
 
 const ExperimentMetadata g_test_experiment_metadata[] = {
     {"test_experiment_1", description_test_experiment_1,
-     additional_constraints_test_experiment_1, kDefaultForDebugOnly, true},
+     additional_constraints_test_experiment_1, nullptr, 0, kDefaultForDebugOnly,
+     true},
     {"test_experiment_2", description_test_experiment_2,
-     additional_constraints_test_experiment_2, kDefaultForDebugOnly, true},
+     additional_constraints_test_experiment_2, nullptr, 0, kDefaultForDebugOnly,
+     true},
     {"test_experiment_3", description_test_experiment_3,
-     additional_constraints_test_experiment_3, kDefaultForDebugOnly, true},
+     additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly,
+     true},
     {"test_experiment_4", description_test_experiment_4,
-     additional_constraints_test_experiment_4, false, true},
+     additional_constraints_test_experiment_4, nullptr, 0, false, true},
 };
 
 }  // namespace grpc_core
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 483ad6b0e4ac7..97ed6eaa71c65 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
@@ -71,7 +71,8 @@ absl::Status ErrorToAbslStatus(
 }
 
 class FuzzingResolverEventEngine
-    : public grpc_event_engine::experimental::AbortingEventEngine {
+    : public grpc_event_engine::experimental::AbortingEventEngine,
+      public std::enable_shared_from_this<FuzzingResolverEventEngine> {
  public:
   explicit FuzzingResolverEventEngine(
       const event_engine_client_channel_resolver::Msg& msg,
diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD
index 283b9a44b3d83..620004d769686 100644
--- a/test/core/gprpp/BUILD
+++ b/test/core/gprpp/BUILD
@@ -20,6 +20,27 @@ licenses(["notice"])
 
 grpc_package(name = "test/core/gprpp")
 
+grpc_cc_test(
+    name = "directory_reader_test",
+    srcs = ["directory_reader_test.cc"],
+    data = [
+        "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0",
+        "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0",
+        "//test/core/tsi/test_creds/crl_data/crls:current.crl",
+        "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl",
+    ],
+    external_deps = [
+        "gtest",
+    ],
+    language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//src/core:directory_reader",
+        "//test/core/util:grpc_test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "examine_stack_test",
     srcs = ["examine_stack_test.cc"],
diff --git a/test/core/gprpp/directory_reader_test.cc b/test/core/gprpp/directory_reader_test.cc
new file mode 100644
index 0000000000000..3aa4c9d5cc50b
--- /dev/null
+++ b/test/core/gprpp/directory_reader_test.cc
@@ -0,0 +1,64 @@
+//
+// Copyright 2023 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/lib/gprpp/directory_reader.h"
+
+#include <string>
+#include <vector>
+
+#include "absl/strings/string_view.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "test/core/util/test_config.h"
+
+static constexpr absl::string_view kCrlDirectory =
+    "test/core/tsi/test_creds/crl_data/crls/";
+
+namespace grpc_core {
+namespace testing {
+namespace {
+
+TEST(DirectoryReader, CanListFiles) {
+  auto reader = MakeDirectoryReader(kCrlDirectory);
+  std::vector<std::string> contents;
+  absl::Status status = reader->ForEach([&](absl::string_view filename) {
+    contents.push_back(std::string(filename));
+  });
+  ASSERT_TRUE(status.ok()) << status;
+  // IsSupersetOf() is needed instead of UnorderedElementsAre() because some
+  // builds/OS combinations will include the BUILD file in this directory when
+  // the tests are run
+  EXPECT_THAT(contents,
+              ::testing::IsSupersetOf({"ab06acdd.r0", "b9322cac.r0",
+                                       "current.crl", "intermediate.crl"}));
+}
+
+TEST(DirectoryReader, NonexistentDirectory) {
+  auto reader = MakeDirectoryReader("DOES_NOT_EXIST");
+  absl::Status status = reader->ForEach([](absl::string_view) {});
+  ASSERT_FALSE(status.ok()) << status;
+}
+
+}  // namespace
+}  // namespace testing
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(&argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/gprpp/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc
index e5b741466614e..cea10b748f778 100644
--- a/test/core/gprpp/orphanable_test.cc
+++ b/test/core/gprpp/orphanable_test.cc
@@ -103,6 +103,32 @@ TEST(OrphanablePtr, InternallyRefCountedWithTracing) {
   baz->FinishWork();
 }
 
+class Qux : public InternallyRefCounted<Qux> {
+ public:
+  Qux() : Qux(0) {}
+  explicit Qux(int value) : InternallyRefCounted<Qux>("Qux"), value_(value) {}
+  ~Qux() override { self_ref_ = RefIfNonZero(DEBUG_LOCATION, "extra_work"); }
+  void Orphan() override { Unref(); }
+  int value() const { return value_; }
+
+  void StartWork() { self_ref_ = RefIfNonZero(DEBUG_LOCATION, "work"); }
+  void FinishWork() {
+    // This is a little ugly, but it makes the logged ref and unref match up.
+    self_ref_.release();
+    Unref(DEBUG_LOCATION, "work");
+  }
+
+ private:
+  int value_;
+  RefCountedPtr<Qux> self_ref_;
+};
+
+TEST(OrphanablePtr, InternallyRefCountedIfNonZero) {
+  auto qux = MakeOrphanable<Qux>();
+  qux->StartWork();
+  qux->FinishWork();
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace grpc_core
diff --git a/test/core/gprpp/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc
index 4d8761ecb1db0..7c28cddc6f645 100644
--- a/test/core/gprpp/ref_counted_test.cc
+++ b/test/core/gprpp/ref_counted_test.cc
@@ -53,6 +53,17 @@ TEST(RefCounted, ExtraRef) {
   foo->Unref();
 }
 
+TEST(RefCounted, Const) {
+  const Foo* foo = new Foo();
+  RefCountedPtr<const Foo> foop = foo->Ref();
+  foop.release();
+  foop = foo->RefIfNonZero();
+  foop.release();
+  foo->Unref();
+  foo->Unref();
+  foo->Unref();
+}
+
 class Value : public RefCounted<Value, PolymorphicRefCount, UnrefNoDelete> {
  public:
   Value(int value, std::set<std::unique_ptr<Value>>* registry) : value_(value) {
diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc
index 5d120c77c00b5..723b57f30fe92 100644
--- a/test/core/memory_usage/callback_client.cc
+++ b/test/core/memory_usage/callback_client.cc
@@ -28,6 +28,7 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
 
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>
@@ -44,7 +45,7 @@
 
 ABSL_FLAG(std::string, target, "", "Target host:port");
 ABSL_FLAG(bool, secure, false, "Use SSL Credentials");
-ABSL_FLAG(int, server_pid, 99999, "Server's pid");
+ABSL_FLAG(int, server_pid, 0, "Server's pid");
 ABSL_FLAG(int, size, 50, "Number of channels");
 
 std::shared_ptr<grpc::Channel> CreateChannelForTest(int index) {
@@ -150,7 +151,9 @@ int main(int argc, char** argv) {
   }
 
   // Getting peak memory usage
-  long peak_server_memory = GetMemUsage(absl::GetFlag(FLAGS_server_pid));
+  long peak_server_memory = absl::GetFlag(FLAGS_server_pid) > 0
+                                ? GetMemUsage(absl::GetFlag(FLAGS_server_pid))
+                                : 0;
   long peak_client_memory = GetMemUsage();
 
   // Checking that all channels are still open
@@ -161,16 +164,23 @@ int main(int argc, char** argv) {
                                              std::chrono::milliseconds(1)));
   }
 
-  const char* prefix = "";
+  std::string prefix;
   if (absl::StartsWith(absl::GetFlag(FLAGS_target), "xds:")) prefix = "xds ";
+  if (absl::GetFlag(FLAGS_server_pid) == 0) {
+    absl::StrAppend(&prefix, "multi_address ");
+  }
   printf("---------Client channel stats--------\n");
-  printf("%sclient channel memory usage: %f bytes per channel\n", prefix,
+  printf("%sclient channel memory usage: %f bytes per channel\n",
+         prefix.c_str(),
          static_cast<double>(peak_client_memory - before_client_memory) / size *
              1024);
-  printf("---------Server channel stats--------\n");
-  printf("%sserver channel memory usage: %f bytes per channel\n", prefix,
-         static_cast<double>(peak_server_memory - before_server_memory) / size *
-             1024);
+  if (absl::GetFlag(FLAGS_server_pid) > 0) {
+    printf("---------Server channel stats--------\n");
+    printf("%sserver channel memory usage: %f bytes per channel\n",
+           prefix.c_str(),
+           static_cast<double>(peak_server_memory - before_server_memory) /
+               size * 1024);
+  }
   gpr_log(GPR_INFO, "Client Done");
   return 0;
 }
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc
index 7b0ab54e11dae..5b178b6d7f47a 100644
--- a/test/core/memory_usage/memory_usage_test.cc
+++ b/test/core/memory_usage/memory_usage_test.cc
@@ -33,6 +33,7 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/wrappers.pb.h"
@@ -48,6 +49,7 @@
 #include "src/core/lib/gpr/subprocess.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
+#include "src/proto/grpc/testing/xds/v3/health_check.pb.h"
 #include "test/core/util/port.h"
 #include "test/core/util/resolve_localhost_ip46.h"
 #include "test/core/util/test_config.h"
@@ -56,9 +58,12 @@
 
 using grpc::testing::XdsResourceUtils;
 
-ABSL_FLAG(std::string, benchmark_names, "call,channel",
-          "Which benchmark to run");  // Default all benchmarks in order to
-                                      // trigger CI testing for each one
+// Default all benchmarks in order to trigger CI testing for each one
+ABSL_FLAG(std::string, benchmark_names, "",
+          "Which benchmark to run.  If empty, defaults to 'call,channel' "
+          "if --use_xds is false, or 'call,channel,channel_multi_address' "
+          "if --use_xds is true.");
+
 ABSL_FLAG(int, size, 1000, "Number of channels/calls");
 ABSL_FLAG(std::string, scenario_config, "insecure",
           "Possible Values: minstack (Use minimal stack), resource_quota, "
@@ -142,19 +147,22 @@ int RunCallBenchmark(int port, char* root,
 }
 
 // Per-channel benchmark
-int RunChannelBenchmark(int port, char* root) {
+int RunChannelBenchmark(const std::vector<int>& server_ports, char* root) {
   // TODO(chennancy) Add the scenario specific flags
-  int status;
 
-  // start the server
-  gpr_log(GPR_INFO, "starting server");
-  std::vector<std::string> server_flags = {
-      absl::StrCat(root, "/memory_usage_callback_server",
-                   gpr_subprocess_binary_extension()),
-      "--bind", grpc_core::LocalIpAndPort(port)};
-  if (absl::GetFlag(FLAGS_use_xds)) server_flags.emplace_back("--use_xds");
-  Subprocess svr(server_flags);
-  gpr_log(GPR_INFO, "server started, pid %d", svr.GetPID());
+  // start the servers
+  std::vector<Subprocess> servers;
+  servers.reserve(server_ports.size());
+  for (int port : server_ports) {
+    gpr_log(GPR_INFO, "starting server on port %d", port);
+    std::vector<std::string> server_flags = {
+        absl::StrCat(root, "/memory_usage_callback_server",
+                     gpr_subprocess_binary_extension()),
+        "--bind", grpc_core::LocalIpAndPort(port)};
+    if (absl::GetFlag(FLAGS_use_xds)) server_flags.emplace_back("--use_xds");
+    servers.emplace_back(server_flags);
+    gpr_log(GPR_INFO, "server started, pid %d", servers.back().GetPID());
+  }
 
   // Wait one second before starting client to avoid possible race condition
   // of client sending an RPC before the server is set up
@@ -168,19 +176,25 @@ int RunChannelBenchmark(int port, char* root) {
       "--target",
       absl::GetFlag(FLAGS_use_xds)
           ? absl::StrCat("xds:", XdsResourceUtils::kServerName)
-          : grpc_core::LocalIpAndPort(port),
-      "--nosecure",
-      absl::StrCat("--server_pid=", svr.GetPID()),
-      absl::StrCat("--size=", absl::GetFlag(FLAGS_size))};
+          : grpc_core::LocalIpAndPort(server_ports[0]),
+      "--nosecure", absl::StrCat("--size=", absl::GetFlag(FLAGS_size))};
+  if (server_ports.size() == 1) {
+    client_flags.emplace_back(
+        absl::StrCat("--server_pid=", servers[0].GetPID()));
+  }
   Subprocess cli(client_flags);
   gpr_log(GPR_INFO, "client started, pid %d", cli.GetPID());
   // wait for completion
-  if ((status = cli.Join()) != 0) {
-    printf("client failed with: %d", status);
+  int retval = cli.Join();
+  if (retval != 0) {
+    printf("client failed with: %d", retval);
     return 1;
   }
-  svr.Interrupt();
-  return svr.Join() == 0 ? 0 : 2;
+  for (auto& server : servers) {
+    server.Interrupt();
+    if (server.Join() != 0) retval = 2;
+  }
+  return retval;
 }
 
 struct XdsServer {
@@ -188,7 +202,8 @@ struct XdsServer {
   std::unique_ptr<grpc::Server> server;
 };
 
-XdsServer StartXdsServerAndConfigureBootstrap(int server_port) {
+XdsServer StartXdsServerAndConfigureBootstrap(
+    const std::vector<int>& server_ports) {
   XdsServer xds_server;
   int xds_server_port = grpc_pick_unused_port_or_die();
   gpr_log(GPR_INFO, "xDS server port: %d", xds_server_port);
@@ -204,6 +219,14 @@ XdsServer StartXdsServerAndConfigureBootstrap(int server_port) {
   xds_server.ads_service = std::make_shared<grpc::testing::AdsServiceImpl>();
   xds_server.ads_service->Start();
   // Populate xDS resources.
+  std::vector<XdsResourceUtils::EdsResourceArgs::Endpoint> endpoints;
+  endpoints.reserve(server_ports.size());
+  for (int port : server_ports) {
+    endpoints.emplace_back(port);
+    XdsResourceUtils::SetServerListenerNameAndRouteConfiguration(
+        xds_server.ads_service.get(), XdsResourceUtils::DefaultServerListener(),
+        port, XdsResourceUtils::DefaultServerRouteConfig());
+  }
   XdsResourceUtils::SetListenerAndRouteConfiguration(
       xds_server.ads_service.get(), XdsResourceUtils::DefaultListener(),
       XdsResourceUtils::DefaultRouteConfig());
@@ -216,11 +239,7 @@ XdsServer StartXdsServerAndConfigureBootstrap(int server_port) {
   xds_server.ads_service->SetEdsResource(
       XdsResourceUtils::BuildEdsResource(XdsResourceUtils::EdsResourceArgs(
           {XdsResourceUtils::EdsResourceArgs::Locality(
-              "here",
-              {XdsResourceUtils::EdsResourceArgs::Endpoint(server_port)})})));
-  XdsResourceUtils::SetServerListenerNameAndRouteConfiguration(
-      xds_server.ads_service.get(), XdsResourceUtils::DefaultServerListener(),
-      server_port, XdsResourceUtils::DefaultServerRouteConfig());
+              "here", std::move(endpoints))})));
   // Create and start server.
   gpr_log(GPR_INFO, "starting xDS server...");
   grpc::ServerBuilder builder;
@@ -236,18 +255,24 @@ int RunBenchmark(char* root, absl::string_view benchmark,
                  std::vector<std::string> server_scenario_flags,
                  std::vector<std::string> client_scenario_flags) {
   gpr_log(GPR_INFO, "running benchmark: %s", std::string(benchmark).c_str());
-  int server_port = grpc_pick_unused_port_or_die();
-  gpr_log(GPR_INFO, "server port: %d", server_port);
+  const size_t num_ports = benchmark == "channel_multi_address" ? 10 : 1;
+  std::vector<int> server_ports;
+  server_ports.reserve(num_ports);
+  for (size_t i = 0; i < num_ports; ++i) {
+    server_ports.push_back(grpc_pick_unused_port_or_die());
+  }
+  gpr_log(GPR_INFO, "server ports: %s",
+          absl::StrJoin(server_ports, ",").c_str());
   XdsServer xds_server;
   if (absl::GetFlag(FLAGS_use_xds)) {
-    xds_server = StartXdsServerAndConfigureBootstrap(server_port);
+    xds_server = StartXdsServerAndConfigureBootstrap(server_ports);
   }
   int retval;
   if (benchmark == "call") {
-    retval = RunCallBenchmark(server_port, root, server_scenario_flags,
+    retval = RunCallBenchmark(server_ports[0], root, server_scenario_flags,
                               client_scenario_flags);
-  } else if (benchmark == "channel") {
-    retval = RunChannelBenchmark(server_port, root);
+  } else if (benchmark == "channel" || benchmark == "channel_multi_address") {
+    retval = RunChannelBenchmark(server_ports, root);
   } else {
     gpr_log(GPR_INFO, "Not a valid benchmark name");
     retval = 4;
@@ -293,7 +318,13 @@ int main(int argc, char** argv) {
 
   // Run all benchmarks listed (Multiple benchmarks usually only for default
   // scenario)
-  auto benchmarks = absl::StrSplit(absl::GetFlag(FLAGS_benchmark_names), ',');
+  std::string benchmark_names = absl::GetFlag(FLAGS_benchmark_names);
+  if (benchmark_names.empty()) {
+    benchmark_names = absl::GetFlag(FLAGS_use_xds)
+                          ? "call,channel,channel_multi_address"
+                          : "call,channel";
+  }
+  auto benchmarks = absl::StrSplit(benchmark_names, ',');
   grpc_init();
   for (const auto& benchmark : benchmarks) {
     int r = RunBenchmark(root, benchmark, it_scenario->second.server,
diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD
index c974eeec7f6d8..2370dfdc4a79b 100644
--- a/test/core/promise/BUILD
+++ b/test/core/promise/BUILD
@@ -419,6 +419,27 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "inter_activity_latch_test",
+    srcs = ["inter_activity_latch_test.cc"],
+    external_deps = [
+        "absl/status",
+        "gtest",
+    ],
+    language = "c++",
+    tags = ["promise_test"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc",
+        "//src/core:default_event_engine",
+        "//src/core:event_engine_wakeup_scheduler",
+        "//src/core:inter_activity_latch",
+        "//src/core:notification",
+        "//src/core:seq",
+    ],
+)
+
 grpc_cc_test(
     name = "mpsc_test",
     srcs = ["mpsc_test.cc"],
@@ -543,6 +564,34 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "status_flag_test",
+    srcs = ["status_flag_test.cc"],
+    external_deps = ["gtest"],
+    language = "c++",
+    tags = ["promise_test"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = ["//src/core:status_flag"],
+)
+
+grpc_cc_test(
+    name = "promise_mutex_test",
+    srcs = ["promise_mutex_test.cc"],
+    external_deps = [
+        "absl/status",
+        "gtest",
+    ],
+    deps = [
+        "test_wakeup_schedulers",
+        "//:promise",
+        "//src/core:activity",
+        "//src/core:join",
+        "//src/core:promise_mutex",
+        "//src/core:seq",
+    ],
+)
+
 grpc_cc_test(
     name = "party_test",
     srcs = ["party_test.cc"],
@@ -563,6 +612,7 @@ grpc_cc_test(
         "//src/core:context",
         "//src/core:default_event_engine",
         "//src/core:event_engine_memory_allocator",
+        "//src/core:inter_activity_latch",
         "//src/core:memory_quota",
         "//src/core:notification",
         "//src/core:poll",
diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc
new file mode 100644
index 0000000000000..087489b240e94
--- /dev/null
+++ b/test/core/promise/inter_activity_latch_test.cc
@@ -0,0 +1,103 @@
+// Copyright 2023 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/lib/promise/inter_activity_latch.h"
+
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
+
+#include <grpc/grpc.h>
+
+#include "src/core/lib/event_engine/default_event_engine.h"
+#include "src/core/lib/gprpp/notification.h"
+#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
+#include "src/core/lib/promise/seq.h"
+
+using grpc_event_engine::experimental::GetDefaultEventEngine;
+
+namespace grpc_core {
+namespace {
+
+TEST(InterActivityLatchTest, Works) {
+  InterActivityLatch<void> latch;
+
+  // Start some waiting activities
+  Notification n1;
+  auto a1 = MakeActivity(
+      [&] {
+        return Seq(latch.Wait(), [&](Empty) {
+          n1.Notify();
+          return absl::OkStatus();
+        });
+      },
+      EventEngineWakeupScheduler{GetDefaultEventEngine()}, [](absl::Status) {});
+  Notification n2;
+  auto a2 = MakeActivity(
+      [&] {
+        return Seq(latch.Wait(), [&](Empty) {
+          n2.Notify();
+          return absl::OkStatus();
+        });
+      },
+      EventEngineWakeupScheduler{GetDefaultEventEngine()}, [](absl::Status) {});
+  Notification n3;
+  auto a3 = MakeActivity(
+      [&] {
+        return Seq(latch.Wait(), [&](Empty) {
+          n3.Notify();
+          return absl::OkStatus();
+        });
+      },
+      EventEngineWakeupScheduler{GetDefaultEventEngine()}, [](absl::Status) {});
+
+  ASSERT_FALSE(n1.HasBeenNotified());
+  ASSERT_FALSE(n2.HasBeenNotified());
+  ASSERT_FALSE(n3.HasBeenNotified());
+
+  // Start a setting activity
+  auto kicker = MakeActivity(
+      [&] {
+        latch.Set();
+        return absl::OkStatus();
+      },
+      EventEngineWakeupScheduler{GetDefaultEventEngine()}, [](absl::Status) {});
+
+  // Start another waiting activity
+  Notification n4;
+  auto a4 = MakeActivity(
+      [&] {
+        return Seq(latch.Wait(), [&](Empty) {
+          n4.Notify();
+          return absl::OkStatus();
+        });
+      },
+      EventEngineWakeupScheduler{GetDefaultEventEngine()}, [](absl::Status) {});
+
+  // Everything should finish
+  n1.WaitForNotification();
+  n2.WaitForNotification();
+  n3.WaitForNotification();
+  n4.WaitForNotification();
+}
+
+}  // namespace
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  grpc_init();  // for GetDefaultEventEngine
+  int r = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return r;
+}
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index a15b10a985b1c..551443ac4d5e7 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -36,6 +36,7 @@
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/inter_activity_latch.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/promise/sleep.h"
@@ -298,6 +299,31 @@ TEST_F(PartyTest, CanSpawnAndRun) {
   n.WaitForNotification();
 }
 
+TEST_F(PartyTest, CanSpawnWaitableAndRun) {
+  auto party1 = MakeRefCounted<TestParty>();
+  auto party2 = MakeRefCounted<TestParty>();
+  Notification n;
+  InterActivityLatch<void> done;
+  // Spawn a task on party1 that will wait for a task on party2.
+  // The party2 task will wait on the latch `done`.
+  party1->Spawn(
+      "party1_main",
+      [&party2, &done]() {
+        return party2->SpawnWaitable("party2_main",
+                                     [&done]() { return done.Wait(); });
+      },
+      [&n](Empty) { n.Notify(); });
+  ASSERT_FALSE(n.HasBeenNotified());
+  party1->Spawn(
+      "party1_notify_latch",
+      [&done]() {
+        done.Set();
+        return Empty{};
+      },
+      [](Empty) {});
+  n.WaitForNotification();
+}
+
 TEST_F(PartyTest, CanSpawnFromSpawn) {
   auto party = MakeRefCounted<TestParty>();
   Notification n1;
diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc
new file mode 100644
index 0000000000000..9ef2c778d655c
--- /dev/null
+++ b/test/core/promise/promise_mutex_test.cc
@@ -0,0 +1,71 @@
+// Copyright 2023 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/lib/promise/promise_mutex.h"
+
+#include <memory>
+#include <optional>
+
+#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"
+#include "src/core/lib/promise/seq.h"
+#include "test/core/promise/test_wakeup_schedulers.h"
+
+namespace grpc_core {
+namespace {
+
+TEST(PromiseMutexTest, Basic) {
+  PromiseMutex<int> mutex{1};
+  bool done = false;
+  MakeActivity(
+      [&]() {
+        return Seq(Join(Seq(mutex.Acquire(),
+                            [](PromiseMutex<int>::Lock l) {
+                              EXPECT_EQ(*l, 1);
+                              *l = 2;
+                              return Empty{};
+                            }),
+                        Seq(mutex.Acquire(),
+                            [](PromiseMutex<int>::Lock l) {
+                              EXPECT_EQ(*l, 2);
+                              *l = 3;
+                              return Empty{};
+                            }),
+                        Seq(mutex.Acquire(),
+                            [](PromiseMutex<int>::Lock l) {
+                              EXPECT_EQ(*l, 3);
+                              return Empty{};
+                            })),
+                   []() { return absl::OkStatus(); });
+      },
+      InlineWakeupScheduler(),
+      [&done](absl::Status status) {
+        EXPECT_TRUE(status.ok());
+        done = true;
+      });
+  EXPECT_TRUE(done);
+  EXPECT_EQ(**NowOrNever(mutex.Acquire()), 3);
+}
+
+}  // namespace
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/promise/status_flag_test.cc b/test/core/promise/status_flag_test.cc
new file mode 100644
index 0000000000000..dcde3641f049c
--- /dev/null
+++ b/test/core/promise/status_flag_test.cc
@@ -0,0 +1,45 @@
+// Copyright 2023 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/lib/promise/status_flag.h"
+
+#include <memory>
+#include <utility>
+
+#include "gtest/gtest.h"
+
+namespace grpc_core {
+
+TEST(StatusFlagTest, Basics) {
+  EXPECT_TRUE(StatusFlag(true).ok());
+  EXPECT_FALSE(StatusFlag(false).ok());
+  EXPECT_TRUE(StatusCast<absl::Status>(StatusFlag(true)).ok());
+  EXPECT_FALSE(StatusCast<absl::Status>(StatusFlag(false)).ok());
+  EXPECT_TRUE(ValueOrFailure<int>(42).ok());
+  EXPECT_FALSE(ValueOrFailure<int>(Failure{}).ok());
+  EXPECT_TRUE(StatusCast<absl::Status>(ValueOrFailure<int>(42)).ok());
+  EXPECT_FALSE(StatusCast<absl::Status>(ValueOrFailure<int>(Failure{})).ok());
+  EXPECT_EQ(ValueOrFailure<int>(42).value(), 42);
+  EXPECT_EQ(StatusCast<absl::StatusOr<int>>(ValueOrFailure<int>(42)).value(),
+            42);
+  EXPECT_TRUE(IsStatusOk(Success{}));
+  EXPECT_FALSE(IsStatusOk(Failure{}));
+}
+
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/security/BUILD b/test/core/security/BUILD
index c37ac640d57a8..7c955f22afcd2 100644
--- a/test/core/security/BUILD
+++ b/test/core/security/BUILD
@@ -565,14 +565,24 @@ grpc_cc_test(
     name = "grpc_tls_crl_provider_test",
     srcs = ["grpc_tls_crl_provider_test.cc"],
     data = [
+        "//test/core/tsi/test_creds/crl_data:ca.pem",
+        "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0",
+        "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0",
         "//test/core/tsi/test_creds/crl_data/crls:current.crl",
+        "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl",
     ],
     external_deps = ["gtest"],
     language = "C++",
     deps = [
         "//:gpr",
         "//:grpc",
+        "//:iomgr_timer",
+        "//src/core:default_event_engine",
         "//src/core:grpc_crl_provider",
+        "//test/core/event_engine:event_engine_test_utils",
+        "//test/core/event_engine/fuzzing_event_engine",
+        "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
+        "//test/core/util:fuzz_config_vars_proto",
         "//test/core/util:grpc_test_util",
     ],
 )
diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc
index 22445c318668b..ad58ccd394f67 100644
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@@ -2127,12 +2127,12 @@ void validate_external_account_creds_token_exchage_request(
   // Check the rest of the request.
   GPR_ASSERT(strcmp(host, "foo.com:5555") == 0);
   GPR_ASSERT(strcmp(path, "/token") == 0);
-  GPR_ASSERT(request->hdr_count == 2);
+  GPR_ASSERT(request->hdr_count == 3);
   GPR_ASSERT(strcmp(request->hdrs[0].key, "Content-Type") == 0);
   GPR_ASSERT(
       strcmp(request->hdrs[0].value, "application/x-www-form-urlencoded") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].key, "Authorization") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].value,
+  GPR_ASSERT(strcmp(request->hdrs[2].key, "Authorization") == 0);
+  GPR_ASSERT(strcmp(request->hdrs[2].value,
                     "Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=") == 0);
 }
 
@@ -2155,12 +2155,12 @@ void validate_external_account_creds_token_exchage_request_with_url_encode(
   // Check the rest of the request.
   GPR_ASSERT(strcmp(host, "foo.com:5555") == 0);
   GPR_ASSERT(strcmp(path, "/token_url_encode") == 0);
-  GPR_ASSERT(request->hdr_count == 2);
+  GPR_ASSERT(request->hdr_count == 3);
   GPR_ASSERT(strcmp(request->hdrs[0].key, "Content-Type") == 0);
   GPR_ASSERT(
       strcmp(request->hdrs[0].value, "application/x-www-form-urlencoded") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].key, "Authorization") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].value,
+  GPR_ASSERT(strcmp(request->hdrs[2].key, "Authorization") == 0);
+  GPR_ASSERT(strcmp(request->hdrs[2].value,
                     "Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=") == 0);
 }
 
@@ -2311,12 +2311,18 @@ void validate_aws_external_account_creds_token_exchage_request(
   // Check the rest of the request.
   GPR_ASSERT(strcmp(host, "foo.com:5555") == 0);
   GPR_ASSERT(strcmp(path, "/token") == 0);
-  GPR_ASSERT(request->hdr_count == 2);
+  GPR_ASSERT(request->hdr_count == 3);
   GPR_ASSERT(strcmp(request->hdrs[0].key, "Content-Type") == 0);
   GPR_ASSERT(
       strcmp(request->hdrs[0].value, "application/x-www-form-urlencoded") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].key, "Authorization") == 0);
-  GPR_ASSERT(strcmp(request->hdrs[1].value,
+  GPR_ASSERT(strcmp(request->hdrs[1].key, "x-goog-api-client") == 0);
+  EXPECT_EQ(
+      request->hdrs[1].value,
+      absl::StrFormat("gl-cpp/unknown auth/%s google-byoid-sdk source/aws "
+                      "sa-impersonation/false config-lifetime/false",
+                      grpc_version_string()));
+  GPR_ASSERT(strcmp(request->hdrs[2].key, "Authorization") == 0);
+  GPR_ASSERT(strcmp(request->hdrs[2].value,
                     "Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=") == 0);
 }
 
@@ -2385,6 +2391,8 @@ class TestExternalAccountCredentials final : public ExternalAccountCredentials {
                                  std::vector<std::string> scopes)
       : ExternalAccountCredentials(std::move(options), std::move(scopes)) {}
 
+  std::string GetMetricsValue() { return MetricsHeaderValue(); }
+
  protected:
   void RetrieveSubjectToken(
       HTTPRequestContext* /*ctx*/, const Options& /*options*/,
@@ -2393,6 +2401,91 @@ class TestExternalAccountCredentials final : public ExternalAccountCredentials {
   }
 };
 
+TEST(CredentialsTest, TestExternalAccountCredsMetricsHeader) {
+  Json credential_source = Json::FromString("");
+  TestExternalAccountCredentials::ServiceAccountImpersonation
+      service_account_impersonation;
+  service_account_impersonation.token_lifetime_seconds = 3600;
+  TestExternalAccountCredentials::Options options = {
+      "external_account",                 // type;
+      "audience",                         // audience;
+      "subject_token_type",               // subject_token_type;
+      "",                                 // service_account_impersonation_url;
+      service_account_impersonation,      // service_account_impersonation;
+      "https://foo.com:5555/token",       // token_url;
+      "https://foo.com:5555/token_info",  // token_info_url;
+      credential_source,                  // credential_source;
+      "quota_project_id",                 // quota_project_id;
+      "client_id",                        // client_id;
+      "client_secret",                    // client_secret;
+      "",                                 // workforce_pool_user_project;
+  };
+  TestExternalAccountCredentials creds(options, {});
+
+  EXPECT_EQ(
+      creds.GetMetricsValue(),
+      absl::StrFormat("gl-cpp/unknown auth/%s google-byoid-sdk source/unknown "
+                      "sa-impersonation/false config-lifetime/false",
+                      grpc_version_string()));
+}
+
+TEST(CredentialsTest,
+     TestExternalAccountCredsMetricsHeaderWithServiceAccountImpersonation) {
+  Json credential_source = Json::FromString("");
+  TestExternalAccountCredentials::ServiceAccountImpersonation
+      service_account_impersonation;
+  service_account_impersonation.token_lifetime_seconds = 3600;
+  TestExternalAccountCredentials::Options options = {
+      "external_account",    // type;
+      "audience",            // audience;
+      "subject_token_type",  // subject_token_type;
+      "https://foo.com:5555/service_account_impersonation",  // service_account_impersonation_url;
+      service_account_impersonation,      // service_account_impersonation;
+      "https://foo.com:5555/token",       // token_url;
+      "https://foo.com:5555/token_info",  // token_info_url;
+      credential_source,                  // credential_source;
+      "quota_project_id",                 // quota_project_id;
+      "client_id",                        // client_id;
+      "client_secret",                    // client_secret;
+      "",                                 // workforce_pool_user_project;
+  };
+  TestExternalAccountCredentials creds(options, {});
+
+  EXPECT_EQ(
+      creds.GetMetricsValue(),
+      absl::StrFormat("gl-cpp/unknown auth/%s google-byoid-sdk source/unknown "
+                      "sa-impersonation/true config-lifetime/false",
+                      grpc_version_string()));
+}
+
+TEST(CredentialsTest, TestExternalAccountCredsMetricsHeaderWithConfigLifetime) {
+  Json credential_source = Json::FromString("");
+  TestExternalAccountCredentials::ServiceAccountImpersonation
+      service_account_impersonation;
+  service_account_impersonation.token_lifetime_seconds = 5000;
+  TestExternalAccountCredentials::Options options = {
+      "external_account",    // type;
+      "audience",            // audience;
+      "subject_token_type",  // subject_token_type;
+      "https://foo.com:5555/service_account_impersonation",  // service_account_impersonation_url;
+      service_account_impersonation,      // service_account_impersonation;
+      "https://foo.com:5555/token",       // token_url;
+      "https://foo.com:5555/token_info",  // token_info_url;
+      credential_source,                  // credential_source;
+      "quota_project_id",                 // quota_project_id;
+      "client_id",                        // client_id;
+      "client_secret",                    // client_secret;
+      "",                                 // workforce_pool_user_project;
+  };
+  TestExternalAccountCredentials creds(options, {});
+
+  EXPECT_EQ(
+      creds.GetMetricsValue(),
+      absl::StrFormat("gl-cpp/unknown auth/%s google-byoid-sdk source/unknown "
+                      "sa-impersonation/true config-lifetime/true",
+                      grpc_version_string()));
+}
+
 TEST(CredentialsTest, TestExternalAccountCredsSuccess) {
   ExecCtx exec_ctx;
   Json credential_source = Json::FromString("");
@@ -3878,6 +3971,22 @@ TEST(CredentialsTest, TestCompositeChannelCredsCompareSuccess) {
   grpc_channel_credentials_release(composite_creds_2);
 }
 
+TEST(CredentialsTest, RecursiveCompositeCredsDuplicateWithoutCallCreds) {
+  auto* insecure_creds = grpc_insecure_credentials_create();
+  auto inner_fake_creds = MakeRefCounted<fake_call_creds>();
+  auto outer_fake_creds = MakeRefCounted<fake_call_creds>();
+  auto* inner_composite_creds = grpc_composite_channel_credentials_create(
+      insecure_creds, inner_fake_creds.get(), nullptr);
+  auto* outer_composite_creds = grpc_composite_channel_credentials_create(
+      inner_composite_creds, outer_fake_creds.get(), nullptr);
+  auto duplicate_without_call_creds =
+      outer_composite_creds->duplicate_without_call_credentials();
+  EXPECT_EQ(duplicate_without_call_creds.get(), insecure_creds);
+  grpc_channel_credentials_release(insecure_creds);
+  grpc_channel_credentials_release(inner_composite_creds);
+  grpc_channel_credentials_release(outer_composite_creds);
+}
+
 TEST(CredentialsTest,
      TestCompositeChannelCredsCompareFailureDifferentChannelCreds) {
   auto* insecure_creds = grpc_insecure_credentials_create();
diff --git a/test/core/security/grpc_tls_crl_provider_test.cc b/test/core/security/grpc_tls_crl_provider_test.cc
index e2729c5980f84..f47028b160bc8 100644
--- a/test/core/security/grpc_tls_crl_provider_test.cc
+++ b/test/core/security/grpc_tls_crl_provider_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 
+#include <chrono>
+#include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
@@ -26,30 +28,122 @@
 
 #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"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
 #include "test/core/util/test_config.h"
 #include "test/core/util/tls_utils.h"
 
-const char* kCrlPath = "test/core/tsi/test_creds/crl_data/crls/current.crl";
-const absl::string_view kCrlIssuer =
+static constexpr absl::string_view kCrlPath =
+    "test/core/tsi/test_creds/crl_data/crls/current.crl";
+static constexpr absl::string_view kCrlName = "current.crl";
+static constexpr absl::string_view kCrlIssuer =
     "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=testca";
-
-namespace grpc_core {
-namespace testing {
+static constexpr absl::string_view kCrlIntermediateIssuer =
+    "/CN=intermediatecert.example.com";
+static constexpr absl::string_view kCrlDirectory =
+    "test/core/tsi/test_creds/crl_data/crls";
+static constexpr absl::string_view kRootCert =
+    "test/core/tsi/test_creds/crl_data/ca.pem";
 
 using ::grpc_core::experimental::CertificateInfoImpl;
 using ::grpc_core::experimental::Crl;
 using ::grpc_core::experimental::CrlProvider;
 
+namespace grpc_core {
+namespace testing {
+
+class FakeDirectoryReader : public DirectoryReader {
+ public:
+  ~FakeDirectoryReader() override = default;
+  absl::Status ForEach(
+      absl::FunctionRef<void(absl::string_view)> callback) override {
+    if (!files_in_directory_.ok()) {
+      return files_in_directory_.status();
+    }
+    for (const auto& file : *files_in_directory_) {
+      callback(file);
+    }
+    return absl::OkStatus();
+  }
+  absl::string_view Name() const override { return kCrlDirectory; }
+
+  void SetFilesInDirectory(std::vector<std::string> files) {
+    files_in_directory_ = std::move(files);
+  }
+
+  void SetStatus(absl::Status status) { files_in_directory_ = status; }
+
+ private:
+  absl::StatusOr<std::vector<std::string>> files_in_directory_ =
+      std::vector<std::string>();
+};
+
+class DirectoryReloaderCrlProviderTest : public ::testing::Test {
+ public:
+  void SetUp() override {
+    event_engine_ =
+        std::make_shared<grpc_event_engine::experimental::FuzzingEventEngine>(
+            grpc_event_engine::experimental::FuzzingEventEngine::Options(),
+            fuzzing_event_engine::Actions());
+    // Without this the test had a failure dealing with grpc timers on TSAN
+    grpc_timer_manager_set_start_threaded(false);
+    grpc_init();
+  }
+  void TearDown() override {
+    ExecCtx exec_ctx;
+    event_engine_->FuzzingDone();
+    exec_ctx.Flush();
+    event_engine_->TickUntilIdle();
+    grpc_event_engine::experimental::WaitForSingleOwner(
+        std::move(event_engine_));
+    grpc_shutdown_blocking();
+    event_engine_.reset();
+  }
+
+ protected:
+  // Tests that want a fake directory reader can call this without setting the
+  // last parameter.
+  absl::StatusOr<std::shared_ptr<CrlProvider>> CreateCrlProvider(
+      std::chrono::seconds refresh_duration,
+      std::function<void(absl::Status)> reload_error_callback,
+      std::shared_ptr<DirectoryReader> directory_reader = nullptr) {
+    if (directory_reader == nullptr) directory_reader = directory_reader_;
+    auto provider =
+        std::make_shared<experimental::DirectoryReloaderCrlProvider>(
+            refresh_duration, std::move(reload_error_callback), event_engine_,
+            std::move(directory_reader));
+    provider->UpdateAndStartTimer();
+    return provider;
+  }
+
+  // Tests that want a real directory can call this instead of the above.
+  absl::StatusOr<std::shared_ptr<CrlProvider>> CreateCrlProvider(
+      absl::string_view directory, std::chrono::seconds refresh_duration,
+      std::function<void(absl::Status)> reload_error_callback) {
+    return CreateCrlProvider(refresh_duration, std::move(reload_error_callback),
+                             MakeDirectoryReader(directory));
+  }
+
+  std::shared_ptr<FakeDirectoryReader> directory_reader_ =
+      std::make_shared<FakeDirectoryReader>();
+  std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+      event_engine_;
+};
+
 TEST(CrlProviderTest, CanParseCrl) {
-  std::string crl_string = GetFileContents(kCrlPath);
+  std::string crl_string = GetFileContents(kCrlPath.data());
   absl::StatusOr<std::shared_ptr<Crl>> crl = Crl::Parse(crl_string);
-  ASSERT_TRUE(crl.ok());
+  ASSERT_TRUE(crl.ok()) << crl.status();
   ASSERT_NE(*crl, nullptr);
   EXPECT_EQ((*crl)->Issuer(), kCrlIssuer);
 }
@@ -63,34 +157,114 @@ TEST(CrlProviderTest, InvalidFile) {
 }
 
 TEST(CrlProviderTest, StaticCrlProviderLookup) {
-  std::vector<std::string> crl_strings = {GetFileContents(kCrlPath)};
+  std::vector<std::string> crl_strings = {GetFileContents(kCrlPath.data())};
   absl::StatusOr<std::shared_ptr<CrlProvider>> provider =
       experimental::CreateStaticCrlProvider(crl_strings);
   ASSERT_TRUE(provider.ok()) << provider.status();
-  CertificateInfoImpl cert = CertificateInfoImpl(kCrlIssuer);
+  CertificateInfoImpl cert(kCrlIssuer);
   auto crl = (*provider)->GetCrl(cert);
   ASSERT_NE(crl, nullptr);
   EXPECT_EQ(crl->Issuer(), kCrlIssuer);
 }
 
-TEST(CrlProviderTest, StaticCrlProviderLookupBad) {
-  std::vector<std::string> crl_strings = {GetFileContents(kCrlPath)};
+TEST(CrlProviderTest, StaticCrlProviderLookupIssuerNotFound) {
+  std::vector<std::string> crl_strings = {GetFileContents(kCrlPath.data())};
   absl::StatusOr<std::shared_ptr<CrlProvider>> provider =
       experimental::CreateStaticCrlProvider(crl_strings);
   ASSERT_TRUE(provider.ok()) << provider.status();
-  CertificateInfoImpl bad_cert = CertificateInfoImpl("BAD CERT");
+  CertificateInfoImpl bad_cert("BAD CERT");
   auto crl = (*provider)->GetCrl(bad_cert);
   EXPECT_EQ(crl, nullptr);
 }
 
+TEST_F(DirectoryReloaderCrlProviderTest, CrlLookupGood) {
+  auto provider =
+      CreateCrlProvider(kCrlDirectory, std::chrono::seconds(60), nullptr);
+  ASSERT_TRUE(provider.ok()) << provider.status();
+  CertificateInfoImpl cert(kCrlIssuer);
+  auto crl = (*provider)->GetCrl(cert);
+  ASSERT_NE(crl, nullptr);
+  EXPECT_EQ(crl->Issuer(), kCrlIssuer);
+  CertificateInfoImpl intermediate(kCrlIntermediateIssuer);
+  auto intermediate_crl = (*provider)->GetCrl(intermediate);
+  ASSERT_NE(intermediate_crl, nullptr);
+  EXPECT_EQ(intermediate_crl->Issuer(), kCrlIntermediateIssuer);
+}
+
+TEST_F(DirectoryReloaderCrlProviderTest, CrlLookupMissingIssuer) {
+  auto provider =
+      CreateCrlProvider(kCrlDirectory, std::chrono::seconds(60), nullptr);
+  ASSERT_TRUE(provider.ok()) << provider.status();
+  CertificateInfoImpl bad_cert("BAD CERT");
+  auto crl = (*provider)->GetCrl(bad_cert);
+  ASSERT_EQ(crl, nullptr);
+}
+
+TEST_F(DirectoryReloaderCrlProviderTest, ReloadsAndDeletes) {
+  const std::chrono::seconds kRefreshDuration(60);
+  auto provider = CreateCrlProvider(kRefreshDuration, nullptr);
+  ASSERT_TRUE(provider.ok()) << provider.status();
+  CertificateInfoImpl cert(kCrlIssuer);
+  auto should_be_no_crl = (*provider)->GetCrl(cert);
+  ASSERT_EQ(should_be_no_crl, nullptr);
+  // Give the provider files to find in the directory
+  directory_reader_->SetFilesInDirectory({std::string(kCrlName)});
+  event_engine_->TickForDuration(kRefreshDuration);
+  auto crl = (*provider)->GetCrl(cert);
+  ASSERT_NE(crl, nullptr);
+  EXPECT_EQ(crl->Issuer(), kCrlIssuer);
+  // Now we won't see any files in our directory
+  directory_reader_->SetFilesInDirectory({});
+  event_engine_->TickForDuration(kRefreshDuration);
+  auto crl_should_be_deleted = (*provider)->GetCrl(cert);
+  ASSERT_EQ(crl_should_be_deleted, nullptr);
+}
+
+TEST_F(DirectoryReloaderCrlProviderTest, WithCorruption) {
+  directory_reader_->SetFilesInDirectory({std::string(kCrlName)});
+  const std::chrono::seconds kRefreshDuration(60);
+  std::vector<absl::Status> reload_errors;
+  std::function<void(absl::Status)> reload_error_callback =
+      [&](const absl::Status& status) { reload_errors.push_back(status); };
+  auto provider =
+      CreateCrlProvider(kRefreshDuration, std::move(reload_error_callback));
+  ASSERT_TRUE(provider.ok()) << provider.status();
+  CertificateInfoImpl cert(kCrlIssuer);
+  auto crl = (*provider)->GetCrl(cert);
+  ASSERT_NE(crl, nullptr);
+  EXPECT_EQ(crl->Issuer(), kCrlIssuer);
+  EXPECT_EQ(reload_errors.size(), 0);
+  // Point the provider at a non-crl file so loading fails
+  // Should result in the CRL Reloader keeping the old CRL data
+  directory_reader_->SetFilesInDirectory({std::string(kRootCert)});
+  event_engine_->TickForDuration(kRefreshDuration);
+  auto crl_post_update = (*provider)->GetCrl(cert);
+  ASSERT_NE(crl_post_update, nullptr);
+  EXPECT_EQ(crl_post_update->Issuer(), kCrlIssuer);
+  EXPECT_EQ(reload_errors.size(), 1);
+}
+
+TEST_F(DirectoryReloaderCrlProviderTest, WithBadInitialDirectoryStatus) {
+  absl::Status status = absl::UnknownError("");
+  directory_reader_->SetStatus(status);
+  std::vector<absl::Status> reload_errors;
+  std::function<void(absl::Status)> reload_error_callback =
+      [&](const absl::Status& status) { reload_errors.push_back(status); };
+  const std::chrono::seconds kRefreshDuration(60);
+  auto provider =
+      CreateCrlProvider(kRefreshDuration, reload_error_callback, nullptr);
+  // We expect the provider to be created successfully, but the reload error
+  // callback will have been called
+  ASSERT_TRUE(provider.ok()) << provider.status();
+  EXPECT_EQ(reload_errors.size(), 1);
+}
+
 }  // namespace testing
 }  // namespace grpc_core
 
 int main(int argc, char** argv) {
   grpc::testing::TestEnvironment env(&argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
-  grpc_init();
   int ret = RUN_ALL_TESTS();
-  grpc_shutdown();
   return ret;
 }
diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc
index 22fdad11da97b..bab56a38d3a6e 100644
--- a/test/core/surface/channel_init_test.cc
+++ b/test/core/surface/channel_init_test.cc
@@ -35,9 +35,9 @@ const grpc_channel_filter* FilterNamed(const char* name) {
   if (it != filters->end()) return it->second;
   return filters
       ->emplace(name,
-                new grpc_channel_filter{nullptr, nullptr, nullptr, 0, nullptr,
-                                        nullptr, nullptr, 0, nullptr, nullptr,
-                                        nullptr, nullptr, name})
+                new grpc_channel_filter{nullptr, nullptr, nullptr, nullptr, 0,
+                                        nullptr, nullptr, nullptr, 0, nullptr,
+                                        nullptr, nullptr, nullptr, name})
       .first->second;
 }
 
diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD
index 9c7cd464cdb66..fc698aeec4446 100644
--- a/test/core/transport/chaotic_good/BUILD
+++ b/test/core/transport/chaotic_good/BUILD
@@ -87,7 +87,47 @@ grpc_cc_test(
     srcs = ["client_transport_test.cc"],
     external_deps = [
         "absl/functional:any_invocable",
+        "absl/status:statusor",
+        "absl/strings:str_format",
+        "absl/types:optional",
+        "gtest",
+    ],
+    language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc",
+        "//:grpc_public_hdrs",
+        "//:iomgr_timer",
+        "//:ref_counted_ptr",
+        "//src/core:activity",
+        "//src/core:arena",
+        "//src/core:chaotic_good_client_transport",
+        "//src/core:event_engine_wakeup_scheduler",
+        "//src/core:if",
+        "//src/core:join",
+        "//src/core:loop",
+        "//src/core:map",
+        "//src/core:memory_quota",
+        "//src/core:pipe",
+        "//src/core:resource_quota",
+        "//src/core:seq",
+        "//src/core:slice",
+        "//src/core:slice_buffer",
+        "//test/core/event_engine/fuzzing_event_engine",
+        "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
+    ],
+)
+
+grpc_cc_test(
+    name = "client_transport_error_test",
+    srcs = ["client_transport_error_test.cc"],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "absl/status",
+        "absl/status:statusor",
         "absl/strings:str_format",
+        "absl/types:optional",
         "gtest",
     ],
     language = "C++",
@@ -95,12 +135,17 @@ grpc_cc_test(
     uses_polling = False,
     deps = [
         "//:grpc",
+        "//:grpc_public_hdrs",
         "//:iomgr_timer",
         "//:ref_counted_ptr",
         "//src/core:activity",
         "//src/core:arena",
         "//src/core:chaotic_good_client_transport",
+        "//src/core:event_engine_wakeup_scheduler",
+        "//src/core:grpc_promise_endpoint",
+        "//src/core:if",
         "//src/core:join",
+        "//src/core:loop",
         "//src/core:memory_quota",
         "//src/core:pipe",
         "//src/core:resource_quota",
@@ -109,6 +154,5 @@ grpc_cc_test(
         "//src/core:slice_buffer",
         "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
-        "//test/core/promise:test_wakeup_schedulers",
     ],
 )
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
new file mode 100644
index 0000000000000..3b30c4ca3309d
--- /dev/null
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -0,0 +1,441 @@
+// Copyright 2023 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 "absl/status/status.h"
+
+#include "src/core/ext/transport/chaotic_good/client_transport.h"
+#include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/lib/transport/transport.h"
+
+// IWYU pragma: no_include <sys/socket.h>
+
+#include <stddef.h>
+
+#include <algorithm>  // IWYU pragma: keep
+#include <memory>
+#include <string>  // IWYU pragma: keep
+#include <tuple>
+#include <utility>
+#include <vector>  // IWYU pragma: keep
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"     // IWYU pragma: keep
+#include "absl/strings/str_format.h"  // IWYU pragma: keep
+#include "absl/types/optional.h"      // IWYU pragma: keep
+#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>  // IWYU pragma: keep
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>  // IWYU pragma: keep
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
+#include "src/core/lib/promise/if.h"
+#include "src/core/lib/promise/join.h"
+#include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/pipe.h"
+#include "src/core/lib/promise/seq.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"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/slice/slice_internal.h"      // IWYU pragma: keep
+#include "src/core/lib/transport/metadata_batch.h"  // IWYU pragma: keep
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
+
+using testing::MockFunction;
+using testing::Return;
+using testing::Sequence;
+using testing::StrictMock;
+using testing::WithArgs;
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+class MockEndpoint
+    : public grpc_event_engine::experimental::EventEngine::Endpoint {
+ public:
+  MOCK_METHOD(
+      bool, Read,
+      (absl::AnyInvocable<void(absl::Status)> on_read,
+       grpc_event_engine::experimental::SliceBuffer* buffer,
+       const grpc_event_engine::experimental::EventEngine::Endpoint::ReadArgs*
+           args),
+      (override));
+
+  MOCK_METHOD(
+      bool, Write,
+      (absl::AnyInvocable<void(absl::Status)> on_writable,
+       grpc_event_engine::experimental::SliceBuffer* data,
+       const grpc_event_engine::experimental::EventEngine::Endpoint::WriteArgs*
+           args),
+      (override));
+
+  MOCK_METHOD(
+      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
+      GetPeerAddress, (), (const, override));
+  MOCK_METHOD(
+      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
+      GetLocalAddress, (), (const, override));
+};
+
+class ClientTransportTest : public ::testing::Test {
+ public:
+  ClientTransportTest()
+      : control_endpoint_ptr_(new StrictMock<MockEndpoint>()),
+        data_endpoint_ptr_(new StrictMock<MockEndpoint>()),
+        memory_allocator_(
+            ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator(
+                "test")),
+        control_endpoint_(*control_endpoint_ptr_),
+        data_endpoint_(*data_endpoint_ptr_),
+        event_engine_(std::make_shared<
+                      grpc_event_engine::experimental::FuzzingEventEngine>(
+            []() {
+              grpc_timer_manager_set_threading(false);
+              grpc_event_engine::experimental::FuzzingEventEngine::Options
+                  options;
+              return options;
+            }(),
+            fuzzing_event_engine::Actions())),
+        arena_(MakeScopedArena(initial_arena_size, &memory_allocator_)),
+        pipe_client_to_server_messages_(arena_.get()),
+        pipe_server_to_client_messages_(arena_.get()),
+        pipe_server_intial_metadata_(arena_.get()),
+        pipe_client_to_server_messages_second_(arena_.get()),
+        pipe_server_to_client_messages_second_(arena_.get()),
+        pipe_server_intial_metadata_second_(arena_.get()) {}
+  // Initial ClientTransport with read expecations
+  void InitialClientTransport() {
+    client_transport_ = std::make_unique<ClientTransport>(
+        std::make_unique<PromiseEndpoint>(
+            std::unique_ptr<MockEndpoint>(control_endpoint_ptr_),
+            SliceBuffer()),
+        std::make_unique<PromiseEndpoint>(
+            std::unique_ptr<MockEndpoint>(data_endpoint_ptr_), SliceBuffer()),
+        event_engine_);
+  }
+  // Send messages from client to server.
+  auto SendClientToServerMessages(
+      Pipe<MessageHandle>& pipe_client_to_server_messages,
+      int num_of_messages) {
+    return Loop([&pipe_client_to_server_messages, num_of_messages,
+                 this]() mutable {
+      bool has_message = (num_of_messages > 0);
+      return If(
+          has_message,
+          Seq(pipe_client_to_server_messages.sender.Push(
+                  arena_->MakePooled<Message>()),
+              [&num_of_messages]() -> LoopCtl<absl::Status> {
+                num_of_messages--;
+                return Continue();
+              }),
+          [&pipe_client_to_server_messages]() mutable -> LoopCtl<absl::Status> {
+            pipe_client_to_server_messages.sender.Close();
+            return absl::OkStatus();
+          });
+    });
+  }
+  // Add stream into client transport, and expect return trailers of
+  // "grpc-status:code".
+  auto AddStream(CallArgs args) {
+    return client_transport_->AddStream(std::move(args));
+  }
+
+ private:
+  MockEndpoint* control_endpoint_ptr_;
+  MockEndpoint* data_endpoint_ptr_;
+  size_t initial_arena_size = 1024;
+  MemoryAllocator memory_allocator_;
+
+ protected:
+  MockEndpoint& control_endpoint_;
+  MockEndpoint& data_endpoint_;
+  std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+      event_engine_;
+  std::unique_ptr<ClientTransport> client_transport_;
+  ScopedArenaPtr arena_;
+  Pipe<MessageHandle> pipe_client_to_server_messages_;
+  Pipe<MessageHandle> pipe_server_to_client_messages_;
+  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_;
+  // Added for mutliple streams tests.
+  Pipe<MessageHandle> pipe_client_to_server_messages_second_;
+  Pipe<MessageHandle> pipe_server_to_client_messages_second_;
+  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_second_;
+  absl::AnyInvocable<void(absl::Status)> read_callback_;
+  Sequence control_endpoint_sequence_;
+  Sequence data_endpoint_sequence_;
+  // Added to verify received message payload.
+  const std::string message_ = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
+};
+
+TEST_F(ClientTransportTest, AddOneStreamWithWriteFailed) {
+  // Mock write failed and read is pending.
+  EXPECT_CALL(control_endpoint_, Write)
+      .WillOnce(
+          WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
+            on_write(absl::InternalError("control endpoint write failed."));
+            return false;
+          }));
+  EXPECT_CALL(data_endpoint_, Write)
+      .WillOnce(
+          WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
+            on_write(absl::InternalError("data endpoint write failed."));
+            return false;
+          }));
+  EXPECT_CALL(control_endpoint_, Read)
+      .InSequence(control_endpoint_sequence_)
+      .WillOnce(Return(false));
+  InitialClientTransport();
+  ClientMetadataHandle md;
+  auto args = CallArgs{std::move(md),
+                       ClientInitialMetadataOutstandingToken::Empty(),
+                       nullptr,
+                       &pipe_server_intial_metadata_.sender,
+                       &pipe_client_to_server_messages_.receiver,
+                       &pipe_server_to_client_messages_.sender};
+  StrictMock<MockFunction<void(absl::Status)>> on_done;
+  EXPECT_CALL(on_done, Call(absl::OkStatus()));
+  auto activity = MakeActivity(
+      Seq(
+          // Concurrently: write and read messages in client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              // Expect return trailers "grpc-status:unavailable".
+              AddStream(std::move(args)),
+              // Send messages to call_args.client_to_server_messages pipe,
+              // which will be eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          }),
+      EventEngineWakeupScheduler(event_engine_),
+      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  // Wait until ClientTransport's internal activities to finish.
+  event_engine_->TickUntilIdle();
+  event_engine_->UnsetGlobalHooks();
+}
+
+TEST_F(ClientTransportTest, AddOneStreamWithReadFailed) {
+  // Mock read failed.
+  EXPECT_CALL(control_endpoint_, Read)
+      .InSequence(control_endpoint_sequence_)
+      .WillOnce(WithArgs<0>(
+          [](absl::AnyInvocable<void(absl::Status)> on_read) mutable {
+            on_read(absl::InternalError("control endpoint read failed."));
+            // Return false to mock EventEngine read not finish.
+            return false;
+          }));
+  InitialClientTransport();
+  ClientMetadataHandle md;
+  auto args = CallArgs{std::move(md),
+                       ClientInitialMetadataOutstandingToken::Empty(),
+                       nullptr,
+                       &pipe_server_intial_metadata_.sender,
+                       &pipe_client_to_server_messages_.receiver,
+                       &pipe_server_to_client_messages_.sender};
+  StrictMock<MockFunction<void(absl::Status)>> on_done;
+  EXPECT_CALL(on_done, Call(absl::OkStatus()));
+  auto activity = MakeActivity(
+      Seq(
+          // Concurrently: write and read messages in client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              // Expect return trailers "grpc-status:unavailable".
+              AddStream(std::move(args)),
+              // Send messages to call_args.client_to_server_messages pipe.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          }),
+      EventEngineWakeupScheduler(event_engine_),
+      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  // Wait until ClientTransport's internal activities to finish.
+  event_engine_->TickUntilIdle();
+  event_engine_->UnsetGlobalHooks();
+}
+
+TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
+  // Mock write failed at first stream and second stream's write will fail too.
+  EXPECT_CALL(control_endpoint_, Write)
+      .Times(1)
+      .WillRepeatedly(
+          WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
+            on_write(absl::InternalError("control endpoint write failed."));
+            return false;
+          }));
+  EXPECT_CALL(data_endpoint_, Write)
+      .Times(1)
+      .WillRepeatedly(
+          WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
+            on_write(absl::InternalError("data endpoint write failed."));
+            return false;
+          }));
+  EXPECT_CALL(control_endpoint_, Read)
+      .InSequence(control_endpoint_sequence_)
+      .WillOnce(Return(false));
+  InitialClientTransport();
+  ClientMetadataHandle first_stream_md;
+  ClientMetadataHandle second_stream_md;
+  auto first_stream_args =
+      CallArgs{std::move(first_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_.sender,
+               &pipe_client_to_server_messages_.receiver,
+               &pipe_server_to_client_messages_.sender};
+  auto second_stream_args =
+      CallArgs{std::move(second_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_second_.sender,
+               &pipe_client_to_server_messages_second_.receiver,
+               &pipe_server_to_client_messages_second_.sender};
+  StrictMock<MockFunction<void(absl::Status)>> on_done;
+  EXPECT_CALL(on_done, Call(absl::OkStatus()));
+  auto activity = MakeActivity(
+      Seq(
+          // Concurrently: write and read messages from client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              // Expect return trailers "grpc-status:unavailable".
+              AddStream(std::move(first_stream_args)),
+              // Send messages to first stream's
+              // call_args.client_to_server_messages pipe.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          },
+          Join(
+              // Add second stream with call_args into client transport.
+              // Expect return trailers "grpc-status:unavailable".
+              AddStream(std::move(second_stream_args)),
+              // Send messages to second stream's
+              // call_args.client_to_server_messages pipe.
+              SendClientToServerMessages(pipe_client_to_server_messages_second_,
+                                         1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          }),
+      EventEngineWakeupScheduler(event_engine_),
+      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  // Wait until ClientTransport's internal activities to finish.
+  event_engine_->TickUntilIdle();
+  event_engine_->UnsetGlobalHooks();
+}
+
+TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
+  // Mock read failed at first stream, and second stream's write will fail too.
+  EXPECT_CALL(control_endpoint_, Read)
+      .InSequence(control_endpoint_sequence_)
+      .WillOnce(WithArgs<0>(
+          [](absl::AnyInvocable<void(absl::Status)> on_read) mutable {
+            on_read(absl::InternalError("control endpoint read failed."));
+            // Return false to mock EventEngine read not finish.
+            return false;
+          }));
+  InitialClientTransport();
+  ClientMetadataHandle first_stream_md;
+  ClientMetadataHandle second_stream_md;
+  auto first_stream_args =
+      CallArgs{std::move(first_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_.sender,
+               &pipe_client_to_server_messages_.receiver,
+               &pipe_server_to_client_messages_.sender};
+  auto second_stream_args =
+      CallArgs{std::move(second_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_second_.sender,
+               &pipe_client_to_server_messages_second_.receiver,
+               &pipe_server_to_client_messages_second_.sender};
+  StrictMock<MockFunction<void(absl::Status)>> on_done;
+  EXPECT_CALL(on_done, Call(absl::OkStatus()));
+  auto activity = MakeActivity(
+      Seq(
+          // Concurrently: write and read messages from client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              AddStream(std::move(first_stream_args)),
+              // Send messages to first stream's
+              // call_args.client_to_server_messages pipe, which will be
+              // eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          },
+          Join(
+              // Add second stream with call_args into client transport.
+              AddStream(std::move(second_stream_args)),
+              // Send messages to second stream's
+              // call_args.client_to_server_messages pipe, which will be
+              // eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_second_,
+                                         1)),
+          // Once complete, verify successful sending and the received value.
+          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
+                      GRPC_STATUS_UNAVAILABLE);
+            EXPECT_TRUE(std::get<1>(ret).ok());
+            return absl::OkStatus();
+          }),
+      EventEngineWakeupScheduler(event_engine_),
+      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  // Wait until ClientTransport's internal activities to finish.
+  event_engine_->TickUntilIdle();
+  event_engine_->UnsetGlobalHooks();
+}
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Must call to create default EventEngine.
+  grpc_init();
+  int ret = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return ret;
+}
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index 96889082a2cf5..86bbf578c291c 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -18,36 +18,46 @@
 
 #include <algorithm>  // IWYU pragma: keep
 #include <memory>
+#include <string>  // IWYU pragma: keep
 #include <tuple>
 #include <vector>  // IWYU pragma: keep
 
 #include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"     // IWYU pragma: keep
 #include "absl/strings/str_format.h"  // IWYU pragma: keep
+#include "absl/types/optional.h"      // IWYU pragma: keep
 #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>  // IWYU pragma: keep
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/grpc.h>
+#include <grpc/status.h>  // IWYU pragma: keep
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
+#include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/join.h"
+#include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/seq.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"
-#include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/slice/slice_internal.h"      // IWYU pragma: keep
+#include "src/core/lib/transport/metadata_batch.h"  // IWYU pragma: keep
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
-#include "test/core/promise/test_wakeup_schedulers.h"
 
 using testing::MockFunction;
 using testing::Return;
+using testing::Sequence;
 using testing::StrictMock;
 using testing::WithArgs;
 
@@ -101,29 +111,187 @@ class ClientTransportTest : public ::testing::Test {
               return options;
             }(),
             fuzzing_event_engine::Actions())),
-        client_transport_(
-            std::make_unique<PromiseEndpoint>(
-                std::unique_ptr<MockEndpoint>(control_endpoint_ptr_),
-                SliceBuffer()),
-            std::make_unique<PromiseEndpoint>(
-                std::unique_ptr<MockEndpoint>(data_endpoint_ptr_),
-                SliceBuffer()),
-            std::static_pointer_cast<
-                grpc_event_engine::experimental::EventEngine>(event_engine_)),
         arena_(MakeScopedArena(initial_arena_size, &memory_allocator_)),
         pipe_client_to_server_messages_(arena_.get()),
-        pipe_client_to_server_messages_second_(arena_.get()) {}
-
-  std::vector<MessageHandle> CreateMessages(int num_of_messages) {
-    std::vector<MessageHandle> messages;
-    for (int i = 0; i < num_of_messages; i++) {
-      SliceBuffer buffer;
-      buffer.Append(
-          Slice::FromCopiedString(absl::StrFormat("test message %d", i)));
-      auto message = arena_->MakePooled<Message>(std::move(buffer), 0);
-      messages.push_back(std::move(message));
+        pipe_server_to_client_messages_(arena_.get()),
+        pipe_server_intial_metadata_(arena_.get()),
+        pipe_client_to_server_messages_second_(arena_.get()),
+        pipe_server_to_client_messages_second_(arena_.get()),
+        pipe_server_intial_metadata_second_(arena_.get()) {}
+  // Expect how client transport will read from control/data endpoints with a
+  // test frame.
+  void AddReadExpectations(int num_of_streams) {
+    for (int i = 0; i < num_of_streams; i++) {
+      EXPECT_CALL(control_endpoint_, Read)
+          .InSequence(control_endpoint_sequence)
+          .WillOnce(WithArgs<0, 1>(
+              [this, i](absl::AnyInvocable<void(absl::Status)> on_read,
+                        grpc_event_engine::experimental::SliceBuffer*
+                            buffer) mutable {
+                // Construct test frame for EventEngine read: headers  (15
+                // bytes), message(16 bytes), message padding (48 byte),
+                // trailers (15 bytes).
+                const std::string frame_header = {
+                    static_cast<char>(0x80),  // frame type = fragment
+                    0x03,                     // flag = has header + has trailer
+                    0x00,
+                    0x00,
+                    static_cast<char>(i + 1),  // stream id = 1
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x1a,  // header length = 26
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x08,  // message length = 8
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x38,  // message padding =56
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x0f,  // trailer length = 15
+                    0x00,
+                    0x00,
+                    0x00};
+                // Schedule mock_endpoint to read buffer.
+                grpc_event_engine::experimental::Slice slice(
+                    grpc_slice_from_cpp_string(frame_header));
+                buffer->Append(std::move(slice));
+                // Execute read callback later to control when read starts.
+                if (i == 0) {
+                  read_callback_ = std::move(on_read);
+                  // Return false to mock EventEngine read not finish.
+                  return false;
+                } else {
+                  return true;
+                }
+              }));
+      EXPECT_CALL(control_endpoint_, Read)
+          .InSequence(control_endpoint_sequence)
+          .WillOnce(WithArgs<1>(
+              [](grpc_event_engine::experimental::SliceBuffer* buffer) {
+                // Encoded string of header ":path: /demo.Service/Step".
+                const std::string header = {
+                    0x10, 0x05, 0x3a, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2f,
+                    0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76,
+                    0x69, 0x63, 0x65, 0x2f, 0x53, 0x74, 0x65, 0x70};
+                // Encoded string of trailer "grpc-status: 0".
+                const std::string trailers = {0x10, 0x0b, 0x67, 0x72, 0x70,
+                                              0x63, 0x2d, 0x73, 0x74, 0x61,
+                                              0x74, 0x75, 0x73, 0x01, 0x30};
+                // Schedule mock_endpoint to read buffer.
+                grpc_event_engine::experimental::Slice slice(
+                    grpc_slice_from_cpp_string(header + trailers));
+                buffer->Append(std::move(slice));
+                return true;
+              }));
+    }
+    EXPECT_CALL(control_endpoint_, Read)
+        .InSequence(control_endpoint_sequence)
+        .WillOnce(Return(false));
+    for (int i = 0; i < num_of_streams; i++) {
+      EXPECT_CALL(data_endpoint_, Read)
+          .InSequence(data_endpoint_sequence)
+          .WillOnce(WithArgs<1>(
+              [this](grpc_event_engine::experimental::SliceBuffer* buffer) {
+                const std::string message_padding = {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+                grpc_event_engine::experimental::Slice slice(
+                    grpc_slice_from_cpp_string(message_padding + message_));
+                buffer->Append(std::move(slice));
+                return true;
+              }));
     }
-    return messages;
+  }
+  // Initial ClientTransport with read expecations
+  void InitialClientTransport(int num_of_streams) {
+    // Read expectaions need to be added before transport initialization since
+    // reader_ activity loop is started in ClientTransport initialization,
+    AddReadExpectations(num_of_streams);
+    client_transport_ = std::make_unique<ClientTransport>(
+        std::make_unique<PromiseEndpoint>(
+            std::unique_ptr<MockEndpoint>(control_endpoint_ptr_),
+            SliceBuffer()),
+        std::make_unique<PromiseEndpoint>(
+            std::unique_ptr<MockEndpoint>(data_endpoint_ptr_), SliceBuffer()),
+        event_engine_);
+  }
+  // Send messages from client to server.
+  auto SendClientToServerMessages(
+      Pipe<MessageHandle>& pipe_client_to_server_messages,
+      int num_of_messages) {
+    return Loop([&pipe_client_to_server_messages, num_of_messages,
+                 this]() mutable {
+      bool has_message = (num_of_messages > 0);
+      return If(
+          has_message,
+          Seq(pipe_client_to_server_messages.sender.Push(
+                  arena_->MakePooled<Message>()),
+              [&num_of_messages]() -> LoopCtl<absl::Status> {
+                num_of_messages--;
+                return Continue();
+              }),
+          [&pipe_client_to_server_messages]() mutable -> LoopCtl<absl::Status> {
+            pipe_client_to_server_messages.sender.Close();
+            return absl::OkStatus();
+          });
+    });
+  }
+  // Add stream into client transport, and expect return trailers of
+  // "grpc-status:code".
+  auto AddStream(CallArgs args, const grpc_status_code trailers) {
+    return Seq(client_transport_->AddStream(std::move(args)),
+               [trailers](ServerMetadataHandle ret) {
+                 // AddStream will finish with server trailers:
+                 // "grpc-status:code".
+                 EXPECT_EQ(ret->get(GrpcStatusMetadata()).value(), trailers);
+                 return trailers;
+               });
+  }
+  // Start read from control endpoints.
+  auto StartRead(const absl::Status& read_status) {
+    return [read_status, this] {
+      read_callback_(read_status);
+      return read_status;
+    };
+  }
+  // Receive messages from server to client.
+  auto ReceiveServerToClientMessages(
+      Pipe<ServerMetadataHandle>& pipe_server_intial_metadata,
+      Pipe<MessageHandle>& pipe_server_to_client_messages) {
+    return Seq(
+        // Receive server initial metadata.
+        Map(pipe_server_intial_metadata.receiver.Next(),
+            [](NextResult<ServerMetadataHandle> r) {
+              // Expect value: ":path: /demo.Service/Step"
+              EXPECT_TRUE(r.has_value());
+              EXPECT_EQ(
+                  r.value()->get_pointer(HttpPathMetadata())->as_string_view(),
+                  "/demo.Service/Step");
+              return absl::OkStatus();
+            }),
+        // Receive server to client messages.
+        Map(pipe_server_to_client_messages.receiver.Next(),
+            [this](NextResult<MessageHandle> r) {
+              EXPECT_TRUE(r.has_value());
+              EXPECT_EQ(r.value()->payload()->JoinIntoString(), message_);
+              return absl::OkStatus();
+            }),
+        [&pipe_server_intial_metadata,
+         &pipe_server_to_client_messages]() mutable {
+          // Close pipes after receive message.
+          pipe_server_to_client_messages.sender.Close();
+          pipe_server_intial_metadata.sender.Close();
+          return absl::OkStatus();
+        });
   }
 
  private:
@@ -131,97 +299,65 @@ class ClientTransportTest : public ::testing::Test {
   MockEndpoint* data_endpoint_ptr_;
   size_t initial_arena_size = 1024;
   MemoryAllocator memory_allocator_;
+  Sequence control_endpoint_sequence;
+  Sequence data_endpoint_sequence;
 
  protected:
   MockEndpoint& control_endpoint_;
   MockEndpoint& data_endpoint_;
   std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
       event_engine_;
-  ClientTransport client_transport_;
+  std::unique_ptr<ClientTransport> client_transport_;
   ScopedArenaPtr arena_;
   Pipe<MessageHandle> pipe_client_to_server_messages_;
+  Pipe<MessageHandle> pipe_server_to_client_messages_;
+  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_;
   // Added for mutliple streams tests.
   Pipe<MessageHandle> pipe_client_to_server_messages_second_;
-
-  const absl::Status kDummyErrorStatus =
-      absl::ErrnoToStatus(5566, "just an error");
-  static constexpr size_t kDummyRequestSize = 5566u;
+  Pipe<MessageHandle> pipe_server_to_client_messages_second_;
+  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_second_;
+  absl::AnyInvocable<void(absl::Status)> read_callback_;
+  // Added to verify received message payload.
+  const std::string message_ = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
 };
 
 TEST_F(ClientTransportTest, AddOneStream) {
-  auto messages = CreateMessages(1);
+  InitialClientTransport(1);
   ClientMetadataHandle md;
-  auto args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(), nullptr,
-      nullptr,       &pipe_client_to_server_messages_.receiver,      nullptr};
+  auto args = CallArgs{std::move(md),
+                       ClientInitialMetadataOutstandingToken::Empty(),
+                       nullptr,
+                       &pipe_server_intial_metadata_.sender,
+                       &pipe_client_to_server_messages_.receiver,
+                       &pipe_server_to_client_messages_.sender};
   StrictMock<MockFunction<void(absl::Status)>> on_done;
   EXPECT_CALL(on_done, Call(absl::OkStatus()));
   EXPECT_CALL(control_endpoint_, Write).WillOnce(Return(true));
   EXPECT_CALL(data_endpoint_, Write).WillOnce(Return(true));
   auto activity = MakeActivity(
       Seq(
-          // Concurrently: send message into the pipe, and receive from the
-          // pipe.
-          Join(Seq(pipe_client_to_server_messages_.sender.Push(
-                       std::move(messages[0])),
-                   [this] {
-                     this->pipe_client_to_server_messages_.sender.Close();
-                     return absl::OkStatus();
-                   }),
-               client_transport_.AddStream(std::move(args))),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<absl::Status, absl::Status>& ret) {
-            EXPECT_TRUE(std::get<0>(ret).ok());
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      InlineWakeupScheduler(),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
-  // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
-}
-
-TEST_F(ClientTransportTest, AddOneStreamWithEEFailed) {
-  auto messages = CreateMessages(1);
-  ClientMetadataHandle md;
-  auto args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(), nullptr,
-      nullptr,       &pipe_client_to_server_messages_.receiver,      nullptr};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  EXPECT_CALL(control_endpoint_, Write)
-      .WillOnce(
-          WithArgs<0>([this](absl::AnyInvocable<void(absl::Status)> on_write) {
-            on_write(this->kDummyErrorStatus);
-            return false;
-          }));
-  EXPECT_CALL(data_endpoint_, Write)
-      .WillOnce(
-          WithArgs<0>([this](absl::AnyInvocable<void(absl::Status)> on_write) {
-            on_write(this->kDummyErrorStatus);
-            return false;
-          }));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: send message into the pipe, and receive from the
-          // pipe.
-          Join(Seq(pipe_client_to_server_messages_.sender.Push(
-                       std::move(messages[0])),
-                   [this] {
-                     this->pipe_client_to_server_messages_.sender.Close();
-                     return absl::OkStatus();
-                   }),
-               client_transport_.AddStream(std::move(args))),
+          // Concurrently: write and read messages in client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              AddStream(std::move(args), GRPC_STATUS_OK),
+              // Start read from control endpoints.
+              StartRead(absl::OkStatus()),
+              // Send messages to call_args.client_to_server_messages pipe,
+              // which will be eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 1),
+              // Receive messages from control/data endpoints.
+              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
+                                            pipe_server_to_client_messages_)),
           // Once complete, verify successful sending and the received value.
-          [](const std::tuple<absl::Status, absl::Status>& ret) {
-            // TODO(ladynana): change these expectations to errors after the
-            // writer activity closes transport for EE failures.
-            EXPECT_TRUE(std::get<0>(ret).ok());
+          [](const std::tuple<grpc_status_code, absl::Status, absl::Status,
+                              absl::Status>& ret) {
+            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
             EXPECT_TRUE(std::get<1>(ret).ok());
+            EXPECT_TRUE(std::get<2>(ret).ok());
+            EXPECT_TRUE(std::get<3>(ret).ok());
             return absl::OkStatus();
           }),
-      InlineWakeupScheduler(),
+      EventEngineWakeupScheduler(event_engine_),
       [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
   // Wait until ClientTransport's internal activities to finish.
   event_engine_->TickUntilIdle();
@@ -229,89 +365,42 @@ TEST_F(ClientTransportTest, AddOneStreamWithEEFailed) {
 }
 
 TEST_F(ClientTransportTest, AddOneStreamMultipleMessages) {
-  auto messages = CreateMessages(3);
+  InitialClientTransport(1);
   ClientMetadataHandle md;
-  auto args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(), nullptr,
-      nullptr,       &pipe_client_to_server_messages_.receiver,      nullptr};
+  auto args = CallArgs{std::move(md),
+                       ClientInitialMetadataOutstandingToken::Empty(),
+                       nullptr,
+                       &pipe_server_intial_metadata_.sender,
+                       &pipe_client_to_server_messages_.receiver,
+                       &pipe_server_to_client_messages_.sender};
   StrictMock<MockFunction<void(absl::Status)>> on_done;
   EXPECT_CALL(on_done, Call(absl::OkStatus()));
   EXPECT_CALL(control_endpoint_, Write).Times(3).WillRepeatedly(Return(true));
   EXPECT_CALL(data_endpoint_, Write).Times(3).WillRepeatedly(Return(true));
   auto activity = MakeActivity(
       Seq(
-          // Concurrently: send messages into the pipe, and receive from the
-          // pipe.
-          Join(Seq(pipe_client_to_server_messages_.sender.Push(
-                       std::move(messages[0])),
-                   pipe_client_to_server_messages_.sender.Push(
-                       std::move(messages[1])),
-                   pipe_client_to_server_messages_.sender.Push(
-                       std::move(messages[2])),
-                   [this] {
-                     this->pipe_client_to_server_messages_.sender.Close();
-                     return absl::OkStatus();
-                   }),
-               client_transport_.AddStream(std::move(args))),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<absl::Status, absl::Status>& ret) {
-            EXPECT_TRUE(std::get<0>(ret).ok());
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      InlineWakeupScheduler(),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
-  // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
-}
-
-TEST_F(ClientTransportTest, AddMultipleStreams) {
-  auto messages = CreateMessages(2);
-  ClientMetadataHandle md;
-  auto first_stream_args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(), nullptr,
-      nullptr,       &pipe_client_to_server_messages_.receiver,      nullptr};
-  auto second_stream_args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(),   nullptr,
-      nullptr,       &pipe_client_to_server_messages_second_.receiver, nullptr};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  EXPECT_CALL(control_endpoint_, Write).Times(2).WillRepeatedly(Return(true));
-  EXPECT_CALL(data_endpoint_, Write).Times(2).WillRepeatedly(Return(true));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: send messages into the pipe, and receive from the
-          // pipe.
+          // Concurrently: write and read messages in client transport.
           Join(
-              // Send message to first stream pipe.
-              Seq(pipe_client_to_server_messages_.sender.Push(
-                      std::move(messages[0])),
-                  [this] {
-                    pipe_client_to_server_messages_.sender.Close();
-                    return absl::OkStatus();
-                  }),
-              // Send message to second stream pipe.
-              Seq(pipe_client_to_server_messages_second_.sender.Push(
-                      std::move(messages[1])),
-                  [this] {
-                    pipe_client_to_server_messages_second_.sender.Close();
-                    return absl::OkStatus();
-                  }),
-              // Receive message from first stream pipe.
-              client_transport_.AddStream(std::move(first_stream_args)),
-              // Receive message from second stream pipe.
-              client_transport_.AddStream(std::move(second_stream_args))),
+              // Add first stream with call_args into client transport.
+              AddStream(std::move(args), GRPC_STATUS_OK),
+              // Start read from control endpoints.
+              StartRead(absl::OkStatus()),
+              // Send messages to call_args.client_to_server_messages pipe,
+              // which will be eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 3),
+              // Receive messages from control/data endpoints.
+              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
+                                            pipe_server_to_client_messages_)),
           // Once complete, verify successful sending and the received value.
-          [](const std::tuple<absl::Status, absl::Status, absl::Status,
+          [](const std::tuple<grpc_status_code, absl::Status, absl::Status,
                               absl::Status>& ret) {
-            EXPECT_TRUE(std::get<0>(ret).ok());
+            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
             EXPECT_TRUE(std::get<1>(ret).ok());
             EXPECT_TRUE(std::get<2>(ret).ok());
             EXPECT_TRUE(std::get<3>(ret).ok());
             return absl::OkStatus();
           }),
-      InlineWakeupScheduler(),
+      EventEngineWakeupScheduler(event_engine_),
       [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
   // Wait until ClientTransport's internal activities to finish.
   event_engine_->TickUntilIdle();
@@ -319,59 +408,63 @@ TEST_F(ClientTransportTest, AddMultipleStreams) {
 }
 
 TEST_F(ClientTransportTest, AddMultipleStreamsMultipleMessages) {
-  auto messages = CreateMessages(6);
-  ClientMetadataHandle md;
-  auto first_stream_args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(), nullptr,
-      nullptr,       &pipe_client_to_server_messages_.receiver,      nullptr};
-  auto second_stream_args = CallArgs{
-      std::move(md), ClientInitialMetadataOutstandingToken::Empty(),   nullptr,
-      nullptr,       &pipe_client_to_server_messages_second_.receiver, nullptr};
+  InitialClientTransport(2);
+  ClientMetadataHandle first_stream_md;
+  ClientMetadataHandle second_stream_md;
+  auto first_stream_args =
+      CallArgs{std::move(first_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_.sender,
+               &pipe_client_to_server_messages_.receiver,
+               &pipe_server_to_client_messages_.sender};
+  auto second_stream_args =
+      CallArgs{std::move(second_stream_md),
+               ClientInitialMetadataOutstandingToken::Empty(),
+               nullptr,
+               &pipe_server_intial_metadata_second_.sender,
+               &pipe_client_to_server_messages_second_.receiver,
+               &pipe_server_to_client_messages_second_.sender};
   StrictMock<MockFunction<void(absl::Status)>> on_done;
   EXPECT_CALL(on_done, Call(absl::OkStatus()));
   EXPECT_CALL(control_endpoint_, Write).Times(6).WillRepeatedly(Return(true));
   EXPECT_CALL(data_endpoint_, Write).Times(6).WillRepeatedly(Return(true));
   auto activity = MakeActivity(
       Seq(
-          // Concurrently: send messages into the pipe, and receive from the
-          // pipe.
+          // Concurrently: write and read messages from client transport.
+          Join(
+              // Add first stream with call_args into client transport.
+              AddStream(std::move(first_stream_args), GRPC_STATUS_OK),
+              // Start read from control endpoints.
+              StartRead(absl::OkStatus()),
+              // Send messages to first stream's
+              // call_args.client_to_server_messages pipe, which will be
+              // eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_, 3),
+              // Receive first stream's messages from control/data endpoints.
+              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
+                                            pipe_server_to_client_messages_)),
           Join(
-              // Send messages to first stream pipe.
-              Seq(pipe_client_to_server_messages_.sender.Push(
-                      std::move(messages[0])),
-                  pipe_client_to_server_messages_.sender.Push(
-                      std::move(messages[1])),
-                  pipe_client_to_server_messages_.sender.Push(
-                      std::move(messages[2])),
-                  [this] {
-                    pipe_client_to_server_messages_.sender.Close();
-                    return absl::OkStatus();
-                  }),
-              // Send messages to second stream pipe.
-              Seq(pipe_client_to_server_messages_second_.sender.Push(
-                      std::move(messages[3])),
-                  pipe_client_to_server_messages_second_.sender.Push(
-                      std::move(messages[4])),
-                  pipe_client_to_server_messages_second_.sender.Push(
-                      std::move(messages[5])),
-                  [this] {
-                    pipe_client_to_server_messages_second_.sender.Close();
-                    return absl::OkStatus();
-                  }),
-              // Receive messages from first stream pipe.
-              client_transport_.AddStream(std::move(first_stream_args)),
-              // Receive messages from second stream pipe.
-              client_transport_.AddStream(std::move(second_stream_args))),
+              // Add second stream with call_args into client transport.
+              AddStream(std::move(second_stream_args), GRPC_STATUS_OK),
+              // Send messages to second stream's
+              // call_args.client_to_server_messages pipe, which will be
+              // eventually sent to control/data endpoints.
+              SendClientToServerMessages(pipe_client_to_server_messages_second_,
+                                         3),
+              // Receive second stream's messages from control/data endpoints.
+              ReceiveServerToClientMessages(
+                  pipe_server_intial_metadata_second_,
+                  pipe_server_to_client_messages_second_)),
           // Once complete, verify successful sending and the received value.
-          [](const std::tuple<absl::Status, absl::Status, absl::Status,
-                              absl::Status>& ret) {
-            EXPECT_TRUE(std::get<0>(ret).ok());
+          [](const std::tuple<grpc_status_code, absl::Status, absl::Status>&
+                 ret) {
+            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
             EXPECT_TRUE(std::get<1>(ret).ok());
             EXPECT_TRUE(std::get<2>(ret).ok());
-            EXPECT_TRUE(std::get<3>(ret).ok());
             return absl::OkStatus();
           }),
-      InlineWakeupScheduler(),
+      EventEngineWakeupScheduler(event_engine_),
       [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
   // Wait until ClientTransport's internal activities to finish.
   event_engine_->TickUntilIdle();
diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc
index e38160d4b41ba..420686ea6e616 100644
--- a/test/core/transport/chttp2/streams_not_seen_test.cc
+++ b/test/core/transport/chttp2/streams_not_seen_test.cc
@@ -199,6 +199,7 @@ class TrailingMetadataRecordingFilter {
 grpc_channel_filter TrailingMetadataRecordingFilter::kFilterVtable = {
     CallData::StartTransportStreamOpBatch,
     nullptr,
+    nullptr,
     grpc_channel_next_op,
     sizeof(CallData),
     CallData::Init,
diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc
index 4bbbf8a2764b9..f5d8565f95d14 100644
--- a/test/core/transport/chttp2/too_many_pings_test.cc
+++ b/test/core/transport/chttp2/too_many_pings_test.cc
@@ -467,22 +467,17 @@ TEST_F(KeepaliveThrottlingTest, NewSubchannelsUseUpdatedKeepaliveTime) {
   // response generator to switch between the two.
   auto response_generator =
       grpc_core::MakeRefCounted<grpc_core::FakeResolverResponseGenerator>();
-  grpc_arg client_args[] = {
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA), 0),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS), 0),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_KEEPALIVE_TIME_MS), 1 * 1000),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_HTTP2_BDP_PROBE), 0),
-      grpc_core::FakeResolverResponseGenerator::MakeChannelArg(
-          response_generator.get())};
-  grpc_channel_args client_channel_args = {GPR_ARRAY_SIZE(client_args),
-                                           client_args};
+  auto client_channel_args =
+      grpc_core::ChannelArgs()
+          .Set(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA, 0)
+          .Set(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, 0)
+          .Set(GRPC_ARG_KEEPALIVE_TIME_MS, 1 * 1000)
+          .Set(GRPC_ARG_HTTP2_BDP_PROBE, 0)
+          .SetObject(response_generator)
+          .ToC();
   grpc_channel_credentials* creds = grpc_insecure_credentials_create();
   grpc_channel* channel =
-      grpc_channel_create("fake:///", creds, &client_channel_args);
+      grpc_channel_create("fake:///", creds, client_channel_args.get());
   grpc_channel_credentials_release(creds);
   // For a single subchannel 3 GOAWAYs would be sufficient to increase the
   // keepalive time from 1 second to beyond 5 seconds. Even though we are
@@ -539,22 +534,17 @@ TEST_F(KeepaliveThrottlingTest,
   // create a single channel with round robin load balancing policy.
   auto response_generator =
       grpc_core::MakeRefCounted<grpc_core::FakeResolverResponseGenerator>();
-  grpc_arg client_args[] = {
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA), 0),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS), 0),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_KEEPALIVE_TIME_MS), 1 * 1000),
-      grpc_channel_arg_integer_create(
-          const_cast<char*>(GRPC_ARG_HTTP2_BDP_PROBE), 0),
-      grpc_core::FakeResolverResponseGenerator::MakeChannelArg(
-          response_generator.get())};
-  grpc_channel_args client_channel_args = {GPR_ARRAY_SIZE(client_args),
-                                           client_args};
+  auto client_channel_args =
+      grpc_core::ChannelArgs()
+          .Set(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA, 0)
+          .Set(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, 0)
+          .Set(GRPC_ARG_KEEPALIVE_TIME_MS, 1 * 1000)
+          .Set(GRPC_ARG_HTTP2_BDP_PROBE, 0)
+          .SetObject(response_generator)
+          .ToC();
   grpc_channel_credentials* creds = grpc_insecure_credentials_create();
   grpc_channel* channel =
-      grpc_channel_create("fake:///", creds, &client_channel_args);
+      grpc_channel_create("fake:///", creds, client_channel_args.get());
   grpc_channel_credentials_release(creds);
   response_generator->SetResponseSynchronously(
       BuildResolverResult({absl::StrCat("ipv4:", server_address1),
diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index 51703a2bb7409..dae69e58c758f 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -53,6 +53,7 @@
 #define SSL_TSI_TEST_LEAF_SIGNED_BY_INTERMEDIATE_KEY_CERT_PAIRS_NUM 1
 #define SSL_TSI_TEST_CREDENTIALS_DIR "src/core/tsi/test_creds/"
 #define SSL_TSI_TEST_WRONG_SNI "test.google.cn"
+#define SSL_TSI_TEST_INVALID_SNI "1.2.3.4"
 
 // OpenSSL 1.1 uses AES256 for encryption session ticket by default so specify
 // different STEK size.
@@ -86,7 +87,9 @@ typedef struct ssl_key_cert_lib {
   bool use_bad_server_cert;
   bool use_bad_client_cert;
   bool use_root_store;
+  bool use_pem_root_certs;
   bool use_cert_signed_by_intermediate_ca;
+  bool skip_server_certificate_verification;
   char* root_cert;
   tsi_ssl_root_certs_store* root_store;
   tsi_ssl_pem_key_cert_pair* server_pem_key_cert_pairs;
@@ -111,6 +114,7 @@ typedef struct ssl_tsi_test_fixture {
   size_t session_ticket_key_size;
   size_t network_bio_buf_size;
   size_t ssl_bio_buf_size;
+  bool verify_root_cert_subject;
   tsi_ssl_server_handshaker_factory* server_handshaker_factory;
   tsi_ssl_client_handshaker_factory* client_handshaker_factory;
 } ssl_tsi_test_fixture;
@@ -125,7 +129,9 @@ static void ssl_test_setup_handshakers(tsi_test_fixture* fixture) {
   ssl_alpn_lib* alpn_lib = ssl_fixture->alpn_lib;
   // Create client handshaker factory.
   tsi_ssl_client_handshaker_options client_options;
-  client_options.pem_root_certs = key_cert_lib->root_cert;
+  if (key_cert_lib->use_pem_root_certs) {
+    client_options.pem_root_certs = key_cert_lib->root_cert;
+  }
   if (ssl_fixture->force_client_auth) {
     client_options.pem_key_cert_pair =
         key_cert_lib->use_bad_client_cert
@@ -145,6 +151,8 @@ static void ssl_test_setup_handshakers(tsi_test_fixture* fixture) {
   }
   client_options.min_tls_version = test_tls_version;
   client_options.max_tls_version = test_tls_version;
+  client_options.skip_server_certificate_verification =
+      key_cert_lib->skip_server_certificate_verification;
   ASSERT_EQ(tsi_create_ssl_client_handshaker_factory_with_options(
                 &client_options, &ssl_fixture->client_handshaker_factory),
             TSI_OK);
@@ -396,13 +404,17 @@ static void ssl_test_check_handshaker_peers(tsi_test_fixture* fixture) {
     check_session_reusage(ssl_fixture, &peer);
     check_alpn(ssl_fixture, &peer);
     check_security_level(&peer);
-    if (!ssl_fixture->session_reused) {
-      check_verified_root_cert_subject(ssl_fixture, &peer);
-    } else {
-      check_verified_root_cert_subject_unset(ssl_fixture, &peer);
+    if (ssl_fixture->verify_root_cert_subject) {
+      if (!ssl_fixture->session_reused) {
+        check_verified_root_cert_subject(ssl_fixture, &peer);
+      } else {
+        check_verified_root_cert_subject_unset(ssl_fixture, &peer);
+      }
     }
     if (ssl_fixture->server_name_indication == nullptr ||
         strcmp(ssl_fixture->server_name_indication, SSL_TSI_TEST_WRONG_SNI) ==
+            0 ||
+        strcmp(ssl_fixture->server_name_indication, SSL_TSI_TEST_INVALID_SNI) ==
             0) {
       // Expect server to use default server0.pem.
       check_server0_peer(&peer);
@@ -534,6 +546,7 @@ static std::string GenerateTrustBundle() {
 static tsi_test_fixture* ssl_tsi_test_fixture_create() {
   ssl_tsi_test_fixture* ssl_fixture = grpc_core::Zalloc<ssl_tsi_test_fixture>();
   tsi_test_fixture_init(&ssl_fixture->base);
+  ssl_fixture->verify_root_cert_subject = true;
   ssl_fixture->base.test_unused_bytes = true;
   ssl_fixture->base.vtable = &vtable;
   // Create ssl_key_cert_lib.
@@ -541,6 +554,8 @@ static tsi_test_fixture* ssl_tsi_test_fixture_create() {
   key_cert_lib->use_bad_server_cert = false;
   key_cert_lib->use_bad_client_cert = false;
   key_cert_lib->use_root_store = false;
+  key_cert_lib->use_pem_root_certs = true;
+  key_cert_lib->skip_server_certificate_verification = false;
   key_cert_lib->server_num_key_cert_pairs =
       SSL_TSI_TEST_SERVER_KEY_CERT_PAIRS_NUM;
   key_cert_lib->bad_server_num_key_cert_pairs =
@@ -651,6 +666,20 @@ void ssl_tsi_test_do_handshake_with_root_store() {
   tsi_test_fixture_destroy(fixture);
 }
 
+void ssl_tsi_test_do_handshake_skipping_server_certificate_verification() {
+  gpr_log(GPR_INFO,
+          "ssl_tsi_test_do_handshake_skipping_server_certificate_verification");
+  tsi_test_fixture* fixture = ssl_tsi_test_fixture_create();
+  ssl_tsi_test_fixture* ssl_fixture =
+      reinterpret_cast<ssl_tsi_test_fixture*>(fixture);
+  ssl_fixture->verify_root_cert_subject = false;
+  ssl_fixture->key_cert_lib->use_root_store = false;
+  ssl_fixture->key_cert_lib->use_pem_root_certs = false;
+  ssl_fixture->key_cert_lib->skip_server_certificate_verification = true;
+  tsi_test_do_handshake(fixture);
+  tsi_test_fixture_destroy(fixture);
+}
+
 void ssl_tsi_test_do_handshake_with_large_server_handshake_messages(
     const std::string& trust_bundle) {
   gpr_log(GPR_INFO,
@@ -745,6 +774,19 @@ void ssl_tsi_test_do_handshake_with_wrong_server_name_indication() {
   tsi_test_fixture_destroy(fixture);
 }
 
+void ssl_tsi_test_do_handshake_with_invalid_and_ignored_server_name_indication() {
+  gpr_log(GPR_INFO,
+          "ssl_tsi_test_do_handshake_with_wrong_server_name_indication");
+  tsi_test_fixture* fixture = ssl_tsi_test_fixture_create();
+  ssl_tsi_test_fixture* ssl_fixture =
+      reinterpret_cast<ssl_tsi_test_fixture*>(fixture);
+  // SNI that's an IP address will be ignored.
+  ssl_fixture->server_name_indication =
+      const_cast<char*>(SSL_TSI_TEST_INVALID_SNI);
+  tsi_test_do_handshake(fixture);
+  tsi_test_fixture_destroy(fixture);
+}
+
 void ssl_tsi_test_do_handshake_with_bad_server_cert() {
   gpr_log(GPR_INFO, "ssl_tsi_test_do_handshake_with_bad_server_cert");
   tsi_test_fixture* fixture = ssl_tsi_test_fixture_create();
@@ -1236,12 +1278,14 @@ TEST(SslTransportSecurityTest, MainTest) {
       ssl_tsi_test_do_handshake_small_handshake_buffer();
       ssl_tsi_test_do_handshake();
       ssl_tsi_test_do_handshake_with_root_store();
+      ssl_tsi_test_do_handshake_skipping_server_certificate_verification();
       ssl_tsi_test_do_handshake_with_large_server_handshake_messages(
           trust_bundle);
       ssl_tsi_test_do_handshake_with_client_authentication();
       ssl_tsi_test_do_handshake_with_client_authentication_and_root_store();
       ssl_tsi_test_do_handshake_with_server_name_indication_exact_domain();
       ssl_tsi_test_do_handshake_with_server_name_indication_wild_star_domain();
+      ssl_tsi_test_do_handshake_with_invalid_and_ignored_server_name_indication();
       ssl_tsi_test_do_handshake_with_wrong_server_name_indication();
       ssl_tsi_test_do_handshake_with_bad_server_cert();
       ssl_tsi_test_do_handshake_with_bad_client_cert();
diff --git a/test/core/util/test_lb_policies.cc b/test/core/util/test_lb_policies.cc
index 8fb255d65edc2..f7e5abe6e2ce2 100644
--- a/test/core/util/test_lb_policies.cc
+++ b/test/core/util/test_lb_policies.cc
@@ -414,17 +414,19 @@ class FixedAddressLoadBalancingPolicy : public ForwardingLoadBalancingPolicy {
             config->address().c_str());
     auto uri = URI::Parse(config->address());
     args.config.reset();
-    args.addresses = EndpointAddressesList();
+    EndpointAddressesList addresses;
     if (uri.ok()) {
       grpc_resolved_address address;
       GPR_ASSERT(grpc_parse_uri(*uri, &address));
-      args.addresses->emplace_back(address, ChannelArgs());
+      addresses.emplace_back(address, ChannelArgs());
     } else {
       gpr_log(GPR_ERROR,
               "%s: could not parse URI (%s), using empty address list",
               kFixedAddressLbPolicyName, uri.status().ToString().c_str());
       args.resolution_note = "no address in fixed_address_lb policy";
     }
+    args.addresses =
+        std::make_shared<EndpointAddressesListIterator>(std::move(addresses));
     return ForwardingLoadBalancingPolicy::UpdateLocked(std::move(args));
   }
 
diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc
index abfc73801e674..7249b1c8b1bfb 100644
--- a/test/core/xds/xds_audit_logger_registry_test.cc
+++ b/test/core/xds/xds_audit_logger_registry_test.cc
@@ -65,10 +65,10 @@ absl::StatusOr<std::string> ConvertAuditLoggerConfig(
     const AuditLoggerConfigProto& config) {
   std::string serialized_config = config.SerializeAsString();
   upb::Arena arena;
-  upb::SymbolTable symtab;
-  XdsResourceType::DecodeContext context = {nullptr,
-                                            GrpcXdsBootstrap::GrpcXdsServer(),
-                                            nullptr, symtab.ptr(), arena.ptr()};
+  upb::DefPool def_pool;
+  XdsResourceType::DecodeContext context = {
+      nullptr, GrpcXdsBootstrap::GrpcXdsServer(), nullptr, def_pool.ptr(),
+      arena.ptr()};
   auto* upb_config =
       envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_parse(
           serialized_config.data(), serialized_config.size(), arena.ptr());
diff --git a/test/core/xds/xds_channel_stack_modifier_test.cc b/test/core/xds/xds_channel_stack_modifier_test.cc
index ab6c78242f054..ffd0b9f450d44 100644
--- a/test/core/xds/xds_channel_stack_modifier_test.cc
+++ b/test/core/xds/xds_channel_stack_modifier_test.cc
@@ -95,11 +95,11 @@ TEST(XdsChannelStackModifierTest, XdsHttpFiltersInsertion) {
   grpc_init();
   // Add 2 test filters to XdsChannelStackModifier
   const grpc_channel_filter test_filter_1 = {
-      nullptr, nullptr, nullptr, 0,       nullptr, nullptr,     nullptr,
-      0,       nullptr, nullptr, nullptr, nullptr, kTestFilter1};
+      nullptr, nullptr, nullptr, nullptr, 0,       nullptr, nullptr,
+      nullptr, 0,       nullptr, nullptr, nullptr, nullptr, kTestFilter1};
   const grpc_channel_filter test_filter_2 = {
-      nullptr, nullptr, nullptr, 0,       nullptr, nullptr,     nullptr,
-      0,       nullptr, nullptr, nullptr, nullptr, kTestFilter2};
+      nullptr, nullptr, nullptr, nullptr, 0,       nullptr, nullptr,
+      nullptr, 0,       nullptr, nullptr, nullptr, nullptr, kTestFilter2};
   auto channel_stack_modifier = MakeRefCounted<XdsChannelStackModifier>(
       std::vector<const grpc_channel_filter*>{&test_filter_1, &test_filter_2});
   grpc_arg arg = channel_stack_modifier->MakeChannelArg();
diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
index b6b10dddd3cd4..d139d6005e3d1 100644
--- a/test/core/xds/xds_lb_policy_registry_test.cc
+++ b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -74,10 +74,10 @@ absl::StatusOr<std::string> ConvertXdsPolicy(
     const LoadBalancingPolicyProto& policy) {
   std::string serialized_policy = policy.SerializeAsString();
   upb::Arena arena;
-  upb::SymbolTable symtab;
-  XdsResourceType::DecodeContext context = {nullptr,
-                                            GrpcXdsBootstrap::GrpcXdsServer(),
-                                            nullptr, symtab.ptr(), arena.ptr()};
+  upb::DefPool def_pool;
+  XdsResourceType::DecodeContext context = {
+      nullptr, GrpcXdsBootstrap::GrpcXdsServer(), nullptr, def_pool.ptr(),
+      arena.ptr()};
   auto* upb_policy = envoy_config_cluster_v3_LoadBalancingPolicy_parse(
       serialized_policy.data(), serialized_policy.size(), arena.ptr());
   ValidationErrors errors;
diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD
index 08634b4fba43c..b69adaf4654c7 100644
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@@ -195,6 +195,30 @@ grpc_cc_binary(
     ],
 )
 
+grpc_cc_test(
+    name = "client_fork_test",
+    srcs = ["client_fork_test.cc"],
+    external_deps = [
+        "absl/strings",
+        "gtest",
+    ],
+    tags = [
+        "fork_test",
+        "no_test_ios",
+        "no_windows",
+    ],
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//:grpc++",
+        "//src/proto/grpc/testing:echo_messages_proto",
+        "//src/proto/grpc/testing:echo_proto",
+        "//src/proto/grpc/testing/duplicate:echo_duplicate_proto",
+        "//test/core/util:grpc_test_util",
+        "//test/cpp/util:test_config",
+    ],
+)
+
 grpc_cc_test(
     name = "client_callback_end2end_test",
     srcs = ["client_callback_end2end_test.cc"],
@@ -308,6 +332,7 @@ grpc_cc_test(
         "//src/proto/grpc/channelz:channelz_proto",
         "//src/proto/grpc/testing:echo_messages_proto",
         "//src/proto/grpc/testing:echo_proto",
+        "//test/core/event_engine:event_engine_test_utils",
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:test_util",
     ],
@@ -1037,6 +1062,32 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "tls_credentials_test",
+    srcs = ["tls_credentials_test.cc"],
+    data = [
+        "//src/core/tsi/test_creds:ca.pem",
+        "//src/core/tsi/test_creds:client.key",
+        "//src/core/tsi/test_creds:client.pem",
+        "//src/core/tsi/test_creds:server1.key",
+        "//src/core/tsi/test_creds:server1.pem",
+    ],
+    external_deps = [
+        "gtest",
+    ],
+    tags = ["tls_credentials_test"],
+    deps = [
+        ":test_service_impl",
+        "//:gpr",
+        "//:grpc",
+        "//:grpc++",
+        "//src/proto/grpc/testing:echo_messages_proto",
+        "//src/proto/grpc/testing:echo_proto",
+        "//test/core/util:grpc_test_util",
+        "//test/cpp/util:test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "crl_provider_test",
     srcs = ["crl_provider_test.cc"],
diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index f7289c86f2acd..333d2804d9b7f 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -18,6 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "absl/memory/memory.h"
@@ -34,6 +35,7 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/iomgr/load_file.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
@@ -42,6 +44,7 @@
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/channelz/channelz.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
+#include "test/core/event_engine/event_engine_test_utils.h"
 #include "test/core/util/port.h"
 #include "test/core/util/resolve_localhost_ip46.h"
 #include "test/core/util/test_config.h"
@@ -206,7 +209,8 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
     proxy_builder.AddChannelArgument(GRPC_ARG_ENABLE_CHANNELZ, 1);
     proxy_builder.AddChannelArgument(
         GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE, 1024);
-    proxy_builder.RegisterService(&proxy_service_);
+    proxy_service_ = std::make_unique<Proxy>();
+    proxy_builder.RegisterService(proxy_service_.get());
     proxy_server_ = proxy_builder.BuildAndStart();
   }
 
@@ -216,6 +220,16 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
     }
     proxy_server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0));
     grpc_shutdown();
+    proxy_server_.reset();
+    echo_stub_.reset();
+    channelz_stub_.reset();
+    backends_.clear();
+    proxy_service_.reset();
+    // Ensure all pending callbacks are handled before finishing the test
+    // to ensure hygene between test cases.
+    // (requires any grpc-object-holding values be cleared out first).
+    grpc_event_engine::experimental::WaitForSingleOwner(
+        grpc_event_engine::experimental::GetDefaultEventEngine());
   }
 
   // Sets the proxy up to have an arbitrary number of backends.
@@ -243,7 +257,7 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
       std::shared_ptr<Channel> channel_to_backend = grpc::CreateCustomChannel(
           backend_server_address, GetChannelCredentials(GetParam(), &args),
           args);
-      proxy_service_.AddChannelToBackend(channel_to_backend);
+      proxy_service_->AddChannelToBackend(channel_to_backend);
     }
   }
 
@@ -279,8 +293,8 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
     request.mutable_param()->set_backend_channel_idx(channel_idx);
     ClientContext context;
     Status s = echo_stub_->Echo(&context, request, &response);
-    EXPECT_EQ(response.message(), request.message());
     EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message();
+    if (s.ok()) EXPECT_EQ(response.message(), request.message());
   }
 
   void SendSuccessfulStream(int num_messages) {
@@ -344,7 +358,7 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
   // proxy server to ping with channelz requests.
   std::unique_ptr<Server> proxy_server_;
   int proxy_port_;
-  Proxy proxy_service_;
+  std::unique_ptr<Proxy> proxy_service_;
 
   // backends. All implement the echo service.
   std::vector<BackendData> backends_;
@@ -840,8 +854,8 @@ TEST_P(ChannelzServerTest, GetServerSocketsPaginationTest) {
     request.mutable_param()->set_backend_channel_idx(0);
     ClientContext context;
     Status s = stubs.back()->Echo(&context, request, &response);
-    EXPECT_EQ(response.message(), request.message());
     EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message();
+    if (s.ok()) EXPECT_EQ(response.message(), request.message());
   }
   GetServersRequest get_server_request;
   GetServersResponse get_server_response;
@@ -902,7 +916,7 @@ TEST_P(ChannelzServerTest, GetServerListenSocketsTest) {
   // The resolver might return one or two addresses depending on the
   // configuration, one for ipv4 and one for ipv6.
   int listen_socket_size = get_server_response.server(0).listen_socket_size();
-  EXPECT_TRUE(listen_socket_size == 1 || listen_socket_size == 2);
+  EXPECT_THAT(listen_socket_size, ::testing::AnyOf(1, 2));
   GetSocketRequest get_socket_request;
   GetSocketResponse get_socket_response;
   get_socket_request.set_socket_id(
diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc
new file mode 100644
index 0000000000000..df473fecfed5a
--- /dev/null
+++ b/test/cpp/end2end/client_fork_test.cc
@@ -0,0 +1,172 @@
+// Copyright 2022 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 <grpc/support/port_platform.h>
+
+#ifndef GRPC_ENABLE_FORK_SUPPORT
+// No-op for builds without fork support.
+int main(int /* argc */, char** /* argv */) { return 0; }
+#else  // GRPC_ENABLE_FORK_SUPPORT
+
+#include <signal.h>
+
+#include <gtest/gtest.h>
+
+#include "absl/strings/str_cat.h"
+
+#include <grpc/fork.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.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 <grpcpp/server_context.h>
+
+#include "src/core/lib/gprpp/fork.h"
+#include "src/proto/grpc/testing/echo.grpc.pb.h"
+#include "test/core/util/port.h"
+#include "test/core/util/test_config.h"
+#include "test/cpp/util/test_config.h"
+
+namespace grpc {
+namespace testing {
+namespace {
+
+class ServiceImpl final : public EchoTestService::Service {
+  Status BidiStream(
+      ServerContext* /*context*/,
+      ServerReaderWriter<EchoResponse, EchoRequest>* stream) override {
+    EchoRequest request;
+    EchoResponse response;
+    while (stream->Read(&request)) {
+      gpr_log(GPR_INFO, "recv msg %s", request.message().c_str());
+      response.set_message(request.message());
+      stream->Write(response);
+      gpr_log(GPR_INFO, "wrote msg %s", response.message().c_str());
+    }
+    return Status::OK;
+  }
+};
+
+std::unique_ptr<EchoTestService::Stub> MakeStub(const std::string& addr) {
+  return EchoTestService::NewStub(
+      grpc::CreateChannel(addr, InsecureChannelCredentials()));
+}
+
+TEST(ClientForkTest, ClientCallsBeforeAndAfterForkSucceed) {
+  grpc_core::Fork::Enable(true);
+
+  int port = grpc_pick_unused_port_or_die();
+  std::string addr = absl::StrCat("localhost:", port);
+
+  pid_t server_pid = fork();
+  switch (server_pid) {
+    case -1:  // fork failed
+      GTEST_FAIL() << "failure forking";
+    case 0:  // post-fork child
+    {
+      ServiceImpl impl;
+      grpc::ServerBuilder builder;
+      builder.AddListeningPort(addr, grpc::InsecureServerCredentials());
+      builder.RegisterService(&impl);
+      std::unique_ptr<Server> server(builder.BuildAndStart());
+      server->Wait();
+      return;
+    }
+    default:  // post-fork parent
+      break;
+  }
+
+  // Do a round trip before we fork.
+  // NOTE: without this scope, test running with the epoll1 poller will fail.
+  {
+    std::unique_ptr<EchoTestService::Stub> stub = MakeStub(addr);
+    EchoRequest request;
+    EchoResponse response;
+    ClientContext context;
+    context.set_wait_for_ready(true);
+
+    auto stream = stub->BidiStream(&context);
+
+    request.set_message("Hello");
+    ASSERT_TRUE(stream->Write(request));
+    ASSERT_TRUE(stream->Read(&response));
+    ASSERT_EQ(response.message(), request.message());
+  }
+  // Fork and do round trips in the post-fork parent and child.
+  pid_t child_client_pid = fork();
+  switch (child_client_pid) {
+    case -1:  // fork failed
+      GTEST_FAIL() << "fork failed";
+    case 0:  // post-fork child
+    {
+      gpr_log(GPR_DEBUG, "In post-fork child");
+      EchoRequest request;
+      EchoResponse response;
+      ClientContext context;
+      context.set_wait_for_ready(true);
+
+      std::unique_ptr<EchoTestService::Stub> stub = MakeStub(addr);
+      auto stream = stub->BidiStream(&context);
+
+      request.set_message("Hello again from child");
+      ASSERT_TRUE(stream->Write(request));
+      ASSERT_TRUE(stream->Read(&response));
+      ASSERT_EQ(response.message(), request.message());
+      exit(0);
+    }
+    default:  // post-fork parent
+    {
+      gpr_log(GPR_DEBUG, "In post-fork parent");
+      EchoRequest request;
+      EchoResponse response;
+      ClientContext context;
+      context.set_wait_for_ready(true);
+
+      std::unique_ptr<EchoTestService::Stub> stub = MakeStub(addr);
+      auto stream = stub->BidiStream(&context);
+
+      request.set_message("Hello again from parent");
+      EXPECT_TRUE(stream->Write(request));
+      EXPECT_TRUE(stream->Read(&response));
+      EXPECT_EQ(response.message(), request.message());
+
+      // Wait for the post-fork child to exit; ensure it exited cleanly.
+      int child_status;
+      ASSERT_EQ(waitpid(child_client_pid, &child_status, 0), child_client_pid)
+          << "failed to get status of child client";
+      ASSERT_EQ(WEXITSTATUS(child_status), 0) << "child did not exit cleanly";
+    }
+  }
+
+  kill(server_pid, SIGINT);
+}
+
+}  // namespace
+}  // namespace testing
+}  // namespace grpc
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  grpc::testing::InitTest(&argc, &argv, true);
+  grpc::testing::TestEnvironment env(&argc, argv);
+  grpc_init();
+  int res = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return res;
+}
+#endif  // GRPC_ENABLE_FORK_SUPPORT
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index ad4bbfb649030..4a2eb3f1d450a 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -213,29 +213,16 @@ class FakeResolverResponseGeneratorWrapper {
     response_generator_ = std::move(other.response_generator_);
   }
 
+  void SetResponse(grpc_core::Resolver::Result result) {
+    grpc_core::ExecCtx exec_ctx;
+    response_generator_->SetResponseSynchronously(std::move(result));
+  }
+
   void SetNextResolution(const std::vector<int>& ports,
                          const char* service_config_json = nullptr,
                          const grpc_core::ChannelArgs& per_address_args =
                              grpc_core::ChannelArgs()) {
-    grpc_core::ExecCtx exec_ctx;
-    response_generator_->SetResponseSynchronously(
-        BuildFakeResults(ports, service_config_json, per_address_args));
-  }
-
-  void SetNextResolutionUponError(const std::vector<int>& ports) {
-    grpc_core::ExecCtx exec_ctx;
-    response_generator_->SetReresolutionResponseSynchronously(
-        BuildFakeResults(ports));
-  }
-
-  void SetFailureOnReresolution() {
-    grpc_core::ExecCtx exec_ctx;
-    response_generator_->SetFailureOnReresolution();
-  }
-
-  void SetResponse(grpc_core::Resolver::Result result) {
-    grpc_core::ExecCtx exec_ctx;
-    response_generator_->SetResponseSynchronously(std::move(result));
+    SetResponse(BuildFakeResults(ports, service_config_json, per_address_args));
   }
 
   grpc_core::FakeResolverResponseGenerator* Get() const {
@@ -1155,10 +1142,15 @@ TEST_F(PickFirstTest, ReresolutionNoSelected) {
         DEBUG_LOCATION, stub, StatusCode::UNAVAILABLE,
         MakeConnectionFailureRegex("failed to connect to all addresses"));
   }
-  // Set a re-resolution result that contains reachable ports, so that the
+  // PF should request re-resolution.
+  gpr_log(GPR_INFO, "****** WAITING FOR RE-RESOLUTION *******");
+  EXPECT_TRUE(response_generator.Get()->WaitForReresolutionRequest(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+  gpr_log(GPR_INFO, "****** RE-RESOLUTION SEEN *******");
+  // Send a resolver result that contains reachable ports, so that the
   // pick_first LB policy can recover soon.
-  response_generator.SetNextResolutionUponError(alive_ports);
-  gpr_log(GPR_INFO, "****** RE-RESOLUTION SET *******");
+  response_generator.SetNextResolution(alive_ports);
+  gpr_log(GPR_INFO, "****** RE-RESOLUTION SENT *******");
   WaitForServer(DEBUG_LOCATION, stub, 0, [](const Status& status) {
     EXPECT_EQ(StatusCode::UNAVAILABLE, status.error_code());
     EXPECT_THAT(status.error_message(),
@@ -1294,7 +1286,6 @@ TEST_F(PickFirstTest, IdleOnDisconnect) {
   CheckRpcSendOk(DEBUG_LOCATION, stub);
   EXPECT_EQ(channel->GetState(false), GRPC_CHANNEL_READY);
   // Stop server.  Channel should go into state IDLE.
-  response_generator.SetFailureOnReresolution();
   servers_[0]->Shutdown();
   EXPECT_TRUE(WaitForChannelNotReady(channel.get()));
   EXPECT_EQ(channel->GetState(false), GRPC_CHANNEL_IDLE);
@@ -1603,16 +1594,20 @@ TEST_F(RoundRobinTest, ReresolveOnSubchannelConnectionFailure) {
   response_generator.SetNextResolution(ports);
   // Wait for both servers to be seen.
   WaitForServers(DEBUG_LOCATION, stub, 0, 2);
-  // Tell the fake resolver to send an update that adds the last server, but
-  // only when the LB policy requests re-resolution.
-  ports.push_back(servers_[2]->port_);
-  response_generator.SetNextResolutionUponError(ports);
   // Have server 0 send a GOAWAY.  This should trigger a re-resolution.
   gpr_log(GPR_INFO, "****** SENDING GOAWAY FROM SERVER 0 *******");
   {
     grpc_core::ExecCtx exec_ctx;
     grpc_core::Server::FromC(servers_[0]->server_->c_server())->SendGoaways();
   }
+  gpr_log(GPR_INFO, "****** WAITING FOR RE-RESOLUTION REQUEST *******");
+  EXPECT_TRUE(response_generator.Get()->WaitForReresolutionRequest(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+  gpr_log(GPR_INFO, "****** RE-RESOLUTION REQUEST SEEN *******");
+  // Tell the fake resolver to send an update that adds the last server, but
+  // only when the LB policy requests re-resolution.
+  ports.push_back(servers_[2]->port_);
+  response_generator.SetNextResolution(ports);
   // Wait for the client to see server 2.
   WaitForServer(DEBUG_LOCATION, stub, 2);
 }
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc
index 949ab9f5f1faf..1d3c865cdb518 100644
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@@ -25,9 +25,12 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "absl/cleanup/cleanup.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
+#include "absl/synchronization/notification.h"
+#include "absl/types/span.h"
 
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
@@ -36,7 +39,6 @@
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
-#include <grpcpp/impl/sync.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
@@ -48,8 +50,10 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/resolver/endpoint_addresses.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
@@ -82,12 +86,12 @@
 //   2) the retry timer is active. Again, the weak reference it holds should
 //   prevent a premature call to \a glb_destroy.
 
-using std::chrono::system_clock;
-
 using grpc::lb::v1::LoadBalancer;
 using grpc::lb::v1::LoadBalanceRequest;
 using grpc::lb::v1::LoadBalanceResponse;
 
+using grpc_core::SourceLocation;
+
 namespace grpc {
 namespace testing {
 namespace {
@@ -102,8 +106,10 @@ constexpr char kDefaultServiceConfig[] =
 using BackendService = CountedService<TestServiceImpl>;
 using BalancerService = CountedService<LoadBalancer::Service>;
 
-const char g_kCallCredsMdKey[] = "call-creds";
-const char g_kCallCredsMdValue[] = "should not be received by balancer";
+const char kCallCredsMdKey[] = "call-creds";
+const char kCallCredsMdValue[] = "should not be received by balancer";
+const char kRequestMessage[] = "Live long and prosper.";
+const absl::string_view kApplicationTargetName = "application_target_name";
 
 // A test user agent string sent by the client only to the grpclb loadbalancer.
 // The backend should not see this user-agent string.
@@ -123,10 +129,10 @@ class BackendServiceImpl : public BackendService {
     }
     // Backend should receive the call credentials metadata.
     auto call_credentials_entry =
-        context->client_metadata().find(g_kCallCredsMdKey);
+        context->client_metadata().find(kCallCredsMdKey);
     EXPECT_NE(call_credentials_entry, context->client_metadata().end());
     if (call_credentials_entry != context->client_metadata().end()) {
-      EXPECT_EQ(call_credentials_entry->second, g_kCallCredsMdValue);
+      EXPECT_EQ(call_credentials_entry->second, kCallCredsMdValue);
     }
     IncreaseRequestCount();
     const auto status = TestServiceImpl::Echo(context, request, response);
@@ -140,17 +146,17 @@ class BackendServiceImpl : public BackendService {
   void Shutdown() {}
 
   std::set<std::string> clients() {
-    grpc::internal::MutexLock lock(&clients_mu_);
+    grpc_core::MutexLock lock(&clients_mu_);
     return clients_;
   }
 
  private:
   void AddClient(const std::string& client) {
-    grpc::internal::MutexLock lock(&clients_mu_);
+    grpc_core::MutexLock lock(&clients_mu_);
     clients_.insert(client);
   }
 
-  grpc::internal::Mutex clients_mu_;
+  grpc_core::Mutex clients_mu_;
   std::set<std::string> clients_ ABSL_GUARDED_BY(&clients_mu_);
 };
 
@@ -198,180 +204,301 @@ struct ClientStats {
 class BalancerServiceImpl : public BalancerService {
  public:
   using Stream = ServerReaderWriter<LoadBalanceResponse, LoadBalanceRequest>;
-  using ResponseDelayPair = std::pair<LoadBalanceResponse, int>;
 
-  explicit BalancerServiceImpl(int client_load_reporting_interval_seconds)
-      : client_load_reporting_interval_seconds_(
-            client_load_reporting_interval_seconds) {}
-
-  Status BalanceLoad(ServerContext* context, Stream* stream) override {
-    gpr_log(GPR_INFO, "LB[%p]: BalanceLoad", this);
+  void Start() {
     {
-      grpc::internal::MutexLock lock(&mu_);
-      if (serverlist_done_) goto done;
+      grpc_core::MutexLock lock(&mu_);
+      shutdown_ = false;
+      response_queue_.clear();
     }
     {
-      // The loadbalancer should see a test user agent because it was
-      // specifically configured at the client using
-      // GRPC_ARG_GRPCLB_CHANNEL_ARGS
-      auto it = context->client_metadata().find("user-agent");
-      EXPECT_TRUE(it != context->client_metadata().end());
-      if (it != context->client_metadata().end()) {
-        EXPECT_THAT(std::string(it->second.data(), it->second.length()),
-                    ::testing::StartsWith(kGrpclbSpecificUserAgentString));
-      }
-      // Balancer shouldn't receive the call credentials metadata.
-      EXPECT_EQ(context->client_metadata().find(g_kCallCredsMdKey),
-                context->client_metadata().end());
-      LoadBalanceRequest request;
-      std::vector<ResponseDelayPair> responses_and_delays;
-
-      if (!stream->Read(&request)) {
-        goto done;
-      } else {
-        if (request.has_initial_request()) {
-          grpc::internal::MutexLock lock(&mu_);
-          service_names_.push_back(request.initial_request().name());
-        }
-      }
-      IncreaseRequestCount();
-      gpr_log(GPR_INFO, "LB[%p]: received initial message '%s'", this,
-              request.DebugString().c_str());
-
-      // TODO(juanlishen): Initial response should always be the first response.
-      if (client_load_reporting_interval_seconds_ > 0) {
-        LoadBalanceResponse initial_response;
-        initial_response.mutable_initial_response()
-            ->mutable_client_stats_report_interval()
-            ->set_seconds(client_load_reporting_interval_seconds_);
-        stream->Write(initial_response);
-      }
-
-      {
-        grpc::internal::MutexLock lock(&mu_);
-        responses_and_delays = responses_and_delays_;
-      }
-      for (const auto& response_and_delay : responses_and_delays) {
-        SendResponse(stream, response_and_delay.first,
-                     response_and_delay.second);
-      }
-      {
-        grpc::internal::MutexLock lock(&mu_);
-        while (!serverlist_done_) {
-          serverlist_cond_.Wait(&mu_);
-        }
-      }
+      grpc_core::MutexLock lock(&load_report_mu_);
+      load_report_queue_.clear();
+    }
+  }
 
-      if (client_load_reporting_interval_seconds_ > 0) {
-        request.Clear();
-        while (stream->Read(&request)) {
-          gpr_log(GPR_INFO, "LB[%p]: received client load report message '%s'",
-                  this, request.DebugString().c_str());
-          GPR_ASSERT(request.has_client_stats());
-          ClientStats load_report;
-          load_report.num_calls_started =
-              request.client_stats().num_calls_started();
-          load_report.num_calls_finished =
-              request.client_stats().num_calls_finished();
-          load_report.num_calls_finished_with_client_failed_to_send =
-              request.client_stats()
-                  .num_calls_finished_with_client_failed_to_send();
-          load_report.num_calls_finished_known_received =
-              request.client_stats().num_calls_finished_known_received();
-          for (const auto& drop_token_count :
-               request.client_stats().calls_finished_with_drop()) {
-            load_report
-                .drop_token_counts[drop_token_count.load_balance_token()] =
-                drop_token_count.num_calls();
-          }
-          // We need to acquire the lock here in order to prevent the notify_one
-          // below from firing before its corresponding wait is executed.
-          grpc::internal::MutexLock lock(&mu_);
-          load_report_queue_.emplace_back(std::move(load_report));
-          load_report_cond_.Signal();
-        }
-      }
+  void Shutdown() {
+    {
+      grpc_core::MutexLock lock(&mu_);
+      shutdown_ = true;
     }
-  done:
-    gpr_log(GPR_INFO, "LB[%p]: done", this);
-    return Status::OK;
+    ShutdownStream();
+    gpr_log(GPR_INFO, "LB[%p]: shut down", this);
   }
 
-  void add_response(const LoadBalanceResponse& response, int send_after_ms) {
-    grpc::internal::MutexLock lock(&mu_);
-    responses_and_delays_.push_back(std::make_pair(response, send_after_ms));
+  void set_client_load_reporting_interval_seconds(int seconds) {
+    client_load_reporting_interval_seconds_ = seconds;
   }
 
-  void Start() {
-    grpc::internal::MutexLock lock(&mu_);
-    serverlist_done_ = false;
-    responses_and_delays_.clear();
-    load_report_queue_.clear();
+  void SendResponse(LoadBalanceResponse response) {
+    grpc_core::MutexLock lock(&mu_);
+    response_queue_.emplace_back(std::move(response));
+    if (response_cond_ != nullptr) response_cond_->SignalAll();
   }
 
-  void Shutdown() {
-    NotifyDoneWithServerlists();
-    gpr_log(GPR_INFO, "LB[%p]: shut down", this);
+  void ShutdownStream() {
+    grpc_core::MutexLock lock(&mu_);
+    response_queue_.emplace_back(absl::nullopt);
+    if (response_cond_ != nullptr) response_cond_->SignalAll();
   }
 
-  ClientStats WaitForLoadReport() {
-    grpc::internal::MutexLock lock(&mu_);
+  absl::optional<ClientStats> WaitForLoadReport(absl::Duration timeout) {
+    grpc_core::MutexLock lock(&load_report_mu_);
     if (load_report_queue_.empty()) {
-      while (load_report_queue_.empty()) {
-        load_report_cond_.Wait(&mu_);
-      }
+      grpc_core::CondVar condition;
+      load_report_cond_ = &condition;
+      condition.WaitWithTimeout(&load_report_mu_,
+                                timeout * grpc_test_slowdown_factor());
+      load_report_cond_ = nullptr;
     }
+    if (load_report_queue_.empty()) return absl::nullopt;
     ClientStats load_report = std::move(load_report_queue_.front());
     load_report_queue_.pop_front();
     return load_report;
   }
 
-  void NotifyDoneWithServerlists() {
-    grpc::internal::MutexLock lock(&mu_);
-    if (!serverlist_done_) {
-      serverlist_done_ = true;
-      serverlist_cond_.SignalAll();
+  bool WaitForNewStream(size_t prev_seen_count,
+                        absl::Duration timeout = absl::Seconds(5)) {
+    grpc_core::MutexLock lock(&stream_count_mu_);
+    if (stream_count_ == prev_seen_count) {
+      grpc_core::CondVar condition;
+      stream_count_cond_ = &condition;
+      condition.WaitWithTimeout(&stream_count_mu_,
+                                timeout * grpc_test_slowdown_factor());
+      stream_count_cond_ = nullptr;
     }
+    return stream_count_ > prev_seen_count;
   }
 
   std::vector<std::string> service_names() {
-    grpc::internal::MutexLock lock(&mu_);
+    grpc_core::MutexLock lock(&mu_);
     return service_names_;
   }
 
+  std::set<std::string> clients() {
+    grpc_core::MutexLock lock(&clients_mu_);
+    return clients_;
+  }
+
  private:
-  void SendResponse(Stream* stream, const LoadBalanceResponse& response,
-                    int delay_ms) {
-    gpr_log(GPR_INFO, "LB[%p]: sleeping for %d ms...", this, delay_ms);
-    if (delay_ms > 0) {
-      gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(delay_ms));
+  // Request handler.
+  Status BalanceLoad(ServerContext* context, Stream* stream) override {
+    gpr_log(GPR_INFO, "LB[%p]: BalanceLoad", this);
+    {
+      grpc_core::MutexLock lock(&mu_);
+      if (shutdown_) {
+        gpr_log(GPR_INFO, "LB[%p]: shutdown at stream start", this);
+        return Status::OK;
+      }
+    }
+    IncrementStreamCount();
+    AddClient(context->peer());
+    // The loadbalancer should see a test user agent because it was
+    // specifically configured at the client using
+    // GRPC_ARG_GRPCLB_CHANNEL_ARGS
+    auto it = context->client_metadata().find("user-agent");
+    EXPECT_TRUE(it != context->client_metadata().end());
+    if (it != context->client_metadata().end()) {
+      EXPECT_THAT(std::string(it->second.data(), it->second.length()),
+                  ::testing::StartsWith(kGrpclbSpecificUserAgentString));
+    }
+    // Balancer shouldn't receive the call credentials metadata.
+    EXPECT_EQ(context->client_metadata().find(kCallCredsMdKey),
+              context->client_metadata().end());
+    // Read initial request.
+    LoadBalanceRequest request;
+    if (!stream->Read(&request)) {
+      gpr_log(GPR_INFO, "LB[%p]: stream read returned false", this);
+      return Status::OK;
+    }
+    EXPECT_TRUE(request.has_initial_request());
+    {
+      grpc_core::MutexLock lock(&mu_);
+      service_names_.push_back(request.initial_request().name());
+    }
+    IncreaseRequestCount();
+    gpr_log(GPR_INFO, "LB[%p]: received initial message '%s'", this,
+            request.DebugString().c_str());
+    // Send initial response.
+    LoadBalanceResponse response;
+    auto* initial_response = response.mutable_initial_response();
+    if (client_load_reporting_interval_seconds_ > 0) {
+      initial_response->mutable_client_stats_report_interval()->set_seconds(
+          client_load_reporting_interval_seconds_);
     }
-    gpr_log(GPR_INFO, "LB[%p]: Woke up! Sending response '%s'", this,
-            response.DebugString().c_str());
-    IncreaseResponseCount();
     stream->Write(response);
+    // Spawn a separate thread to read requests from the client.
+    absl::Notification reader_shutdown;
+    std::thread reader(std::bind(&BalancerServiceImpl::ReadThread, this, stream,
+                                 &reader_shutdown));
+    auto thread_cleanup = absl::MakeCleanup([&]() {
+      gpr_log(GPR_INFO, "shutting down reader thread");
+      reader_shutdown.Notify();
+      gpr_log(GPR_INFO, "joining reader thread");
+      reader.join();
+      gpr_log(GPR_INFO, "joining reader thread complete");
+    });
+    // Send responses as instructed by the test.
+    while (true) {
+      auto response = GetNextResponse();
+      if (!response.has_value()) {
+        context->TryCancel();
+        break;
+      }
+      gpr_log(GPR_INFO, "LB[%p]: Sending response: %s", this,
+              response->DebugString().c_str());
+      IncreaseResponseCount();
+      stream->Write(*response);
+    }
+    gpr_log(GPR_INFO, "LB[%p]: done", this);
+    return Status::OK;
   }
 
-  const int client_load_reporting_interval_seconds_;
-  std::vector<ResponseDelayPair> responses_and_delays_;
-  std::vector<std::string> service_names_;
+  // Reader thread spawned by request handler.
+  void ReadThread(Stream* stream, absl::Notification* shutdown) {
+    LoadBalanceRequest request;
+    while (!shutdown->HasBeenNotified() && stream->Read(&request)) {
+      gpr_log(GPR_INFO, "LB[%p]: received client load report message '%s'",
+              this, request.DebugString().c_str());
+      EXPECT_GT(client_load_reporting_interval_seconds_, 0);
+      EXPECT_TRUE(request.has_client_stats());
+      ClientStats load_report;
+      load_report.num_calls_started =
+          request.client_stats().num_calls_started();
+      load_report.num_calls_finished =
+          request.client_stats().num_calls_finished();
+      load_report.num_calls_finished_with_client_failed_to_send =
+          request.client_stats()
+              .num_calls_finished_with_client_failed_to_send();
+      load_report.num_calls_finished_known_received =
+          request.client_stats().num_calls_finished_known_received();
+      for (const auto& drop_token_count :
+           request.client_stats().calls_finished_with_drop()) {
+        load_report.drop_token_counts[drop_token_count.load_balance_token()] =
+            drop_token_count.num_calls();
+      }
+      // We need to acquire the lock here in order to prevent the notify_one
+      // below from firing before its corresponding wait is executed.
+      grpc_core::MutexLock lock(&load_report_mu_);
+      load_report_queue_.emplace_back(std::move(load_report));
+      if (load_report_cond_ != nullptr) load_report_cond_->Signal();
+    }
+  }
+
+  // Helper for request handler thread to get the next response to be
+  // sent on the stream.  Returns nullopt when the test has requested
+  // stream shutdown.
+  absl::optional<LoadBalanceResponse> GetNextResponse() {
+    grpc_core::MutexLock lock(&mu_);
+    if (response_queue_.empty()) {
+      grpc_core::CondVar condition;
+      response_cond_ = &condition;
+      condition.Wait(&mu_);
+      response_cond_ = nullptr;
+    }
+    auto response = std::move(response_queue_.front());
+    response_queue_.pop_front();
+    return response;
+  }
+
+  void AddClient(const std::string& client) {
+    grpc_core::MutexLock lock(&clients_mu_);
+    clients_.insert(client);
+  }
 
-  grpc::internal::Mutex mu_;
-  grpc::internal::CondVar serverlist_cond_;
-  bool serverlist_done_ ABSL_GUARDED_BY(mu_) = false;
-  grpc::internal::CondVar load_report_cond_;
-  std::deque<ClientStats> load_report_queue_ ABSL_GUARDED_BY(mu_);
+  void IncrementStreamCount() {
+    grpc_core::MutexLock lock(&stream_count_mu_);
+    ++stream_count_;
+    if (stream_count_cond_ != nullptr) stream_count_cond_->Signal();
+  }
+
+  int client_load_reporting_interval_seconds_ = 0;
+
+  grpc_core::Mutex mu_;
+  bool shutdown_ ABSL_GUARDED_BY(&mu_) = false;
+  std::vector<std::string> service_names_ ABSL_GUARDED_BY(mu_);
+  std::deque<absl::optional<LoadBalanceResponse>> response_queue_
+      ABSL_GUARDED_BY(mu_);
+  grpc_core::CondVar* response_cond_ ABSL_GUARDED_BY(mu_) = nullptr;
+
+  grpc_core::Mutex load_report_mu_;
+  grpc_core::CondVar* load_report_cond_ ABSL_GUARDED_BY(load_report_mu_) =
+      nullptr;
+  std::deque<ClientStats> load_report_queue_ ABSL_GUARDED_BY(load_report_mu_);
+
+  grpc_core::Mutex clients_mu_;
+  std::set<std::string> clients_ ABSL_GUARDED_BY(&clients_mu_);
+
+  grpc_core::Mutex stream_count_mu_;
+  grpc_core::CondVar* stream_count_cond_ ABSL_GUARDED_BY(&stream_count_mu_) =
+      nullptr;
+  size_t stream_count_ ABSL_GUARDED_BY(&stream_count_mu_) = 0;
 };
 
 class GrpclbEnd2endTest : public ::testing::Test {
  protected:
-  GrpclbEnd2endTest(size_t num_backends, size_t num_balancers,
-                    int client_load_reporting_interval_seconds)
-      : server_host_("localhost"),
-        num_backends_(num_backends),
-        num_balancers_(num_balancers),
-        client_load_reporting_interval_seconds_(
-            client_load_reporting_interval_seconds) {}
+  template <typename T>
+  class ServerThread {
+   public:
+    template <typename... Args>
+    explicit ServerThread(const std::string& type, Args&&... args)
+        : port_(grpc_pick_unused_port_or_die()),
+          type_(type),
+          service_(std::forward<Args>(args)...) {}
+
+    ~ServerThread() { Shutdown(); }
+
+    void Start() {
+      gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_);
+      GPR_ASSERT(!running_);
+      running_ = true;
+      service_.Start();
+      grpc_core::Mutex mu;
+      // We need to acquire the lock here in order to prevent the notify_one
+      // by ServerThread::Serve from firing before the wait below is hit.
+      grpc_core::MutexLock lock(&mu);
+      grpc_core::CondVar cond;
+      thread_ = std::make_unique<std::thread>(
+          std::bind(&ServerThread::Serve, this, &mu, &cond));
+      cond.Wait(&mu);
+      gpr_log(GPR_INFO, "%s server startup complete", type_.c_str());
+    }
+
+    void Serve(grpc_core::Mutex* mu, grpc_core::CondVar* cond) {
+      // We need to acquire the lock here in order to prevent the notify_one
+      // below from firing before its corresponding wait is executed.
+      grpc_core::MutexLock lock(mu);
+      ServerBuilder builder;
+      std::shared_ptr<ServerCredentials> creds(new SecureServerCredentials(
+          grpc_fake_transport_security_server_credentials_create()));
+      builder.AddListeningPort(grpc_core::LocalIpAndPort(port_), creds);
+      builder.RegisterService(&service_);
+      server_ = builder.BuildAndStart();
+      cond->Signal();
+    }
+
+    void Shutdown() {
+      if (!running_) return;
+      gpr_log(GPR_INFO, "%s about to shutdown", type_.c_str());
+      service_.Shutdown();
+      server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0));
+      thread_->join();
+      gpr_log(GPR_INFO, "%s shutdown completed", type_.c_str());
+      running_ = false;
+    }
+
+    int port() const { return port_; }
+
+    T& service() { return service_; }
+
+   private:
+    const int port_;
+    std::string type_;
+    T service_;
+    std::unique_ptr<Server> server_;
+    std::unique_ptr<std::thread> thread_;
+    bool running_ = false;
+  };
 
   static void SetUpTestSuite() {
     // Make the backup poller poll very frequently in order to pick up
@@ -391,30 +518,28 @@ class GrpclbEnd2endTest : public ::testing::Test {
   void SetUp() override {
     response_generator_ =
         grpc_core::MakeRefCounted<grpc_core::FakeResolverResponseGenerator>();
-    // Start the backends.
-    for (size_t i = 0; i < num_backends_; ++i) {
-      backends_.emplace_back(new ServerThread<BackendServiceImpl>("backend"));
-      backends_.back()->Start(server_host_);
-    }
-    // Start the load balancers.
-    for (size_t i = 0; i < num_balancers_; ++i) {
-      balancers_.emplace_back(new ServerThread<BalancerServiceImpl>(
-          "balancer", client_load_reporting_interval_seconds_));
-      balancers_.back()->Start(server_host_);
-    }
+    balancer_ = CreateAndStartBalancer();
     ResetStub();
   }
 
   void TearDown() override {
     ShutdownAllBackends();
-    for (auto& balancer : balancers_) balancer->Shutdown();
+    balancer_->Shutdown();
+  }
+
+  void CreateBackends(size_t num_backends) {
+    for (size_t i = 0; i < num_backends; ++i) {
+      backends_.emplace_back(
+          std::make_unique<ServerThread<BackendServiceImpl>>("backend"));
+      backends_.back()->Start();
+    }
   }
 
   void StartAllBackends() {
-    for (auto& backend : backends_) backend->Start(server_host_);
+    for (auto& backend : backends_) backend->Start();
   }
 
-  void StartBackend(size_t index) { backends_[index]->Start(server_host_); }
+  void StartBackend(size_t index) { backends_[index]->Start(); }
 
   void ShutdownAllBackends() {
     for (auto& backend : backends_) backend->Shutdown();
@@ -422,7 +547,14 @@ class GrpclbEnd2endTest : public ::testing::Test {
 
   void ShutdownBackend(size_t index) { backends_[index]->Shutdown(); }
 
-  void ResetStub(int fallback_timeout = 0,
+  std::unique_ptr<ServerThread<BalancerServiceImpl>> CreateAndStartBalancer() {
+    auto balancer =
+        std::make_unique<ServerThread<BalancerServiceImpl>>("balancer");
+    balancer->Start();
+    return balancer;
+  }
+
+  void ResetStub(int fallback_timeout_ms = 0,
                  const std::string& expected_targets = "",
                  int subchannel_cache_delay_ms = 0) {
     // Send a separate user agent string for the grpclb load balancer alone.
@@ -432,7 +564,10 @@ class GrpclbEnd2endTest : public ::testing::Test {
     grpclb_channel_args = grpclb_channel_args.Set(
         GRPC_ARG_PRIMARY_USER_AGENT_STRING, kGrpclbSpecificUserAgentString);
     ChannelArguments args;
-    if (fallback_timeout > 0) args.SetGrpclbFallbackTimeout(fallback_timeout);
+    if (fallback_timeout_ms > 0) {
+      args.SetGrpclbFallbackTimeout(fallback_timeout_ms *
+                                    grpc_test_slowdown_factor());
+    }
     args.SetPointer(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR,
                     response_generator_.get());
     if (!expected_targets.empty()) {
@@ -464,39 +599,35 @@ class GrpclbEnd2endTest : public ::testing::Test {
         GRPC_ARG_EXPERIMENTAL_GRPCLB_CHANNEL_ARGS,
         const_cast<grpc_channel_args*>(grpclb_channel_args.ToC().get()),
         &channel_args_vtable);
-    std::ostringstream uri;
-    uri << "fake:///" << kApplicationTargetName_;
     // TODO(dgq): templatize tests to run everything using both secure and
     // insecure channel credentials.
     grpc_channel_credentials* channel_creds =
         grpc_fake_transport_security_credentials_create();
     grpc_call_credentials* call_creds = grpc_md_only_test_credentials_create(
-        g_kCallCredsMdKey, g_kCallCredsMdValue);
+        kCallCredsMdKey, kCallCredsMdValue);
     std::shared_ptr<ChannelCredentials> creds(
         new SecureChannelCredentials(grpc_composite_channel_credentials_create(
             channel_creds, call_creds, nullptr)));
     call_creds->Unref();
     channel_creds->Unref();
-    channel_ = grpc::CreateCustomChannel(uri.str(), creds, args);
+    channel_ = grpc::CreateCustomChannel(
+        absl::StrCat("fake:", kApplicationTargetName), creds, args);
     stub_ = grpc::testing::EchoTestService::NewStub(channel_);
   }
 
   void ResetBackendCounters() {
-    for (auto& backend : backends_) backend->service_.ResetCounters();
+    for (auto& backend : backends_) backend->service().ResetCounters();
   }
 
-  ClientStats WaitForLoadReports() {
-    ClientStats client_stats;
-    for (auto& balancer : balancers_) {
-      client_stats += balancer->service_.WaitForLoadReport();
-    }
-    return client_stats;
+  absl::optional<ClientStats> WaitForLoadReports(
+      absl::Duration timeout = absl::Seconds(5)) {
+    return balancer_->service().WaitForLoadReport(timeout);
   }
 
   bool SeenAllBackends(size_t start_index = 0, size_t stop_index = 0) {
     if (stop_index == 0) stop_index = backends_.size();
     for (size_t i = start_index; i < stop_index; ++i) {
-      if (backends_[i]->service_.request_count() == 0) return false;
+      if (backends_[i]->service().request_count() == 0) return false;
     }
     return true;
   }
@@ -516,102 +647,106 @@ class GrpclbEnd2endTest : public ::testing::Test {
     ++*num_total;
   }
 
-  std::tuple<int, int, int> WaitForAllBackends(int num_requests_multiple_of = 1,
-                                               size_t start_index = 0,
-                                               size_t stop_index = 0) {
+  struct WaitForBackendOptions {
+    int timeout_seconds = 10;
+    int num_requests_multiple_of = 1;
+
+    WaitForBackendOptions() {}
+    WaitForBackendOptions& SetTimeoutSeconds(int seconds) {
+      timeout_seconds = seconds;
+      return *this;
+    }
+    WaitForBackendOptions& SetNumRequestsMultipleOf(int multiple) {
+      num_requests_multiple_of = multiple;
+      return *this;
+    }
+  };
+
+  std::tuple<int, int, int> WaitForAllBackends(
+      size_t start_index = 0, size_t stop_index = 0,
+      WaitForBackendOptions options = WaitForBackendOptions(),
+      SourceLocation location = SourceLocation()) {
+    gpr_log(GPR_INFO, "Waiting for backends [%" PRIuPTR ", %" PRIuPTR ")",
+            start_index, stop_index);
+    const absl::Time deadline =
+        absl::Now() +
+        absl::Seconds(options.timeout_seconds * grpc_test_slowdown_factor());
     int num_ok = 0;
     int num_failure = 0;
     int num_drops = 0;
     int num_total = 0;
     while (!SeenAllBackends(start_index, stop_index)) {
+      absl::Time now = absl::Now();
+      EXPECT_LT(now, deadline) << location.file() << ":" << location.line();
+      if (now > deadline) break;
       SendRpcAndCount(&num_total, &num_ok, &num_failure, &num_drops);
     }
-    while (num_total % num_requests_multiple_of != 0) {
+    while (num_total % options.num_requests_multiple_of != 0) {
+      absl::Time now = absl::Now();
+      EXPECT_LT(now, deadline) << location.file() << ":" << location.line();
+      if (now > deadline) break;
       SendRpcAndCount(&num_total, &num_ok, &num_failure, &num_drops);
     }
     ResetBackendCounters();
     gpr_log(GPR_INFO,
             "Performed %d warm up requests (a multiple of %d) against the "
             "backends. %d succeeded, %d failed, %d dropped.",
-            num_total, num_requests_multiple_of, num_ok, num_failure,
+            num_total, options.num_requests_multiple_of, num_ok, num_failure,
             num_drops);
     return std::make_tuple(num_ok, num_failure, num_drops);
   }
 
-  void WaitForBackend(size_t backend_idx) {
-    do {
-      (void)SendRpc();
-    } while (backends_[backend_idx]->service_.request_count() == 0);
-    ResetBackendCounters();
+  void WaitForBackend(size_t backend_idx,
+                      WaitForBackendOptions options = WaitForBackendOptions(),
+                      SourceLocation location = SourceLocation()) {
+    WaitForAllBackends(backend_idx, backend_idx + 1, options, location);
   }
 
-  struct AddressData {
-    int port;
-    std::string balancer_name;
-  };
-
-  grpc_core::EndpointAddressesList CreateLbAddressesFromAddressDataList(
-      const std::vector<AddressData>& address_data) {
+  grpc_core::EndpointAddressesList CreateAddressListFromPorts(
+      const absl::Span<const int> ports, absl::string_view balancer_name = "") {
     grpc_core::EndpointAddressesList addresses;
-    for (const auto& addr : address_data) {
+    for (int port : ports) {
       absl::StatusOr<grpc_core::URI> lb_uri =
-          grpc_core::URI::Parse(grpc_core::LocalIpUri(addr.port));
+          grpc_core::URI::Parse(grpc_core::LocalIpUri(port));
       GPR_ASSERT(lb_uri.ok());
       grpc_resolved_address address;
       GPR_ASSERT(grpc_parse_uri(*lb_uri, &address));
-      addresses.emplace_back(
-          address, grpc_core::ChannelArgs().Set(GRPC_ARG_DEFAULT_AUTHORITY,
-                                                addr.balancer_name));
+      grpc_core::ChannelArgs args;
+      if (!balancer_name.empty()) {
+        args = args.Set(GRPC_ARG_DEFAULT_AUTHORITY, balancer_name);
+      }
+      addresses.emplace_back(address, args);
     }
     return addresses;
   }
 
-  grpc_core::Resolver::Result MakeResolverResult(
-      const std::vector<AddressData>& balancer_address_data,
-      const std::vector<AddressData>& backend_address_data = {},
+  void SetNextResolutionFromEndpoints(
+      grpc_core::EndpointAddressesList balancers,
+      grpc_core::EndpointAddressesList backends = {},
       const char* service_config_json = kDefaultServiceConfig) {
+    grpc_core::ExecCtx exec_ctx;
     grpc_core::Resolver::Result result;
-    result.addresses =
-        CreateLbAddressesFromAddressDataList(backend_address_data);
+    result.addresses = std::move(backends);
     result.service_config = grpc_core::ServiceConfigImpl::Create(
         grpc_core::ChannelArgs(), service_config_json);
     GPR_ASSERT(result.service_config.ok());
-    grpc_core::EndpointAddressesList balancer_addresses =
-        CreateLbAddressesFromAddressDataList(balancer_address_data);
     result.args = grpc_core::SetGrpcLbBalancerAddresses(
-        grpc_core::ChannelArgs(), std::move(balancer_addresses));
-    return result;
-  }
-
-  void SetNextResolutionAllBalancers(
-      const char* service_config_json = kDefaultServiceConfig) {
-    std::vector<AddressData> addresses;
-    for (size_t i = 0; i < balancers_.size(); ++i) {
-      addresses.emplace_back(AddressData{balancers_[i]->port_, ""});
-    }
-    SetNextResolution(addresses, {}, service_config_json);
+        grpc_core::ChannelArgs(), std::move(balancers));
+    response_generator_->SetResponseSynchronously(std::move(result));
   }
 
   void SetNextResolution(
-      const std::vector<AddressData>& balancer_address_data,
-      const std::vector<AddressData>& backend_address_data = {},
+      const absl::Span<const int> balancer_ports,
+      const absl::Span<const int> backend_ports = {},
       const char* service_config_json = kDefaultServiceConfig) {
-    grpc_core::ExecCtx exec_ctx;
-    grpc_core::Resolver::Result result = MakeResolverResult(
-        balancer_address_data, backend_address_data, service_config_json);
-    response_generator_->SetResponseSynchronously(std::move(result));
+    SetNextResolutionFromEndpoints(CreateAddressListFromPorts(balancer_ports),
+                                   CreateAddressListFromPorts(backend_ports),
+                                   service_config_json);
   }
 
-  void SetNextReresolutionResponse(
-      const std::vector<AddressData>& balancer_address_data,
-      const std::vector<AddressData>& backend_address_data = {},
+  void SetNextResolutionDefaultBalancer(
       const char* service_config_json = kDefaultServiceConfig) {
-    grpc_core::ExecCtx exec_ctx;
-    response_generator_->WaitForResolverSet();
-    grpc_core::Resolver::Result result = MakeResolverResult(
-        balancer_address_data, backend_address_data, service_config_json);
-    response_generator_->SetReresolutionResponseSynchronously(
-        std::move(result));
+    SetNextResolution({balancer_->port()}, {}, service_config_json);
   }
 
   std::vector<int> GetBackendPorts(size_t start_index = 0,
@@ -619,15 +754,13 @@ class GrpclbEnd2endTest : public ::testing::Test {
     if (stop_index == 0) stop_index = backends_.size();
     std::vector<int> backend_ports;
     for (size_t i = start_index; i < stop_index; ++i) {
-      backend_ports.push_back(backends_[i]->port_);
+      backend_ports.push_back(backends_[i]->port());
     }
     return backend_ports;
   }
 
-  void ScheduleResponseForBalancer(size_t i,
-                                   const LoadBalanceResponse& response,
-                                   int delay_ms) {
-    balancers_[i]->service_.add_response(response, delay_ms);
+  void SendBalancerResponse(LoadBalanceResponse response) {
+    balancer_->service().SendResponse(std::move(response));
   }
 
   LoadBalanceResponse BuildResponseForBackends(
@@ -660,7 +793,7 @@ class GrpclbEnd2endTest : public ::testing::Test {
     const bool local_response = (response == nullptr);
     if (local_response) response = new EchoResponse;
     EchoRequest request;
-    request.set_message(kRequestMessage_);
+    request.set_message(kRequestMessage);
     if (!expected_status.ok()) {
       auto* error = request.mutable_param()->mutable_expected_error();
       error->set_code(expected_status.error_code());
@@ -681,7 +814,7 @@ class GrpclbEnd2endTest : public ::testing::Test {
       const Status status = SendRpc(&response, timeout_ms, wait_for_ready);
       EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
                                << " message=" << status.error_message();
-      EXPECT_EQ(response.message(), kRequestMessage_);
+      EXPECT_EQ(response.message(), kRequestMessage);
     }
   }
 
@@ -690,159 +823,64 @@ class GrpclbEnd2endTest : public ::testing::Test {
     EXPECT_FALSE(status.ok());
   }
 
-  template <typename T>
-  struct ServerThread {
-    template <typename... Args>
-    explicit ServerThread(const std::string& type, Args&&... args)
-        : port_(grpc_pick_unused_port_or_die()),
-          type_(type),
-          service_(std::forward<Args>(args)...) {}
-
-    void Start(const std::string& server_host) {
-      gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_);
-      GPR_ASSERT(!running_);
-      running_ = true;
-      service_.Start();
-      grpc::internal::Mutex mu;
-      // We need to acquire the lock here in order to prevent the notify_one
-      // by ServerThread::Serve from firing before the wait below is hit.
-      grpc::internal::MutexLock lock(&mu);
-      grpc::internal::CondVar cond;
-      thread_ = std::make_unique<std::thread>(
-          std::bind(&ServerThread::Serve, this, server_host, &mu, &cond));
-      cond.Wait(&mu);
-      gpr_log(GPR_INFO, "%s server startup complete", type_.c_str());
-    }
-
-    void Serve(const std::string& server_host, grpc::internal::Mutex* mu,
-               grpc::internal::CondVar* cond) {
-      // We need to acquire the lock here in order to prevent the notify_one
-      // below from firing before its corresponding wait is executed.
-      grpc::internal::MutexLock lock(mu);
-      std::ostringstream server_address;
-      server_address << server_host << ":" << port_;
-      ServerBuilder builder;
-      std::shared_ptr<ServerCredentials> creds(new SecureServerCredentials(
-          grpc_fake_transport_security_server_credentials_create()));
-      builder.AddListeningPort(server_address.str(), creds);
-      builder.RegisterService(&service_);
-      server_ = builder.BuildAndStart();
-      cond->Signal();
-    }
-
-    void Shutdown() {
-      if (!running_) return;
-      gpr_log(GPR_INFO, "%s about to shutdown", type_.c_str());
-      service_.Shutdown();
-      server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0));
-      thread_->join();
-      gpr_log(GPR_INFO, "%s shutdown completed", type_.c_str());
-      running_ = false;
-    }
-
-    const int port_;
-    std::string type_;
-    T service_;
-    std::unique_ptr<Server> server_;
-    std::unique_ptr<std::thread> thread_;
-    bool running_ = false;
-  };
-
-  const std::string server_host_;
-  const size_t num_backends_;
-  const size_t num_balancers_;
-  const int client_load_reporting_interval_seconds_;
   std::shared_ptr<Channel> channel_;
   std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
   std::vector<std::unique_ptr<ServerThread<BackendServiceImpl>>> backends_;
-  std::vector<std::unique_ptr<ServerThread<BalancerServiceImpl>>> balancers_;
+  std::unique_ptr<ServerThread<BalancerServiceImpl>> balancer_;
   grpc_core::RefCountedPtr<grpc_core::FakeResolverResponseGenerator>
       response_generator_;
-  const std::string kRequestMessage_ = "Live long and prosper.";
-  const std::string kApplicationTargetName_ = "application_target_name";
 };
 
-class SingleBalancerTest : public GrpclbEnd2endTest {
- public:
-  SingleBalancerTest() : GrpclbEnd2endTest(4, 1, 0) {}
-};
-
-TEST_F(SingleBalancerTest, Vanilla) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, Vanilla) {
+  const size_t kNumBackends = 3;
   const size_t kNumRpcsPerAddress = 100;
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
+  CreateBackends(kNumBackends);
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
+  SetNextResolutionDefaultBalancer();
   // Make sure that trying to connect works without a call.
   channel_->GetState(true /* try_to_connect */);
   // We need to wait for all backends to come online.
   WaitForAllBackends();
   // Send kNumRpcsPerAddress RPCs per server.
-  CheckRpcSendOk(kNumRpcsPerAddress * num_backends_);
-
+  CheckRpcSendOk(kNumRpcsPerAddress * kNumBackends);
   // Each backend should have gotten 100 requests.
   for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service_.request_count());
+    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service().request_count());
   }
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-
+  EXPECT_EQ(1U, balancer_->service().response_count());
   // Check LB policy name for the channel.
   EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
 }
 
-TEST_F(SingleBalancerTest, SubchannelCaching) {
-  ResetStub(/*fallback_timeout=*/0, /*expected_targets=*/"",
+TEST_F(GrpclbEnd2endTest, SubchannelCaching) {
+  CreateBackends(3);
+  ResetStub(/*fallback_timeout_ms=*/0, /*expected_targets=*/"",
             /*subchannel_cache_delay_ms=*/1500);
-  SetNextResolutionAllBalancers();
-  // Initially send all backends.
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  // Then remove backends 0 and 1.
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(2), {}), 1000);
+  SetNextResolutionDefaultBalancer();
+  // Initially send backends 0 and 1.
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(0, 2), {}));
+  WaitForAllBackends(0, 2);
+  // Now remove backends 0 and 1 and add backend 2.
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(2), {}));
+  WaitForBackend(2);
   // Now re-add backend 1.
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(1), {}), 1000);
-  // Wait for all backends to come online.
-  WaitForAllBackends();
-  // Send RPCs for long enough to get all responses.
-  gpr_timespec deadline = grpc_timeout_milliseconds_to_deadline(3000);
-  do {
-    CheckRpcSendOk();
-  } while (gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), deadline) < 0);
-  // Backend 0 should have received less traffic than the others.
-  // Backend 1 would have received less traffic than 2 and 3.
-  gpr_log(GPR_INFO, "BACKEND 0: %" PRIuPTR " requests",
-          backends_[0]->service_.request_count());
-  EXPECT_GT(backends_[0]->service_.request_count(), 0);
-  for (size_t i = 1; i < backends_.size(); ++i) {
-    gpr_log(GPR_INFO, "BACKEND %" PRIuPTR ": %" PRIuPTR " requests", i,
-            backends_[i]->service_.request_count());
-    EXPECT_GT(backends_[i]->service_.request_count(),
-              backends_[0]->service_.request_count())
-        << "backend " << i;
-    if (i >= 2) {
-      EXPECT_GT(backends_[i]->service_.request_count(),
-                backends_[1]->service_.request_count())
-          << "backend " << i;
-    }
-  }
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(1), {}));
+  WaitForBackend(1);
   // Backend 1 should never have lost its connection from the client.
-  EXPECT_EQ(1UL, backends_[1]->service_.clients().size());
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  EXPECT_EQ(1UL, backends_[1]->service().clients().size());
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // And sent 3 responses.
-  EXPECT_EQ(3U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(3U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, ReturnServerStatus) {
-  SetNextResolutionAllBalancers();
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
+TEST_F(GrpclbEnd2endTest, ReturnServerStatus) {
+  CreateBackends(1);
+  SetNextResolutionDefaultBalancer();
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   // We need to wait for all backends to come online.
   WaitForAllBackends();
   // Send a request that the backend will fail, and make sure we get
@@ -854,29 +892,28 @@ TEST_F(SingleBalancerTest, ReturnServerStatus) {
   EXPECT_EQ(actual.error_message(), expected.error_message());
 }
 
-TEST_F(SingleBalancerTest, SelectGrpclbWithMigrationServiceConfig) {
-  SetNextResolutionAllBalancers(
+TEST_F(GrpclbEnd2endTest, SelectGrpclbWithMigrationServiceConfig) {
+  CreateBackends(1);
+  SetNextResolutionDefaultBalancer(
       "{\n"
       "  \"loadBalancingConfig\":[\n"
       "    { \"does_not_exist\":{} },\n"
       "    { \"grpclb\":{} }\n"
       "  ]\n"
       "}");
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   CheckRpcSendOk(1, 3000 /* timeout_ms */, true /* wait_for_ready */);
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
   // Check LB policy name for the channel.
   EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
 }
 
-TEST_F(SingleBalancerTest,
+TEST_F(GrpclbEnd2endTest,
        SelectGrpclbWithMigrationServiceConfigAndNoAddresses) {
-  const int kFallbackTimeoutMs = 200 * grpc_test_slowdown_factor();
+  const int kFallbackTimeoutMs = 200;
   ResetStub(kFallbackTimeoutMs);
   SetNextResolution({}, {},
                     "{\n"
@@ -898,8 +935,11 @@ TEST_F(SingleBalancerTest,
   EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
 }
 
-TEST_F(SingleBalancerTest, UsePickFirstChildPolicy) {
-  SetNextResolutionAllBalancers(
+TEST_F(GrpclbEnd2endTest, UsePickFirstChildPolicy) {
+  const size_t kNumBackends = 2;
+  const size_t kNumRpcs = kNumBackends * 2;
+  CreateBackends(kNumBackends);
+  SetNextResolutionDefaultBalancer(
       "{\n"
       "  \"loadBalancingConfig\":[\n"
       "    { \"grpclb\":{\n"
@@ -909,27 +949,27 @@ TEST_F(SingleBalancerTest, UsePickFirstChildPolicy) {
       "    } }\n"
       "  ]\n"
       "}");
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  const size_t kNumRpcs = num_backends_ * 2;
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // Check that all requests went to the first backend.  This verifies
   // that we used pick_first instead of round_robin as the child policy.
-  EXPECT_EQ(backends_[0]->service_.request_count(), kNumRpcs);
+  EXPECT_EQ(backends_[0]->service().request_count(), kNumRpcs);
   for (size_t i = 1; i < backends_.size(); ++i) {
-    EXPECT_EQ(backends_[i]->service_.request_count(), 0UL);
+    EXPECT_EQ(backends_[i]->service().request_count(), 0UL);
   }
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
   // Check LB policy name for the channel.
   EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
 }
 
-TEST_F(SingleBalancerTest, SwapChildPolicy) {
-  SetNextResolutionAllBalancers(
+TEST_F(GrpclbEnd2endTest, SwapChildPolicy) {
+  const size_t kNumBackends = 2;
+  const size_t kNumRpcs = kNumBackends * 2;
+  CreateBackends(kNumBackends);
+  SetNextResolutionDefaultBalancer(
       "{\n"
       "  \"loadBalancingConfig\":[\n"
       "    { \"grpclb\":{\n"
@@ -939,378 +979,192 @@ TEST_F(SingleBalancerTest, SwapChildPolicy) {
       "    } }\n"
       "  ]\n"
       "}");
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  const size_t kNumRpcs = num_backends_ * 2;
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
   // Check that all requests went to the first backend.  This verifies
   // that we used pick_first instead of round_robin as the child policy.
-  EXPECT_EQ(backends_[0]->service_.request_count(), kNumRpcs);
+  EXPECT_EQ(backends_[0]->service().request_count(), kNumRpcs);
   for (size_t i = 1; i < backends_.size(); ++i) {
-    EXPECT_EQ(backends_[i]->service_.request_count(), 0UL);
+    EXPECT_EQ(backends_[i]->service().request_count(), 0UL);
   }
   // Send new resolution that removes child policy from service config.
-  SetNextResolutionAllBalancers();
+  SetNextResolutionDefaultBalancer();
   WaitForAllBackends();
   CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
   // Check that every backend saw the same number of requests.  This verifies
   // that we used round_robin.
   for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(backends_[i]->service_.request_count(), 2UL);
+    EXPECT_EQ(backends_[i]->service().request_count(), 2UL);
   }
-  // Done.
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
   // Check LB policy name for the channel.
   EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
 }
 
-TEST_F(SingleBalancerTest, SameBackendListedMultipleTimes) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, SameBackendListedMultipleTimes) {
+  CreateBackends(1);
+  SetNextResolutionDefaultBalancer();
   // Same backend listed twice.
   std::vector<int> ports;
-  ports.push_back(backends_[0]->port_);
-  ports.push_back(backends_[0]->port_);
+  ports.push_back(backends_[0]->port());
+  ports.push_back(backends_[0]->port());
   const size_t kNumRpcsPerAddress = 10;
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(ports, {}), 0);
+  SendBalancerResponse(BuildResponseForBackends(ports, {}));
   // We need to wait for the backend to come online.
   WaitForBackend(0);
   // Send kNumRpcsPerAddress RPCs per server.
   CheckRpcSendOk(kNumRpcsPerAddress * ports.size());
   // Backend should have gotten 20 requests.
-  EXPECT_EQ(kNumRpcsPerAddress * 2, backends_[0]->service_.request_count());
+  EXPECT_EQ(kNumRpcsPerAddress * 2, backends_[0]->service().request_count());
   // And they should have come from a single client port, because of
   // subchannel sharing.
-  EXPECT_EQ(1UL, backends_[0]->service_.clients().size());
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  EXPECT_EQ(1UL, backends_[0]->service().clients().size());
 }
 
-TEST_F(SingleBalancerTest, SecureNaming) {
-  ResetStub(0, kApplicationTargetName_ + ";lb");
-  SetNextResolution({AddressData{balancers_[0]->port_, "lb"}});
-  const size_t kNumRpcsPerAddress = 100;
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  // Make sure that trying to connect works without a call.
-  channel_->GetState(true /* try_to_connect */);
-  // We need to wait for all backends to come online.
-  WaitForAllBackends();
-  // Send kNumRpcsPerAddress RPCs per server.
-  CheckRpcSendOk(kNumRpcsPerAddress * num_backends_);
-
-  // Each backend should have gotten 100 requests.
-  for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service_.request_count());
-  }
-  balancers_[0]->service_.NotifyDoneWithServerlists();
-  // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  // Check LB policy name for the channel.
-  EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
-}
-
-TEST_F(SingleBalancerTest, InitiallyEmptyServerlist) {
-  SetNextResolutionAllBalancers();
-  const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor();
-  const int kCallDeadlineMs = kServerlistDelayMs * 10;
-  // First response is an empty serverlist, sent right away.
-  ScheduleResponseForBalancer(0, LoadBalanceResponse(), 0);
-  // Send non-empty serverlist only after kServerlistDelayMs
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), kServerlistDelayMs);
-  const auto t0 = system_clock::now();
-  // Client will block: LB will initially send empty serverlist.
-  CheckRpcSendOk(1, kCallDeadlineMs, true /* wait_for_ready */);
-  const auto ellapsed_ms =
-      std::chrono::duration_cast<std::chrono::milliseconds>(
-          system_clock::now() - t0);
-  // but eventually, the LB sends a serverlist update that allows the call to
-  // proceed. The call delay must be larger than the delay in sending the
-  // populated serverlist but under the call's deadline (which is enforced by
-  // the call's deadline).
-  EXPECT_GT(ellapsed_ms.count(), kServerlistDelayMs);
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+TEST_F(GrpclbEnd2endTest, InitiallyEmptyServerlist) {
+  CreateBackends(1);
+  SetNextResolutionDefaultBalancer();
+  // First response is an empty serverlist.  RPCs should fail.
+  SendBalancerResponse(LoadBalanceResponse());
+  CheckRpcSendFailure();
+  // Now send a non-empty serverlist.
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
+  CheckRpcSendOk(1, /*timeout_ms=*/3000, /*wait_for_ready=*/true);
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent two responses.
-  EXPECT_EQ(2U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(2U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, AllServersUnreachableFailFast) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, AllServersUnreachableFailFast) {
+  SetNextResolutionDefaultBalancer();
   const size_t kNumUnreachableServers = 5;
   std::vector<int> ports;
   for (size_t i = 0; i < kNumUnreachableServers; ++i) {
     ports.push_back(grpc_pick_unused_port_or_die());
   }
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(ports, {}), 0);
+  SendBalancerResponse(BuildResponseForBackends(ports, {}));
   const Status status = SendRpc();
   // The error shouldn't be DEADLINE_EXCEEDED.
   EXPECT_EQ(StatusCode::UNAVAILABLE, status.error_code());
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, Fallback) {
-  SetNextResolutionAllBalancers();
-  const int kFallbackTimeoutMs = 200 * grpc_test_slowdown_factor();
-  const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor();
-  const size_t kNumBackendsInResolution = backends_.size() / 2;
-
-  ResetStub(kFallbackTimeoutMs);
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    backend_addresses.emplace_back(AddressData{backends_[i]->port_, ""});
-  }
-  SetNextResolution(balancer_addresses, backend_addresses);
-
-  // Send non-empty serverlist only after kServerlistDelayMs.
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          GetBackendPorts(kNumBackendsInResolution /* start_index */), {}),
-      kServerlistDelayMs);
-
+TEST_F(GrpclbEnd2endTest, Fallback) {
+  const size_t kNumBackends = 4;
+  const size_t kNumBackendsInResolution = kNumBackends / 2;
+  CreateBackends(kNumBackends);
+  // Inject resolver result that contains the fallback backends.
+  SetNextResolution({balancer_->port()},
+                    GetBackendPorts(0, kNumBackendsInResolution));
+  // Balancer has not sent a serverlist, so we should use fallback.
   // Wait until all the fallback backends are reachable.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    WaitForBackend(i);
-  }
-
-  // The first request.
-  gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
-  CheckRpcSendOk(kNumBackendsInResolution);
-  gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
-
-  // Fallback is used: each backend returned by the resolver should have
-  // gotten one request.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    EXPECT_EQ(1U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution; i < backends_.size(); ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-
-  // Wait until the serverlist reception has been processed and all backends
-  // in the serverlist are reachable.
-  for (size_t i = kNumBackendsInResolution; i < backends_.size(); ++i) {
-    WaitForBackend(i);
-  }
-
-  // Send out the second request.
-  gpr_log(GPR_INFO, "========= BEFORE SECOND BATCH ==========");
-  CheckRpcSendOk(backends_.size() - kNumBackendsInResolution);
-  gpr_log(GPR_INFO, "========= DONE WITH SECOND BATCH ==========");
-
-  // Serverlist is used: each backend returned by the balancer should
-  // have gotten one request.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution; i < backends_.size(); ++i) {
-    EXPECT_EQ(1U, backends_[i]->service_.request_count());
-  }
-
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  WaitForAllBackends(0, kNumBackendsInResolution,
+                     WaitForBackendOptions().SetTimeoutSeconds(20));
+  // Send serverlist.
+  SendBalancerResponse(BuildResponseForBackends(
+      GetBackendPorts(/*start_index=*/kNumBackendsInResolution), {}));
+  // Now we should be using the backends from the balancer.
+  WaitForAllBackends(kNumBackendsInResolution);
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, FallbackUpdate) {
-  SetNextResolutionAllBalancers();
-  const int kFallbackTimeoutMs = 200 * grpc_test_slowdown_factor();
-  const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor();
-  const size_t kNumBackendsInResolution = backends_.size() / 3;
-  const size_t kNumBackendsInResolutionUpdate = backends_.size() / 3;
-
-  ResetStub(kFallbackTimeoutMs);
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    backend_addresses.emplace_back(AddressData{backends_[i]->port_, ""});
-  }
-  SetNextResolution(balancer_addresses, backend_addresses);
-
-  // Send non-empty serverlist only after kServerlistDelayMs.
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          GetBackendPorts(kNumBackendsInResolution +
-                          kNumBackendsInResolutionUpdate /* start_index */),
-          {}),
-      kServerlistDelayMs);
-
+TEST_F(GrpclbEnd2endTest, FallbackUpdate) {
+  const size_t kNumBackends = 6;
+  const size_t kNumBackendsInResolution = kNumBackends / 3;
+  const size_t kNumBackendsInResolutionUpdate = kNumBackends / 3;
+  ResetStub(/*fallback_timeout_ms=*/500);
+  CreateBackends(kNumBackends);
+  // Inject resolver result with fallback addresses.
+  SetNextResolution({balancer_->port()},
+                    GetBackendPorts(0, kNumBackendsInResolution));
+  // Balancer has not sent a serverlist, so we should use fallback.
   // Wait until all the fallback backends are reachable.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    WaitForBackend(i);
-  }
-
-  // The first request.
-  gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
-  CheckRpcSendOk(kNumBackendsInResolution);
-  gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
-
-  // Fallback is used: each backend returned by the resolver should have
-  // gotten one request.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    EXPECT_EQ(1U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution; i < backends_.size(); ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-
-  balancer_addresses.clear();
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  backend_addresses.clear();
-  for (size_t i = kNumBackendsInResolution;
-       i < kNumBackendsInResolution + kNumBackendsInResolutionUpdate; ++i) {
-    backend_addresses.emplace_back(AddressData{backends_[i]->port_, ""});
-  }
-  SetNextResolution(balancer_addresses, backend_addresses);
-
-  // Wait until the resolution update has been processed and all the new
-  // fallback backends are reachable.
-  for (size_t i = kNumBackendsInResolution;
-       i < kNumBackendsInResolution + kNumBackendsInResolutionUpdate; ++i) {
-    WaitForBackend(i);
-  }
-
-  // Send out the second request.
-  gpr_log(GPR_INFO, "========= BEFORE SECOND BATCH ==========");
-  CheckRpcSendOk(kNumBackendsInResolutionUpdate);
-  gpr_log(GPR_INFO, "========= DONE WITH SECOND BATCH ==========");
-
-  // The resolution update is used: each backend in the resolution update should
-  // have gotten one request.
-  for (size_t i = 0; i < kNumBackendsInResolution; ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution;
-       i < kNumBackendsInResolution + kNumBackendsInResolutionUpdate; ++i) {
-    EXPECT_EQ(1U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution + kNumBackendsInResolutionUpdate;
-       i < backends_.size(); ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-
-  // Wait until the serverlist reception has been processed and all backends
-  // in the serverlist are reachable.
-  for (size_t i = kNumBackendsInResolution + kNumBackendsInResolutionUpdate;
-       i < backends_.size(); ++i) {
-    WaitForBackend(i);
-  }
-
-  // Send out the third request.
-  gpr_log(GPR_INFO, "========= BEFORE THIRD BATCH ==========");
-  CheckRpcSendOk(backends_.size() - kNumBackendsInResolution -
-                 kNumBackendsInResolutionUpdate);
-  gpr_log(GPR_INFO, "========= DONE WITH THIRD BATCH ==========");
-
-  // Serverlist is used: each backend returned by the balancer should
-  // have gotten one request.
-  for (size_t i = 0;
-       i < kNumBackendsInResolution + kNumBackendsInResolutionUpdate; ++i) {
-    EXPECT_EQ(0U, backends_[i]->service_.request_count());
-  }
-  for (size_t i = kNumBackendsInResolution + kNumBackendsInResolutionUpdate;
-       i < backends_.size(); ++i) {
-    EXPECT_EQ(1U, backends_[i]->service_.request_count());
-  }
-
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  WaitForAllBackends(0, kNumBackendsInResolution);
+  // Now send a resolver result with a different set of backend addresses.
+  SetNextResolution({balancer_->port()},
+                    GetBackendPorts(kNumBackendsInResolution,
+                                    kNumBackendsInResolution +
+                                        kNumBackendsInResolutionUpdate));
+  // Wait until the new fallback backends are reachable.
+  WaitForAllBackends(kNumBackendsInResolution,
+                     kNumBackendsInResolution + kNumBackendsInResolutionUpdate);
+  // Send non-empty serverlist.
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumBackendsInResolution +
+                                               kNumBackendsInResolutionUpdate),
+                               {}));
+  // Wait for backends from balancer to be seen.
+  WaitForAllBackends(kNumBackendsInResolution + kNumBackendsInResolutionUpdate);
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest,
+TEST_F(GrpclbEnd2endTest,
        FallbackAfterStartupLoseContactWithBalancerThenBackends) {
   // First two backends are fallback, last two are pointed to by balancer.
+  const size_t kNumBackends = 4;
   const size_t kNumFallbackBackends = 2;
-  const size_t kNumBalancerBackends = backends_.size() - kNumFallbackBackends;
-  std::vector<AddressData> backend_addresses;
-  for (size_t i = 0; i < kNumFallbackBackends; ++i) {
-    backend_addresses.emplace_back(AddressData{backends_[i]->port_, ""});
-  }
-  std::vector<AddressData> balancer_addresses;
-  for (size_t i = 0; i < balancers_.size(); ++i) {
-    balancer_addresses.emplace_back(AddressData{balancers_[i]->port_, ""});
-  }
-  SetNextResolution(balancer_addresses, backend_addresses);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}),
-      0);
+  const size_t kNumBalancerBackends = kNumBackends - kNumFallbackBackends;
+  CreateBackends(kNumBackends);
+  SetNextResolution({balancer_->port()},
+                    GetBackendPorts(0, kNumFallbackBackends));
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}));
   // Try to connect.
-  channel_->GetState(true /* try_to_connect */);
-  WaitForAllBackends(1 /* num_requests_multiple_of */,
-                     kNumFallbackBackends /* start_index */);
+  WaitForAllBackends(kNumFallbackBackends /* start_index */);
   // Stop balancer.  RPCs should continue going to backends from balancer.
-  balancers_[0]->Shutdown();
+  balancer_->Shutdown();
   CheckRpcSendOk(100 * kNumBalancerBackends);
   for (size_t i = kNumFallbackBackends; i < backends_.size(); ++i) {
-    EXPECT_EQ(100UL, backends_[i]->service_.request_count());
+    EXPECT_EQ(100UL, backends_[i]->service().request_count());
   }
   // Stop backends from balancer.  This should put us in fallback mode.
   for (size_t i = kNumFallbackBackends; i < backends_.size(); ++i) {
     ShutdownBackend(i);
   }
-  WaitForAllBackends(1 /* num_requests_multiple_of */, 0 /* start_index */,
-                     kNumFallbackBackends /* stop_index */);
+  WaitForAllBackends(0, kNumFallbackBackends);
   // Restart the backends from the balancer.  We should *not* start
-  // sending traffic back to them at this point (although the behavior
-  // in xds may be different).
+  // sending traffic back to them at this point.
   for (size_t i = kNumFallbackBackends; i < backends_.size(); ++i) {
     StartBackend(i);
   }
   CheckRpcSendOk(100 * kNumBalancerBackends);
   for (size_t i = 0; i < kNumFallbackBackends; ++i) {
-    EXPECT_EQ(100UL, backends_[i]->service_.request_count());
+    EXPECT_EQ(100UL, backends_[i]->service().request_count());
   }
   // Now start the balancer again.  This should cause us to exit
   // fallback mode.
-  balancers_[0]->Start(server_host_);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}),
-      0);
-  WaitForAllBackends(1 /* num_requests_multiple_of */,
-                     kNumFallbackBackends /* start_index */);
+  balancer_->Start();
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}));
+  WaitForAllBackends(kNumFallbackBackends);
 }
 
-TEST_F(SingleBalancerTest,
+TEST_F(GrpclbEnd2endTest,
        FallbackAfterStartupLoseContactWithBackendsThenBalancer) {
   // First two backends are fallback, last two are pointed to by balancer.
+  const size_t kNumBackends = 4;
   const size_t kNumFallbackBackends = 2;
-  const size_t kNumBalancerBackends = backends_.size() - kNumFallbackBackends;
-  std::vector<AddressData> backend_addresses;
-  for (size_t i = 0; i < kNumFallbackBackends; ++i) {
-    backend_addresses.emplace_back(AddressData{backends_[i]->port_, ""});
-  }
-  std::vector<AddressData> balancer_addresses;
-  for (size_t i = 0; i < balancers_.size(); ++i) {
-    balancer_addresses.emplace_back(AddressData{balancers_[i]->port_, ""});
-  }
-  SetNextResolution(balancer_addresses, backend_addresses);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}),
-      0);
+  const size_t kNumBalancerBackends = kNumBackends - kNumFallbackBackends;
+  CreateBackends(kNumBackends);
+  SetNextResolution({balancer_->port()},
+                    GetBackendPorts(0, kNumFallbackBackends));
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}));
   // Try to connect.
-  channel_->GetState(true /* try_to_connect */);
-  WaitForAllBackends(1 /* num_requests_multiple_of */,
-                     kNumFallbackBackends /* start_index */);
+  WaitForAllBackends(kNumFallbackBackends);
   // Stop backends from balancer.  Since we are still in contact with
   // the balancer at this point, RPCs should be failing.
   for (size_t i = kNumFallbackBackends; i < backends_.size(); ++i) {
@@ -1318,9 +1172,8 @@ TEST_F(SingleBalancerTest,
   }
   CheckRpcSendFailure();
   // Stop balancer.  This should put us in fallback mode.
-  balancers_[0]->Shutdown();
-  WaitForAllBackends(1 /* num_requests_multiple_of */, 0 /* start_index */,
-                     kNumFallbackBackends /* stop_index */);
+  balancer_->Shutdown();
+  WaitForAllBackends(0, kNumFallbackBackends);
   // Restart the backends from the balancer.  We should *not* start
   // sending traffic back to them at this point (although the behavior
   // in xds may be different).
@@ -1329,103 +1182,80 @@ TEST_F(SingleBalancerTest,
   }
   CheckRpcSendOk(100 * kNumBalancerBackends);
   for (size_t i = 0; i < kNumFallbackBackends; ++i) {
-    EXPECT_EQ(100UL, backends_[i]->service_.request_count());
+    EXPECT_EQ(100UL, backends_[i]->service().request_count());
   }
   // Now start the balancer again.  This should cause us to exit
   // fallback mode.
-  balancers_[0]->Start(server_host_);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}),
-      0);
-  WaitForAllBackends(1 /* num_requests_multiple_of */,
-                     kNumFallbackBackends /* start_index */);
+  balancer_->Start();
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumFallbackBackends), {}));
+  WaitForAllBackends(kNumFallbackBackends);
 }
 
-TEST_F(SingleBalancerTest, FallbackEarlyWhenBalancerChannelFails) {
-  const int kFallbackTimeoutMs = 10000 * grpc_test_slowdown_factor();
+TEST_F(GrpclbEnd2endTest, FallbackEarlyWhenBalancerChannelFails) {
+  const int kFallbackTimeoutMs = 10000;
   ResetStub(kFallbackTimeoutMs);
+  CreateBackends(1);
   // Return an unreachable balancer and one fallback backend.
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(
-      AddressData{grpc_pick_unused_port_or_die(), ""});
-  std::vector<AddressData> backend_addresses;
-  backend_addresses.emplace_back(AddressData{backends_[0]->port_, ""});
-  SetNextResolution(balancer_addresses, backend_addresses);
+  SetNextResolution({grpc_pick_unused_port_or_die()}, GetBackendPorts());
   // Send RPC with deadline less than the fallback timeout and make sure it
   // succeeds.
   CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
                  /* wait_for_ready */ false);
 }
 
-TEST_F(SingleBalancerTest, FallbackEarlyWhenBalancerCallFails) {
-  const int kFallbackTimeoutMs = 10000 * grpc_test_slowdown_factor();
+TEST_F(GrpclbEnd2endTest, FallbackEarlyWhenBalancerCallFails) {
+  const int kFallbackTimeoutMs = 10000;
   ResetStub(kFallbackTimeoutMs);
+  CreateBackends(1);
   // Return one balancer and one fallback backend.
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  backend_addresses.emplace_back(AddressData{backends_[0]->port_, ""});
-  SetNextResolution(balancer_addresses, backend_addresses);
+  SetNextResolution({balancer_->port()}, GetBackendPorts());
   // Balancer drops call without sending a serverlist.
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  balancer_->service().ShutdownStream();
   // Send RPC with deadline less than the fallback timeout and make sure it
   // succeeds.
   CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
                  /* wait_for_ready */ false);
 }
 
-TEST_F(SingleBalancerTest, FallbackControlledByBalancerBeforeFirstServerlist) {
-  const int kFallbackTimeoutMs = 10000 * grpc_test_slowdown_factor();
+TEST_F(GrpclbEnd2endTest, FallbackControlledByBalancerBeforeFirstServerlist) {
+  const int kFallbackTimeoutMs = 10000;
   ResetStub(kFallbackTimeoutMs);
+  CreateBackends(1);
   // Return one balancer and one fallback backend.
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  backend_addresses.emplace_back(AddressData{backends_[0]->port_, ""});
-  SetNextResolution(balancer_addresses, backend_addresses);
+  SetNextResolution({balancer_->port()}, GetBackendPorts());
   // Balancer explicitly tells client to fallback.
-  LoadBalanceResponse resp;
-  resp.mutable_fallback_response();
-  ScheduleResponseForBalancer(0, resp, 0);
+  LoadBalanceResponse response;
+  response.mutable_fallback_response();
+  SendBalancerResponse(std::move(response));
   // Send RPC with deadline less than the fallback timeout and make sure it
   // succeeds.
   CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
                  /* wait_for_ready */ false);
 }
 
-TEST_F(SingleBalancerTest, FallbackControlledByBalancerAfterFirstServerlist) {
+TEST_F(GrpclbEnd2endTest, FallbackControlledByBalancerAfterFirstServerlist) {
+  CreateBackends(2);
   // Return one balancer and one fallback backend (backend 0).
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  backend_addresses.emplace_back(AddressData{backends_[0]->port_, ""});
-  SetNextResolution(balancer_addresses, backend_addresses);
-  // Balancer initially sends serverlist, then tells client to fall back,
-  // then sends the serverlist again.
-  // The serverlist points to backend 1.
-  LoadBalanceResponse serverlist_resp =
-      BuildResponseForBackends({backends_[1]->port_}, {});
-  LoadBalanceResponse fallback_resp;
-  fallback_resp.mutable_fallback_response();
-  ScheduleResponseForBalancer(0, serverlist_resp, 0);
-  ScheduleResponseForBalancer(0, fallback_resp, 100);
-  ScheduleResponseForBalancer(0, serverlist_resp, 100);
-  // Requests initially go to backend 1, then go to backend 0 in
-  // fallback mode, then go back to backend 1 when we exit fallback.
+  SetNextResolution({balancer_->port()}, {backends_[0]->port()});
+  // Balancer sends a serverlist pointing to backend 1.
+  SendBalancerResponse(BuildResponseForBackends({backends_[1]->port()}, {}));
   WaitForBackend(1);
+  // Balancer tells client to fall back.
+  LoadBalanceResponse fallback_response;
+  fallback_response.mutable_fallback_response();
+  SendBalancerResponse(std::move(fallback_response));
   WaitForBackend(0);
+  // Balancer sends a new serverlist, so client exits fallback.
+  SendBalancerResponse(BuildResponseForBackends({backends_[1]->port()}, {}));
   WaitForBackend(1);
 }
 
-TEST_F(SingleBalancerTest, BackendsRestart) {
-  SetNextResolutionAllBalancers();
-  const size_t kNumRpcsPerAddress = 100;
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  // Make sure that trying to connect works without a call.
-  channel_->GetState(true /* try_to_connect */);
-  // Send kNumRpcsPerAddress RPCs per server.
-  CheckRpcSendOk(kNumRpcsPerAddress * num_backends_);
+TEST_F(GrpclbEnd2endTest, BackendsRestart) {
+  CreateBackends(2);
+  SetNextResolutionDefaultBalancer();
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
+  WaitForAllBackends();
   // Stop backends.  RPCs should fail.
   ShutdownAllBackends();
   CheckRpcSendFailure();
@@ -1434,12 +1264,12 @@ TEST_F(SingleBalancerTest, BackendsRestart) {
   CheckRpcSendOk(1 /* times */, 3000 /* timeout_ms */,
                  true /* wait_for_ready */);
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, ServiceNameFromLbPolicyConfig) {
+TEST_F(GrpclbEnd2endTest, ServiceNameFromLbPolicyConfig) {
   constexpr char kServiceConfigWithTarget[] =
       "{\n"
       "  \"loadBalancingConfig\":[\n"
@@ -1448,396 +1278,240 @@ TEST_F(SingleBalancerTest, ServiceNameFromLbPolicyConfig) {
       "    }}\n"
       "  ]\n"
       "}";
-
-  SetNextResolutionAllBalancers(kServiceConfigWithTarget);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  // Make sure that trying to connect works without a call.
-  channel_->GetState(true /* try_to_connect */);
-  // We need to wait for all backends to come online.
+  SetNextResolutionDefaultBalancer(kServiceConfigWithTarget);
+  CreateBackends(1);
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   WaitForAllBackends();
-  EXPECT_EQ(balancers_[0]->service_.service_names().back(), "test_service");
+  EXPECT_EQ(balancer_->service().service_names().back(), "test_service");
 }
 
-// This death test is kept separate from the rest to ensure that it's run before
-// any others. See https://github.com/grpc/grpc/pull/32269 for details.
-using SingleBalancerDeathTest = SingleBalancerTest;
-
-TEST_F(SingleBalancerDeathTest, SecureNaming) {
-  GTEST_FLAG_SET(death_test_style, "threadsafe");
-  // Make sure that we blow up (via abort() from the security connector) when
-  // the name from the balancer doesn't match expectations.
-  ASSERT_DEATH_IF_SUPPORTED(
-      {
-        ResetStub(0, kApplicationTargetName_ + ";lb");
-        SetNextResolution({AddressData{balancers_[0]->port_, "woops"}});
-        channel_->WaitForConnected(grpc_timeout_seconds_to_deadline(1));
-      },
-      "");
-}
-
-class UpdatesTest : public GrpclbEnd2endTest {
- public:
-  UpdatesTest() : GrpclbEnd2endTest(4, 3, 0) {}
-};
-
-TEST_F(UpdatesTest, UpdateBalancersButKeepUsingOriginalBalancer) {
-  SetNextResolutionAllBalancers();
-  const std::vector<int> first_backend{GetBackendPorts()[0]};
-  const std::vector<int> second_backend{GetBackendPorts()[1]};
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(first_backend, {}),
-                              0);
-  ScheduleResponseForBalancer(1, BuildResponseForBackends(second_backend, {}),
-                              0);
-
-  // Wait until the first backend is ready.
+TEST_F(GrpclbEnd2endTest,
+       NewBalancerAddressNotUsedIfOriginalStreamDoesNotFail) {
+  CreateBackends(3);
+  // Default balancer sends backend 0.
+  SendBalancerResponse(BuildResponseForBackends({backends_[0]->port()}, {}));
+  // Second balancer sends backend 1.
+  auto balancer2 = CreateAndStartBalancer();
+  balancer2->service().SendResponse(
+      BuildResponseForBackends({backends_[1]->port()}, {}));
+  // Initially, the channel uses the default balancer.
+  SetNextResolutionDefaultBalancer();
   WaitForBackend(0);
-
   // Send 10 requests.
   gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
-
   // All 10 requests should have gone to the first backend.
-  EXPECT_EQ(10U, backends_[0]->service_.request_count());
-
-  // Balancer 0 got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
-
-  std::vector<AddressData> addresses;
-  addresses.emplace_back(AddressData{balancers_[1]->port_, ""});
+  EXPECT_EQ(10U, backends_[0]->service().request_count());
+  EXPECT_EQ(0U, backends_[1]->service().request_count());
+  EXPECT_EQ(0U, backends_[2]->service().request_count());
+  // Balancer 0 got a single request and sent a single response.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(0U, balancer2->service().request_count());
+  EXPECT_EQ(0U, balancer2->service().response_count());
+  // Now tell the channel to use balancer 2.  However, the stream to the
+  // default balancer is not terminated, so the client will continue to
+  // use it.
   gpr_log(GPR_INFO, "========= ABOUT TO UPDATE 1 ==========");
-  SetNextResolution(addresses);
+  SetNextResolution({balancer2->port()});
   gpr_log(GPR_INFO, "========= UPDATE 1 DONE ==========");
-
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-  gpr_timespec deadline = gpr_time_add(
-      gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(10000, GPR_TIMESPAN));
-  // Send 10 seconds worth of RPCs
-  do {
-    CheckRpcSendOk();
-  } while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), deadline) < 0);
-  // The current LB call is still working, so grpclb continued using it to the
-  // first balancer, which doesn't assign the second backend.
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
+  // Now the default balancer sends backend 2.
+  SendBalancerResponse(BuildResponseForBackends({backends_[2]->port()}, {}));
+  WaitForBackend(2);
 }
 
-// Send an update with the same set of LBs as the one in SetUp() in order to
+// Send an update with the same set of LBs as the previous one in order to
 // verify that the LB channel inside grpclb keeps the initial connection (which
 // by definition is also present in the update).
-TEST_F(UpdatesTest, UpdateBalancersRepeated) {
-  SetNextResolutionAllBalancers();
-  const std::vector<int> first_backend{GetBackendPorts()[0]};
-  const std::vector<int> second_backend{GetBackendPorts()[0]};
-
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(first_backend, {}),
-                              0);
-  ScheduleResponseForBalancer(1, BuildResponseForBackends(second_backend, {}),
-                              0);
-
+TEST_F(GrpclbEnd2endTest,
+       UpdatedBalancerAddressesWithSameAddressDoesNotBreakConnection) {
+  CreateBackends(2);
+  // Default balancer points to backend 0.
+  SendBalancerResponse(BuildResponseForBackends({backends_[0]->port()}, {}));
+  // Second balancer points to backend 1.
+  auto balancer2 = CreateAndStartBalancer();
+  balancer2->service().SendResponse(
+      BuildResponseForBackends({backends_[1]->port()}, {}));
+  // Send both balancer addresses.
+  SetNextResolution({balancer_->port(), balancer2->port()});
   // Wait until the first backend is ready.
   WaitForBackend(0);
-
   // Send 10 requests.
   gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
-
   // All 10 requests should have gone to the first backend.
-  EXPECT_EQ(10U, backends_[0]->service_.request_count());
-
-  balancers_[0]->service_.NotifyDoneWithServerlists();
-  // Balancer 0 got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
-
-  std::vector<AddressData> addresses;
-  addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  addresses.emplace_back(AddressData{balancers_[1]->port_, ""});
-  addresses.emplace_back(AddressData{balancers_[2]->port_, ""});
+  EXPECT_EQ(10U, backends_[0]->service().request_count());
+  EXPECT_EQ(0U, backends_[1]->service().request_count());
+  // Balancer 0 got a single request and sent a single response.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(0U, balancer2->service().request_count());
+  EXPECT_EQ(0U, balancer2->service().response_count());
+  // Send another address list with the same list of balancers.
   gpr_log(GPR_INFO, "========= ABOUT TO UPDATE 1 ==========");
-  SetNextResolution(addresses);
+  SetNextResolution({balancer_->port(), balancer2->port()});
   gpr_log(GPR_INFO, "========= UPDATE 1 DONE ==========");
-
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-  gpr_timespec deadline = gpr_time_add(
-      gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(10000, GPR_TIMESPAN));
-  // Send 10 seconds worth of RPCs
-  do {
-    CheckRpcSendOk();
-  } while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), deadline) < 0);
-  // grpclb continued using the original LB call to the first balancer, which
-  // doesn't assign the second backend.
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-  balancers_[0]->service_.NotifyDoneWithServerlists();
-
-  addresses.clear();
-  addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  addresses.emplace_back(AddressData{balancers_[1]->port_, ""});
-  gpr_log(GPR_INFO, "========= ABOUT TO UPDATE 2 ==========");
-  SetNextResolution(addresses);
-  gpr_log(GPR_INFO, "========= UPDATE 2 DONE ==========");
-
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-  deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
-                          gpr_time_from_millis(10000, GPR_TIMESPAN));
-  // Send 10 seconds worth of RPCs
-  do {
-    CheckRpcSendOk();
-  } while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), deadline) < 0);
-  // grpclb continued using the original LB call to the first balancer, which
-  // doesn't assign the second backend.
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-  balancers_[0]->service_.NotifyDoneWithServerlists();
+  // Shut down the balancer stream to force the client to create a new one.
+  // The new stream should go to the default balancer, since the
+  // underlying connection should not have been broken.
+  gpr_log(GPR_INFO, "========= SHUTTING DOWN BALANCER CALL ==========");
+  balancer_->service().ShutdownStream();
+  gpr_log(GPR_INFO, "========= DONE SHUTTING DOWN BALANCER CALL ==========");
+  // Wait until client has created a new balancer stream.
+  EXPECT_TRUE(balancer_->service().WaitForNewStream(1));
+  // Make sure there was only one client connection seen by the balancer.
+  EXPECT_EQ(1UL, balancer_->service().clients().size());
 }
 
-TEST_F(UpdatesTest, UpdateBalancersDeadUpdate) {
-  std::vector<AddressData> addresses;
-  addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  SetNextResolution(addresses);
-  const std::vector<int> first_backend{GetBackendPorts()[0]};
-  const std::vector<int> second_backend{GetBackendPorts()[1]};
-
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(first_backend, {}),
-                              0);
-  ScheduleResponseForBalancer(1, BuildResponseForBackends(second_backend, {}),
-                              0);
-
-  // Start servers and send 10 RPCs per server.
+TEST_F(GrpclbEnd2endTest, BalancerDiesThenSwitchToNewBalancer) {
+  CreateBackends(2);
+  // Default balancer sends backend 0.
+  SendBalancerResponse(BuildResponseForBackends({backends_[0]->port()}, {}));
+  // Balancer 2 sends backend 1.
+  auto balancer2 = CreateAndStartBalancer();
+  balancer2->service().SendResponse(
+      BuildResponseForBackends({backends_[1]->port()}, {}));
+  // Channel initially uses default balancer and therefore backend 0.
+  SetNextResolutionDefaultBalancer();
+  WaitForBackend(0);
+  // Default balancer got a single request.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(0U, balancer2->service().request_count());
+  EXPECT_EQ(0U, balancer2->service().response_count());
+  // Send 10 RPCs.
   gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
   // All 10 requests should have gone to the first backend.
-  EXPECT_EQ(10U, backends_[0]->service_.request_count());
-
-  // Kill balancer 0
-  gpr_log(GPR_INFO, "********** ABOUT TO KILL BALANCER 0 *************");
-  balancers_[0]->Shutdown();
-  gpr_log(GPR_INFO, "********** KILLED BALANCER 0 *************");
-
-  // This is serviced by the existing RR policy
+  EXPECT_EQ(10U, backends_[0]->service().request_count());
+  EXPECT_EQ(0U, backends_[1]->service().request_count());
+  // Kill default balancer.
+  gpr_log(GPR_INFO, "********** ABOUT TO KILL BALANCER *************");
+  balancer_->Shutdown();
+  gpr_log(GPR_INFO, "********** KILLED BALANCER *************");
+  // Channel should continue using the last backend it saw from the
+  // balancer before the balancer died.
   gpr_log(GPR_INFO, "========= BEFORE SECOND BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH SECOND BATCH ==========");
   // All 10 requests should again have gone to the first backend.
-  EXPECT_EQ(20U, backends_[0]->service_.request_count());
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
-
-  // Balancer 0 got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
-
-  addresses.clear();
-  addresses.emplace_back(AddressData{balancers_[1]->port_, ""});
+  EXPECT_EQ(20U, backends_[0]->service().request_count());
+  EXPECT_EQ(0U, backends_[1]->service().request_count());
+  // Tell channel to start using balancer 2.
   gpr_log(GPR_INFO, "========= ABOUT TO UPDATE 1 ==========");
-  SetNextResolution(addresses);
+  SetNextResolution({balancer2->port()});
   gpr_log(GPR_INFO, "========= UPDATE 1 DONE ==========");
-
-  // Wait until update has been processed, as signaled by the second backend
-  // receiving a request. In the meantime, the client continues to be serviced
-  // (by the first backend) without interruption.
-  EXPECT_EQ(0U, backends_[1]->service_.request_count());
+  // Channel should start using backend 1.
   WaitForBackend(1);
-
   // This is serviced by the updated RR policy
-  backends_[1]->service_.ResetCounters();
   gpr_log(GPR_INFO, "========= BEFORE THIRD BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH THIRD BATCH ==========");
   // All 10 requests should have gone to the second backend.
-  EXPECT_EQ(10U, backends_[1]->service_.request_count());
-
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  // The second balancer, published as part of the first update, may end up
-  // getting two requests (that is, 1 <= #req <= 2) if the LB call retry timer
-  // firing races with the arrival of the update containing the second
-  // balancer.
-  EXPECT_GE(balancers_[1]->service_.request_count(), 1U);
-  EXPECT_GE(balancers_[1]->service_.response_count(), 1U);
-  EXPECT_LE(balancers_[1]->service_.request_count(), 2U);
-  EXPECT_LE(balancers_[1]->service_.response_count(), 2U);
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
+  EXPECT_EQ(0U, backends_[0]->service().request_count());
+  EXPECT_EQ(10U, backends_[1]->service().request_count());
+  // Both balancers should have gotten one request and sent one response.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(1U, balancer2->service().request_count());
+  EXPECT_EQ(1U, balancer2->service().response_count());
 }
 
-TEST_F(UpdatesTest, ReresolveDeadBackend) {
-  ResetStub(500);
+TEST_F(GrpclbEnd2endTest, ReresolveDeadBackendWhileInFallback) {
+  ResetStub(/*fallback_timeout_ms=*/500);
+  CreateBackends(2);
   // The first resolution contains the addresses of a balancer that never
   // responds, and a fallback backend.
-  std::vector<AddressData> balancer_addresses;
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  std::vector<AddressData> backend_addresses;
-  backend_addresses.emplace_back(AddressData{backends_[0]->port_, ""});
-  SetNextResolution(balancer_addresses, backend_addresses);
-  // Ask channel to connect to trigger resolver creation.
-  channel_->GetState(true);
-  // The re-resolution result will contain the addresses of the same balancer
-  // and a new fallback backend.
-  balancer_addresses.clear();
-  balancer_addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  backend_addresses.clear();
-  backend_addresses.emplace_back(AddressData{backends_[1]->port_, ""});
-  SetNextReresolutionResponse(balancer_addresses, backend_addresses);
-
+  SetNextResolution({balancer_->port()}, {backends_[0]->port()});
   // Start servers and send 10 RPCs per server.
   gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
   // All 10 requests should have gone to the fallback backend.
-  EXPECT_EQ(10U, backends_[0]->service_.request_count());
-
+  EXPECT_EQ(10U, backends_[0]->service().request_count());
   // Kill backend 0.
   gpr_log(GPR_INFO, "********** ABOUT TO KILL BACKEND 0 *************");
   backends_[0]->Shutdown();
   gpr_log(GPR_INFO, "********** KILLED BACKEND 0 *************");
-
-  // Wait until re-resolution has finished, as signaled by the second backend
+  // This should trigger re-resolution.
+  EXPECT_TRUE(response_generator_->WaitForReresolutionRequest(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+  // The re-resolution result will contain the addresses of the same balancer
+  // and a new fallback backend.
+  SetNextResolution({balancer_->port()}, {backends_[1]->port()});
+  // Wait until re-resolution has been seen, as signaled by the second backend
   // receiving a request.
   WaitForBackend(1);
-
   gpr_log(GPR_INFO, "========= BEFORE SECOND BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH SECOND BATCH ==========");
   // All 10 requests should have gone to the second backend.
-  EXPECT_EQ(10U, backends_[1]->service_.request_count());
-
-  balancers_[0]->service_.NotifyDoneWithServerlists();
-  balancers_[1]->service_.NotifyDoneWithServerlists();
-  balancers_[2]->service_.NotifyDoneWithServerlists();
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
+  EXPECT_EQ(10U, backends_[1]->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(0U, balancer_->service().response_count());
 }
 
-// TODO(juanlishen): Should be removed when the first response is always the
-// initial response. Currently, if client load reporting is not enabled, the
-// balancer doesn't send initial response. When the backend shuts down, an
-// unexpected re-resolution will happen. This test configuration is a workaround
-// for test ReresolveDeadBalancer.
-class UpdatesWithClientLoadReportingTest : public GrpclbEnd2endTest {
- public:
-  UpdatesWithClientLoadReportingTest() : GrpclbEnd2endTest(4, 3, 2) {}
-};
-
-TEST_F(UpdatesWithClientLoadReportingTest, ReresolveDeadBalancer) {
-  const std::vector<int> first_backend{GetBackendPorts()[0]};
-  const std::vector<int> second_backend{GetBackendPorts()[1]};
-  ScheduleResponseForBalancer(0, BuildResponseForBackends(first_backend, {}),
-                              0);
-  ScheduleResponseForBalancer(1, BuildResponseForBackends(second_backend, {}),
-                              0);
-
-  // Ask channel to connect to trigger resolver creation.
-  channel_->GetState(true);
-  std::vector<AddressData> addresses;
-  addresses.emplace_back(AddressData{balancers_[0]->port_, ""});
-  SetNextResolution(addresses);
-  addresses.clear();
-  addresses.emplace_back(AddressData{balancers_[1]->port_, ""});
-  SetNextReresolutionResponse(addresses);
-
-  // Start servers and send 10 RPCs per server.
+TEST_F(GrpclbEnd2endTest, ReresolveWhenBalancerCallFails) {
+  CreateBackends(2);
+  // Default balancer sends backend 0.
+  SendBalancerResponse(BuildResponseForBackends({backends_[0]->port()}, {}));
+  // Balancer 2 sends backend 1.
+  auto balancer2 = CreateAndStartBalancer();
+  balancer2->service().SendResponse(
+      BuildResponseForBackends({backends_[1]->port()}, {}));
+  // Channel initially uses default balancer and therefore backend 0.
+  SetNextResolutionDefaultBalancer();
+  WaitForBackend(0);
+  // Send 10 RPCs.
   gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH ==========");
   CheckRpcSendOk(10);
   gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH ==========");
   // All 10 requests should have gone to the first backend.
-  EXPECT_EQ(10U, backends_[0]->service_.request_count());
-
-  // Kill backend 0.
-  gpr_log(GPR_INFO, "********** ABOUT TO KILL BACKEND 0 *************");
-  backends_[0]->Shutdown();
-  gpr_log(GPR_INFO, "********** KILLED BACKEND 0 *************");
-
-  CheckRpcSendFailure();
-
-  // Balancer 0 got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[1]->service_.response_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
-
+  EXPECT_EQ(10U, backends_[0]->service().request_count());
+  // Balancer 0 got a single request and sent a single request.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(0U, balancer2->service().request_count());
+  EXPECT_EQ(0U, balancer2->service().response_count());
   // Kill balancer 0.
   gpr_log(GPR_INFO, "********** ABOUT TO KILL BALANCER 0 *************");
-  balancers_[0]->Shutdown();
+  balancer_->Shutdown();
   gpr_log(GPR_INFO, "********** KILLED BALANCER 0 *************");
-
-  // Wait until re-resolution has finished, as signaled by the second backend
-  // receiving a request.
+  // This should trigger a re-resolution.
+  EXPECT_TRUE(response_generator_->WaitForReresolutionRequest(
+      absl::Seconds(5 * grpc_test_slowdown_factor())));
+  gpr_log(GPR_INFO, "********** SAW RE-RESOLUTION REQUEST *************");
+  // Re-resolution result switches to balancer 2.
+  SetNextResolution({balancer2->port()});
+  // Client should start using backend 1.
   WaitForBackend(1);
-
-  // This is serviced by the new serverlist.
-  gpr_log(GPR_INFO, "========= BEFORE SECOND BATCH ==========");
-  CheckRpcSendOk(10);
-  gpr_log(GPR_INFO, "========= DONE WITH SECOND BATCH ==========");
-  // All 10 requests should have gone to the second backend.
-  EXPECT_EQ(10U, backends_[1]->service_.request_count());
-
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-  // After balancer 0 is killed, we restart an LB call immediately (because we
-  // disconnect to a previously connected balancer). Although we will cancel
-  // this call when the re-resolution update is done and another LB call restart
-  // is needed, this old call may still succeed reaching the LB server if
-  // re-resolution is slow. So balancer 1 may have received 2 requests and sent
-  // 2 responses.
-  EXPECT_GE(balancers_[1]->service_.request_count(), 1U);
-  EXPECT_GE(balancers_[1]->service_.response_count(), 1U);
-  EXPECT_LE(balancers_[1]->service_.request_count(), 2U);
-  EXPECT_LE(balancers_[1]->service_.response_count(), 2U);
-  EXPECT_EQ(0U, balancers_[2]->service_.request_count());
-  EXPECT_EQ(0U, balancers_[2]->service_.response_count());
+  // Both balancers should each have handled one request and sent one response.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  EXPECT_EQ(1U, balancer2->service().request_count());
+  EXPECT_EQ(1U, balancer2->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, Drop) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, Drop) {
   const size_t kNumRpcsPerAddress = 100;
-  const int num_of_drop_by_rate_limiting_addresses = 1;
-  const int num_of_drop_by_load_balancing_addresses = 2;
-  const int num_of_drop_addresses = num_of_drop_by_rate_limiting_addresses +
-                                    num_of_drop_by_load_balancing_addresses;
-  const int num_total_addresses = num_backends_ + num_of_drop_addresses;
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          GetBackendPorts(),
-          {{"rate_limiting", num_of_drop_by_rate_limiting_addresses},
-           {"load_balancing", num_of_drop_by_load_balancing_addresses}}),
-      0);
+  const size_t kNumBackends = 2;
+  const int kNumDropRateLimiting = 1;
+  const int kNumDropLoadBalancing = 2;
+  const int kNumDropTotal = kNumDropRateLimiting + kNumDropLoadBalancing;
+  const int kNumAddressesTotal = kNumBackends + kNumDropTotal;
+  SetNextResolutionDefaultBalancer();
+  CreateBackends(kNumBackends);
+  SendBalancerResponse(BuildResponseForBackends(
+      GetBackendPorts(), {{"rate_limiting", kNumDropRateLimiting},
+                          {"load_balancing", kNumDropLoadBalancing}}));
   // Wait until all backends are ready.
   WaitForAllBackends();
   // Send kNumRpcsPerAddress RPCs for each server and drop address.
   size_t num_drops = 0;
-  for (size_t i = 0; i < kNumRpcsPerAddress * num_total_addresses; ++i) {
+  for (size_t i = 0; i < kNumRpcsPerAddress * kNumAddressesTotal; ++i) {
     EchoResponse response;
     const Status status = SendRpc(&response);
     if (!status.ok() &&
@@ -1846,52 +1520,41 @@ TEST_F(SingleBalancerTest, Drop) {
     } else {
       EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
                                << " message=" << status.error_message();
-      EXPECT_EQ(response.message(), kRequestMessage_);
+      EXPECT_EQ(response.message(), kRequestMessage);
     }
   }
-  EXPECT_EQ(kNumRpcsPerAddress * num_of_drop_addresses, num_drops);
+  EXPECT_EQ(kNumRpcsPerAddress * kNumDropTotal, num_drops);
   // Each backend should have gotten 100 requests.
   for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service_.request_count());
+    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service().request_count());
   }
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
+  EXPECT_EQ(1U, balancer_->service().response_count());
 }
 
-TEST_F(SingleBalancerTest, DropAllFirst) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, DropAllFirst) {
+  SetNextResolutionDefaultBalancer();
   // All registered addresses are marked as "drop".
-  const int num_of_drop_by_rate_limiting_addresses = 1;
-  const int num_of_drop_by_load_balancing_addresses = 1;
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          {}, {{"rate_limiting", num_of_drop_by_rate_limiting_addresses},
-               {"load_balancing", num_of_drop_by_load_balancing_addresses}}),
-      0);
+  const int kNumDropRateLimiting = 1;
+  const int kNumDropLoadBalancing = 1;
+  SendBalancerResponse(BuildResponseForBackends(
+      {}, {{"rate_limiting", kNumDropRateLimiting},
+           {"load_balancing", kNumDropLoadBalancing}}));
   const Status status = SendRpc(nullptr, 3000, true);
   EXPECT_FALSE(status.ok());
   EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer");
 }
 
-TEST_F(SingleBalancerTest, DropAll) {
-  SetNextResolutionAllBalancers();
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
-  const int num_of_drop_by_rate_limiting_addresses = 1;
-  const int num_of_drop_by_load_balancing_addresses = 1;
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          {}, {{"rate_limiting", num_of_drop_by_rate_limiting_addresses},
-               {"load_balancing", num_of_drop_by_load_balancing_addresses}}),
-      1000);
-
-  // First call succeeds.
+TEST_F(GrpclbEnd2endTest, DropAll) {
+  CreateBackends(1);
+  SetNextResolutionDefaultBalancer();
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   CheckRpcSendOk();
-  // But eventually, the update with only dropped servers is processed and calls
+  SendBalancerResponse(BuildResponseForBackends(
+      {}, {{"rate_limiting", 1}, {"load_balancing", 1}}));
+  // Eventually, the update with only dropped servers is processed, and calls
   // fail.
   Status status;
   do {
@@ -1901,132 +1564,127 @@ TEST_F(SingleBalancerTest, DropAll) {
   EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer");
 }
 
-class SingleBalancerWithClientLoadReportingTest : public GrpclbEnd2endTest {
- public:
-  SingleBalancerWithClientLoadReportingTest() : GrpclbEnd2endTest(4, 1, 3) {}
-};
-
-TEST_F(SingleBalancerWithClientLoadReportingTest, Vanilla) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, ClientLoadReporting) {
+  const size_t kNumBackends = 3;
+  CreateBackends(kNumBackends);
+  balancer_->service().set_client_load_reporting_interval_seconds(3);
+  SetNextResolutionDefaultBalancer();
   const size_t kNumRpcsPerAddress = 100;
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
   // Wait until all backends are ready.
   int num_ok = 0;
   int num_failure = 0;
   int num_drops = 0;
   std::tie(num_ok, num_failure, num_drops) = WaitForAllBackends();
   // Send kNumRpcsPerAddress RPCs per server.
-  CheckRpcSendOk(kNumRpcsPerAddress * num_backends_);
+  CheckRpcSendOk(kNumRpcsPerAddress * kNumBackends);
   // Each backend should have gotten 100 requests.
   for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service_.request_count());
+    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service().request_count());
   }
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-
+  EXPECT_EQ(1U, balancer_->service().response_count());
   ClientStats client_stats;
   do {
-    client_stats += WaitForLoadReports();
+    auto stats = WaitForLoadReports();
+    ASSERT_TRUE(stats.has_value());
+    client_stats += *stats;
   } while (client_stats.num_calls_finished !=
-           kNumRpcsPerAddress * num_backends_ + num_ok);
-  EXPECT_EQ(kNumRpcsPerAddress * num_backends_ + num_ok,
+           kNumRpcsPerAddress * kNumBackends + num_ok);
+  EXPECT_EQ(kNumRpcsPerAddress * kNumBackends + num_ok,
             client_stats.num_calls_started);
-  EXPECT_EQ(kNumRpcsPerAddress * num_backends_ + num_ok,
+  EXPECT_EQ(kNumRpcsPerAddress * kNumBackends + num_ok,
             client_stats.num_calls_finished);
   EXPECT_EQ(0U, client_stats.num_calls_finished_with_client_failed_to_send);
-  EXPECT_EQ(kNumRpcsPerAddress * num_backends_ + (num_ok + num_drops),
+  EXPECT_EQ(kNumRpcsPerAddress * kNumBackends + (num_ok + num_drops),
             client_stats.num_calls_finished_known_received);
   EXPECT_THAT(client_stats.drop_token_counts, ::testing::ElementsAre());
 }
 
-TEST_F(SingleBalancerWithClientLoadReportingTest, BalancerRestart) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, LoadReportingWithBalancerRestart) {
+  const size_t kNumBackends = 4;
   const size_t kNumBackendsFirstPass = 2;
-  const size_t kNumBackendsSecondPass =
-      backends_.size() - kNumBackendsFirstPass;
+  const size_t kNumBackendsSecondPass = kNumBackends - kNumBackendsFirstPass;
+  CreateBackends(kNumBackends);
+  balancer_->service().set_client_load_reporting_interval_seconds(3);
+  SetNextResolutionDefaultBalancer();
   // Balancer returns backends starting at index 1.
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(GetBackendPorts(0, kNumBackendsFirstPass), {}),
-      0);
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(0, kNumBackendsFirstPass), {}));
   // Wait until all backends returned by the balancer are ready.
   int num_ok = 0;
   int num_failure = 0;
   int num_drops = 0;
   std::tie(num_ok, num_failure, num_drops) =
-      WaitForAllBackends(/* num_requests_multiple_of */ 1, /* start_index */ 0,
-                         /* stop_index */ kNumBackendsFirstPass);
-  balancers_[0]->service_.NotifyDoneWithServerlists();
-  ClientStats client_stats = WaitForLoadReports();
-  EXPECT_EQ(static_cast<size_t>(num_ok), client_stats.num_calls_started);
-  EXPECT_EQ(static_cast<size_t>(num_ok), client_stats.num_calls_finished);
-  EXPECT_EQ(0U, client_stats.num_calls_finished_with_client_failed_to_send);
+      WaitForAllBackends(0, kNumBackendsFirstPass);
+  auto client_stats = WaitForLoadReports();
+  ASSERT_TRUE(client_stats.has_value());
+  EXPECT_EQ(static_cast<size_t>(num_ok), client_stats->num_calls_started);
+  EXPECT_EQ(static_cast<size_t>(num_ok), client_stats->num_calls_finished);
+  EXPECT_EQ(0U, client_stats->num_calls_finished_with_client_failed_to_send);
   EXPECT_EQ(static_cast<size_t>(num_ok),
-            client_stats.num_calls_finished_known_received);
-  EXPECT_THAT(client_stats.drop_token_counts, ::testing::ElementsAre());
+            client_stats->num_calls_finished_known_received);
+  EXPECT_THAT(client_stats->drop_token_counts, ::testing::ElementsAre());
   // Shut down the balancer.
-  balancers_[0]->Shutdown();
+  balancer_->Shutdown();
   // Send 10 more requests per backend.  This will continue using the
   // last serverlist we received from the balancer before it was shut down.
   ResetBackendCounters();
   CheckRpcSendOk(kNumBackendsFirstPass);
   // Each backend should have gotten 1 request.
   for (size_t i = 0; i < kNumBackendsFirstPass; ++i) {
-    EXPECT_EQ(1UL, backends_[i]->service_.request_count());
+    EXPECT_EQ(1UL, backends_[i]->service().request_count());
   }
   // Now restart the balancer, this time pointing to all backends.
-  balancers_[0]->Start(server_host_);
-  ScheduleResponseForBalancer(
-      0, BuildResponseForBackends(GetBackendPorts(kNumBackendsFirstPass), {}),
-      0);
+  balancer_->Start();
+  SendBalancerResponse(
+      BuildResponseForBackends(GetBackendPorts(kNumBackendsFirstPass), {}));
   // Wait for queries to start going to one of the new backends.
   // This tells us that we're now using the new serverlist.
   do {
     CheckRpcSendOk();
-  } while (backends_[2]->service_.request_count() == 0 &&
-           backends_[3]->service_.request_count() == 0);
+  } while (backends_[2]->service().request_count() == 0 &&
+           backends_[3]->service().request_count() == 0);
   // Send one RPC per backend.
   CheckRpcSendOk(kNumBackendsSecondPass);
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // Check client stats.
   client_stats = WaitForLoadReports();
-  EXPECT_EQ(kNumBackendsSecondPass + 1, client_stats.num_calls_started);
-  EXPECT_EQ(kNumBackendsSecondPass + 1, client_stats.num_calls_finished);
-  EXPECT_EQ(0U, client_stats.num_calls_finished_with_client_failed_to_send);
+  ASSERT_TRUE(client_stats.has_value());
+  EXPECT_EQ(kNumBackendsSecondPass + 1, client_stats->num_calls_started);
+  EXPECT_EQ(kNumBackendsSecondPass + 1, client_stats->num_calls_finished);
+  EXPECT_EQ(0U, client_stats->num_calls_finished_with_client_failed_to_send);
   EXPECT_EQ(kNumBackendsSecondPass + 1,
-            client_stats.num_calls_finished_known_received);
-  EXPECT_THAT(client_stats.drop_token_counts, ::testing::ElementsAre());
+            client_stats->num_calls_finished_known_received);
+  EXPECT_THAT(client_stats->drop_token_counts, ::testing::ElementsAre());
 }
 
-TEST_F(SingleBalancerWithClientLoadReportingTest, Drop) {
-  SetNextResolutionAllBalancers();
+TEST_F(GrpclbEnd2endTest, LoadReportingWithDrops) {
+  const size_t kNumBackends = 3;
   const size_t kNumRpcsPerAddress = 3;
-  const int num_of_drop_by_rate_limiting_addresses = 2;
-  const int num_of_drop_by_load_balancing_addresses = 1;
-  const int num_of_drop_addresses = num_of_drop_by_rate_limiting_addresses +
-                                    num_of_drop_by_load_balancing_addresses;
-  const int num_total_addresses = num_backends_ + num_of_drop_addresses;
-  ScheduleResponseForBalancer(
-      0,
-      BuildResponseForBackends(
-          GetBackendPorts(),
-          {{"rate_limiting", num_of_drop_by_rate_limiting_addresses},
-           {"load_balancing", num_of_drop_by_load_balancing_addresses}}),
-      0);
+  const int kNumDropRateLimiting = 2;
+  const int kNumDropLoadBalancing = 1;
+  const int kNumDropTotal = kNumDropRateLimiting + kNumDropLoadBalancing;
+  const int kNumAddressesTotal = kNumBackends + kNumDropTotal;
+  CreateBackends(kNumBackends);
+  balancer_->service().set_client_load_reporting_interval_seconds(3);
+  SetNextResolutionDefaultBalancer();
+  SendBalancerResponse(BuildResponseForBackends(
+      GetBackendPorts(), {{"rate_limiting", kNumDropRateLimiting},
+                          {"load_balancing", kNumDropLoadBalancing}}));
   // Wait until all backends are ready.
   int num_warmup_ok = 0;
   int num_warmup_failure = 0;
   int num_warmup_drops = 0;
   std::tie(num_warmup_ok, num_warmup_failure, num_warmup_drops) =
-      WaitForAllBackends(num_total_addresses /* num_requests_multiple_of */);
+      WaitForAllBackends(
+          0, kNumBackends,
+          WaitForBackendOptions().SetNumRequestsMultipleOf(kNumAddressesTotal));
   const int num_total_warmup_requests =
       num_warmup_ok + num_warmup_failure + num_warmup_drops;
   size_t num_drops = 0;
-  for (size_t i = 0; i < kNumRpcsPerAddress * num_total_addresses; ++i) {
+  for (size_t i = 0; i < kNumRpcsPerAddress * kNumAddressesTotal; ++i) {
     EchoResponse response;
     const Status status = SendRpc(&response);
     if (!status.ok() &&
@@ -2035,37 +1693,34 @@ TEST_F(SingleBalancerWithClientLoadReportingTest, Drop) {
     } else {
       EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
                                << " message=" << status.error_message();
-      EXPECT_EQ(response.message(), kRequestMessage_);
+      EXPECT_EQ(response.message(), kRequestMessage);
     }
   }
-  EXPECT_EQ(kNumRpcsPerAddress * num_of_drop_addresses, num_drops);
+  EXPECT_EQ(kNumRpcsPerAddress * kNumDropTotal, num_drops);
   // Each backend should have gotten 100 requests.
   for (size_t i = 0; i < backends_.size(); ++i) {
-    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service_.request_count());
+    EXPECT_EQ(kNumRpcsPerAddress, backends_[i]->service().request_count());
   }
-  balancers_[0]->service_.NotifyDoneWithServerlists();
   // The balancer got a single request.
-  EXPECT_EQ(1U, balancers_[0]->service_.request_count());
+  EXPECT_EQ(1U, balancer_->service().request_count());
   // and sent a single response.
-  EXPECT_EQ(1U, balancers_[0]->service_.response_count());
-
-  const ClientStats client_stats = WaitForLoadReports();
-  EXPECT_EQ(
-      kNumRpcsPerAddress * num_total_addresses + num_total_warmup_requests,
-      client_stats.num_calls_started);
-  EXPECT_EQ(
-      kNumRpcsPerAddress * num_total_addresses + num_total_warmup_requests,
-      client_stats.num_calls_finished);
-  EXPECT_EQ(0U, client_stats.num_calls_finished_with_client_failed_to_send);
-  EXPECT_EQ(kNumRpcsPerAddress * num_backends_ + num_warmup_ok,
-            client_stats.num_calls_finished_known_received);
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  // Get load reports.
+  auto client_stats = WaitForLoadReports();
+  ASSERT_TRUE(client_stats.has_value());
+  EXPECT_EQ(kNumRpcsPerAddress * kNumAddressesTotal + num_total_warmup_requests,
+            client_stats->num_calls_started);
+  EXPECT_EQ(kNumRpcsPerAddress * kNumAddressesTotal + num_total_warmup_requests,
+            client_stats->num_calls_finished);
+  EXPECT_EQ(0U, client_stats->num_calls_finished_with_client_failed_to_send);
+  EXPECT_EQ(kNumRpcsPerAddress * kNumBackends + num_warmup_ok,
+            client_stats->num_calls_finished_known_received);
   // The number of warmup request is a multiple of the number of addresses.
   // Therefore, all addresses in the scheduled balancer response are hit the
   // same number of times.
-  const int num_times_drop_addresses_hit =
-      num_warmup_drops / num_of_drop_addresses;
+  const int num_times_drop_addresses_hit = num_warmup_drops / kNumDropTotal;
   EXPECT_THAT(
-      client_stats.drop_token_counts,
+      client_stats->drop_token_counts,
       ::testing::ElementsAre(
           ::testing::Pair("load_balancing",
                           (kNumRpcsPerAddress + num_times_drop_addresses_hit)),
@@ -2074,6 +1729,42 @@ TEST_F(SingleBalancerWithClientLoadReportingTest, Drop) {
               (kNumRpcsPerAddress + num_times_drop_addresses_hit) * 2)));
 }
 
+TEST_F(GrpclbEnd2endTest, SecureNaming) {
+  CreateBackends(1);
+  ResetStub(/*fallback_timeout_ms=*/0,
+            absl::StrCat(kApplicationTargetName, ";lb"));
+  SetNextResolutionFromEndpoints(
+      CreateAddressListFromPorts({balancer_->port()}, "lb"));
+  SendBalancerResponse(BuildResponseForBackends(GetBackendPorts(), {}));
+  // We need to wait for all backends to come online.
+  WaitForAllBackends();
+  // The balancer got a single request.
+  EXPECT_EQ(1U, balancer_->service().request_count());
+  // and sent a single response.
+  EXPECT_EQ(1U, balancer_->service().response_count());
+  // Check LB policy name for the channel.
+  EXPECT_EQ("grpclb", channel_->GetLoadBalancingPolicyName());
+}
+
+// This death test is kept separate from the rest to ensure that it's run before
+// any others. See https://github.com/grpc/grpc/pull/32269 for details.
+using SingleBalancerDeathTest = GrpclbEnd2endTest;
+
+TEST_F(SingleBalancerDeathTest, SecureNaming) {
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
+  // Make sure that we blow up (via abort() from the security connector) when
+  // the name from the balancer doesn't match expectations.
+  ASSERT_DEATH_IF_SUPPORTED(
+      {
+        ResetStub(/*fallback_timeout_ms=*/0,
+                  absl::StrCat(kApplicationTargetName, ";lb"));
+        SetNextResolutionFromEndpoints(
+            CreateAddressListFromPorts({balancer_->port()}, "woops"));
+        channel_->WaitForConnected(grpc_timeout_seconds_to_deadline(1));
+      },
+      "");
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace grpc
diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc
new file mode 100644
index 0000000000000..a0a78e684bec0
--- /dev/null
+++ b/test/cpp/end2end/tls_credentials_test.cc
@@ -0,0 +1,161 @@
+//
+//
+// Copyright 2023 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 <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "absl/synchronization/notification.h"
+
+#include <grpc/grpc_security.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/tls_certificate_verifier.h>
+#include <grpcpp/security/tls_credentials_options.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+
+#include "src/core/lib/iomgr/load_file.h"
+#include "test/core/util/port.h"
+#include "test/core/util/test_config.h"
+#include "test/cpp/end2end/test_service_impl.h"
+
+namespace grpc {
+namespace testing {
+namespace {
+
+using ::grpc::experimental::ExternalCertificateVerifier;
+using ::grpc::experimental::TlsChannelCredentialsOptions;
+
+constexpr char kCaCertPath[] = "src/core/tsi/test_creds/ca.pem";
+constexpr char kServerCertPath[] = "src/core/tsi/test_creds/server1.pem";
+constexpr char kServerKeyPath[] = "src/core/tsi/test_creds/server1.key";
+constexpr char kMessage[] = "Hello";
+
+std::string ReadFile(const std::string& file_path) {
+  grpc_slice slice;
+  GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file",
+                               grpc_load_file(file_path.c_str(), 0, &slice)));
+  std::string file_contents(grpc_core::StringViewFromSlice(slice));
+  grpc_slice_unref(slice);
+  return file_contents;
+}
+
+class NoOpCertificateVerifier : public ExternalCertificateVerifier {
+ public:
+  ~NoOpCertificateVerifier() override = default;
+
+  bool Verify(grpc::experimental::TlsCustomVerificationCheckRequest*,
+              std::function<void(grpc::Status)>,
+              grpc::Status* sync_status) override {
+    *sync_status = grpc::Status(grpc::StatusCode::OK, "");
+    return true;
+  }
+
+  void Cancel(grpc::experimental::TlsCustomVerificationCheckRequest*) override {
+  }
+};
+
+class TlsCredentialsTest : public ::testing::Test {
+ protected:
+  void RunServer(absl::Notification* notification) {
+    std::string root_cert = ReadFile(kCaCertPath);
+    grpc::SslServerCredentialsOptions::PemKeyCertPair key_cert_pair = {
+        ReadFile(kServerKeyPath), ReadFile(kServerCertPath)};
+    grpc::SslServerCredentialsOptions ssl_options;
+    ssl_options.pem_key_cert_pairs.push_back(key_cert_pair);
+    ssl_options.pem_root_certs = root_cert;
+
+    grpc::ServerBuilder builder;
+    TestServiceImpl service_;
+
+    builder
+        .AddListeningPort(server_addr_, grpc::SslServerCredentials(ssl_options))
+        .RegisterService(&service_);
+    server_ = builder.BuildAndStart();
+    notification->Notify();
+    server_->Wait();
+  }
+
+  void TearDown() override {
+    if (server_ != nullptr) {
+      server_->Shutdown();
+      server_thread_->join();
+      delete server_thread_;
+    }
+  }
+
+  TestServiceImpl service_;
+  std::unique_ptr<Server> server_ = nullptr;
+  std::thread* server_thread_ = nullptr;
+  std::string server_addr_;
+};
+
+void DoRpc(const std::string& server_addr,
+           const TlsChannelCredentialsOptions& tls_options) {
+  std::shared_ptr<Channel> channel =
+      grpc::CreateChannel(server_addr, TlsCredentials(tls_options));
+
+  auto stub = grpc::testing::EchoTestService::NewStub(channel);
+  grpc::testing::EchoRequest request;
+  grpc::testing::EchoResponse response;
+  request.set_message(kMessage);
+  ClientContext context;
+  context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/10));
+  grpc::Status result = stub->Echo(&context, request, &response);
+  EXPECT_TRUE(result.ok());
+  if (!result.ok()) {
+    gpr_log(GPR_ERROR, "Echo failed: %d, %s, %s",
+            static_cast<int>(result.error_code()),
+            result.error_message().c_str(), result.error_details().c_str());
+  }
+  EXPECT_EQ(response.message(), kMessage);
+}
+
+// How do we test that skipping server certificate verification works as
+// expected? Give the server credentials that chain up to a custom CA (that does
+// not belong to the default or OS trust store), do not configure the client to
+// have this CA in its trust store, and attempt to establish a connection
+// between the client and server.
+TEST_F(TlsCredentialsTest, SkipServerCertificateVerification) {
+  server_addr_ = absl::StrCat("localhost:",
+                              std::to_string(grpc_pick_unused_port_or_die()));
+  absl::Notification notification;
+  server_thread_ = new std::thread([&]() { RunServer(&notification); });
+  notification.WaitForNotification();
+
+  TlsChannelCredentialsOptions tls_options;
+  tls_options.set_certificate_verifier(
+      ExternalCertificateVerifier::Create<NoOpCertificateVerifier>());
+  tls_options.set_check_call_host(/*check_call_host=*/false);
+  tls_options.set_verify_server_certs(/*verify_server_certs=*/false);
+
+  DoRpc(server_addr_, tls_options);
+}
+
+}  // namespace
+}  // namespace testing
+}  // namespace grpc
+
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(&argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
+  int ret = RUN_ALL_TESTS();
+  return ret;
+}
diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index f4e6e1cdbf873..b66416061d7ca 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -13,13 +13,10 @@
 // limitations under the License.
 //
 
-// TODO(roth): Split this file up into a common test framework and a set
-// of test files that use that framework.  Need to figure out the best
-// way to split up the tests.  One option would be to split it up by xDS
-// resource type; another approach would be to have all of the "core"
-// xDS functionality in one file and then move specific features to
-// their own files (e.g., mTLS security, fault injection, circuit
-// breaking, etc).
+// TODO(yashkt): Split this file up into (at least) the following pieces:
+// - xDS-enabled server functionality
+// - mTLS functionality on both client and server
+// - RBAC
 
 #include <deque>
 #include <memory>
@@ -324,34 +321,14 @@ class XdsSecurityTest : public XdsEnd2endTest {
     balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
   }
 
-  // Sends CDS updates with the new security configuration and verifies that
-  // after propagation, this new configuration is used for connections. If \a
-  // identity_instance_name and \a root_instance_name are both empty,
-  // connections are expected to use fallback credentials.
-  void UpdateAndVerifyXdsSecurityConfiguration(
+  void MaybeSetUpstreamTlsContextOnCluster(
       absl::string_view root_instance_name,
       absl::string_view root_certificate_name,
       absl::string_view identity_instance_name,
       absl::string_view identity_certificate_name,
-      const std::vector<StringMatcher>& san_matchers,
-      const std::vector<std::string>& expected_authenticated_identity,
-      bool test_expects_failure = false) {
-    // Change the backend and use a unique service name to use so that we know
-    // that the CDS update was applied.
-    std::string service_name = absl::StrCat(
-        "eds_service_name",
-        absl::FormatTime("%H%M%E3S", absl::Now(), absl::LocalTimeZone()));
-    backend_index_ = (backend_index_ + 1) % 2;
-    EdsResourceArgs args({
-        {"locality0",
-         CreateEndpointsForBackends(backend_index_, backend_index_ + 1)},
-    });
-    balancer_->ads_service()->SetEdsResource(
-        BuildEdsResource(args, service_name.c_str()));
-    auto cluster = default_cluster_;
-    cluster.mutable_eds_cluster_config()->set_service_name(service_name);
+      const std::vector<StringMatcher>& san_matchers, Cluster* cluster) {
     if (!identity_instance_name.empty() || !root_instance_name.empty()) {
-      auto* transport_socket = cluster.mutable_transport_socket();
+      auto* transport_socket = cluster->mutable_transport_socket();
       transport_socket->set_name("envoy.transport_sockets.tls");
       UpstreamTlsContext upstream_tls_context;
       if (!identity_instance_name.empty()) {
@@ -382,6 +359,37 @@ class XdsSecurityTest : public XdsEnd2endTest {
       }
       transport_socket->mutable_typed_config()->PackFrom(upstream_tls_context);
     }
+  }
+
+  // Sends CDS updates with the new security configuration and verifies that
+  // after propagation, this new configuration is used for connections. If \a
+  // identity_instance_name and \a root_instance_name are both empty,
+  // connections are expected to use fallback credentials.
+  void UpdateAndVerifyXdsSecurityConfiguration(
+      absl::string_view root_instance_name,
+      absl::string_view root_certificate_name,
+      absl::string_view identity_instance_name,
+      absl::string_view identity_certificate_name,
+      const std::vector<StringMatcher>& san_matchers,
+      const std::vector<std::string>& expected_authenticated_identity,
+      bool test_expects_failure = false) {
+    // Change the backend and use a unique service name to use so that we know
+    // that the CDS update was applied.
+    std::string service_name = absl::StrCat(
+        "eds_service_name",
+        absl::FormatTime("%H%M%E3S", absl::Now(), absl::LocalTimeZone()));
+    backend_index_ = (backend_index_ + 1) % 2;
+    EdsResourceArgs args({
+        {"locality0",
+         CreateEndpointsForBackends(backend_index_, backend_index_ + 1)},
+    });
+    balancer_->ads_service()->SetEdsResource(
+        BuildEdsResource(args, service_name.c_str()));
+    auto cluster = default_cluster_;
+    cluster.mutable_eds_cluster_config()->set_service_name(service_name);
+    MaybeSetUpstreamTlsContextOnCluster(
+        root_instance_name, root_certificate_name, identity_instance_name,
+        identity_certificate_name, san_matchers, &cluster);
     balancer_->ads_service()->SetCdsResource(cluster);
     // The updates might take time to have an effect, so use a retry loop.
     if (test_expects_failure) {
@@ -730,6 +738,63 @@ TEST_P(XdsSecurityTest, TestFileWatcherCertificateProvider) {
                                           authenticated_identity_);
 }
 
+TEST_P(XdsSecurityTest, MtlsWithAggregateCluster) {
+  g_fake1_cert_data_map->Set({{"", {root_cert_, identity_pair_}}});
+  g_fake2_cert_data_map->Set({{"", {root_cert_, fallback_identity_pair_}}});
+  // Set up aggregate cluster.
+  const char* kNewCluster1Name = "new_cluster_1";
+  const char* kNewEdsService1Name = "new_eds_service_name_1";
+  const char* kNewCluster2Name = "new_cluster_2";
+  const char* kNewEdsService2Name = "new_eds_service_name_2";
+  // Populate new EDS resources.
+  EdsResourceArgs args1({
+      {"locality0", CreateEndpointsForBackends(0, 1)},
+  });
+  EdsResourceArgs args2({
+      {"locality0", CreateEndpointsForBackends(1, 2)},
+  });
+  balancer_->ads_service()->SetEdsResource(
+      BuildEdsResource(args1, kNewEdsService1Name));
+  balancer_->ads_service()->SetEdsResource(
+      BuildEdsResource(args2, kNewEdsService2Name));
+  // Populate new CDS resources.
+  Cluster new_cluster1 = default_cluster_;
+  new_cluster1.set_name(kNewCluster1Name);
+  new_cluster1.mutable_eds_cluster_config()->set_service_name(
+      kNewEdsService1Name);
+  MaybeSetUpstreamTlsContextOnCluster("fake_plugin1", "", "fake_plugin1", "",
+                                      {}, &new_cluster1);
+  balancer_->ads_service()->SetCdsResource(new_cluster1);
+  Cluster new_cluster2 = default_cluster_;
+  new_cluster2.set_name(kNewCluster2Name);
+  new_cluster2.mutable_eds_cluster_config()->set_service_name(
+      kNewEdsService2Name);
+  MaybeSetUpstreamTlsContextOnCluster("fake_plugin1", "", "fake_plugin2", "",
+                                      {}, &new_cluster2);
+  balancer_->ads_service()->SetCdsResource(new_cluster2);
+  // Create Aggregate Cluster
+  auto cluster = default_cluster_;
+  auto* custom_cluster = cluster.mutable_cluster_type();
+  custom_cluster->set_name("envoy.clusters.aggregate");
+  envoy::extensions::clusters::aggregate::v3::ClusterConfig cluster_config;
+  cluster_config.add_clusters(kNewCluster1Name);
+  cluster_config.add_clusters(kNewCluster2Name);
+  custom_cluster->mutable_typed_config()->PackFrom(cluster_config);
+  balancer_->ads_service()->SetCdsResource(cluster);
+  // RPC should go to backend 0.
+  CheckRpcSendOk(DEBUG_LOCATION);
+  EXPECT_EQ(backends_[0]->backend_service()->request_count(), 1);
+  // Make sure the backend saw the right client identity.
+  EXPECT_EQ(backends_[0]->backend_service()->last_peer_identity(),
+            authenticated_identity_);
+  // Now stop backend 0 and wait for backend 1.
+  ShutdownBackend(0);
+  WaitForBackend(DEBUG_LOCATION, 1);
+  // Make sure the backend saw the right client identity.
+  EXPECT_EQ(backends_[1]->backend_service()->last_peer_identity(),
+            fallback_authenticated_identity_);
+}
+
 class XdsEnabledServerTest : public XdsEnd2endTest {
  protected:
   void SetUp() override {}  // No-op -- individual tests do this themselves.
diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD
index ca3321b2211de..8262b29ab27a7 100644
--- a/test/cpp/interop/BUILD
+++ b/test/cpp/interop/BUILD
@@ -268,6 +268,8 @@ grpc_cc_binary(
     ],
     external_deps = [
         "absl/flags:flag",
+        "otel/exporters/prometheus:prometheus_exporter",
+        "otel/sdk/src/metrics",
     ],
     deps = [
         ":rpc_behavior_lb_policy",
@@ -275,6 +277,7 @@ grpc_cc_binary(
         "//:grpc++",
         "//:grpc++_reflection",
         "//:grpcpp_admin",
+        "//:grpcpp_csm_observability",
         "//src/proto/grpc/testing:empty_proto",
         "//src/proto/grpc/testing:messages_proto",
         "//src/proto/grpc/testing:test_proto",
@@ -313,10 +316,13 @@ grpc_cc_binary(
     ],
     external_deps = [
         "absl/flags:flag",
+        "otel/exporters/prometheus:prometheus_exporter",
+        "otel/sdk/src/metrics",
     ],
     deps = [
         ":xds_interop_server_lib",
         "//:grpc++",
+        "//:grpcpp_csm_observability",
         "//test/core/util:grpc_test_util",
         "//test/cpp/end2end:test_health_check_service_impl",
         "//test/cpp/util:test_config",
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
index 6fe2dd385336d..8484e06f6a2cf 100644
--- a/test/cpp/interop/xds_interop_client.cc
+++ b/test/cpp/interop/xds_interop_client.cc
@@ -33,8 +33,12 @@
 #include "absl/algorithm/container.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/str_split.h"
+#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>
@@ -69,6 +73,8 @@ ABSL_FLAG(std::string, expect_status, "OK",
 ABSL_FLAG(
     bool, secure_mode, false,
     "If true, XdsCredentials are used, InsecureChannelCredentials otherwise");
+ABSL_FLAG(bool, enable_csm_observability, false,
+          "Whether to enable CSM Observability");
 
 using grpc::Channel;
 using grpc::ClientAsyncResponseReader;
@@ -386,6 +392,22 @@ void RunTestLoop(std::chrono::duration<double> duration_per_query,
   GPR_UNREACHABLE_CODE(thread.join());
 }
 
+void EnableCsmObservability() {
+  gpr_log(GPR_DEBUG, "Registering Prometheus exporter");
+  opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
+  // default was "localhost:9464" which causes connection issue across GKE
+  // pods
+  opts.url = "0.0.0.0:9464";
+  auto prometheus_exporter =
+      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
+  auto meter_provider =
+      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
+  meter_provider->AddMetricReader(std::move(prometheus_exporter));
+  auto observability = grpc::experimental::CsmObservabilityBuilder();
+  observability.SetMeterProvider(std::move(meter_provider));
+  auto status = observability.BuildAndRegister();
+}
+
 void RunServer(const int port, StatsWatchers* stats_watchers,
                RpcConfigurationsQueue* rpc_configs_queue) {
   GPR_ASSERT(port != 0);
@@ -474,6 +496,9 @@ int main(int argc, char** argv) {
   }
 
   BuildRpcConfigsFromFlags(&rpc_config_queue);
+  if (absl::GetFlag(FLAGS_enable_csm_observability)) {
+    EnableCsmObservability();
+  }
 
   std::chrono::duration<double> duration_per_query =
       std::chrono::nanoseconds(std::chrono::seconds(1)) /
diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
index eacf26f23cb06..a3b95485af0d4 100644
--- a/test/cpp/interop/xds_interop_server.cc
+++ b/test/cpp/interop/xds_interop_server.cc
@@ -19,8 +19,12 @@
 #include <iostream>
 
 #include "absl/flags/flag.h"
+#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/lib/iomgr/gethostname.h"
@@ -36,6 +40,24 @@ ABSL_FLAG(std::string, server_id, "cpp_server",
 ABSL_FLAG(bool, secure_mode, false,
           "If true, XdsServerCredentials are used, InsecureServerCredentials "
           "otherwise");
+ABSL_FLAG(bool, enable_csm_observability, false,
+          "Whether to enable CSM Observability");
+
+void EnableCsmObservability() {
+  gpr_log(GPR_DEBUG, "Registering Prometheus exporter");
+  opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
+  // default was "localhost:9464" which causes connection issue across GKE
+  // pods
+  opts.url = "0.0.0.0:9464";
+  auto prometheus_exporter =
+      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
+  auto meter_provider =
+      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
+  meter_provider->AddMetricReader(std::move(prometheus_exporter));
+  auto observability = grpc::experimental::CsmObservabilityBuilder();
+  observability.SetMeterProvider(std::move(meter_provider));
+  auto status = observability.BuildAndRegister();
+}
 
 int main(int argc, char** argv) {
   grpc::testing::TestEnvironment env(&argc, argv);
@@ -56,6 +78,9 @@ int main(int argc, char** argv) {
     return 1;
   }
   grpc::EnableDefaultHealthCheckService(false);
+  if (absl::GetFlag(FLAGS_enable_csm_observability)) {
+    EnableCsmObservability();
+  }
   grpc::testing::RunServer(
       absl::GetFlag(FLAGS_secure_mode), port, maintenance_port, hostname,
       absl::GetFlag(FLAGS_server_id), [](grpc::Server* /* unused */) {});
diff --git a/test/cpp/interop/xds_stats_watcher.cc b/test/cpp/interop/xds_stats_watcher.cc
index d6cb3037b8a5e..1f2852575a349 100644
--- a/test/cpp/interop/xds_stats_watcher.cc
+++ b/test/cpp/interop/xds_stats_watcher.cc
@@ -51,6 +51,19 @@ std::unordered_set<std::string> ToLowerCase(
   return result;
 }
 
+bool HasNonEmptyMetadata(
+    const std::map<std::string, LoadBalancerStatsResponse::MetadataByPeer>&
+        metadata_by_peer) {
+  for (const auto& entry : metadata_by_peer) {
+    for (const auto& rpc_metadata : entry.second.rpc_metadata()) {
+      if (rpc_metadata.metadata_size() > 0) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 }  // namespace
 
 XdsStatsWatcher::XdsStatsWatcher(int start_id, int end_id,
@@ -113,8 +126,12 @@ LoadBalancerStatsResponse XdsStatsWatcher::WaitForRpcStatsResponse(
                [this] { return rpcs_needed_ == 0; });
   response.mutable_rpcs_by_peer()->insert(rpcs_by_peer_.begin(),
                                           rpcs_by_peer_.end());
-  response.mutable_metadatas_by_peer()->insert(metadata_by_peer_.begin(),
-                                               metadata_by_peer_.end());
+  // Return metadata if at least one RPC had relevant metadata. Note that empty
+  // entries would be returned for RCPs with no relevant metadata in this case.
+  if (HasNonEmptyMetadata(metadata_by_peer_)) {
+    response.mutable_metadatas_by_peer()->insert(metadata_by_peer_.begin(),
+                                                 metadata_by_peer_.end());
+  }
   auto& response_rpcs_by_method = *response.mutable_rpcs_by_method();
   for (const auto& rpc_by_type : rpcs_by_type_) {
     std::string method_name;
diff --git a/test/cpp/interop/xds_stats_watcher_test.cc b/test/cpp/interop/xds_stats_watcher_test.cc
index 0909b49bd1b1d..3d2f951c24681 100644
--- a/test/cpp/interop/xds_stats_watcher_test.cc
+++ b/test/cpp/interop/xds_stats_watcher_test.cc
@@ -152,7 +152,7 @@ TEST(XdsStatsWatcherTest, WaitForRpcStatsResponseReturnsAll) {
             watcher.WaitForRpcStatsResponse(0).DebugString());
 }
 
-TEST(XdsStatsWatcherTest, WaitForRpcStatsResponseIgnoresMetadata) {
+TEST(XdsStatsWatcherTest, WaitForRpcStatsResponseExcludesMetadata) {
   XdsStatsWatcher watcher(0, 3, {});
   // RPC had metadata - but watcher should ignore it
   watcher.RpcCompleted(BuildCallResult(0), "peer1",
@@ -163,11 +163,6 @@ TEST(XdsStatsWatcherTest, WaitForRpcStatsResponseIgnoresMetadata) {
                        {{"k1", "v5"}, {"k2", "v6"}, {"k3", "v7"}});
   LoadBalancerStatsResponse expected;
   expected.mutable_rpcs_by_peer()->insert({{"peer1", 2}, {"peer2", 1}});
-  // There will still be an empty metadata collection for each RPC
-  expected.mutable_metadatas_by_peer()->insert({
-      {"peer1", BuildMetadatas({{}, {}})},
-      {"peer2", BuildMetadatas({{}})},
-  });
   (*expected.mutable_rpcs_by_method())["UnaryCall"]
       .mutable_rpcs_by_peer()
       ->insert({{"peer1", 2}, {"peer2", 1}});
diff --git a/test/cpp/naming/utils/health_check.py b/test/cpp/naming/utils/health_check.py
index a7950c65f6b67..e754571db30b4 100755
--- a/test/cpp/naming/utils/health_check.py
+++ b/test/cpp/naming/utils/health_check.py
@@ -25,7 +25,7 @@ def test_runner_log(msg):
 
 
 def python_args(arg_list):
-    if platform.system() == "Windows":
+    if platform.system() == "Windows" and arg_list[0].endswith(".py"):
         return [sys.executable] + arg_list
     return arg_list
 
diff --git a/test/distrib/bazel/python/WORKSPACE b/test/distrib/bazel/python/WORKSPACE
index 04c41ccca8ef1..3567f8a2ac073 100644
--- a/test/distrib/bazel/python/WORKSPACE
+++ b/test/distrib/bazel/python/WORKSPACE
@@ -25,7 +25,7 @@ local_repository(
     path = "../python_second_test_repo",
 )
 
-load("@upb//bazel:system_python.bzl", "system_python")
+load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
 
 system_python(
     name = "system_python",
@@ -36,8 +36,8 @@ load("@system_python//:pip.bzl", "pip_parse")
 
 pip_parse(
     name = "pip_deps",
-    requirements = "@upb//python:requirements.txt",
+    requirements = "@com_google_protobuf//python:requirements.txt",
     requirements_overrides = {
-        "3.11": "@upb//python:requirements_311.txt",
+        "3.11": "@com_google_protobuf//python:requirements_311.txt",
     },
 )
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 2adfaf141419f..887c20dcd74a9 100644
--- a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
@@ -78,6 +78,11 @@ popd
 @rem folders, like the following command trying to imitate.
 git submodule foreach bash -c "cd $toplevel; rm -rf $name"
 
+@rem TODO(dawidcha): Remove this once this DLL test can pass {
+echo Skipped!
+exit /b 0
+@rem TODO(dawidcha): Remove this once this DLL test can pass }
+
 @rem Install gRPC
 @rem NOTE(jtattermusch): The -DProtobuf_USE_STATIC_LIBS=ON is necessary on cmake3.16+
 @rem since by default "find_package(Protobuf ...)" uses the cmake's builtin
diff --git a/test/distrib/csharp/run_distrib_test_dotnetcli.sh b/test/distrib/csharp/run_distrib_test_dotnetcli.sh
index 69257edde432e..643b102ad53fa 100755
--- a/test/distrib/csharp/run_distrib_test_dotnetcli.sh
+++ b/test/distrib/csharp/run_distrib_test_dotnetcli.sh
@@ -25,7 +25,7 @@ cd DistribTest
 
 # TODO(jtattermusch): make sure we don't pollute the global nuget cache with
 # the nugets being tested.
-dotnet restore DistribTestDotNet.csproj
+CLR_OPENSSL_VERSION_OVERRIDE=1.1 dotnet restore DistribTestDotNet.csproj
 
 dotnet build DistribTestDotNet.csproj
 
diff --git a/third_party/protobuf b/third_party/protobuf
index b2b7a51158418..6b5d8db01fe47 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit b2b7a51158418f41cff0520894836c15b1738721
+Subproject commit 6b5d8db01fe47478e8d400f550e797e6230d464e
diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch
index 1b870a305e90c..a7b1cad4a0e7f 100644
--- a/third_party/protobuf.patch
+++ b/third_party/protobuf.patch
@@ -1,11 +1,11 @@
 diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
-index 97ac28028..8b7585d9d 100644
+index 45a6c20c5..c28dd8852 100755
 --- a/python/google/protobuf/__init__.py
 +++ b/python/google/protobuf/__init__.py
-@@ -31,3 +31,9 @@
+@@ -8,3 +8,9 @@
  # Copyright 2007 Google Inc. All Rights Reserved.
 
- __version__ = '4.24.3'
+ __version__ = '4.25.0'
 +
 +if __name__ != '__main__':
 +  try:
diff --git a/third_party/upb/BUILD b/third_party/upb/BUILD
deleted file mode 100644
index d89e9922763af..0000000000000
--- a/third_party/upb/BUILD
+++ /dev/null
@@ -1,1189 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_COPTS",
-    "UPB_DEFAULT_CPPOPTS",
-)
-load(
-    "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
-    "upb_proto_library_copts",
-    "upb_proto_reflection_library",
-)
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-load(
-    "//upbc:bootstrap_compiler.bzl",
-    "bootstrap_cc_library",
-    "bootstrap_upb_proto_library",
-)
-
-# begin:google_only
-# load(
-#     "//third_party/bazel_rules/rules_kotlin/kotlin/native:native_interop_hint.bzl",
-#     "kt_native_interop_hint",
-# )
-# load("//tools/build_defs/license:license.bzl", "license")
-# end:google_only
-
-# begin:github_only
-load(
-    "//bazel:amalgamation.bzl",
-    "upb_amalgamation",
-)
-load("@rules_pkg//:mappings.bzl", "pkg_files")
-# end:github_only
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-#
-# license(
-#     name = "license",
-#     package_name = "upb",
-# )
-# end:google_only
-
-licenses(["notice"])
-
-exports_files(["LICENSE"])
-
-exports_files(
-    [
-        "BUILD",
-        "WORKSPACE",
-    ],
-    visibility = ["//cmake:__pkg__"],
-)
-
-config_setting(
-    name = "windows",
-    constraint_values = ["@platforms//os:windows"],
-    visibility = ["//visibility:public"],
-)
-
-bool_flag(
-    name = "fasttable_enabled",
-    build_setting_default = False,
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "fasttable_enabled_setting",
-    flag_values = {"//:fasttable_enabled": "true"},
-    visibility = ["//visibility:public"],
-)
-
-upb_proto_library_copts(
-    name = "upb_proto_library_copts__for_generated_code_only_do_not_use",
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-)
-
-# Please update copy.bara.sky target = ":friends" if
-# you make changes to this list.
-package_group(
-    name = "friends",
-    packages = ["//..."],
-)
-
-# Public C/C++ libraries #######################################################
-
-cc_library(
-    name = "port",
-    hdrs = [
-        "upb/port/atomic.h",
-        "upb/port/vsnprintf_compat.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    textual_hdrs = [
-        "upb/port/def.inc",
-        "upb/port/undef.inc",
-    ],
-    visibility = ["//:__subpackages__"],
-)
-
-cc_library(
-    name = "upb",
-    hdrs = [
-        "upb/alloc.h",
-        "upb/arena.h",
-        "upb/array.h",
-        "upb/base/descriptor_constants.h",
-        "upb/base/status.h",
-        "upb/base/string_view.h",
-        "upb/collections/array.h",
-        "upb/decode.h",
-        "upb/encode.h",
-        "upb/extension_registry.h",
-        "upb/map.h",
-        "upb/mem/alloc.h",
-        "upb/mem/arena.h",
-        "upb/message/extension_internal.h",
-        "upb/message/message.h",
-        "upb/msg.h",
-        "upb/status.h",
-        "upb/string_view.h",
-        "upb/upb.h",
-        "upb/upb.hpp",
-        "upb/wire/common.h",
-        "upb/wire/decode.h",
-        "upb/wire/encode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":base",
-        ":collections_internal",
-        ":fastdecode",
-        ":hash",
-        ":lex",
-        ":mem",
-        ":message_internal",
-        ":port",
-        ":wire",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "base",
-    srcs = [
-        "upb/base/status.c",
-    ],
-    hdrs = [
-        "upb/base/descriptor_constants.h",
-        "upb/base/log2.h",
-        "upb/base/status.h",
-        "upb/base/string_view.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [":port"],
-)
-
-cc_library(
-    name = "message",
-    hdrs = [
-        "upb/message/message.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":mem",
-        ":message_internal",
-        ":port",
-        "//upb/mini_table",
-    ],
-)
-
-alias(
-    name = "mini_table",
-    actual = "//upb/mini_table",
-    visibility = ["//:friends"],
-)
-
-alias(
-    name = "mini_table_internal",
-    actual = "//upb/mini_table:internal",
-    visibility = ["//:friends"],
-)
-
-cc_library(
-    name = "message_internal",
-    srcs = [
-        "upb/message/message.c",
-    ],
-    hdrs = [
-        "upb/message/extension_internal.h",
-        "upb/message/internal.h",
-        "upb/message/message.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":base",
-        ":hash",
-        ":mem",
-        ":port",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "message_tagged_ptr",
-    hdrs = ["upb/message/tagged_ptr.h"],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:friends"],
-    deps = [
-        ":port",
-    ],
-)
-
-cc_library(
-    name = "message_accessors_internal",
-    hdrs = [
-        "upb/message/accessors_internal.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:friends"],
-    deps = [
-        ":collections_internal",
-        ":message_internal",
-        ":mini_table_internal",
-        ":port",
-    ],
-)
-
-cc_library(
-    name = "message_accessors",
-    srcs = [
-        "upb/message/accessors.c",
-        "upb/message/accessors_internal.h",
-    ],
-    hdrs = [
-        "upb/message/accessors.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections_internal",
-        ":eps_copy_input_stream",
-        ":message_internal",
-        ":mini_table",
-        ":port",
-        ":upb",
-        ":wire",
-        ":wire_reader",
-        "//upb/mini_table:internal",
-    ],
-)
-
-cc_library(
-    name = "message_promote",
-    srcs = [
-        "upb/message/promote.c",
-    ],
-    hdrs = [
-        "upb/message/promote.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections_internal",
-        ":eps_copy_input_stream",
-        ":hash",
-        ":message_accessors",
-        ":message_internal",
-        ":port",
-        ":upb",
-        ":wire",
-        ":wire_reader",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "message_copy",
-    srcs = [
-        "upb/message/copy.c",
-    ],
-    hdrs = [
-        "upb/message/copy.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections_internal",
-        ":message_accessors",
-        ":message_internal",
-        ":port",
-        ":upb",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "message_split64",
-    hdrs = [
-        "upb/message/accessors_split64.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":message_accessors",
-        ":port",
-    ],
-)
-
-cc_test(
-    name = "message_accessors_test",
-    srcs = ["upb/message/accessors_test.cc"],
-    deps = [
-        ":collections",
-        ":message_accessors",
-        ":port",
-        ":upb",
-        "//upb/mini_descriptor",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_table",
-        "//upb/test:test_messages_proto2_upb_proto",
-        "//upb/test:test_messages_proto3_upb_proto",
-        "//upb/test:test_upb_proto",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_test(
-    name = "message_promote_test",
-    srcs = ["upb/message/promote_test.cc"],
-    deps = [
-        ":collections",
-        ":message_accessors",
-        ":message_copy",
-        ":message_promote",
-        ":port",
-        ":upb",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_table",
-        "//upb/test:test_messages_proto2_upb_proto",
-        "//upb/test:test_messages_proto3_upb_proto",
-        "//upb/test:test_upb_proto",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_test(
-    name = "message_copy_test",
-    srcs = ["upb/message/copy_test.cc"],
-    deps = [
-        ":collections",
-        ":message_accessors",
-        ":message_copy",
-        ":upb",
-        "//upb/mini_table",
-        "//upb/test:test_messages_proto2_upb_proto",
-        "//upb/test:test_messages_proto3_upb_proto",
-        "//upb/test:test_upb_proto",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_library(
-    name = "fastdecode",
-    copts = UPB_DEFAULT_COPTS,
-    deps = [
-        ":base",
-        ":collections_internal",
-        ":hash",
-        ":mem_internal",
-        ":message_internal",
-        ":port",
-        ":wire",
-        "//upb/mini_table",
-    ],
-)
-
-# Common support routines used by generated code.  This library has no
-# implementation, but depends on :upb and exposes a few more hdrs.
-#
-# This is public only because we have no way of visibility-limiting it to
-# upb_proto_library() only.  This interface is not stable and by using it you
-# give up any backward compatibility guarantees.
-cc_library(
-    name = "generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-    hdrs = ["upb/generated_code_support.h"],
-    copts = UPB_DEFAULT_COPTS,
-    textual_hdrs = [
-        "upb/port/def.inc",
-        "upb/port/undef.inc",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections_internal",
-        ":message_accessors",
-        ":message_accessors_internal",
-        ":message_internal",
-        ":upb",
-        ":wire_internal",
-        "//upb/mini_descriptor",
-        "//upb/mini_table",
-    ],
-)
-
-# Common support code for C++ generated code.
-cc_library(
-    name = "generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-    hdrs = [
-        "upb/message/message.h",
-        "upb/port/def.inc",
-        "upb/port/undef.inc",
-        "upb/upb.hpp",
-        "upb/wire/decode.h",
-        "upb/wire/decode_fast.h",
-        "upb/wire/encode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":base",
-        ":collections_internal",
-        ":hash",
-        ":message_copy",
-        ":upb",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-    hdrs = [
-        "upb/port/def.inc",
-        "upb/port/undef.inc",
-        "upb/reflection/def.h",
-        "upb/reflection/def_pool_internal.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":reflection_internal",
-        "//upb/mini_descriptor",
-    ],
-)
-
-bootstrap_upb_proto_library(
-    name = "descriptor_upb_proto",
-    base_dir = "upb/reflection/",
-    # TODO(b/289127200): Export 'net/proto2/proto/descriptor.upb.h' and remove "-layering_check".
-    features = ["-layering_check"],
-    google3_src_files = ["net/proto2/proto/descriptor.proto"],
-    google3_src_rules = ["//net/proto2/proto:descriptor_proto_source"],
-    oss_src_files = ["google/protobuf/descriptor.proto"],
-    oss_src_rules = ["@com_google_protobuf//:descriptor_proto_srcs"],
-    oss_strip_prefix = "third_party/protobuf/github/bootstrap/src",
-    proto_lib_deps = ["@com_google_protobuf//:descriptor_proto"],
-    visibility = ["//visibility:public"],
-)
-
-upb_proto_reflection_library(
-    name = "descriptor_upb_proto_reflection",
-    visibility = ["//visibility:public"],
-    deps = ["@com_google_protobuf//:descriptor_proto"],
-)
-
-cc_library(
-    name = "collections",
-    hdrs = [
-        "upb/collections/array.h",
-        "upb/collections/map.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":base",
-        ":collections_internal",
-        ":mem",
-        ":port",
-    ],
-)
-
-cc_library(
-    name = "message_rep_internal",
-    hdrs = [
-        "upb/message/internal/map_entry.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    deps = [
-        ":base",
-        ":hash",
-    ],
-)
-
-cc_library(
-    name = "collections_internal",
-    srcs = [
-        "upb/collections/array.c",
-        "upb/collections/map.c",
-        "upb/collections/map_sorter.c",
-    ],
-    hdrs = [
-        "upb/collections/array.h",
-        "upb/collections/array_internal.h",
-        "upb/collections/map.h",
-        "upb/collections/map_gencode_util.h",
-        "upb/collections/map_internal.h",
-        "upb/collections/map_sorter_internal.h",
-        "upb/collections/message_value.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":base",
-        ":hash",
-        ":mem",
-        ":message_internal",
-        ":message_rep_internal",
-        ":message_tagged_ptr",
-        ":port",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "collections_split64",
-    hdrs = [
-        "upb/collections/array_split64.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections",
-        ":port",
-    ],
-)
-
-# TODO(b/232091617): Once we can delete the deprecated forwarding headers
-# (= everything in upb/) we can move this build target down into reflection/
-bootstrap_cc_library(
-    name = "reflection",
-    hdrs = [
-        "upb/def.h",
-        "upb/def.hpp",
-        "upb/reflection.h",
-        "upb/reflection.hpp",
-        "upb/reflection/def.h",
-        "upb/reflection/def.hpp",
-        "upb/reflection/message.h",
-        "upb/reflection/message.hpp",
-    ],
-    bootstrap_deps = [":reflection_internal"],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections",
-        ":port",
-        ":upb",
-    ],
-)
-
-bootstrap_cc_library(
-    name = "reflection_internal",
-    srcs = [
-        "upb/reflection/def_builder.c",
-        "upb/reflection/def_pool.c",
-        "upb/reflection/def_type.c",
-        "upb/reflection/desc_state.c",
-        "upb/reflection/enum_def.c",
-        "upb/reflection/enum_reserved_range.c",
-        "upb/reflection/enum_value_def.c",
-        "upb/reflection/extension_range.c",
-        "upb/reflection/field_def.c",
-        "upb/reflection/file_def.c",
-        "upb/reflection/message.c",
-        "upb/reflection/message_def.c",
-        "upb/reflection/message_reserved_range.c",
-        "upb/reflection/method_def.c",
-        "upb/reflection/oneof_def.c",
-        "upb/reflection/service_def.c",
-    ],
-    hdrs = [
-        "upb/reflection/common.h",
-        "upb/reflection/def.h",
-        "upb/reflection/def.hpp",
-        "upb/reflection/def_builder_internal.h",
-        "upb/reflection/def_pool.h",
-        "upb/reflection/def_pool_internal.h",
-        "upb/reflection/def_type.h",
-        "upb/reflection/desc_state_internal.h",
-        "upb/reflection/enum_def.h",
-        "upb/reflection/enum_def_internal.h",
-        "upb/reflection/enum_reserved_range.h",
-        "upb/reflection/enum_reserved_range_internal.h",
-        "upb/reflection/enum_value_def.h",
-        "upb/reflection/enum_value_def_internal.h",
-        "upb/reflection/extension_range.h",
-        "upb/reflection/extension_range_internal.h",
-        "upb/reflection/field_def.h",
-        "upb/reflection/field_def_internal.h",
-        "upb/reflection/file_def.h",
-        "upb/reflection/file_def_internal.h",
-        "upb/reflection/message.h",
-        "upb/reflection/message.hpp",
-        "upb/reflection/message_def.h",
-        "upb/reflection/message_def_internal.h",
-        "upb/reflection/message_reserved_range.h",
-        "upb/reflection/message_reserved_range_internal.h",
-        "upb/reflection/method_def.h",
-        "upb/reflection/method_def_internal.h",
-        "upb/reflection/oneof_def.h",
-        "upb/reflection/oneof_def_internal.h",
-        "upb/reflection/service_def.h",
-        "upb/reflection/service_def_internal.h",
-    ],
-    bootstrap_deps = [":descriptor_upb_proto"],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections",
-        ":hash",
-        ":message_accessors",
-        ":port",
-        ":upb",
-        "//upb/mini_descriptor",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "textformat",
-    srcs = [
-        "upb/text/encode.c",
-    ],
-    hdrs = [
-        "upb/text/encode.h",
-        "upb/text_encode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections_internal",
-        ":eps_copy_input_stream",
-        ":lex",
-        ":port",
-        ":reflection",
-        ":wire",
-        ":wire_reader",
-        ":wire_types",
-    ],
-)
-
-alias(
-    name = "json",
-    actual = "//upb/json",
-    visibility = ["//visibility:public"],
-)
-
-# Tests ########################################################################
-
-cc_test(
-    name = "def_builder_test",
-    srcs = [
-        "upb/reflection/common.h",
-        "upb/reflection/def_builder_internal.h",
-        "upb/reflection/def_builder_test.cc",
-        "upb/reflection/def_type.h",
-    ],
-    deps = [
-        ":descriptor_upb_proto",
-        ":hash",
-        ":port",
-        ":reflection",
-        ":reflection_internal",
-        ":upb",
-        "@com_google_absl//absl/strings",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "collections_test",
-    srcs = ["upb/collections/test.cc"],
-    deps = [
-        ":collections",
-        ":upb",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "message_test",
-    srcs = ["upb/message/test.cc"],
-    deps = [
-        ":json",
-        ":message_test_upb_proto",
-        ":message_test_upb_proto_reflection",
-        ":reflection",
-        ":upb",
-        "//upb/json",
-        "//upb/test:fuzz_util",
-        "//upb/test:test_messages_proto3_upb_proto",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-proto_library(
-    name = "message_test_proto",
-    testonly = 1,
-    srcs = ["upb/message/test.proto"],
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto3_proto"],
-)
-
-upb_proto_library(
-    name = "message_test_upb_proto",
-    testonly = 1,
-    deps = [":message_test_proto"],
-)
-
-upb_proto_reflection_library(
-    name = "message_test_upb_proto_reflection",
-    testonly = 1,
-    deps = [":message_test_proto"],
-)
-
-cc_test(
-    name = "atoi_test",
-    srcs = ["upb/lex/atoi_test.cc"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    deps = [
-        ":lex",
-        "@com_google_absl//absl/strings",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "hash_test",
-    srcs = ["upb/hash/test.cc"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    deps = [
-        ":hash",
-        ":port",
-        ":upb",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-# Internal C/C++ libraries #####################################################
-
-cc_library(
-    name = "mem",
-    hdrs = [
-        "upb/mem/alloc.h",
-        "upb/mem/arena.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":mem_internal",
-        ":port",
-    ],
-)
-
-cc_test(
-    name = "arena_test",
-    srcs = ["upb/mem/arena_test.cc"],
-    deps = [
-        ":port",
-        ":upb",
-        "@com_google_absl//absl/random",
-        "@com_google_absl//absl/random:distributions",
-        "@com_google_absl//absl/synchronization",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "mem_internal",
-    srcs = [
-        "upb/mem/alloc.c",
-        "upb/mem/arena.c",
-    ],
-    hdrs = [
-        "upb/mem/alloc.h",
-        "upb/mem/arena.h",
-        "upb/mem/arena_internal.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [":port"],
-)
-
-cc_library(
-    name = "wire",
-    hdrs = [
-        "upb/wire/decode.h",
-        "upb/wire/encode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":mem",
-        ":message_internal",
-        ":port",
-        ":wire_internal",
-        "//upb/mini_table",
-    ],
-)
-
-cc_library(
-    name = "wire_internal",
-    srcs = [
-        "upb/wire/decode.c",
-        "upb/wire/decode_fast.c",
-        "upb/wire/encode.c",
-    ],
-    hdrs = [
-        "upb/wire/common.h",
-        "upb/wire/common_internal.h",
-        "upb/wire/decode.h",
-        "upb/wire/decode_fast.h",
-        "upb/wire/decode_internal.h",
-        "upb/wire/encode.h",
-        "upb/wire/swap_internal.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":base",
-        ":collections_internal",
-        ":eps_copy_input_stream",
-        ":mem_internal",
-        ":message_accessors_internal",
-        ":message_internal",
-        ":message_rep_internal",
-        ":port",
-        ":wire_reader",
-        ":wire_types",
-        "//upb/mini_table",
-        "@utf8_range",
-    ],
-)
-
-cc_library(
-    name = "wire_types",
-    hdrs = ["upb/wire/types.h"],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "eps_copy_input_stream",
-    srcs = ["upb/wire/eps_copy_input_stream.c"],
-    hdrs = ["upb/wire/eps_copy_input_stream.h"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":mem",
-        ":port",
-    ],
-)
-
-cc_library(
-    name = "wire_reader",
-    srcs = [
-        "upb/wire/reader.c",
-        "upb/wire/swap_internal.h",
-    ],
-    hdrs = ["upb/wire/reader.h"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":eps_copy_input_stream",
-        ":port",
-        ":wire_types",
-    ],
-)
-
-cc_test(
-    name = "eps_copy_input_stream_test",
-    srcs = ["upb/wire/eps_copy_input_stream_test.cc"],
-    deps = [
-        ":eps_copy_input_stream",
-        ":upb",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "hash",
-    srcs = [
-        "upb/hash/common.c",
-    ],
-    hdrs = [
-        "upb/hash/common.h",
-        "upb/hash/int_table.h",
-        "upb/hash/str_table.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":base",
-        ":mem",
-        ":port",
-    ],
-)
-
-cc_library(
-    name = "lex",
-    srcs = [
-        "upb/lex/atoi.c",
-        "upb/lex/round_trip.c",
-        "upb/lex/strtod.c",
-        "upb/lex/unicode.c",
-    ],
-    hdrs = [
-        "upb/lex/atoi.h",
-        "upb/lex/round_trip.h",
-        "upb/lex/strtod.h",
-        "upb/lex/unicode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [":port"],
-)
-
-cc_binary(
-    name = "libupb.so",
-    srcs = ["upb/upb_so.c"],
-    copts = UPB_DEFAULT_COPTS + ["-DUPB_BUILD_API"],
-    linkshared = 1,
-    linkstatic = 1,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":collections",
-        ":collections_split64",
-        ":mem",
-        ":message",
-        ":message_accessors",
-        ":message_split64",
-        ":mini_table",
-        ":port",
-        "//upb/mini_descriptor",
-    ],
-)
-
-# Amalgamation #################################################################
-
-# begin:github_only
-
-upb_amalgamation(
-    name = "gen_amalgamation",
-    outs = [
-        "upb.c",
-        "upb.h",
-    ],
-    libs = [
-        ":base",
-        ":collections_internal",
-        ":descriptor_upb_proto",
-        ":eps_copy_input_stream",
-        ":fastdecode",
-        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        ":hash",
-        ":lex",
-        ":mem_internal",
-        ":message_accessors",
-        ":message_internal",
-        ":message_rep_internal",
-        ":message_tagged_ptr",
-        ":port",
-        ":reflection_internal",
-        ":reflection",
-        ":upb",
-        ":wire_internal",
-        ":wire_reader",
-        ":wire_types",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_descriptor:mini_descriptor",
-        "//upb/mini_table:internal",
-        "//upb/mini_table:mini_table",
-    ],
-    strip_import_prefix = ["src"],
-)
-
-cc_library(
-    name = "amalgamation",
-    srcs = ["upb.c"],
-    hdrs = ["upb.h"],
-    copts = UPB_DEFAULT_COPTS,
-    deps = ["@utf8_range"],
-)
-
-upb_amalgamation(
-    name = "gen_php_amalgamation",
-    outs = [
-        "php-upb.c",
-        "php-upb.h",
-    ],
-    libs = [
-        ":base",
-        ":collections_internal",
-        ":descriptor_upb_proto_reflection",
-        ":descriptor_upb_proto",
-        ":eps_copy_input_stream",
-        ":fastdecode",
-        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        ":hash",
-        ":json",
-        ":lex",
-        ":mem_internal",
-        ":message_accessors",
-        ":message_internal",
-        ":message_rep_internal",
-        ":message_tagged_ptr",
-        ":port",
-        ":reflection_internal",
-        ":reflection",
-        ":upb",
-        ":wire_internal",
-        ":wire_reader",
-        ":wire_types",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_descriptor:mini_descriptor",
-        "//upb/mini_table:internal",
-        "//upb/mini_table:mini_table",
-    ],
-    prefix = "php-",
-    strip_import_prefix = ["src"],
-    visibility = ["@com_google_protobuf//php:__subpackages__"],
-)
-
-cc_library(
-    name = "php_amalgamation",
-    srcs = ["php-upb.c"],
-    hdrs = ["php-upb.h"],
-    copts = UPB_DEFAULT_COPTS,
-    deps = ["@utf8_range"],
-)
-
-upb_amalgamation(
-    name = "gen_ruby_amalgamation",
-    outs = [
-        "ruby-upb.c",
-        "ruby-upb.h",
-    ],
-    libs = [
-        ":base",
-        ":collections_internal",
-        ":descriptor_upb_proto",
-        ":eps_copy_input_stream",
-        ":fastdecode",
-        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        ":hash",
-        ":json",
-        ":lex",
-        ":mem_internal",
-        ":message_accessors",
-        ":message_internal",
-        ":message_rep_internal",
-        ":message_tagged_ptr",
-        ":port",
-        ":reflection_internal",
-        ":reflection",
-        ":upb",
-        ":wire_internal",
-        ":wire_reader",
-        ":wire_types",
-        "//upb/mini_descriptor:encode_internal",
-        "//upb/mini_descriptor:internal",
-        "//upb/mini_descriptor:mini_descriptor",
-        "//upb/mini_table:internal",
-        "//upb/mini_table:mini_table",
-    ],
-    prefix = "ruby-",
-    strip_import_prefix = ["src"],
-    visibility = ["@com_google_protobuf//ruby:__subpackages__"],
-)
-
-cc_library(
-    name = "ruby_amalgamation",
-    srcs = ["ruby-upb.c"],
-    hdrs = ["ruby-upb.h"],
-    copts = UPB_DEFAULT_COPTS,
-    deps = ["@utf8_range"],
-)
-
-exports_files(
-    [
-        "third_party/lunit/console.lua",
-        "third_party/lunit/lunit.lua",
-    ],
-    visibility = ["//lua:__pkg__"],
-)
-
-filegroup(
-    name = "cmake_files",
-    srcs = glob([
-        "upb/**/*",
-        "third_party/**/*",
-    ]),
-    visibility = ["//cmake:__pkg__"],
-)
-
-
-pkg_files(
-   name = "upb_source_files",
-   srcs = glob(
-       [
-           "upb/**/*.c",
-           "upb/**/*.h",
-           "upb/**/*.hpp",
-           "upb/**/*.inc",
-      ],
-       exclude = [
-           "upb/**/conformance_upb.c",
-           "upb/reflection/stage0/**/*",
-       ],
-   ),
-   strip_prefix = "",
-   visibility = ["//python/dist:__pkg__"],
-)
-
-# end:github_only
-
-# begin:google_only
-#
-# py_binary(
-#     name = "update_check_runs",
-#     srcs = ["update_check_runs.py"],
-#     main = "update_check_runs.py",
-#     deps = [
-#         "//third_party/py/absl:app",
-#         "//third_party/py/absl/flags",
-#     ],
-# )
-#
-# kt_native_interop_hint(
-#     name = "upb_kotlin_native_hint",
-#     compatible_with = ["//buildenv/target:non_prod"],
-#     headers_to_exclude = glob([
-#         "**/*.hpp",
-#     ]),
-#     kotlin_package = "upb",
-#     no_string_conversion = ["_upb_MiniTable_Build"],
-#     strict_enums = ["upb_FieldType"],
-#     visibility = ["//:__subpackages__"],
-# )
-#
-# end:google_only
diff --git a/third_party/upb/CONTRIBUTING.md b/third_party/upb/CONTRIBUTING.md
deleted file mode 100644
index df48bf6325ef5..0000000000000
--- a/third_party/upb/CONTRIBUTING.md
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# How to Contribute
-
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
-
-## Get in touch
-
-If your idea will take you more than, say, 30 minutes to
-implement, please get in touch first via the issue tracker
-to touch base about your plan.  That will give an
-opportunity for early feedback and help avoid wasting your
-time.
-
-## Contributor License Agreement
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution;
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to <https://cla.developers.google.com/> to see
-your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
-
-## Code Reviews
-
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
-
-## Community Guidelines
-
-This project follows [Google's Open Source Community
-Guidelines](https://opensource.google/conduct/).
diff --git a/third_party/upb/DESIGN.md b/third_party/upb/DESIGN.md
deleted file mode 100644
index 41a2097e7f3b2..0000000000000
--- a/third_party/upb/DESIGN.md
+++ /dev/null
@@ -1,201 +0,0 @@
-
-# upb Design
-
-upb aims to be a minimal C protobuf kernel.  It has a C API, but its primary
-goal is to be the core runtime for a higher-level API.
-
-## Design goals
-
-- Full protobuf conformance
-- Small code size
-- Fast performance (without compromising code size)
-- Easy to wrap in language runtimes
-- Easy to adapt to different memory management schemes (refcounting, GC, etc)
-
-## Design parameters
-
-- C99
-- 32 or 64-bit CPU (assumes 4 or 8 byte pointers)
-- Uses pointer tagging, but avoids other implementation-defined behavior
-- Aims to never invoke undefined behavior (tests with ASAN, UBSAN, etc)
-- No global state, fully re-entrant
-
-
-## Overall Structure
-
-The upb library is divided into two main parts:
-
-- A core message representation, which supports binary format parsing
-  and serialization.
-  - `upb/upb.h`: arena allocator (`upb_arena`)
-  - `upb/msg_internal.h`: core message representation and parse tables
-  - `upb/msg.h`: accessing metadata common to all messages, like unknown fields
-  - `upb/decode.h`: binary format parsing
-  - `upb/encode.h`: binary format serialization
-  - `upb/table_internal.h`: hash table (used for maps)
-  - `upbc/protoc-gen-upbc.cc`: compiler that generates `.upb.h`/`.upb.c` APIs for
-    accessing messages without reflection.
-- A reflection add-on library that supports JSON and text format.
-  - `upb/def.h`: schema representation and loading from descriptors
-  - `upb/reflection.h`: reflective access to message data.
-  - `upb/json_encode.h`: JSON encoding
-  - `upb/json_decode.h`: JSON decoding
-  - `upb/text_encode.h`: text format encoding
-  - `upbc/protoc-gen-upbdefs.cc`: compiler that generates `.upbdefs.h`/`.upbdefs.c`
-    APIs for loading reflection.
-
-## Core Message Representation
-
-The representation for each message consists of:
-- One pointer (`upb_msg_internaldata*`) for unknown fields and extensions. This
-  pointer is `NULL` when no unknown fields or extensions are present.
-- Hasbits for any optional/required fields.
-- Case integers for each oneof.
-- Data for each field.
-
-For example, a layout for a message with two `optional int32` fields would end
-up looking something like this:
-
-```c
-// For illustration only, upb does not actually generate structs.
-typedef struct {
-  upb_msg_internaldata* internal;  // Unknown fields and extensions.
-  uint32_t hasbits;                // We are only using two hasbits.
-  int32_t field1;
-  int32_t field2;
-} package_name_MessageName;
-```
-
-Note in particular that messages do *not* have:
-- A pointer to reflection or a parse table (upb messages are not self-describing).
-- A pointer to an arena (the arena must be explicitly passed into any function that
-  allocates).
-
-The upb compiler computes a layout for each message, and determines the offset for
-each field using normal alignment rules (each data member must be aligned to a
-multiple of its size).  This layout is then embedded into the generated `.upb.h`
-and `.upb.c` headers in two different forms.  First as inline accessors that expect
-the data at a given offset:
-
-```c
-// Example of a generated accessor, from foo.upb.h
-UPB_INLINE int32_t package_name_MessageName_field1(
-    const upb_test_MessageName *msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-```
-
-Secondly, the layout is emitted as a table which is used by the parser and serializer.
-We call these tables "mini-tables" to distinguish them from the larger and more
-optimized "fast tables" used in `upb/decode_fast.c` (an experimental parser that is
-2-3x the speed of the main parser, though the main parser is already quite fast).
-
-```c
-// Definition of mini-table structure, from upb/msg_internal.h
-typedef struct {
-  uint32_t number;
-  uint16_t offset;
-  int16_t presence;       /* If >0, hasbit_index.  If <0, ~oneof_index. */
-  uint16_t submsg_index;  /* undefined if descriptortype != MESSAGE or GROUP. */
-  uint8_t descriptortype;
-  int8_t mode;            /* upb_fieldmode, with flags from upb_labelflags */
-} upb_msglayout_field;
-
-typedef enum {
-  _UPB_MODE_MAP = 0,
-  _UPB_MODE_ARRAY = 1,
-  _UPB_MODE_SCALAR = 2,
-} upb_fieldmode;
-
-typedef struct {
-  const struct upb_msglayout *const* submsgs;
-  const upb_msglayout_field *fields;
-  uint16_t size;
-  uint16_t field_count;
-  bool extendable;
-  uint8_t dense_below;
-  uint8_t table_mask;
-} upb_msglayout;
-
-// Example of a generated mini-table, from foo.upb.c
-static const upb_msglayout_field upb_test_MessageName__fields[2] = {
-  {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR},
-  {2, UPB_SIZE(8, 8), 2, 0, 5, _UPB_MODE_SCALAR},
-};
-
-const upb_msglayout upb_test_MessageName_msg_init = {
-  NULL,
-  &upb_test_MessageName__fields[0],
-  UPB_SIZE(16, 16), 2, false, 2, 255,
-};
-```
-
-The upb compiler computes separate layouts for 32 and 64 bit modes, since the
-pointer size will be 4 or 8 bytes respectively.  The upb compiler embeds both
-sizes into the source code, using a `UPB_SIZE(size32, size64)` macro that can
-choose the appropriate size at build time based on the size of `UINTPTR_MAX`.
-
-Note that `.upb.c` files contain data tables only.  There is no "generated code"
-except for the inline accessors in the `.upb.h` files: the entire footprint
-of `.upb.c` files is in `.rodata`, none in `.text` or `.data`.
-
-## Memory Management Model
-
-All memory management in upb is built around arenas.  A message is never
-considered to "own" the strings or sub-messages contained within it.  Instead a
-message and all of its sub-messages/strings/etc. are all owned by an arena and
-are freed when the arena is freed.  An entire message tree will probably be
-owned by a single arena, but this is not required or enforced.  As far as upb is
-concerned, it is up to the client how to partition its arenas.  upb only requires
-that when you ask it to serialize a message, that all reachable messages are
-still alive.
-
-The arena supports both a user-supplied initial block and a custom allocation
-callback, so there is a lot of flexibility in memory allocation strategy.  The
-allocation callback can even be `NULL` for heap-free operation.  The main
-constraint of the arena is that all of the memory in each arena must be freed
-together.
-
-`upb_arena` supports a novel operation called "fuse".  When two arenas are fused
-together, their lifetimes are irreversibly joined, such that none of the arena
-blocks in either arena will be freed until *both* arenas are freed with
-`upb_arena_free()`.  This is useful when joining two messages from separate
-arenas (making one a sub-message of the other).  Fuse is a very cheap
-operation, and an unlimited number of arenas can be fused together efficiently.
-
-## Reflection and Descriptors
-
-upb offers a fully-featured reflection library.  There are two main ways of
-using reflection:
-
-1. You can load descriptors from strings using `upb_symtab_addfile()`.
-  The upb runtime will dynamically create mini-tables like what the upb compiler
-  would have created if you had compiled this type into a `.upb.c` file.
-2. You can load descriptors using generated `.upbdefs.h` interfaces.
-  This will load reflection that references the corresponding `.upb.c`
-  mini-tables instead of building a new mini-table on the fly.  This lets
-  you reflect on generated types that are linked into your program.
-
-upb's design for descriptors is similar to protobuf C++ in many ways, with
-the following correspondences:
-
-| C++ Type | upb type |
-| ---------| ---------|
-| `google::protobuf::DescriptorPool` | `upb_symtab`
-| `google::protobuf::Descriptor` | `upb_msgdef`
-| `google::protobuf::FieldDescriptor` | `upb_fielddef`
-| `google::protobuf::OneofDescriptor` | `upb_oneofdef`
-| `google::protobuf::EnumDescriptor` | `upb_enumdef`
-| `google::protobuf::FileDescriptor` | `upb_filedef`
-| `google::protobuf::ServiceDescriptor` | `upb_servicedef`
-| `google::protobuf::MethodDescriptor` | `upb_methoddef`
-
-Like in C++ descriptors (defs) are created by loading a
-`google_protobuf_FileDescriptorProto` into a `upb_symtab`.  This creates and
-links all of the def objects corresponding to that `.proto` file, and inserts
-the names into a symbol table so they can be looked up by name.
-
-Once you have loaded some descriptors into a `upb_symtab`, you can create and
-manipulate messages using the interfaces defined in `upb/reflection.h`.  If your
-descriptors are linked to your generated layouts using option (2) above, you can
-safely access the same messages using both reflection and generated interfaces.
diff --git a/third_party/upb/LICENSE b/third_party/upb/LICENSE
deleted file mode 100644
index 7f3bd16837e71..0000000000000
--- a/third_party/upb/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Copyright (c) 2009-2021, Google LLC
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Google LLC nor the names of any other
-      contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL GOOGLE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/upb/README.md b/third_party/upb/README.md
deleted file mode 100644
index dcba8f6e116ba..0000000000000
--- a/third_party/upb/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-
-# μpb: small, fast C protos
-
-μpb (often written 'upb') is a small
-[protobuf](https://github.com/protocolbuffers/protobuf) implementation written
-in C.
-
-upb is the core runtime for protobuf languages extensions in
-[Ruby](https://github.com/protocolbuffers/protobuf/tree/master/ruby),
-[PHP](https://github.com/protocolbuffers/protobuf/tree/master/php), and
-[Python](https://github.com/protocolbuffers/upb/tree/main/python).
-
-While upb offers a C API, the C API & ABI **are not stable**. For this reason,
-upb is not generally offered as a C library for direct consumption, and there
-are no releases.
-
-## Features
-
-upb has comparable speed to protobuf C++, but is an order of magnitude smaller
-in code size.
-
-Like the main protobuf implementation in C++, it supports:
-
-- a generated API (in C)
-- reflection
-- binary & JSON wire formats
-- text format serialization
-- all standard features of protobufs (oneofs, maps, unknown fields, extensions,
-  etc.)
-- full conformance with the protobuf conformance tests
-
-upb also supports some features that C++ does not:
-
-- **optional reflection:** generated messages are agnostic to whether
-  reflection will be linked in or not.
-- **no global state:** no pre-main registration or other global state.
-- **fast reflection-based parsing:** messages loaded at runtime parse
-  just as fast as compiled-in messages.
-
-However there are a few features it does not support:
-
-- text format parsing
-- deep descriptor verification: upb's descriptor validation is not as exhaustive
-  as `protoc`.
-
-## Install
-
-For Ruby, use [RubyGems](https://rubygems.org/gems/google-protobuf):
-
-```
-$ gem install google-protobuf
-```
-
-For PHP, use [PECL](https://pecl.php.net/package/protobuf):
-
-```
-$ sudo pecl install protobuf
-```
-
-For Python, use [PyPI](https://pypi.org/project/protobuf/):
-
-```
-$ sudo pip install protobuf
-```
-
-Alternatively, you can build and install upb using
-[vcpkg](https://github.com/microsoft/vcpkg/) dependency manager:
-
-    git clone https://github.com/Microsoft/vcpkg.git
-    cd vcpkg
-    ./bootstrap-vcpkg.sh
-    ./vcpkg integrate install
-    ./vcpkg install upb
-
-The upb port in vcpkg is kept up to date by microsoft team members and community
-contributors.
-
-If the version is out of date, please
-[create an issue or pull request](https://github.com/Microsoft/vcpkg) on the
-vcpkg repository.
-
-## Contributing
-
-Please see [CONTRIBUTING.md](CONTRIBUTING.md).
diff --git a/third_party/upb/WORKSPACE b/third_party/upb/WORKSPACE
deleted file mode 100644
index a9dd26700e992..0000000000000
--- a/third_party/upb/WORKSPACE
+++ /dev/null
@@ -1,86 +0,0 @@
-workspace(name = "upb")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("//bazel:workspace_deps.bzl", "upb_deps")
-
-upb_deps()
-
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-protobuf_deps()
-
-load("@utf8_range//:workspace_deps.bzl", "utf8_range_deps")
-utf8_range_deps()
-
-http_archive(
-    name = "lua",
-    build_file = "//bazel:lua.BUILD",
-    sha256 = "b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b",
-    strip_prefix = "lua-5.2.4",
-    urls = [
-        "https://mirror.bazel.build/www.lua.org/ftp/lua-5.2.4.tar.gz",
-        "https://www.lua.org/ftp/lua-5.2.4.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "com_github_google_benchmark",
-    urls = ["https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.zip"],
-    strip_prefix = "benchmark-0baacde3618ca617da95375e0af13ce1baadea47",
-    sha256 = "62e2f2e6d8a744d67e4bbc212fcfd06647080de4253c97ad5c6749e09faf2cb0",
-)
-
-http_archive(
-    name = "com_google_googleapis",
-    urls = ["https://github.com/googleapis/googleapis/archive/refs/heads/master.zip"],
-    build_file = "//benchmarks:BUILD.googleapis",
-    strip_prefix = "googleapis-master",
-    patch_cmds = ["find google -type f -name BUILD.bazel -delete"],
-)
-
-http_archive(
-    name = "com_google_absl",
-    sha256 = "e7fdfe0bed87702a22c5b73b6b5fe08bedd25f17d617e52df6061b0f47d480b0",
-    strip_prefix = "abseil-cpp-e6044634dd7caec2d79a13aecc9e765023768757",
-    urls = [
-        "https://github.com/abseil/abseil-cpp/archive/e6044634dd7caec2d79a13aecc9e765023768757.tar.gz"
-    ],
-)
-
-http_archive(
-    name = "com_google_googletest",
-    sha256 = "730215d76eace9dd49bf74ce044e8daa065d175f1ac891cc1d6bb184ef94e565",
-    strip_prefix = "googletest-f53219cdcb7b084ef57414efea92ee5b71989558",
-    urls = [
-        "https://github.com/google/googletest/archive/f53219cdcb7b084ef57414efea92ee5b71989558.tar.gz" # 2023-03-16
-    ],
-)
-
-load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")
-
-googletest_deps()
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-
-rules_pkg_dependencies()
-
-load("//bazel:system_python.bzl", "system_python")
-system_python(
-    name = "system_python",
-    minimum_python_version = "3.7",
-)
-
-load("@system_python//:register.bzl", "register_system_python")
-register_system_python()
-
-load("@system_python//:pip.bzl", "pip_parse")
-
-pip_parse(
-    name="pip_deps",
-    requirements = "//python:requirements.txt",
-    requirements_overrides = {
-        "3.11": "//python:requirements_311.txt",
-    },
-)
-
-load("@pip_deps//:requirements.bzl", "install_deps")
-install_deps()
diff --git a/third_party/upb/bazel/BUILD b/third_party/upb/bazel/BUILD
deleted file mode 100644
index 5196c0cd38bdd..0000000000000
--- a/third_party/upb/bazel/BUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-exports_files(
-    ["workspace_deps.bzl"],
-    visibility = ["//cmake:__pkg__"],
-)
-
-py_binary(
-    name = "amalgamate",
-    srcs = ["amalgamate.py"],
-    visibility = ["//:__pkg__"],
-)
-
-# py_proto_library() is private rule, only intended for internal use by upb.
-# Hopefully py_proto_library() will eventually be availble in rules_proto or
-# another upstream package.
-bzl_library(
-    name = "py_proto_library_bzl",
-    srcs = ["py_proto_library.bzl"],
-)
-
-bzl_library(
-    name = "upb_proto_library_bzl",
-    srcs = ["upb_proto_library.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@bazel_skylib//lib:paths",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
-        "@rules_proto//proto:defs",
-    ],
-)
diff --git a/third_party/upb/bazel/amalgamate.py b/third_party/upb/bazel/amalgamate.py
deleted file mode 100755
index d15ea57cf2b61..0000000000000
--- a/third_party/upb/bazel/amalgamate.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import re
-import os
-
-INCLUDE_RE = re.compile('^#include "([^"]*)"$')
-
-def parse_include(line):
-  match = INCLUDE_RE.match(line)
-  return match.groups()[0] if match else None
-
-class Amalgamator:
-  def __init__(self, h_out, c_out):
-    self.include_paths = ["."]
-    self.included = set()
-    self.output_h = open(h_out, "w")
-    self.output_c = open(c_out, "w")
-    self.h_out = h_out.split("/")[-1]
-
-  def amalgamate(self, h_files, c_files):
-    self.h_files = set(h_files)
-    self.output_c.write("/* Amalgamated source file */\n")
-    self.output_c.write('#include "%s"\n' % (self.h_out))
-    if self.h_out == "ruby-upb.h":
-      self.output_h.write("// Ruby is still using proto3 enum semantics for proto2\n")
-      self.output_h.write("#define UPB_DISABLE_PROTO2_ENUM_CHECKING\n")
-
-    self.output_h.write("/* Amalgamated source file */\n")
-
-    port_def = self._find_include_file("upb/port/def.inc")
-    port_undef = self._find_include_file("upb/port/undef.inc")
-    self._process_file(port_def, self.output_h)
-    self._process_file(port_def, self.output_c)
-
-    for file in c_files:
-      self._process_file(file, self.output_c)
-
-    self._process_file(port_undef, self.output_h)
-    self._process_file(port_undef, self.output_c)
-
-  def _process_file(self, infile_name, outfile):
-    lines = open(infile_name).readlines()
-
-    has_copyright = lines[1].startswith(" * Copyright")
-    if has_copyright:
-      while not lines[0].startswith(" */"):
-        lines.pop(0)
-      lines.pop(0)
-
-    for line in lines:
-      if not self._process_include(line):
-        outfile.write(line)
-
-  def _find_include_file(self, name):
-    for h_file in self.h_files:
-      if h_file.endswith(name):
-        return h_file
-
-  def _process_include(self, line):
-    include = parse_include(line)
-    if not include:
-      return False
-    if not (include.startswith("upb") or include.startswith("google")):
-      return False
-    if include and (include.endswith("port/def.inc") or include.endswith("port/undef.inc")):
-      # Skip, we handle this separately
-      return True
-    if include.endswith("hpp"):
-      # Skip, we don't support the amalgamation from C++.
-      return True
-    elif include in self.included:
-      return True
-    else:
-      # Include this upb header inline.
-      h_file = self._find_include_file(include)
-      if h_file:
-        self.h_files.remove(h_file)
-        self.included.add(include)
-        self._process_file(h_file, self.output_h)
-        return True
-      raise RuntimeError("Couldn't find include: " + include + ", h_files=" + repr(self.h_files))
-
-# ---- main ----
-
-c_out = sys.argv[1]
-h_out = sys.argv[2]
-amalgamator = Amalgamator(h_out, c_out)
-c_files = []
-h_files = []
-
-for arg in sys.argv[3:]:
-  arg = arg.strip()
-  if arg.endswith(".h") or arg.endswith(".inc"):
-    h_files.append(arg)
-  else:
-    c_files.append(arg)
-
-amalgamator.amalgamate(h_files, c_files)
diff --git a/third_party/upb/bazel/amalgamation.bzl b/third_party/upb/bazel/amalgamation.bzl
deleted file mode 100644
index cabbaccd911d3..0000000000000
--- a/third_party/upb/bazel/amalgamation.bzl
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Internal rules for building upb."""
-
-load(":upb_proto_library.bzl", "GeneratedSrcsInfo")
-
-# upb_amalgamation() rule, with file_list aspect.
-
-SrcList = provider(
-    fields = {
-        "srcs": "list of srcs",
-    },
-)
-
-def _file_list_aspect_impl(target, ctx):
-    if GeneratedSrcsInfo in target:
-        srcs = target[GeneratedSrcsInfo]
-        return [SrcList(srcs = srcs.srcs + srcs.hdrs)]
-
-    srcs = []
-    for src in ctx.rule.attr.srcs:
-        srcs += src.files.to_list()
-    for hdr in ctx.rule.attr.hdrs:
-        srcs += hdr.files.to_list()
-    for hdr in ctx.rule.attr.textual_hdrs:
-        srcs += hdr.files.to_list()
-    return [SrcList(srcs = srcs)]
-
-_file_list_aspect = aspect(
-    implementation = _file_list_aspect_impl,
-)
-
-def _upb_amalgamation(ctx):
-    inputs = []
-    for lib in ctx.attr.libs:
-        inputs += lib[SrcList].srcs
-    srcs = [src for src in inputs if not src.path.endswith("hpp")]
-    ctx.actions.run(
-        inputs = inputs,
-        outputs = ctx.outputs.outs,
-        arguments = [f.path for f in ctx.outputs.outs] + [f.path for f in srcs],
-        progress_message = "Making amalgamation",
-        executable = ctx.executable._amalgamator,
-    )
-    return []
-
-upb_amalgamation = rule(
-    attrs = {
-        "_amalgamator": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//bazel:amalgamate",
-        ),
-        "prefix": attr.string(
-            default = "",
-        ),
-        "libs": attr.label_list(aspects = [_file_list_aspect]),
-        "outs": attr.output_list(),
-        "strip_import_prefix": attr.string_list(),
-    },
-    implementation = _upb_amalgamation,
-)
diff --git a/third_party/upb/bazel/build_defs.bzl b/third_party/upb/bazel/build_defs.bzl
deleted file mode 100644
index e4212b3c6795d..0000000000000
--- a/third_party/upb/bazel/build_defs.bzl
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Internal rules for building upb."""
-
-_DEFAULT_CPPOPTS = []
-_DEFAULT_COPTS = []
-
-# begin:github_only
-_DEFAULT_CPPOPTS.extend([
-    "-Wextra",
-    # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
-    "-Werror",
-    "-Wno-unused-parameter",
-    "-Wno-long-long",
-])
-_DEFAULT_COPTS.extend([
-    "-std=c99",
-    "-Wall",
-    "-Wstrict-prototypes",
-    # GCC (at least) emits spurious warnings for this that cannot be fixed
-    # without introducing redundant initialization (with runtime cost):
-    #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
-    #"-Wno-maybe-uninitialized",
-])
-# end:github_only
-
-UPB_DEFAULT_CPPOPTS = select({
-    "//:windows": [],
-    "//conditions:default": _DEFAULT_CPPOPTS,
-})
-
-UPB_DEFAULT_COPTS = select({
-    "//:windows": [],
-    "//:fasttable_enabled_setting": ["-std=gnu99", "-DUPB_ENABLE_FASTTABLE"],
-    "//conditions:default": _DEFAULT_COPTS,
-})
-
-runfiles_init = """\
-# --- begin runfiles.bash initialization v2 ---
-# Copy-pasted from the Bazel Bash runfiles library v2.
-set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash
-source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
-  source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
-  source "$0.runfiles/$f" 2>/dev/null || \
-  source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
-  source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
-  { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
-# --- end runfiles.bash initialization v2 ---
-"""
-
-def _get_real_short_path(file):
-    # For some reason, files from other archives have short paths that look like:
-    #   ../com_google_protobuf/google/protobuf/descriptor.proto
-    short_path = file.short_path
-    if short_path.startswith("../"):
-        second_slash = short_path.index("/", 3)
-        short_path = short_path[second_slash + 1:]
-    return short_path
-
-def _get_real_root(file):
-    real_short_path = _get_real_short_path(file)
-    return file.path[:-len(real_short_path) - 1]
-
-def _get_real_roots(files):
-    roots = {}
-    for file in files:
-        real_root = _get_real_root(file)
-        if real_root:
-            roots[real_root] = True
-    return roots.keys()
-
-def make_shell_script(name, contents, out):
-    contents = contents.replace("$", "$$")
-    native.genrule(
-        name = "gen_" + name,
-        outs = [out],
-        cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % contents,
-    )
diff --git a/third_party/upb/bazel/lua.BUILD b/third_party/upb/bazel/lua.BUILD
deleted file mode 100644
index 11755a4f73459..0000000000000
--- a/third_party/upb/bazel/lua.BUILD
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "liblua_headers",
-    hdrs = [
-        "src/lauxlib.h",
-        "src/lua.h",
-        "src/lua.hpp",
-        "src/luaconf.h",
-        "src/lualib.h",
-    ],
-    defines = ["LUA_USE_LINUX"],
-    includes = ["src"],
-)
-
-cc_library(
-    name = "liblua",
-    srcs = [
-        "src/lapi.c",
-        "src/lapi.h",
-        "src/lauxlib.c",
-        "src/lauxlib.h",
-        "src/lbaselib.c",
-        "src/lbitlib.c",
-        "src/lcode.c",
-        "src/lcode.h",
-        "src/lcorolib.c",
-        "src/lctype.c",
-        "src/lctype.h",
-        "src/ldblib.c",
-        "src/ldebug.c",
-        "src/ldebug.h",
-        "src/ldo.c",
-        "src/ldo.h",
-        "src/ldump.c",
-        "src/lfunc.c",
-        "src/lfunc.h",
-        "src/lgc.c",
-        "src/lgc.h",
-        "src/linit.c",
-        "src/liolib.c",
-        "src/llex.c",
-        "src/llex.h",
-        "src/llimits.h",
-        "src/lmathlib.c",
-        "src/lmem.c",
-        "src/lmem.h",
-        "src/loadlib.c",
-        "src/lobject.c",
-        "src/lobject.h",
-        "src/lopcodes.c",
-        "src/lopcodes.h",
-        "src/loslib.c",
-        "src/lparser.c",
-        "src/lparser.h",
-        "src/lstate.c",
-        "src/lstate.h",
-        "src/lstring.c",
-        "src/lstring.h",
-        "src/lstrlib.c",
-        "src/ltable.c",
-        "src/ltable.h",
-        "src/ltablib.c",
-        "src/ltm.c",
-        "src/ltm.h",
-        "src/lundump.c",
-        "src/lundump.h",
-        "src/lvm.c",
-        "src/lvm.h",
-        "src/lzio.c",
-        "src/lzio.h",
-    ],
-    hdrs = [
-        "src/lauxlib.h",
-        "src/lua.h",
-        "src/lua.hpp",
-        "src/luaconf.h",
-        "src/lualib.h",
-    ],
-    defines = ["LUA_USE_LINUX"],
-    includes = ["src"],
-    linkopts = [
-        "-lm",
-        "-ldl",
-    ],
-)
-
-cc_binary(
-    name = "lua",
-    srcs = [
-        "src/lua.c",
-    ],
-    linkopts = [
-        "-lreadline",
-        "-rdynamic",
-    ],
-    deps = [
-        ":liblua",
-    ],
-)
diff --git a/third_party/upb/bazel/protobuf.patch b/third_party/upb/bazel/protobuf.patch
deleted file mode 100644
index 16e41c0cbba74..0000000000000
--- a/third_party/upb/bazel/protobuf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- python/google/protobuf/internal/test_util.py
-+++ python/google/protobuf/internal/test_util.py
-@@ -39,6 +39,7 @@ __author__ = 'robinson@google.com (Will Robinson)'
- import numbers
- import operator
- import os.path
-+import pathlib
- 
- from google.protobuf import unittest_import_pb2
- from google.protobuf import unittest_pb2
-@@ -617,17 +618,22 @@ def ExpectAllFieldsSet(test_case, message):
-                           message.default_import_enum)
- 
- 
-+def _SearchUp(path, filename):
-+  path = pathlib.Path(path).resolve()
-+  for parent in [path] + list(path.parents):
-+    file_path = parent / ('google/protobuf/testdata/' + filename)
-+    if file_path.exists():
-+      # Found it.  Load the golden file from the testdata directory.
-+      return file_path.open('rb')
-+  return None
-+
- def GoldenFile(filename):
-   """Finds the given golden file and returns a file object representing it."""
- 
-   # Search up the directory tree looking for the C++ protobuf source code.
--  path = '.'
--  while os.path.exists(path):
--    if os.path.exists(os.path.join(path, 'src/google/protobuf')):
--      # Found it.  Load the golden file from the testdata directory.
--      full_path = os.path.join(path, 'src/google/protobuf/testdata', filename)
--      return open(full_path, 'rb')
--    path = os.path.join(path, '..')
-+  f = _SearchUp('.', filename) or _SearchUp(__file__, filename)
-+  if f:
-+      return f
- 
-   # Search internally.
-   path = '.'
\ No newline at end of file
diff --git a/third_party/upb/bazel/py_proto_library.bzl b/third_party/upb/bazel/py_proto_library.bzl
deleted file mode 100644
index 1ce3a6e11b365..0000000000000
--- a/third_party/upb/bazel/py_proto_library.bzl
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""An implementation of py_proto_library().
-
-We have to implement this ourselves because there is currently no reasonable
-py_proto_library() rule available for Bazel.
-
-Our py_proto_library() is similar to how a real py_proto_library() should work.
-But it hasn't been deeply tested or reviewed, and upb should not be in the
-business of vending py_proto_library(), so we keep it private to upb.
-"""
-
-load("@bazel_skylib//lib:paths.bzl", "paths")
-
-# begin:github_only
-load("@rules_proto//proto:defs.bzl", "ProtoInfo")
-# end:github_only
-
-# Generic support code #########################################################
-
-# begin:github_only
-_is_google3 = False
-# end:github_only
-
-# begin:google_only
-# _is_google3 = True
-# end:google_only
-
-def _get_real_short_path(file):
-    # For some reason, files from other archives have short paths that look like:
-    #   ../com_google_protobuf/google/protobuf/descriptor.proto
-    short_path = file.short_path
-    if short_path.startswith("../"):
-        second_slash = short_path.index("/", 3)
-        short_path = short_path[second_slash + 1:]
-
-    # Sometimes it has another few prefixes like:
-    #   _virtual_imports/any_proto/google/protobuf/any.proto
-    #   benchmarks/_virtual_imports/100_msgs_proto/benchmarks/100_msgs.proto
-    # We want just google/protobuf/any.proto.
-    virtual_imports = "_virtual_imports/"
-    if virtual_imports in short_path:
-        short_path = short_path.split(virtual_imports)[1].split("/", 1)[1]
-    return short_path
-
-def _get_real_root(ctx, file):
-    real_short_path = _get_real_short_path(file)
-    root = file.path[:-len(real_short_path) - 1]
-
-    if not _is_google3 and ctx.rule.attr.strip_import_prefix:
-        root = paths.join(root, ctx.rule.attr.strip_import_prefix[1:])
-    return root
-
-def _generate_output_file(ctx, src, extension):
-    package = ctx.label.package
-    if not _is_google3:
-        strip_import_prefix = ctx.rule.attr.strip_import_prefix
-        if strip_import_prefix and strip_import_prefix != "/":
-            if not package.startswith(strip_import_prefix[1:]):
-                fail("%s does not begin with prefix %s" % (package, strip_import_prefix))
-            package = package[len(strip_import_prefix):]
-
-    real_short_path = _get_real_short_path(src)
-    real_short_path = paths.relativize(real_short_path, package)
-    output_filename = paths.replace_extension(real_short_path, extension)
-    ret = ctx.actions.declare_file(output_filename)
-    return ret
-
-# py_proto_library() ###########################################################
-
-def _py_proto_library_rule_impl(ctx):
-    # A real py_proto_library() should enforce this constraint.
-    # We don't bother for now, since it saves us some effort not to.
-    #
-    # if len(ctx.attr.deps) != 1:
-    #     fail("only one deps dependency allowed.")
-
-    files = []
-    for dep in ctx.attr.deps:
-        files += dep[PyInfo].transitive_sources.to_list()
-    return [
-        DefaultInfo(files = depset(direct = files)),
-    ]
-
-def _py_proto_library_aspect_impl(target, ctx):
-    proto_info = target[ProtoInfo]
-    proto_sources = proto_info.direct_sources
-    srcs = [_generate_output_file(ctx, name, "_pb2.py") for name in proto_sources]
-    transitive_sets = proto_info.transitive_descriptor_sets.to_list()
-    ctx.actions.run(
-        inputs = depset(
-            direct = [proto_info.direct_descriptor_set],
-            transitive = [proto_info.transitive_descriptor_sets],
-        ),
-        outputs = srcs,
-        executable = ctx.executable._protoc,
-        arguments = [
-                        "--python_out=" + _get_real_root(ctx, srcs[0]),
-                        "--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]),
-                    ] +
-                    [_get_real_short_path(file) for file in proto_sources],
-        progress_message = "Generating Python protos for :" + ctx.label.name,
-    )
-    outs_depset = depset(srcs)
-    return [
-        PyInfo(transitive_sources = outs_depset),
-    ]
-
-_py_proto_library_aspect = aspect(
-    attrs = {
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-    },
-    implementation = _py_proto_library_aspect_impl,
-    provides = [
-        PyInfo,
-    ],
-    attr_aspects = ["deps"],
-)
-
-py_proto_library = rule(
-    output_to_genfiles = True,
-    implementation = _py_proto_library_rule_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects = [_py_proto_library_aspect],
-            allow_rules = ["proto_library"],
-            providers = [ProtoInfo],
-        ),
-    },
-)
diff --git a/third_party/upb/bazel/python_downloads.bzl b/third_party/upb/bazel/python_downloads.bzl
deleted file mode 100644
index e237c936314ca..0000000000000
--- a/third_party/upb/bazel/python_downloads.bzl
+++ /dev/null
@@ -1,84 +0,0 @@
-"""Helper methods to download different python versions"""
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-limited_api_build_file = """
-cc_library(
-    name = "python_headers",
-    hdrs = glob(["**/Include/**/*.h"]),
-    strip_include_prefix = "Python-{}/Include",
-    visibility = ["//visibility:public"],
-)
-"""
-
-def python_source_archive(name, sha256):
-    """Helper method to create a python_headers target that will work for linux and macos.
-
-    Args:
-      name: The name of the target, should be in the form python_{VERSION}
-      sha256: The sha256 of the python package for the specified version
-    """
-    version = name.split("-")[1]
-    http_archive(
-        name = name,
-        urls = [
-            "https://www.python.org/ftp/python/{0}/Python-{0}.tgz"
-                .format(version),
-        ],
-        sha256 = sha256,
-        build_file_content = limited_api_build_file.format(version),
-        patch_cmds = [
-            "echo '#define SIZEOF_WCHAR_T 4' > Python-{}/Include/pyconfig.h"
-                .format(version),
-        ],
-    )
-
-nuget_build_file = """
-cc_import(
-    name = "python_full_api",
-    hdrs = glob(["**/*.h"]),
-    shared_library = "python{0}.dll",
-    interface_library = "libs/python{0}.lib",
-    visibility = ["@upb//python:__pkg__"],
-)
-
-cc_import(
-    name = "python_limited_api",
-    hdrs = glob(["**/*.h"]),
-    shared_library = "python{1}.dll",
-    interface_library = "libs/python{1}.lib",
-    visibility = ["@upb//python:__pkg__"],
-)
-"""
-
-def python_nuget_package(name, sha256):
-    """Helper method to create full and limited api dependencies for windows using nuget
-
-    Args:
-      name: The name of the target, should be in the form nuget_python_{CPU}_{VERSION}
-      sha256: The sha256 of the nuget package for that version
-    """
-    cpu = name.split("_")[2]
-    version = name.split("_")[3]
-
-    full_api_lib_number = version.split(".")[0] + version.split(".")[1]
-    limited_api_lib_number = version.split(".")[0]
-
-    folder_name_dict = {
-        "i686": "pythonx86",
-        "x86-64": "python",
-    }
-
-    http_archive(
-        name = name,
-        urls = [
-            "https://www.nuget.org/api/v2/package/{}/{}"
-                .format(folder_name_dict[cpu], version),
-        ],
-        sha256 = sha256,
-        strip_prefix = "tools",
-        build_file_content =
-            nuget_build_file.format(full_api_lib_number, limited_api_lib_number),
-        type = "zip",
-        patch_cmds = ["cp -r include/* ."],
-    )
diff --git a/third_party/upb/bazel/system_python.bzl b/third_party/upb/bazel/system_python.bzl
deleted file mode 100644
index 43fa59b646c98..0000000000000
--- a/third_party/upb/bazel/system_python.bzl
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Repository rule for using Python 3.x headers from the system."""
-
-# Mock out rules_python's pip.bzl for cases where no system python is found.
-_mock_pip = """
-def _pip_install_impl(repository_ctx):
-    repository_ctx.file("BUILD.bazel", '''
-py_library(
-    name = "noop",
-    visibility = ["//visibility:public"],
-)
-''')
-    repository_ctx.file("requirements.bzl", '''
-def install_deps(*args, **kwargs):
-    print("WARNING: could not install pip dependencies")
-
-def requirement(*args, **kwargs):
-    return "@{}//:noop"
-'''.format(repository_ctx.attr.name))
-pip_install = repository_rule(
-    implementation = _pip_install_impl,
-    attrs = {
-        "requirements": attr.string(),
-        "requirements_overrides": attr.string_dict(),
-        "python_interpreter_target": attr.string(),
-    },
-)
-pip_parse = pip_install
-"""
-
-# Alias rules_python's pip.bzl for cases where a system python is found.
-_alias_pip = """
-load("@rules_python//python:pip.bzl", _pip_install = "pip_install", _pip_parse = "pip_parse")
-
-def _get_requirements(requirements, requirements_overrides):
-    for version, override in requirements_overrides.items():
-        if version in "{python_version}":
-            requirements = override
-            break
-    return requirements
-
-def pip_install(requirements, requirements_overrides={{}}, **kwargs):
-    _pip_install(
-        python_interpreter_target = "@{repo}//:interpreter",
-        requirements = _get_requirements(requirements, requirements_overrides),
-        **kwargs,
-    )
-def pip_parse(requirements, requirements_overrides={{}}, **kwargs):
-    _pip_parse(
-        python_interpreter_target = "@{repo}//:interpreter",
-        requirements = _get_requirements(requirements, requirements_overrides),
-        **kwargs,
-    )
-"""
-
-_mock_fuzzing_py = """
-def fuzzing_py_install_deps():
-    print("WARNING: could not install fuzzing_py dependencies")
-"""
-
-# Alias rules_fuzzing's requirements.bzl for cases where a system python is found.
-_alias_fuzzing_py = """
-load("@fuzzing_py_deps//:requirements.bzl", _fuzzing_py_install_deps = "install_deps")
-
-def fuzzing_py_install_deps():
-    _fuzzing_py_install_deps()
-"""
-
-_build_file = """
-load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
-load("@bazel_tools//tools/python:toolchain.bzl", "py_runtime_pair")
-
-cc_library(
-   name = "python_headers",
-   hdrs = glob(["python/**/*.h"]),
-   includes = ["python"],
-   visibility = ["//visibility:public"],
-)
-
-string_flag(
-    name = "internal_python_support",
-    build_setting_default = "{support}",
-    values = [
-        "None",
-        "Supported",
-        "Unsupported",
-    ]
-)
-
-config_setting(
-    name = "none",
-    flag_values = {{
-        ":internal_python_support": "None",
-    }},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "supported",
-    flag_values = {{
-        ":internal_python_support": "Supported",
-    }},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "unsupported",
-    flag_values = {{
-        ":internal_python_support": "Unsupported",
-    }},
-    visibility = ["//visibility:public"],
-)
-
-selects.config_setting_group(
-    name = "exists",
-    match_any = [":supported", ":unsupported"],
-    visibility = ["//visibility:public"],
-)
-
-sh_binary(
-    name = "interpreter",
-    srcs = ["interpreter"],
-    visibility = ["//visibility:public"],
-)
-
-py_runtime(
-    name = "py3_runtime",
-    interpreter_path = "{interpreter}",
-    python_version = "PY3",
-)
-
-py_runtime_pair(
-    name = "runtime_pair",
-    py3_runtime = ":py3_runtime",
-)
-
-toolchain(
-    name = "python_toolchain",
-    toolchain = ":runtime_pair",
-    toolchain_type = "@rules_python//python:toolchain_type",
-)
-"""
-
-_register = """
-def register_system_python():
-    native.register_toolchains("@{}//:python_toolchain")
-"""
-
-_mock_register = """
-def register_system_python():
-    pass
-"""
-
-def _get_python_version(repository_ctx):
-    py_program = "import sys; print(str(sys.version_info.major) + '.' + str(sys.version_info.minor) + '.' + str(sys.version_info.micro))"
-    result = repository_ctx.execute(["python3", "-c", py_program])
-    return (result.stdout).strip().split(".")
-
-def _get_python_path(repository_ctx):
-    py_program = "import sysconfig; print(sysconfig.get_config_var('%s'), end='')"
-    result = repository_ctx.execute(["python3", "-c", py_program % ("INCLUDEPY")])
-    if result.return_code != 0:
-        return None
-    return result.stdout
-
-def _populate_package(ctx, path, python3, python_version):
-    ctx.symlink(path, "python")
-    supported = True
-    for idx, v in enumerate(ctx.attr.minimum_python_version.split(".")):
-        if int(python_version[idx]) < int(v):
-            supported = False
-            break
-    if "win" in ctx.os.name:
-        # buildifier: disable=print
-        print("WARNING: python is not supported on Windows")
-        supported = False
-
-    build_file = _build_file.format(
-        interpreter = python3,
-        support = "Supported" if supported else "Unsupported",
-    )
-
-    ctx.file("interpreter", "#!/bin/sh\nexec {} \"$@\"".format(python3))
-    ctx.file("BUILD.bazel", build_file)
-    ctx.file("version.bzl", "SYSTEM_PYTHON_VERSION = '{}{}'".format(python_version[0], python_version[1]))
-    ctx.file("register.bzl", _register.format(ctx.attr.name))
-    if supported:
-        ctx.file("pip.bzl", _alias_pip.format(
-            python_version = ".".join(python_version),
-            repo = ctx.attr.name,
-        ))
-        ctx.file("fuzzing_py.bzl", _alias_fuzzing_py)
-    else:
-        # Dependencies are unlikely to be satisfiable for unsupported versions of python.
-        ctx.file("pip.bzl", _mock_pip)
-        ctx.file("fuzzing_py.bzl", _mock_fuzzing_py)
-
-def _populate_empty_package(ctx):
-    # Mock out all the entrypoints we need to run from WORKSPACE.  Targets that
-    # actually need python should use `target_compatible_with` and the generated
-    # @system_python//:exists or @system_python//:supported constraints.
-    ctx.file(
-        "BUILD.bazel",
-        _build_file.format(
-            interpreter = "",
-            support = "None",
-        ),
-    )
-    ctx.file("version.bzl", "SYSTEM_PYTHON_VERSION = 'None'")
-    ctx.file("register.bzl", _mock_register)
-    ctx.file("pip.bzl", _mock_pip)
-    ctx.file("fuzzing_py.bzl", _mock_fuzzing_py)
-
-def _system_python_impl(repository_ctx):
-    path = _get_python_path(repository_ctx)
-    python3 = repository_ctx.which("python3")
-    python_version = _get_python_version(repository_ctx)
-
-    if path and python_version[0] == "3":
-        _populate_package(repository_ctx, path, python3, python_version)
-    else:
-        # buildifier: disable=print
-        print("WARNING: no system python available, builds against system python will fail")
-        _populate_empty_package(repository_ctx)
-
-# The system_python() repository rule exposes information from the version of python installed in the current system.
-#
-# In WORKSPACE:
-#   system_python(
-#       name = "system_python_repo",
-#       minimum_python_version = "3.7",
-#   )
-#
-# This repository exposes some repository rules for configuring python in Bazel.  The python toolchain
-# *must* be registered in your WORKSPACE:
-#   load("@system_python_repo//:register.bzl", "register_system_python")
-#   register_system_python()
-#
-# Pip dependencies can optionally be specified using a wrapper around rules_python's repository rules:
-#   load("@system_python//:pip.bzl", "pip_install")
-#   pip_install(
-#       name="pip_deps",
-#       requirements = "@com_google_protobuf//python:requirements.txt",
-#   )
-# An optional argument `requirements_overrides` takes a dictionary mapping python versions to alternate
-# requirements files.  This works around the requirement for fully pinned dependencies in python_rules.
-#
-# Four config settings are exposed from this repository to help declare target compatibility in Bazel.
-# For example, `@system_python_repo//:exists` will be true if a system python version has been found.
-# The `none` setting will be true only if no python version was found, and `supported`/`unsupported`
-# correspond to whether or not the system version is compatible with `minimum_python_version`.
-#
-# This repository also exposes a header rule that you can depend on from BUILD files:
-#   cc_library(
-#     name = "foobar",
-#     srcs = ["foobar.cc"],
-#     deps = ["@system_python_repo//:python_headers"],
-#   )
-#
-# The headers should correspond to the version of python obtained by running
-# the `python3` command on the system.
-system_python = repository_rule(
-    implementation = _system_python_impl,
-    local = True,
-    attrs = {
-        "minimum_python_version": attr.string(default = "3.7"),
-    },
-)
diff --git a/third_party/upb/bazel/upb_proto_library.bzl b/third_party/upb/bazel/upb_proto_library.bzl
deleted file mode 100644
index bb14cf0918ea3..0000000000000
--- a/third_party/upb/bazel/upb_proto_library.bzl
+++ /dev/null
@@ -1,524 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Public rules for using upb protos:
-  - upb_proto_library()
-  - upb_proto_reflection_library()
-"""
-
-load("@bazel_skylib//lib:paths.bzl", "paths")
-
-# begin:google_only
-# load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
-# end:google_only
-
-# begin:github_only
-# Compatibility code for Bazel 4.x. Remove this when we drop support for Bazel 4.x.
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
-
-def use_cpp_toolchain():
-    return ["@bazel_tools//tools/cpp:toolchain_type"]
-# end:github_only
-
-# Generic support code #########################################################
-
-# begin:github_only
-_is_google3 = False
-# end:github_only
-
-# begin:google_only
-# _is_google3 = True
-# end:google_only
-
-def _get_real_short_path(file):
-    # For some reason, files from other archives have short paths that look like:
-    #   ../com_google_protobuf/google/protobuf/descriptor.proto
-    short_path = file.short_path
-    if short_path.startswith("../"):
-        second_slash = short_path.index("/", 3)
-        short_path = short_path[second_slash + 1:]
-
-    # Sometimes it has another few prefixes like:
-    #   _virtual_imports/any_proto/google/protobuf/any.proto
-    #   benchmarks/_virtual_imports/100_msgs_proto/benchmarks/100_msgs.proto
-    # We want just google/protobuf/any.proto.
-    virtual_imports = "_virtual_imports/"
-    if virtual_imports in short_path:
-        short_path = short_path.split(virtual_imports)[1].split("/", 1)[1]
-    return short_path
-
-def _get_real_root(ctx, file):
-    real_short_path = _get_real_short_path(file)
-    root = file.path[:-len(real_short_path) - 1]
-
-    if not _is_google3 and ctx.rule.attr.strip_import_prefix:
-        root = paths.join(root, ctx.rule.attr.strip_import_prefix[1:])
-    return root
-
-def _generate_output_file(ctx, src, extension):
-    package = ctx.label.package
-    if not _is_google3:
-        strip_import_prefix = ctx.rule.attr.strip_import_prefix
-        if strip_import_prefix and strip_import_prefix != "/":
-            if not package.startswith(strip_import_prefix[1:]):
-                fail("%s does not begin with prefix %s" % (package, strip_import_prefix))
-            package = package[len(strip_import_prefix):]
-
-    real_short_path = _get_real_short_path(src)
-    real_short_path = paths.relativize(real_short_path, package)
-    output_filename = paths.replace_extension(real_short_path, extension)
-    ret = ctx.actions.declare_file(output_filename)
-    return ret
-
-def _generate_include_path(src, out, extension):
-    short_path = _get_real_short_path(src)
-    short_path = paths.replace_extension(short_path, extension)
-    if not out.path.endswith(short_path):
-        fail("%s does not end with %s" % (out.path, short_path))
-
-    return out.path[:-len(short_path)]
-
-def _filter_none(elems):
-    out = []
-    for elem in elems:
-        if elem:
-            out.append(elem)
-    return out
-
-def _cc_library_func(ctx, name, hdrs, srcs, copts, includes, dep_ccinfos):
-    """Like cc_library(), but callable from rules.
-
-    Args:
-      ctx: Rule context.
-      name: Unique name used to generate output files.
-      hdrs: Public headers that can be #included from other rules.
-      srcs: C/C++ source files.
-      copts: Additional options for cc compilation.
-      includes: Additional include paths.
-      dep_ccinfos: CcInfo providers of dependencies we should build/link against.
-
-    Returns:
-      CcInfo provider for this compilation.
-    """
-
-    compilation_contexts = [info.compilation_context for info in dep_ccinfos]
-    linking_contexts = [info.linking_context for info in dep_ccinfos]
-    toolchain = find_cpp_toolchain(ctx)
-    feature_configuration = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = toolchain,
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
-
-    (compilation_context, compilation_outputs) = cc_common.compile(
-        actions = ctx.actions,
-        feature_configuration = feature_configuration,
-        cc_toolchain = toolchain,
-        name = name,
-        srcs = srcs,
-        includes = includes,
-        public_hdrs = hdrs,
-        user_compile_flags = copts,
-        compilation_contexts = compilation_contexts,
-    )
-
-    # buildifier: disable=unused-variable
-    (linking_context, linking_outputs) = cc_common.create_linking_context_from_compilation_outputs(
-        actions = ctx.actions,
-        name = name,
-        feature_configuration = feature_configuration,
-        cc_toolchain = toolchain,
-        compilation_outputs = compilation_outputs,
-        linking_contexts = linking_contexts,
-        disallow_dynamic_library = cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "targets_windows"),
-    )
-
-    return CcInfo(
-        compilation_context = compilation_context,
-        linking_context = linking_context,
-    )
-
-# Dummy rule to expose select() copts to aspects  ##############################
-
-UpbProtoLibraryCoptsInfo = provider(
-    "Provides copts for upb proto targets",
-    fields = {
-        "copts": "copts for upb_proto_library()",
-    },
-)
-
-def upb_proto_library_copts_impl(ctx):
-    return UpbProtoLibraryCoptsInfo(copts = ctx.attr.copts)
-
-upb_proto_library_copts = rule(
-    implementation = upb_proto_library_copts_impl,
-    attrs = {"copts": attr.string_list(default = [])},
-)
-
-# upb_proto_library / upb_proto_reflection_library shared code #################
-
-GeneratedSrcsInfo = provider(
-    "Provides generated headers and sources",
-    fields = {
-        "srcs": "list of srcs",
-        "hdrs": "list of hdrs",
-        "thunks": "Experimental, do not use. List of srcs defining C API. Incompatible with hdrs.",
-        "includes": "list of extra includes",
-    },
-)
-
-UpbWrappedCcInfo = provider("Provider for cc_info for protos", fields = ["cc_info", "cc_info_with_thunks"])
-_UpbDefsWrappedCcInfo = provider("Provider for cc_info for protos", fields = ["cc_info"])
-_UpbWrappedGeneratedSrcsInfo = provider("Provider for generated sources", fields = ["srcs"])
-_WrappedDefsGeneratedSrcsInfo = provider(
-    "Provider for generated reflective sources",
-    fields = ["srcs"],
-)
-
-def _compile_upb_protos(ctx, generator, proto_info, proto_sources):
-    if len(proto_sources) == 0:
-        return GeneratedSrcsInfo(srcs = [], hdrs = [], thunks = [], includes = [])
-
-    ext = "." + generator
-    tool = getattr(ctx.executable, "_gen_" + generator)
-    srcs = [_generate_output_file(ctx, name, ext + ".c") for name in proto_sources]
-    hdrs = [_generate_output_file(ctx, name, ext + ".h") for name in proto_sources]
-    thunks = []
-    if generator == "upb":
-        thunks = [_generate_output_file(ctx, name, ext + ".thunks.c") for name in proto_sources]
-    transitive_sets = proto_info.transitive_descriptor_sets.to_list()
-
-    args = ctx.actions.args()
-    args.use_param_file(param_file_arg = "@%s")
-    args.set_param_file_format("multiline")
-
-    args.add("--" + generator + "_out=" + _get_real_root(ctx, srcs[0]))
-    args.add("--plugin=protoc-gen-" + generator + "=" + tool.path)
-    args.add("--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]))
-    args.add_all(proto_sources, map_each = _get_real_short_path)
-
-    ctx.actions.run(
-        inputs = depset(
-            direct = [proto_info.direct_descriptor_set],
-            transitive = [proto_info.transitive_descriptor_sets],
-        ),
-        tools = [tool],
-        outputs = srcs + hdrs,
-        executable = ctx.executable._protoc,
-        arguments = [args],
-        progress_message = "Generating upb protos for :" + ctx.label.name,
-        mnemonic = "GenUpbProtos",
-    )
-    if generator == "upb":
-        ctx.actions.run_shell(
-            inputs = hdrs,
-            outputs = thunks,
-            command = " && ".join([
-                "sed 's/UPB_INLINE //' {} > {}".format(hdr.path, thunk.path)
-                for (hdr, thunk) in zip(hdrs, thunks)
-            ]),
-            progress_message = "Generating thunks for upb protos API for: " + ctx.label.name,
-            mnemonic = "GenUpbProtosThunks",
-        )
-    return GeneratedSrcsInfo(
-        srcs = srcs,
-        hdrs = hdrs,
-        thunks = thunks,
-        includes = [_generate_include_path(proto_sources[0], hdrs[0], ext + ".h")],
-    )
-
-def _upb_proto_rule_impl(ctx):
-    if len(ctx.attr.deps) != 1:
-        fail("only one deps dependency allowed.")
-    dep = ctx.attr.deps[0]
-
-    if _WrappedDefsGeneratedSrcsInfo in dep:
-        srcs = dep[_WrappedDefsGeneratedSrcsInfo].srcs
-    elif _UpbWrappedGeneratedSrcsInfo in dep:
-        srcs = dep[_UpbWrappedGeneratedSrcsInfo].srcs
-    else:
-        fail("proto_library rule must generate _UpbWrappedGeneratedSrcsInfo or " +
-             "_WrappedDefsGeneratedSrcsInfo (aspect should have handled this).")
-
-    if _UpbDefsWrappedCcInfo in dep:
-        cc_info = dep[_UpbDefsWrappedCcInfo].cc_info
-    elif UpbWrappedCcInfo in dep:
-        cc_info = dep[UpbWrappedCcInfo].cc_info
-    else:
-        fail("proto_library rule must generate UpbWrappedCcInfo or " +
-             "_UpbDefsWrappedCcInfo (aspect should have handled this).")
-
-    lib = cc_info.linking_context.linker_inputs.to_list()[0].libraries[0]
-    files = _filter_none([
-        lib.static_library,
-        lib.pic_static_library,
-        lib.dynamic_library,
-    ])
-    return [
-        DefaultInfo(files = depset(files + srcs.hdrs + srcs.srcs)),
-        srcs,
-        cc_info,
-    ]
-
-def _generate_name(ctx, generator, thunks = False):
-    if thunks:
-        return ctx.rule.attr.name + "." + generator + ".thunks"
-    return ctx.rule.attr.name + "." + generator
-
-def _upb_proto_aspect_impl(target, ctx, generator, cc_provider, file_provider, provide_cc_shared_library_hints = True):
-    providers = []
-    if not getattr(ctx.rule.attr, "srcs", []):
-        # This target doesn't declare any sources, reexport all its deps instead.
-        srcs = []
-        hdrs = []
-        thunks = []
-        includes = []
-        cc_infos = []
-        cc_infos_with_thunks = []
-        for dep in ctx.rule.attr.deps:
-            if CcInfo in dep:
-                cc_infos.append(dep[CcInfo])
-            if UpbWrappedCcInfo in dep:
-                cc_infos.append(dep[UpbWrappedCcInfo].cc_info)
-                cc_infos_with_thunks.append(dep[UpbWrappedCcInfo].cc_info_with_thunks)
-            if _UpbDefsWrappedCcInfo in dep:
-                cc_infos.append(dep[_UpbDefsWrappedCcInfo].cc_info)
-
-            if _UpbWrappedGeneratedSrcsInfo in dep:
-                unwrapped_sources = dep[_UpbWrappedGeneratedSrcsInfo].srcs
-                srcs += unwrapped_sources.srcs
-                hdrs += unwrapped_sources.hdrs
-                thunks += unwrapped_sources.thunks
-                includes += unwrapped_sources.includes
-            if _WrappedDefsGeneratedSrcsInfo in dep:
-                unwrapped_sources = dep[_WrappedDefsGeneratedSrcsInfo].srcs
-                srcs += unwrapped_sources.srcs
-                hdrs += unwrapped_sources.hdrs
-                thunks += unwrapped_sources.thunks
-                includes += unwrapped_sources.includes
-
-        if len(cc_infos_with_thunks) > 0:
-            providers.append(cc_provider(
-                cc_info = cc_common.merge_cc_infos(direct_cc_infos = cc_infos),
-                cc_info_with_thunks = cc_common.merge_cc_infos(direct_cc_infos = cc_infos_with_thunks),
-            ))
-        else:
-            providers.append(cc_provider(cc_info = cc_common.merge_cc_infos(direct_cc_infos = cc_infos)))
-        providers.append(file_provider(srcs = GeneratedSrcsInfo(srcs = srcs, hdrs = hdrs, thunks = thunks, includes = includes)))
-    else:
-        proto_info = target[ProtoInfo]
-        files = _compile_upb_protos(ctx, generator, proto_info, proto_info.direct_sources)
-        deps = ctx.rule.attr.deps + getattr(ctx.attr, "_" + generator)
-        dep_ccinfos = [dep[CcInfo] for dep in deps if CcInfo in dep]
-        dep_ccinfos += [dep[UpbWrappedCcInfo].cc_info for dep in deps if UpbWrappedCcInfo in dep]
-        dep_ccinfos += [dep[_UpbDefsWrappedCcInfo].cc_info for dep in deps if _UpbDefsWrappedCcInfo in dep]
-        if generator == "upbdefs":
-            if UpbWrappedCcInfo not in target:
-                fail("Target should have UpbWrappedCcInfo provider")
-            dep_ccinfos.append(target[UpbWrappedCcInfo].cc_info)
-
-        cc_info = _cc_library_func(
-            ctx = ctx,
-            name = _generate_name(ctx, generator),
-            hdrs = files.hdrs,
-            srcs = files.srcs,
-            includes = files.includes,
-            copts = ctx.attr._copts[UpbProtoLibraryCoptsInfo].copts,
-            dep_ccinfos = dep_ccinfos,
-        )
-
-        if files.thunks:
-            cc_info_with_thunks = _cc_library_func(
-                ctx = ctx,
-                name = _generate_name(ctx, generator, files.thunks),
-                hdrs = [],
-                srcs = files.thunks,
-                includes = files.includes,
-                copts = ctx.attr._copts[UpbProtoLibraryCoptsInfo].copts,
-                dep_ccinfos = dep_ccinfos + [cc_info],
-            )
-            wrapped_cc_info = cc_provider(
-                cc_info = cc_info,
-                cc_info_with_thunks = cc_info_with_thunks,
-            )
-        else:
-            wrapped_cc_info = cc_provider(
-                cc_info = cc_info,
-            )
-        providers += [
-            wrapped_cc_info,
-            file_provider(srcs = files),
-        ]
-
-    if generator not in _GENERATORS:
-        fail("Please add new generator '{}' to _GENERATORS list".format(generator))
-
-    possible_owners = []
-    for generator in _GENERATORS:
-        possible_owners.append(ctx.label.relative(_generate_name(ctx, generator)))
-        possible_owners.append(ctx.label.relative(_generate_name(ctx, generator, thunks = True)))
-
-    if provide_cc_shared_library_hints:
-        if hasattr(cc_common, "CcSharedLibraryHintInfo"):
-            providers.append(cc_common.CcSharedLibraryHintInfo(owners = possible_owners))
-        elif hasattr(cc_common, "CcSharedLibraryHintInfo_6_X_constructor_do_not_use"):
-            # This branch can be deleted once 6.X is not supported by upb rules
-            providers.append(cc_common.CcSharedLibraryHintInfo_6_X_constructor_do_not_use(owners = possible_owners))
-    return providers
-
-_GENERATORS = ["upb", "upbdefs"]
-
-def upb_proto_library_aspect_impl(target, ctx):
-    return _upb_proto_aspect_impl(target, ctx, "upb", UpbWrappedCcInfo, _UpbWrappedGeneratedSrcsInfo)
-
-def _upb_proto_reflection_library_aspect_impl(target, ctx):
-    return _upb_proto_aspect_impl(target, ctx, "upbdefs", _UpbDefsWrappedCcInfo, _WrappedDefsGeneratedSrcsInfo, provide_cc_shared_library_hints = False)
-
-def _maybe_add(d):
-    if _is_google3:
-        d["_grep_includes"] = attr.label(
-            allow_single_file = True,
-            cfg = "exec",
-            default = "@bazel_tools//tools/cpp:grep-includes",
-        )
-    return d
-
-# upb_proto_library() ##########################################################
-
-def _get_upb_proto_library_aspect_provides():
-    provides = [
-        UpbWrappedCcInfo,
-        _UpbWrappedGeneratedSrcsInfo,
-    ]
-
-    if hasattr(cc_common, "CcSharedLibraryHintInfo"):
-        provides.append(cc_common.CcSharedLibraryHintInfo)
-    elif hasattr(cc_common, "CcSharedLibraryHintInfo_6_X_getter_do_not_use"):
-        # This branch can be deleted once 6.X is not supported by upb rules
-        provides.append(cc_common.CcSharedLibraryHintInfo_6_X_getter_do_not_use)
-
-    return provides
-
-upb_proto_library_aspect = aspect(
-    attrs = _maybe_add({
-        "_copts": attr.label(
-            default = "//:upb_proto_library_copts__for_generated_code_only_do_not_use",
-        ),
-        "_gen_upb": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//upbc:protoc-gen-upb_stage1",
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-        "_cc_toolchain": attr.label(
-            default = "@bazel_tools//tools/cpp:current_cc_toolchain",
-        ),
-        "_upb": attr.label_list(default = [
-            "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        ]),
-        "_fasttable_enabled": attr.label(default = "//:fasttable_enabled"),
-    }),
-    implementation = upb_proto_library_aspect_impl,
-    provides = _get_upb_proto_library_aspect_provides(),
-    attr_aspects = ["deps"],
-    fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(),
-    incompatible_use_toolchain_transition = True,
-)
-
-upb_proto_library = rule(
-    output_to_genfiles = True,
-    implementation = _upb_proto_rule_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects = [upb_proto_library_aspect],
-            allow_rules = ["proto_library"],
-            providers = [ProtoInfo],
-        ),
-    },
-    provides = [CcInfo],
-)
-
-# upb_proto_reflection_library() ###############################################
-
-_upb_proto_reflection_library_aspect = aspect(
-    attrs = _maybe_add({
-        "_copts": attr.label(
-            default = "//:upb_proto_library_copts__for_generated_code_only_do_not_use",
-        ),
-        "_gen_upbdefs": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//upbc:protoc-gen-upbdefs",
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-        "_cc_toolchain": attr.label(
-            default = "@bazel_tools//tools/cpp:current_cc_toolchain",
-        ),
-        "_upbdefs": attr.label_list(
-            default = [
-                "//:generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-            ],
-        ),
-    }),
-    implementation = _upb_proto_reflection_library_aspect_impl,
-    provides = [
-        _UpbDefsWrappedCcInfo,
-        _WrappedDefsGeneratedSrcsInfo,
-    ],
-    required_aspect_providers = [
-        UpbWrappedCcInfo,
-        _UpbWrappedGeneratedSrcsInfo,
-    ],
-    attr_aspects = ["deps"],
-    fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(),
-    incompatible_use_toolchain_transition = True,
-)
-
-upb_proto_reflection_library = rule(
-    output_to_genfiles = True,
-    implementation = _upb_proto_rule_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects = [
-                upb_proto_library_aspect,
-                _upb_proto_reflection_library_aspect,
-            ],
-            allow_rules = ["proto_library"],
-            providers = [ProtoInfo],
-        ),
-    },
-    provides = [CcInfo],
-)
diff --git a/third_party/upb/bazel/workspace_deps.bzl b/third_party/upb/bazel/workspace_deps.bzl
deleted file mode 100644
index bd97183f20a49..0000000000000
--- a/third_party/upb/bazel/workspace_deps.bzl
+++ /dev/null
@@ -1,104 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//bazel:python_downloads.bzl", "python_nuget_package", "python_source_archive")
-
-def _github_archive(repo, commit, **kwargs):
-    repo_name = repo.split("/")[-1]
-    http_archive(
-        urls = [repo + "/archive/" + commit + ".zip"],
-        strip_prefix = repo_name + "-" + commit,
-        **kwargs
-    )
-
-def upb_deps():
-    maybe(
-        _github_archive,
-        name = "com_google_absl",
-        repo = "https://github.com/abseil/abseil-cpp",
-        commit = "29bf8085f3bf17b84d30e34b3d7ff8248fda404e",  # Abseil LTS 20230802
-        sha256 = "f4871f2982e29496f4ddd598ccd5a87fea42f23c49b5e5eb459d57eab91df9d9",
-    )
-
-    maybe(
-        _github_archive,
-        name = "com_google_protobuf",
-        repo = "https://github.com/protocolbuffers/protobuf",
-        commit = "3465661aece8b9c754dcb3d4f0432bb89374e738",
-        patches = ["@upb//bazel:protobuf.patch"],
-        sha256 = "1a59e28a55cc46fa444c976460799f6d76b69a6831fdb7da870ff9031fc40617",
-    )
-
-    maybe(
-        _github_archive,
-        name = "utf8_range",
-        repo = "https://github.com/protocolbuffers/utf8_range",
-        commit = "de0b4a8ff9b5d4c98108bdfe723291a33c52c54f",
-        sha256 = "5da960e5e5d92394c809629a03af3c7709d2d3d0ca731dacb3a9fb4bf28f7702",
-    )
-
-    maybe(
-        http_archive,
-        name = "rules_pkg",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-        ],
-        sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
-    )
-
-    maybe(
-        _github_archive,
-        name = "rules_python",
-        repo = "https://github.com/bazelbuild/rules_python",
-        commit = "912a5051f51581784fd64094f6bdabf93f6d698f",  # 0.14.0
-        sha256 = "a3e4b4ade7c4a52e757b16a16e94d0b2640333062180cba577d81fac087a501d",
-    )
-
-    maybe(
-        http_archive,
-        name = "bazel_skylib",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-        ],
-        sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
-    )
-
-    #Python Downloads
-
-    python_source_archive(
-        name = "python-3.7.0",
-        sha256 = "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d",
-    )
-    python_nuget_package(
-        name = "nuget_python_i686_3.7.0",
-        sha256 = "a8bb49fa1ca62ad55430fcafaca1b58015e22943e66b1a87d5e7cef2556c6a54",
-    )
-    python_nuget_package(
-        name = "nuget_python_x86-64_3.7.0",
-        sha256 = "66eb796a5bdb1e6787b8f655a1237a6b6964af2115b7627cf4f0032cf068b4b2",
-    )
-    python_nuget_package(
-        name = "nuget_python_i686_3.8.0",
-        sha256 = "87a6481f5eef30b42ac12c93f06f73bd0b8692f26313b76a6615d1641c4e7bca",
-    )
-    python_nuget_package(
-        name = "nuget_python_x86-64_3.8.0",
-        sha256 = "96c61321ce90dd053c8a04f305a5f6cc6d91350b862db34440e4a4f069b708a0",
-    )
-    python_nuget_package(
-        name = "nuget_python_i686_3.9.0",
-        sha256 = "229abecbe49dc08fe5709e0b31e70edfb3b88f23335ebfc2904c44f940fd59b6",
-    )
-    python_nuget_package(
-        name = "nuget_python_x86-64_3.9.0",
-        sha256 = "6af58a733e7dfbfcdd50d55788134393d6ffe7ab8270effbf724bdb786558832",
-    )
-    python_nuget_package(
-        name = "nuget_python_i686_3.10.0",
-        sha256 = "e115e102eb90ce160ab0ef7506b750a8d7ecc385bde0a496f02a54337a8bc333",
-    )
-    python_nuget_package(
-        name = "nuget_python_x86-64_3.10.0",
-        sha256 = "4474c83c25625d93e772e926f95f4cd398a0abbb52793625fa30f39af3d2cc00",
-    )
diff --git a/third_party/upb/benchmarks/BUILD b/third_party/upb/benchmarks/BUILD
deleted file mode 100644
index 92873f3bdcdd2..0000000000000
--- a/third_party/upb/benchmarks/BUILD
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# begin:google_only
-# load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-# end:google_only
-
-load(
-    "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
-    "upb_proto_reflection_library",
-)
-load(
-    ":build_defs.bzl",
-    "cc_optimizefor_proto_library",
-    "expand_suffixes",
-    "proto_library",
-    "tmpl_cc_binary",
-)
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-proto_library(
-    name = "descriptor_proto",
-    srcs = ["descriptor.proto"],
-)
-
-upb_proto_library(
-    name = "benchmark_descriptor_upb_proto",
-    deps = [":descriptor_proto"],
-)
-
-upb_proto_reflection_library(
-    name = "benchmark_descriptor_upb_proto_reflection",
-    deps = [":descriptor_proto"],
-)
-
-upb_proto_reflection_library(
-    name = "ads_upb_proto_reflection",
-    deps = ["@com_google_googleapis//:ads_proto"],
-)
-
-cc_proto_library(
-    name = "benchmark_descriptor_cc_proto",
-    deps = [":descriptor_proto"],
-)
-
-proto_library(
-    name = "benchmark_descriptor_sv_proto",
-    srcs = ["descriptor_sv.proto"],
-)
-
-cc_proto_library(
-    name = "benchmark_descriptor_sv_cc_proto",
-    deps = [":benchmark_descriptor_sv_proto"],
-)
-
-cc_test(
-    name = "benchmark",
-    testonly = 1,
-    srcs = ["benchmark.cc"],
-    deps = [
-        ":ads_upb_proto_reflection",
-        ":benchmark_descriptor_cc_proto",
-        ":benchmark_descriptor_sv_cc_proto",
-        ":benchmark_descriptor_upb_proto",
-        ":benchmark_descriptor_upb_proto_reflection",
-        "//:base",
-        "//:descriptor_upb_proto",
-        "//:mem",
-        "//:reflection",
-        "@com_github_google_benchmark//:benchmark_main",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-# Size benchmarks.
-
-SIZE_BENCHMARKS = {
-    "empty": "Empty",
-    "descriptor": "FileDescriptorSet",
-    "100_msgs": "Message100",
-    "200_msgs": "Message200",
-    "100_fields": "Message",
-    "200_fields": "Message",
-}
-
-py_binary(
-    name = "gen_synthetic_protos",
-    srcs = ["gen_synthetic_protos.py"],
-    python_version = "PY3",
-)
-
-py_binary(
-    name = "gen_upb_binary_c",
-    srcs = ["gen_upb_binary_c.py"],
-    python_version = "PY3",
-)
-
-py_binary(
-    name = "gen_protobuf_binary_cc",
-    srcs = ["gen_protobuf_binary_cc.py"],
-    python_version = "PY3",
-)
-
-genrule(
-    name = "do_gen_synthetic_protos",
-    outs = [
-        "100_msgs.proto",
-        "200_msgs.proto",
-        "100_fields.proto",
-        "200_fields.proto",
-    ],
-    cmd = "$(execpath :gen_synthetic_protos) $(RULEDIR)",
-    tools = [":gen_synthetic_protos"],
-)
-
-proto_library(
-    name = "100_msgs_proto",
-    srcs = ["100_msgs.proto"],
-)
-
-proto_library(
-    name = "200_msgs_proto",
-    srcs = ["200_msgs.proto"],
-)
-
-proto_library(
-    name = "100_fields_proto",
-    srcs = ["100_fields.proto"],
-)
-
-proto_library(
-    name = "200_fields_proto",
-    srcs = ["200_fields.proto"],
-)
-
-proto_library(
-    name = "empty_proto",
-    srcs = ["empty.proto"],
-)
-
-[(
-    upb_proto_library(
-        name = k + "_upb_proto",
-        deps = [":" + k + "_proto"],
-    ),
-    cc_proto_library(
-        name = k + "_cc_proto",
-        deps = [":" + k + "_proto"],
-    ),
-    tmpl_cc_binary(
-        name = k + "_upb_binary",
-        testonly = 1,
-        args = [
-            package_name() + "/" + k + ".upb.h",
-            "upb_benchmark_" + v,
-        ],
-        gen = ":gen_upb_binary_c",
-        deps = [
-            ":" + k + "_upb_proto",
-        ],
-    ),
-    tmpl_cc_binary(
-        name = k + "_protobuf_binary",
-        testonly = 1,
-        args = [
-            package_name() + "/" + k + ".pb.h",
-            "upb_benchmark::" + v,
-        ],
-        gen = ":gen_protobuf_binary_cc",
-        deps = [
-            ":" + k + "_cc_proto",
-        ],
-    ),
-    cc_optimizefor_proto_library(
-        name = k + "_cc_lite_proto",
-        srcs = [k + ".proto"],
-        outs = [k + "_lite.proto"],
-        optimize_for = "LITE_RUNTIME",
-    ),
-    tmpl_cc_binary(
-        name = k + "_lite_protobuf_binary",
-        testonly = 1,
-        args = [
-            package_name() + "/" + k + "_lite.pb.h",
-            "upb_benchmark::" + v,
-        ],
-        gen = ":gen_protobuf_binary_cc",
-        deps = [
-            ":" + k + "_cc_lite_proto",
-        ],
-    ),
-    cc_optimizefor_proto_library(
-        name = k + "_cc_codesize_proto",
-        srcs = [k + ".proto"],
-        outs = [k + "_codesize.proto"],
-        optimize_for = "CODE_SIZE",
-    ),
-    tmpl_cc_binary(
-        name = k + "_codesize_protobuf_binary",
-        testonly = 1,
-        args = [
-            package_name() + "/" + k + "_codesize.pb.h",
-            "upb_benchmark::" + v,
-        ],
-        gen = ":gen_protobuf_binary_cc",
-        deps = [
-            ":" + k + "_cc_codesize_proto",
-        ],
-    ),
-) for k, v in SIZE_BENCHMARKS.items()]
-
-genrule(
-    name = "size_data",
-    testonly = 1,
-    srcs = expand_suffixes(
-        SIZE_BENCHMARKS.keys(),
-        suffixes = [
-            "_upb_binary",
-            "_protobuf_binary",
-            "_lite_protobuf_binary",
-            "_codesize_protobuf_binary",
-        ],
-    ),
-    outs = ["size_data.txt"],
-    # We want --format=GNU which counts rodata with data, not text.
-    cmd = "size $$($$OSTYPE == 'linux-gnu' ? '--format=GNU -d' : '') $(SRCS) > $@",
-    # "size" sometimes isn't available remotely.
-    local = 1,
-    tags = ["no-remote-exec"],
-)
diff --git a/third_party/upb/benchmarks/BUILD.googleapis b/third_party/upb/benchmarks/BUILD.googleapis
deleted file mode 100644
index cb12bc7a413f5..0000000000000
--- a/third_party/upb/benchmarks/BUILD.googleapis
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "@rules_proto//proto:defs.bzl",
-    "proto_library",
-)
-
-proto_library(
-    name = "ads_proto",
-    srcs = glob([
-        "google/ads/googleads/v13/**/*.proto",
-        "google/api/**/*.proto",
-        "google/rpc/**/*.proto",
-        "google/longrunning/**/*.proto",
-        "google/logging/**/*.proto",
-    ]),
-    #srcs = ["google/ads/googleads/v5/services/google_ads_service.proto"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:api_proto",
-        "@com_google_protobuf//:descriptor_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:field_mask_proto",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:type_proto",
-        "@com_google_protobuf//:wrappers_proto",
-    ],
-)
diff --git a/third_party/upb/benchmarks/benchmark.cc b/third_party/upb/benchmarks/benchmark.cc
deleted file mode 100644
index 6b0314b500910..0000000000000
--- a/third_party/upb/benchmarks/benchmark.cc
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <benchmark/benchmark.h>
-
-#include <string.h>
-
-#include "google/ads/googleads/v13/services/google_ads_service.upbdefs.h"
-#include "google/protobuf/descriptor.pb.h"
-#include "absl/container/flat_hash_set.h"
-#include "google/protobuf/dynamic_message.h"
-#include "benchmarks/descriptor.pb.h"
-#include "benchmarks/descriptor.upb.h"
-#include "benchmarks/descriptor.upbdefs.h"
-#include "benchmarks/descriptor_sv.pb.h"
-#include "upb/base/log2.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.hpp"
-
-upb_StringView descriptor = benchmarks_descriptor_proto_upbdefinit.descriptor;
-namespace protobuf = ::google::protobuf;
-
-// A buffer big enough to parse descriptor.proto without going to heap.
-// We use 64-bit ints here to force alignment.
-int64_t buf[8191];
-
-void CollectFileDescriptors(
-    const _upb_DefPool_Init* file,
-    std::vector<upb_StringView>& serialized_files,
-    absl::flat_hash_set<const _upb_DefPool_Init*>& seen) {
-  if (!seen.insert(file).second) return;
-  for (_upb_DefPool_Init** deps = file->deps; *deps; deps++) {
-    CollectFileDescriptors(*deps, serialized_files, seen);
-  }
-  serialized_files.push_back(file->descriptor);
-}
-
-static void BM_ArenaOneAlloc(benchmark::State& state) {
-  for (auto _ : state) {
-    upb_Arena* arena = upb_Arena_New();
-    upb_Arena_Malloc(arena, 1);
-    upb_Arena_Free(arena);
-  }
-}
-BENCHMARK(BM_ArenaOneAlloc);
-
-static void BM_ArenaInitialBlockOneAlloc(benchmark::State& state) {
-  for (auto _ : state) {
-    upb_Arena* arena = upb_Arena_Init(buf, sizeof(buf), NULL);
-    upb_Arena_Malloc(arena, 1);
-    upb_Arena_Free(arena);
-  }
-}
-BENCHMARK(BM_ArenaInitialBlockOneAlloc);
-
-static void BM_ArenaFuseUnbalanced(benchmark::State& state) {
-  std::vector<upb_Arena*> arenas(state.range(0));
-  size_t n = 0;
-  for (auto _ : state) {
-    for (auto& arena : arenas) {
-      arena = upb_Arena_New();
-    }
-    for (auto& arena : arenas) {
-      upb_Arena_Fuse(arenas[0], arena);
-    }
-    for (auto& arena : arenas) {
-      upb_Arena_Free(arena);
-    }
-    n += arenas.size();
-  }
-  state.SetItemsProcessed(n);
-}
-BENCHMARK(BM_ArenaFuseUnbalanced)->Range(2, 128);
-
-static void BM_ArenaFuseBalanced(benchmark::State& state) {
-  std::vector<upb_Arena*> arenas(state.range(0));
-  size_t n = 0;
-
-  for (auto _ : state) {
-    for (auto& arena : arenas) {
-      arena = upb_Arena_New();
-    }
-
-    // Perform a series of fuses that keeps the halves balanced.
-    size_t max = upb_Log2Ceiling(arenas.size());
-    for (size_t n = 0; n <= max; n++) {
-      size_t step = 1 << n;
-      for (size_t i = 0; i + step < arenas.size(); i += (step * 2)) {
-        upb_Arena_Fuse(arenas[i], arenas[i + step]);
-      }
-    }
-
-    for (auto& arena : arenas) {
-      upb_Arena_Free(arena);
-    }
-    n += arenas.size();
-  }
-  state.SetItemsProcessed(n);
-}
-BENCHMARK(BM_ArenaFuseBalanced)->Range(2, 128);
-
-enum LoadDescriptorMode {
-  NoLayout,
-  WithLayout,
-};
-
-// This function is mostly copied from upb/def.c, but it is modified to avoid
-// passing in the pre-generated mini-tables, in order to force upb to compute
-// them dynamically.  Generally you would never want to do this, but we want to
-// simulate the cost we would pay if we were loading these types purely from
-// descriptors, with no mini-tales available.
-bool LoadDefInit_BuildLayout(upb_DefPool* s, const _upb_DefPool_Init* init,
-                             size_t* bytes) {
-  _upb_DefPool_Init** deps = init->deps;
-  google_protobuf_FileDescriptorProto* file;
-  upb_Arena* arena;
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-
-  if (upb_DefPool_FindFileByName(s, init->filename)) {
-    return true;
-  }
-
-  arena = upb_Arena_New();
-
-  for (; *deps; deps++) {
-    if (!LoadDefInit_BuildLayout(s, *deps, bytes)) goto err;
-  }
-
-  file = google_protobuf_FileDescriptorProto_parse_ex(
-      init->descriptor.data, init->descriptor.size, NULL,
-      kUpb_DecodeOption_AliasString, arena);
-  *bytes += init->descriptor.size;
-
-  if (!file) {
-    upb_Status_SetErrorFormat(
-        &status,
-        "Failed to parse compiled-in descriptor for file '%s'. This should "
-        "never happen.",
-        init->filename);
-    goto err;
-  }
-
-  // KEY DIFFERENCE: Here we pass in only the descriptor, and not the
-  // pre-generated minitables.
-  if (!upb_DefPool_AddFile(s, file, &status)) {
-    goto err;
-  }
-
-  upb_Arena_Free(arena);
-  return true;
-
-err:
-  fprintf(stderr,
-          "Error loading compiled-in descriptor for file '%s' (this should "
-          "never happen): %s\n",
-          init->filename, upb_Status_ErrorMessage(&status));
-  exit(1);
-}
-
-template <LoadDescriptorMode Mode>
-static void BM_LoadAdsDescriptor_Upb(benchmark::State& state) {
-  size_t bytes_per_iter = 0;
-  for (auto _ : state) {
-    upb::DefPool defpool;
-    if (Mode == NoLayout) {
-      google_ads_googleads_v13_services_SearchGoogleAdsRequest_getmsgdef(
-          defpool.ptr());
-      bytes_per_iter = _upb_DefPool_BytesLoaded(defpool.ptr());
-    } else {
-      bytes_per_iter = 0;
-      LoadDefInit_BuildLayout(
-          defpool.ptr(),
-          &google_ads_googleads_v13_services_google_ads_service_proto_upbdefinit,
-          &bytes_per_iter);
-    }
-  }
-  state.SetBytesProcessed(state.iterations() * bytes_per_iter);
-}
-BENCHMARK_TEMPLATE(BM_LoadAdsDescriptor_Upb, NoLayout);
-BENCHMARK_TEMPLATE(BM_LoadAdsDescriptor_Upb, WithLayout);
-
-template <LoadDescriptorMode Mode>
-static void BM_LoadAdsDescriptor_Proto2(benchmark::State& state) {
-  extern _upb_DefPool_Init
-      google_ads_googleads_v13_services_google_ads_service_proto_upbdefinit;
-  std::vector<upb_StringView> serialized_files;
-  absl::flat_hash_set<const _upb_DefPool_Init*> seen_files;
-  CollectFileDescriptors(
-      &google_ads_googleads_v13_services_google_ads_service_proto_upbdefinit,
-      serialized_files, seen_files);
-  size_t bytes_per_iter = 0;
-  for (auto _ : state) {
-    bytes_per_iter = 0;
-    protobuf::Arena arena;
-    protobuf::DescriptorPool pool;
-    for (auto file : serialized_files) {
-      absl::string_view input(file.data, file.size);
-      auto proto =
-          protobuf::Arena::CreateMessage<protobuf::FileDescriptorProto>(&arena);
-      bool ok = proto->ParseFrom<protobuf::MessageLite::kMergePartial>(input) &&
-                pool.BuildFile(*proto) != nullptr;
-      if (!ok) {
-        printf("Failed to add file.\n");
-        exit(1);
-      }
-      bytes_per_iter += input.size();
-    }
-
-    if (Mode == WithLayout) {
-      protobuf::DynamicMessageFactory factory;
-      const protobuf::Descriptor* d = pool.FindMessageTypeByName(
-          "google.ads.googleads.v13.services.SearchGoogleAdsResponse");
-      if (!d) {
-        printf("Failed to find descriptor.\n");
-        exit(1);
-      }
-      factory.GetPrototype(d);
-    }
-  }
-  state.SetBytesProcessed(state.iterations() * bytes_per_iter);
-}
-BENCHMARK_TEMPLATE(BM_LoadAdsDescriptor_Proto2, NoLayout);
-BENCHMARK_TEMPLATE(BM_LoadAdsDescriptor_Proto2, WithLayout);
-
-enum CopyStrings {
-  Copy,
-  Alias,
-};
-
-enum ArenaMode {
-  NoArena,
-  UseArena,
-  InitBlock,
-};
-
-template <ArenaMode AMode, CopyStrings Copy>
-static void BM_Parse_Upb_FileDesc(benchmark::State& state) {
-  for (auto _ : state) {
-    upb_Arena* arena;
-    if (AMode == InitBlock) {
-      arena = upb_Arena_Init(buf, sizeof(buf), NULL);
-    } else {
-      arena = upb_Arena_New();
-    }
-    upb_benchmark_FileDescriptorProto* set =
-        upb_benchmark_FileDescriptorProto_parse_ex(
-            descriptor.data, descriptor.size, NULL,
-            Copy == Alias ? kUpb_DecodeOption_AliasString : 0, arena);
-    if (!set) {
-      printf("Failed to parse.\n");
-      exit(1);
-    }
-    upb_Arena_Free(arena);
-  }
-  state.SetBytesProcessed(state.iterations() * descriptor.size);
-}
-BENCHMARK_TEMPLATE(BM_Parse_Upb_FileDesc, UseArena, Copy);
-BENCHMARK_TEMPLATE(BM_Parse_Upb_FileDesc, UseArena, Alias);
-BENCHMARK_TEMPLATE(BM_Parse_Upb_FileDesc, InitBlock, Copy);
-BENCHMARK_TEMPLATE(BM_Parse_Upb_FileDesc, InitBlock, Alias);
-
-template <ArenaMode AMode, class P>
-struct Proto2Factory;
-
-template <class P>
-struct Proto2Factory<NoArena, P> {
- public:
-  P* GetProto() { return &proto_; }
-
- private:
-  P proto_;
-};
-
-template <class P>
-struct Proto2Factory<UseArena, P> {
- public:
-  P* GetProto() { return protobuf::Arena::CreateMessage<P>(&arena_); }
-
- private:
-  protobuf::Arena arena_;
-};
-
-template <class P>
-struct Proto2Factory<InitBlock, P> {
- public:
-  Proto2Factory() : arena_(GetOptions()) {}
-  P* GetProto() { return protobuf::Arena::CreateMessage<P>(&arena_); }
-
- private:
-  protobuf::ArenaOptions GetOptions() {
-    protobuf::ArenaOptions opts;
-    opts.initial_block = (char*)buf;
-    opts.initial_block_size = sizeof(buf);
-    return opts;
-  }
-
-  protobuf::Arena arena_;
-};
-
-using FileDesc = ::upb_benchmark::FileDescriptorProto;
-using FileDescSV = ::upb_benchmark::sv::FileDescriptorProto;
-
-template <class P, ArenaMode AMode, CopyStrings kCopy>
-void BM_Parse_Proto2(benchmark::State& state) {
-  constexpr protobuf::MessageLite::ParseFlags kParseFlags =
-      kCopy == Copy
-          ? protobuf::MessageLite::ParseFlags::kMergePartial
-          : protobuf::MessageLite::ParseFlags::kMergePartialWithAliasing;
-  for (auto _ : state) {
-    Proto2Factory<AMode, P> proto_factory;
-    auto proto = proto_factory.GetProto();
-    absl::string_view input(descriptor.data, descriptor.size);
-    bool ok = proto->template ParseFrom<kParseFlags>(input);
-    if (!ok) {
-      printf("Failed to parse.\n");
-      exit(1);
-    }
-  }
-  state.SetBytesProcessed(state.iterations() * descriptor.size);
-}
-BENCHMARK_TEMPLATE(BM_Parse_Proto2, FileDesc, NoArena, Copy);
-BENCHMARK_TEMPLATE(BM_Parse_Proto2, FileDesc, UseArena, Copy);
-BENCHMARK_TEMPLATE(BM_Parse_Proto2, FileDesc, InitBlock, Copy);
-BENCHMARK_TEMPLATE(BM_Parse_Proto2, FileDescSV, InitBlock, Alias);
-
-static void BM_SerializeDescriptor_Proto2(benchmark::State& state) {
-  upb_benchmark::FileDescriptorProto proto;
-  proto.ParseFromArray(descriptor.data, descriptor.size);
-  for (auto _ : state) {
-    proto.SerializePartialToArray(buf, sizeof(buf));
-  }
-  state.SetBytesProcessed(state.iterations() * descriptor.size);
-}
-BENCHMARK(BM_SerializeDescriptor_Proto2);
-
-static void BM_SerializeDescriptor_Upb(benchmark::State& state) {
-  int64_t total = 0;
-  upb_Arena* arena = upb_Arena_New();
-  upb_benchmark_FileDescriptorProto* set =
-      upb_benchmark_FileDescriptorProto_parse(descriptor.data, descriptor.size,
-                                              arena);
-  if (!set) {
-    printf("Failed to parse.\n");
-    exit(1);
-  }
-  for (auto _ : state) {
-    upb_Arena* enc_arena = upb_Arena_Init(buf, sizeof(buf), NULL);
-    size_t size;
-    char* data =
-        upb_benchmark_FileDescriptorProto_serialize(set, enc_arena, &size);
-    if (!data) {
-      printf("Failed to serialize.\n");
-      exit(1);
-    }
-    total += size;
-  }
-  state.SetBytesProcessed(total);
-}
-BENCHMARK(BM_SerializeDescriptor_Upb);
diff --git a/third_party/upb/benchmarks/build_defs.bzl b/third_party/upb/benchmarks/build_defs.bzl
deleted file mode 100644
index 168dab6634faf..0000000000000
--- a/third_party/upb/benchmarks/build_defs.bzl
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# begin:google_only
-# load("@rules_cc//cc:defs.bzl", _cc_proto_library = "cc_proto_library")
-#
-# _is_google3 = True
-# end:google_only
-
-# begin:github_only
-_cc_proto_library = native.cc_proto_library
-_is_google3 = False
-# end:github_only
-
-def proto_library(**kwargs):
-    if _is_google3:
-        kwargs["cc_api_version"] = 2
-    native.proto_library(
-        **kwargs
-    )
-
-def tmpl_cc_binary(name, gen, args, replacements = [], **kwargs):
-    srcs = [name + ".cc"]
-    native.genrule(
-        name = name + "_gen_srcs",
-        tools = [gen],
-        outs = srcs,
-        cmd = "$(location " + gen + ") " + " ".join(args) + " > $@",
-    )
-
-    if _is_google3:
-        kwargs["malloc"] = "//base:system_malloc"
-        kwargs["features"] = ["-static_linking_mode"]
-    native.cc_binary(
-        name = name,
-        srcs = srcs,
-        **kwargs
-    )
-
-def cc_optimizefor_proto_library(name, srcs, outs, optimize_for):
-    if len(srcs) != 1:
-        fail("Currently srcs must have exactly 1 element")
-
-    native.genrule(
-        name = name + "_gen_proto",
-        srcs = srcs,
-        outs = outs,
-        cmd = "cp $< $@ && chmod a+w $@ && echo 'option optimize_for = " + optimize_for + ";' >> $@",
-    )
-
-    proto_library(
-        name = name + "_proto",
-        srcs = outs,
-    )
-
-    _cc_proto_library(
-        name = name,
-        deps = [":" + name + "_proto"],
-    )
-
-def expand_suffixes(vals, suffixes):
-    ret = []
-    for val in vals:
-        for suffix in suffixes:
-            ret.append(val + suffix)
-    return ret
diff --git a/third_party/upb/benchmarks/compare.py b/third_party/upb/benchmarks/compare.py
deleted file mode 100755
index 445e61554d890..0000000000000
--- a/third_party/upb/benchmarks/compare.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Benchmarks the current working directory against a given baseline.
-
-This script benchmarks both size and speed. Sample output:
-"""
-
-import contextlib
-import json
-import os
-import re
-import subprocess
-import sys
-import tempfile
-
-@contextlib.contextmanager
-def GitWorktree(commit):
-  tmpdir = tempfile.mkdtemp()
-  subprocess.run(['git', 'worktree', 'add', '-q', '-d', tmpdir, commit], check=True)
-  cwd = os.getcwd()
-  os.chdir(tmpdir)
-  try:
-    yield tmpdir
-  finally:
-    os.chdir(cwd)
-    subprocess.run(['git', 'worktree', 'remove', tmpdir], check=True)
-
-def Run(cmd):
-  subprocess.check_call(cmd, shell=True)
-
-def Benchmark(outbase, bench_cpu=True, runs=12, fasttable=False):
-  tmpfile = "/tmp/bench-output.json"
-  Run("rm -rf {}".format(tmpfile))
-  #Run("CC=clang bazel test ...")
-  if fasttable:
-    extra_args = " --//:fasttable_enabled=true"
-  else:
-    extra_args = ""
-
-  if bench_cpu:
-    Run("CC=clang bazel build -c opt --copt=-march=native benchmarks:benchmark" + extra_args)
-    Run("./bazel-bin/benchmarks/benchmark --benchmark_out_format=json --benchmark_out={} --benchmark_repetitions={} --benchmark_min_time=0.05 --benchmark_enable_random_interleaving=true".format(tmpfile, runs))
-    with open(tmpfile) as f:
-      bench_json = json.load(f)
-
-    # Translate into the format expected by benchstat.
-    txt_filename = outbase + ".txt"
-    with open(txt_filename, "w") as f:
-      for run in bench_json["benchmarks"]:
-        if run["run_type"] == "aggregate":
-          continue
-        name = run["name"]
-        name = name.replace(" ", "")
-        name = re.sub(r'^BM_', 'Benchmark', name)
-        values = (name, run["iterations"], run["cpu_time"])
-        print("{} {} {} ns/op".format(*values), file=f)
-    Run("sort {} -o {} ".format(txt_filename, txt_filename))
-
-  Run("CC=clang bazel build -c opt --copt=-g --copt=-march=native :conformance_upb"
-      + extra_args)
-  Run("cp -f bazel-bin/conformance_upb {}.bin".format(outbase))
-
-
-baseline = "main"
-bench_cpu = True
-fasttable = False
-
-if len(sys.argv) > 1:
-  baseline = sys.argv[1]
-
-  # Quickly verify that the baseline exists.
-  with GitWorktree(baseline):
-    pass
-
-# Benchmark our current directory first, since it's more likely to be broken.
-Benchmark("/tmp/new", bench_cpu, fasttable=fasttable)
-
-# Benchmark the baseline.
-with GitWorktree(baseline):
-  Benchmark("/tmp/old", bench_cpu, fasttable=fasttable)
-
-print()
-print()
-
-if bench_cpu:
-  Run("~/go/bin/benchstat /tmp/old.txt /tmp/new.txt")
-
-print()
-print()
-
-Run("objcopy --strip-debug /tmp/old.bin /tmp/old.bin.stripped")
-Run("objcopy --strip-debug /tmp/new.bin /tmp/new.bin.stripped")
-Run("~/code/bloaty/bloaty /tmp/new.bin.stripped -- /tmp/old.bin.stripped --debug-file=/tmp/old.bin --debug-file=/tmp/new.bin -d compileunits,symbols")
diff --git a/third_party/upb/benchmarks/descriptor.proto b/third_party/upb/benchmarks/descriptor.proto
deleted file mode 100644
index db16ebc5cb874..0000000000000
--- a/third_party/upb/benchmarks/descriptor.proto
+++ /dev/null
@@ -1,888 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// The messages in this file describe the definitions found in .proto files.
-// A valid .proto file can be translated directly to a FileDescriptorProto
-// without any other information (e.g. without reading its imports).
-
-syntax = "proto2";
-
-package upb_benchmark;
-
-option go_package = "google.golang.org/protobuf/types/descriptorpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-message FileDescriptorSet {
-  repeated FileDescriptorProto file = 1;
-}
-
-// Describes a complete .proto file.
-message FileDescriptorProto {
-  optional string name = 1;     // file name, relative to root of source tree
-  optional string package = 2;  // e.g. "foo", "foo.bar", etc.
-
-  // Names of files imported by this file.
-  repeated string dependency = 3;
-  // Indexes of the public imported files in the dependency list above.
-  repeated int32 public_dependency = 10;
-  // Indexes of the weak imported files in the dependency list.
-  // For Google-internal migration only. Do not use.
-  repeated int32 weak_dependency = 11;
-
-  // All top-level definitions in this file.
-  repeated DescriptorProto message_type = 4;
-  repeated EnumDescriptorProto enum_type = 5;
-  repeated ServiceDescriptorProto service = 6;
-  repeated FieldDescriptorProto extension = 7;
-
-  optional FileOptions options = 8;
-
-  // This field contains optional information about the original source code.
-  // You may safely remove this entire field without harming runtime
-  // functionality of the descriptors -- the information is needed only by
-  // development tools.
-  optional SourceCodeInfo source_code_info = 9;
-
-  // The syntax of the proto file.
-  // The supported values are "proto2" and "proto3".
-  optional string syntax = 12;
-}
-
-// Describes a message type.
-message DescriptorProto {
-  optional string name = 1;
-
-  repeated FieldDescriptorProto field = 2;
-  repeated FieldDescriptorProto extension = 6;
-
-  repeated DescriptorProto nested_type = 3;
-  repeated EnumDescriptorProto enum_type = 4;
-
-  message ExtensionRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-
-    optional ExtensionRangeOptions options = 3;
-  }
-  repeated ExtensionRange extension_range = 5;
-
-  repeated OneofDescriptorProto oneof_decl = 8;
-
-  optional MessageOptions options = 7;
-
-  // Range of reserved tag numbers. Reserved tag numbers may not be used by
-  // fields or extension ranges in the same message. Reserved ranges may
-  // not overlap.
-  message ReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-  }
-  repeated ReservedRange reserved_range = 9;
-  // Reserved field names, which may not be used by fields in the same message.
-  // A given name may only be reserved once.
-  repeated string reserved_name = 10;
-}
-
-message ExtensionRangeOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// Describes a field within a message.
-message FieldDescriptorProto {
-  enum Type {
-    // 0 is reserved for errors.
-    // Order is weird for historical reasons.
-    TYPE_DOUBLE = 1;
-    TYPE_FLOAT = 2;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-    // negative values are likely.
-    TYPE_INT64 = 3;
-    TYPE_UINT64 = 4;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-    // negative values are likely.
-    TYPE_INT32 = 5;
-    TYPE_FIXED64 = 6;
-    TYPE_FIXED32 = 7;
-    TYPE_BOOL = 8;
-    TYPE_STRING = 9;
-    // Tag-delimited aggregate.
-    // Group type is deprecated and not supported in proto3. However, Proto3
-    // implementations should still be able to parse the group wire format and
-    // treat group fields as unknown fields.
-    TYPE_GROUP = 10;
-    TYPE_MESSAGE = 11;  // Length-delimited aggregate.
-
-    // New in version 2.
-    TYPE_BYTES = 12;
-    TYPE_UINT32 = 13;
-    TYPE_ENUM = 14;
-    TYPE_SFIXED32 = 15;
-    TYPE_SFIXED64 = 16;
-    TYPE_SINT32 = 17;  // Uses ZigZag encoding.
-    TYPE_SINT64 = 18;  // Uses ZigZag encoding.
-  }
-
-  enum Label {
-    // 0 is reserved for errors
-    LABEL_OPTIONAL = 1;
-    LABEL_REQUIRED = 2;
-    LABEL_REPEATED = 3;
-  }
-
-  optional string name = 1;
-  optional int32 number = 3;
-  optional Label label = 4;
-
-  // If type_name is set, this need not be set.  If both this and type_name
-  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-  optional Type type = 5;
-
-  // For message and enum types, this is the name of the type.  If the name
-  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-  // rules are used to find the type (i.e. first the nested types within this
-  // message are searched, then within the parent, on up to the root
-  // namespace).
-  optional string type_name = 6;
-
-  // For extensions, this is the name of the type being extended.  It is
-  // resolved in the same manner as type_name.
-  optional string extendee = 2;
-
-  // For numeric types, contains the original text representation of the value.
-  // For booleans, "true" or "false".
-  // For strings, contains the default text contents (not escaped in any way).
-  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
-  optional string default_value = 7;
-
-  // If set, gives the index of a oneof in the containing type's oneof_decl
-  // list.  This field is a member of that oneof.
-  optional int32 oneof_index = 9;
-
-  // JSON name of this field. The value is set by protocol compiler. If the
-  // user has set a "json_name" option on this field, that option's value
-  // will be used. Otherwise, it's deduced from the field's name by converting
-  // it to camelCase.
-  optional string json_name = 10;
-
-  optional FieldOptions options = 8;
-
-  // If true, this is a proto3 "optional". When a proto3 field is optional, it
-  // tracks presence regardless of field type.
-  //
-  // When proto3_optional is true, this field must be belong to a oneof to
-  // signal to old proto3 clients that presence is tracked for this field. This
-  // oneof is known as a "synthetic" oneof, and this field must be its sole
-  // member (each proto3 optional field gets its own synthetic oneof). Synthetic
-  // oneofs exist in the descriptor only, and do not generate any API. Synthetic
-  // oneofs must be ordered after all "real" oneofs.
-  //
-  // For message fields, proto3_optional doesn't create any semantic change,
-  // since non-repeated message fields always track presence. However it still
-  // indicates the semantic detail of whether the user wrote "optional" or not.
-  // This can be useful for round-tripping the .proto file. For consistency we
-  // give message fields a synthetic oneof also, even though it is not required
-  // to track presence. This is especially important because the parser can't
-  // tell if a field is a message or an enum, so it must always create a
-  // synthetic oneof.
-  //
-  // Proto2 optional fields do not set this flag, because they already indicate
-  // optional with `LABEL_OPTIONAL`.
-  optional bool proto3_optional = 17;
-}
-
-// Describes a oneof.
-message OneofDescriptorProto {
-  optional string name = 1;
-  optional OneofOptions options = 2;
-}
-
-// Describes an enum type.
-message EnumDescriptorProto {
-  optional string name = 1;
-
-  repeated EnumValueDescriptorProto value = 2;
-
-  optional EnumOptions options = 3;
-
-  // Range of reserved numeric values. Reserved values may not be used by
-  // entries in the same enum. Reserved ranges may not overlap.
-  //
-  // Note that this is distinct from DescriptorProto.ReservedRange in that it
-  // is inclusive such that it can appropriately represent the entire int32
-  // domain.
-  message EnumReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Inclusive.
-  }
-
-  // Range of reserved numeric values. Reserved numeric values may not be used
-  // by enum values in the same enum declaration. Reserved ranges may not
-  // overlap.
-  repeated EnumReservedRange reserved_range = 4;
-
-  // Reserved enum value names, which may not be reused. A given name may only
-  // be reserved once.
-  repeated string reserved_name = 5;
-}
-
-// Describes a value within an enum.
-message EnumValueDescriptorProto {
-  optional string name = 1;
-  optional int32 number = 2;
-
-  optional EnumValueOptions options = 3;
-}
-
-// Describes a service.
-message ServiceDescriptorProto {
-  optional string name = 1;
-  repeated MethodDescriptorProto method = 2;
-
-  optional ServiceOptions options = 3;
-}
-
-// Describes a method of a service.
-message MethodDescriptorProto {
-  optional string name = 1;
-
-  // Input and output type names.  These are resolved in the same way as
-  // FieldDescriptorProto.type_name, but must refer to a message type.
-  optional string input_type = 2;
-  optional string output_type = 3;
-
-  optional MethodOptions options = 4;
-
-  // Identifies if client streams multiple client messages
-  optional bool client_streaming = 5 [default = false];
-  // Identifies if server streams multiple server messages
-  optional bool server_streaming = 6 [default = false];
-}
-
-// ===================================================================
-// Options
-
-// Each of the definitions above may have "options" attached.  These are
-// just annotations which may cause code to be generated slightly differently
-// or may contain hints for code that manipulates protocol messages.
-//
-// Clients may define custom options as extensions of the *Options messages.
-// These extensions may not yet be known at parsing time, so the parser cannot
-// store the values in them.  Instead it stores them in a field in the *Options
-// message called uninterpreted_option. This field must have the same name
-// across all *Options messages. We then use this field to populate the
-// extensions when we build a descriptor, at which point all protos have been
-// parsed and so all extensions are known.
-//
-// Extension numbers for custom options may be chosen as follows:
-// * For options which will only be used within a single application or
-//   organization, or for experimental options, use field numbers 50000
-//   through 99999.  It is up to you to ensure that you do not use the
-//   same number for multiple options.
-// * For options which will be published and used publicly by multiple
-//   independent entities, e-mail protobuf-global-extension-registry@google.com
-//   to reserve extension numbers. Simply provide your project name (e.g.
-//   Objective-C plugin) and your project website (if available) -- there's no
-//   need to explain how you intend to use them. Usually you only need one
-//   extension number. You can declare multiple options with only one extension
-//   number by putting them in a sub-message. See the Custom Options section of
-//   the docs for examples:
-//   https://developers.google.com/protocol-buffers/docs/proto#options
-//   If this turns out to be popular, a web service will be set up
-//   to automatically assign option numbers.
-
-message FileOptions {
-  // Sets the Java package where classes generated from this .proto will be
-  // placed.  By default, the proto package is used, but this is often
-  // inappropriate because proto packages do not normally start with backwards
-  // domain names.
-  optional string java_package = 1;
-
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
-  optional string java_outer_classname = 8;
-
-  // If set true, then the Java code generator will generate a separate .java
-  // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
-  // generated to contain the file's getDescriptor() method as well as any
-  // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default = false];
-
-  // This option does nothing.
-  optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-
-  // If set true, then the Java2 code generator will generate code that
-  // throws an exception whenever an attempt is made to assign a non-UTF-8
-  // byte sequence to a string field.
-  // Message reflection will do the same.
-  // However, an extension field still accepts non-UTF-8 byte sequences.
-  // This option has no effect on when used with the lite runtime.
-  optional bool java_string_check_utf8 = 27 [default = false];
-
-  // Generated classes can be optimized for speed or code size.
-  enum OptimizeMode {
-    SPEED = 1;         // Generate complete code for parsing, serialization,
-                       // etc.
-    CODE_SIZE = 2;     // Use ReflectionOps to implement these methods.
-    LITE_RUNTIME = 3;  // Generate code using MessageLite and the lite runtime.
-  }
-  optional OptimizeMode optimize_for = 9 [default = SPEED];
-
-  // Sets the Go package where structs generated from this .proto will be
-  // placed. If omitted, the Go package will be derived from the following:
-  //   - The basename of the package import path, if provided.
-  //   - Otherwise, the package statement in the .proto file, if present.
-  //   - Otherwise, the basename of the .proto file, without extension.
-  optional string go_package = 11;
-
-  // Should generic services be generated in each language?  "Generic" services
-  // are not specific to any particular RPC system.  They are generated by the
-  // main code generators in each language (without additional plugins).
-  // Generic services were the only kind of service generation supported by
-  // early versions of google.protobuf.
-  //
-  // Generic services are now considered deprecated in favor of using plugins
-  // that generate code specific to your particular RPC system.  Therefore,
-  // these default to false.  Old code which depends on generic services should
-  // explicitly set them to true.
-  optional bool cc_generic_services = 16 [default = false];
-  optional bool java_generic_services = 17 [default = false];
-  optional bool py_generic_services = 18 [default = false];
-  optional bool php_generic_services = 42 [default = false];
-
-  // Is this file deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for everything in the file, or it will be completely ignored; in the very
-  // least, this is a formalization for deprecating files.
-  optional bool deprecated = 23 [default = false];
-
-  // Enables the use of arenas for the proto messages in this file. This applies
-  // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default = true];
-
-  // Sets the objective c class prefix which is prepended to all objective c
-  // generated classes from this .proto. There is no default.
-  optional string objc_class_prefix = 36;
-
-  // Namespace for generated classes; defaults to the package.
-  optional string csharp_namespace = 37;
-
-  // By default Swift generators will take the proto package and CamelCase it
-  // replacing '.' with underscore and use that to prefix the types/symbols
-  // defined. When this options is provided, they will use this value instead
-  // to prefix the types/symbols defined.
-  optional string swift_prefix = 39;
-
-  // Sets the php class prefix which is prepended to all php generated classes
-  // from this .proto. Default is empty.
-  optional string php_class_prefix = 40;
-
-  // Use this option to change the namespace of php generated classes. Default
-  // is empty. When this option is empty, the package name will be used for
-  // determining the namespace.
-  optional string php_namespace = 41;
-
-  // Use this option to change the namespace of php generated metadata classes.
-  // Default is empty. When this option is empty, the proto file name will be
-  // used for determining the namespace.
-  optional string php_metadata_namespace = 44;
-
-  // Use this option to change the package of ruby generated classes. Default
-  // is empty. When this option is not set, the package name will be used for
-  // determining the ruby package.
-  optional string ruby_package = 45;
-
-  // The parser stores options it doesn't recognize here.
-  // See the documentation for the "Options" section above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message.
-  // See the documentation for the "Options" section above.
-  extensions 1000 to max;
-
-  reserved 38;
-}
-
-message MessageOptions {
-  // Set true to use the old proto1 MessageSet wire format for extensions.
-  // This is provided for backwards-compatibility with the MessageSet wire
-  // format.  You should not use this for any other reason:  It's less
-  // efficient, has fewer features, and is more complicated.
-  //
-  // The message must be defined exactly as follows:
-  //   message Foo {
-  //     option message_set_wire_format = true;
-  //     extensions 4 to max;
-  //   }
-  // Note that the message cannot have any defined fields; MessageSets only
-  // have extensions.
-  //
-  // All extensions of your type must be singular messages; e.g. they cannot
-  // be int32s, enums, or repeated messages.
-  //
-  // Because this is an option, the above two restrictions are not enforced by
-  // the protocol compiler.
-  optional bool message_set_wire_format = 1 [default = false];
-
-  // Disables the generation of the standard "descriptor()" accessor, which can
-  // conflict with a field of the same name.  This is meant to make migration
-  // from proto1 easier; new code should avoid fields named "descriptor".
-  optional bool no_standard_descriptor_accessor = 2 [default = false];
-
-  // Is this message deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the message, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating messages.
-  optional bool deprecated = 3 [default = false];
-
-  // Whether the message is an automatically generated map entry type for the
-  // maps field.
-  //
-  // For maps fields:
-  //     map<KeyType, ValueType> map_field = 1;
-  // The parsed descriptor looks like:
-  //     message MapFieldEntry {
-  //         option map_entry = true;
-  //         optional KeyType key = 1;
-  //         optional ValueType value = 2;
-  //     }
-  //     repeated MapFieldEntry map_field = 1;
-  //
-  // Implementations may choose not to generate the map_entry=true message, but
-  // use a native map in the target language to hold the keys and values.
-  // The reflection APIs in such implementations still need to work as
-  // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
-  optional bool map_entry = 7;
-
-  reserved 8;  // javalite_serializable
-  reserved 9;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message FieldOptions {
-  // The ctype option instructs the C++ code generator to use a different
-  // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
-  optional CType ctype = 1 [default = STRING];
-  enum CType {
-    // Default mode.
-    STRING = 0;
-
-    CORD = 1;
-
-    STRING_PIECE = 2;
-  }
-  // The packed option can be enabled for repeated primitive fields to enable
-  // a more efficient representation on the wire. Rather than repeatedly
-  // writing the tag and type for each element, the entire array is encoded as
-  // a single length-delimited blob. In proto3, only explicit setting it to
-  // false will avoid using packed encoding.
-  optional bool packed = 2;
-
-  // The jstype option determines the JavaScript type used for values of the
-  // field.  The option is permitted only for 64 bit integral and fixed types
-  // (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-  // is represented as JavaScript string, which avoids loss of precision that
-  // can happen when a large value is converted to a floating point JavaScript.
-  // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-  // use the JavaScript "number" type.  The behavior of the default option
-  // JS_NORMAL is implementation dependent.
-  //
-  // This option is an enum to permit additional types to be added, e.g.
-  // goog.math.Integer.
-  optional JSType jstype = 6 [default = JS_NORMAL];
-  enum JSType {
-    // Use the default type.
-    JS_NORMAL = 0;
-
-    // Use JavaScript strings.
-    JS_STRING = 1;
-
-    // Use JavaScript numbers.
-    JS_NUMBER = 2;
-  }
-
-  // Should this field be parsed lazily?  Lazy applies only to message-type
-  // fields.  It means that when the outer message is initially parsed, the
-  // inner message's contents will not be parsed but instead stored in encoded
-  // form.  The inner message will actually be parsed when it is first accessed.
-  //
-  // This is only a hint.  Implementations are free to choose whether to use
-  // eager or lazy parsing regardless of the value of this option.  However,
-  // setting this option true suggests that the protocol author believes that
-  // using lazy parsing on this field is worth the additional bookkeeping
-  // overhead typically needed to implement it.
-  //
-  // This option does not affect the public interface of any generated code;
-  // all method signatures remain the same.  Furthermore, thread-safety of the
-  // interface is not affected by this option; const methods remain safe to
-  // call from multiple threads concurrently, while non-const methods continue
-  // to require exclusive access.
-  //
-  //
-  // Note that implementations may choose not to check required fields within
-  // a lazy sub-message.  That is, calling IsInitialized() on the outer message
-  // may return true even if the inner message has missing required fields.
-  // This is necessary because otherwise the inner message would have to be
-  // parsed in order to perform the check, defeating the purpose of lazy
-  // parsing.  An implementation which chooses not to check required fields
-  // must be consistent about it.  That is, for any particular sub-message, the
-  // implementation must either *always* check its required fields, or *never*
-  // check its required fields, regardless of whether or not the message has
-  // been parsed.
-  optional bool lazy = 5 [default = false];
-
-  // Is this field deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for accessors, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating fields.
-  optional bool deprecated = 3 [default = false];
-
-  // For Google-internal migration only. Do not use.
-  optional bool weak = 10 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 4;  // removed jtype
-}
-
-message OneofOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumOptions {
-  // Set this option to true to allow mapping different tag names to the same
-  // value.
-  optional bool allow_alias = 2;
-
-  // Is this enum deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating enums.
-  optional bool deprecated = 3 [default = false];
-
-  reserved 5;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumValueOptions {
-  // Is this enum value deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum value, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating enum values.
-  optional bool deprecated = 1 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message ServiceOptions {
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this service deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the service, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating services.
-  optional bool deprecated = 33 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message MethodOptions {
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this method deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the method, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating methods.
-  optional bool deprecated = 33 [default = false];
-
-  // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-  // or neither? HTTP based RPC implementation may choose GET verb for safe
-  // methods, and PUT verb for idempotent methods instead of the default POST.
-  enum IdempotencyLevel {
-    IDEMPOTENCY_UNKNOWN = 0;
-    NO_SIDE_EFFECTS = 1;  // implies idempotent
-    IDEMPOTENT = 2;       // idempotent, but may have side effects
-  }
-  optional IdempotencyLevel idempotency_level = 34
-      [default = IDEMPOTENCY_UNKNOWN];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-message UninterpretedOption {
-  // The name of the uninterpreted option.  Each string represents a segment in
-  // a dot-separated name.  is_extension is true iff a segment represents an
-  // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
-  message NamePart {
-    optional string name_part = 1;
-    optional bool is_extension = 2;
-  }
-  repeated NamePart name = 2;
-
-  // The value of the uninterpreted option, in whatever type the tokenizer
-  // identified it as during parsing. Exactly one of these should be set.
-  optional string identifier_value = 3;
-  optional uint64 positive_int_value = 4;
-  optional int64 negative_int_value = 5;
-  optional double double_value = 6;
-  optional bytes string_value = 7;
-  optional string aggregate_value = 8;
-}
-
-// ===================================================================
-// Optional source code info
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-message SourceCodeInfo {
-  // A Location identifies a piece of source code in a .proto file which
-  // corresponds to a particular definition.  This information is intended
-  // to be useful to IDEs, code indexers, documentation generators, and similar
-  // tools.
-  //
-  // For example, say we have a file like:
-  //   message Foo {
-  //     optional string foo = 1;
-  //   }
-  // Let's look at just the field definition:
-  //   optional string foo = 1;
-  //   ^       ^^     ^^  ^  ^^^
-  //   a       bc     de  f  ghi
-  // We have the following locations:
-  //   span   path               represents
-  //   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-  //   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-  //   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-  //   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-  //   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-  //
-  // Notes:
-  // - A location may refer to a repeated field itself (i.e. not to any
-  //   particular index within it).  This is used whenever a set of elements are
-  //   logically enclosed in a single code segment.  For example, an entire
-  //   extend block (possibly containing multiple extension definitions) will
-  //   have an outer location whose path refers to the "extensions" repeated
-  //   field without an index.
-  // - Multiple locations may have the same path.  This happens when a single
-  //   logical declaration is spread out across multiple places.  The most
-  //   obvious example is the "extend" block again -- there may be multiple
-  //   extend blocks in the same scope, each of which will have the same path.
-  // - A location's span is not always a subset of its parent's span.  For
-  //   example, the "extendee" of an extension declaration appears at the
-  //   beginning of the "extend" block and is shared by all extensions within
-  //   the block.
-  // - Just because a location's span is a subset of some other location's span
-  //   does not mean that it is a descendant.  For example, a "group" defines
-  //   both a type and a field in a single declaration.  Thus, the locations
-  //   corresponding to the type and field and their components will overlap.
-  // - Code which tries to interpret locations should probably be designed to
-  //   ignore those that it doesn't understand, as more types of locations could
-  //   be recorded in the future.
-  repeated Location location = 1;
-  message Location {
-    // Identifies which part of the FileDescriptorProto was defined at this
-    // location.
-    //
-    // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
-    //   [ 4, 3, 2, 7, 1 ]
-    // refers to:
-    //   file.message_type(3)  // 4, 3
-    //       .field(7)         // 2, 7
-    //       .name()           // 1
-    // This is because FileDescriptorProto.message_type has field number 4:
-    //   repeated DescriptorProto message_type = 4;
-    // and DescriptorProto.field has field number 2:
-    //   repeated FieldDescriptorProto field = 2;
-    // and FieldDescriptorProto.name has field number 1:
-    //   optional string name = 1;
-    //
-    // Thus, the above path gives the location of a field name.  If we removed
-    // the last element:
-    //   [ 4, 3, 2, 7 ]
-    // this path refers to the whole field declaration (from the beginning
-    // of the label to the terminating semicolon).
-    repeated int32 path = 1 [packed = true];
-
-    // Always has exactly three or four elements: start line, start column,
-    // end line (optional, otherwise assumed same as start line), end column.
-    // These are packed into a single field for efficiency.  Note that line
-    // and column numbers are zero-based -- typically you will want to add
-    // 1 to each before displaying to a user.
-    repeated int32 span = 2 [packed = true];
-
-    // If this SourceCodeInfo represents a complete declaration, these are any
-    // comments appearing before and after the declaration which appear to be
-    // attached to the declaration.
-    //
-    // A series of line comments appearing on consecutive lines, with no other
-    // tokens appearing on those lines, will be treated as a single comment.
-    //
-    // leading_detached_comments will keep paragraphs of comments that appear
-    // before (but not connected to) the current element. Each paragraph,
-    // separated by empty lines, will be one comment element in the repeated
-    // field.
-    //
-    // Only the comment content is provided; comment markers (e.g. //) are
-    // stripped out.  For block comments, leading whitespace and an asterisk
-    // will be stripped from the beginning of each line other than the first.
-    // Newlines are included in the output.
-    //
-    // Examples:
-    //
-    //   optional int32 foo = 1;  // Comment attached to foo.
-    //   // Comment attached to bar.
-    //   optional int32 bar = 2;
-    //
-    //   optional string baz = 3;
-    //   // Comment attached to baz.
-    //   // Another line attached to baz.
-    //
-    //   // Comment attached to qux.
-    //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
-    //
-    //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
-    //   // both.
-    //
-    //   // Detached comment for corge paragraph 2.
-    //
-    //   optional string corge = 5;
-    //   /* Block comment attached
-    //    * to corge.  Leading asterisks
-    //    * will be removed. */
-    //   /* Block comment attached to
-    //    * grault. */
-    //   optional int32 grault = 6;
-    //
-    //   // ignored detached comments.
-    optional string leading_comments = 3;
-    optional string trailing_comments = 4;
-    repeated string leading_detached_comments = 6;
-  }
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-message GeneratedCodeInfo {
-  // An Annotation connects some span of text in generated code to an element
-  // of its generating .proto file.
-  repeated Annotation annotation = 1;
-  message Annotation {
-    // Identifies the element in the original source .proto file. This field
-    // is formatted the same as SourceCodeInfo.Location.path.
-    repeated int32 path = 1 [packed = true];
-
-    // Identifies the filesystem path to the original source .proto.
-    optional string source_file = 2;
-
-    // Identifies the starting offset in bytes in the generated code
-    // that relates to the identified object.
-    optional int32 begin = 3;
-
-    // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
-    // the last relevant byte (so the length of the text = end - begin).
-    optional int32 end = 4;
-  }
-}
diff --git a/third_party/upb/benchmarks/descriptor_sv.proto b/third_party/upb/benchmarks/descriptor_sv.proto
deleted file mode 100644
index 8ca0888da7dc6..0000000000000
--- a/third_party/upb/benchmarks/descriptor_sv.proto
+++ /dev/null
@@ -1,890 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// The messages in this file describe the definitions found in .proto files.
-// A valid .proto file can be translated directly to a FileDescriptorProto
-// without any other information (e.g. without reading its imports).
-
-syntax = "proto2";
-
-package upb_benchmark.sv;
-
-option go_package = "google.golang.org/protobuf/types/descriptorpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-message FileDescriptorSet {
-  repeated FileDescriptorProto file = 1;
-}
-
-// Describes a complete .proto file.
-message FileDescriptorProto {
-  optional string name = 1
-      [ctype = STRING_PIECE];  // file name, relative to root of source tree
-  optional string package = 2
-      [ctype = STRING_PIECE];  // e.g. "foo", "foo.bar", etc.
-
-  // Names of files imported by this file.
-  repeated string dependency = 3 [ctype = STRING_PIECE];
-  // Indexes of the public imported files in the dependency list above.
-  repeated int32 public_dependency = 10;
-  // Indexes of the weak imported files in the dependency list.
-  // For Google-internal migration only. Do not use.
-  repeated int32 weak_dependency = 11;
-
-  // All top-level definitions in this file.
-  repeated DescriptorProto message_type = 4;
-  repeated EnumDescriptorProto enum_type = 5;
-  repeated ServiceDescriptorProto service = 6;
-  repeated FieldDescriptorProto extension = 7;
-
-  optional FileOptions options = 8;
-
-  // This field contains optional information about the original source code.
-  // You may safely remove this entire field without harming runtime
-  // functionality of the descriptors -- the information is needed only by
-  // development tools.
-  optional SourceCodeInfo source_code_info = 9;
-
-  // The syntax of the proto file.
-  // The supported values are "proto2" and "proto3".
-  optional string syntax = 12 [ctype = STRING_PIECE];
-}
-
-// Describes a message type.
-message DescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-
-  repeated FieldDescriptorProto field = 2;
-  repeated FieldDescriptorProto extension = 6;
-
-  repeated DescriptorProto nested_type = 3;
-  repeated EnumDescriptorProto enum_type = 4;
-
-  message ExtensionRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-
-    optional ExtensionRangeOptions options = 3;
-  }
-  repeated ExtensionRange extension_range = 5;
-
-  repeated OneofDescriptorProto oneof_decl = 8;
-
-  optional MessageOptions options = 7;
-
-  // Range of reserved tag numbers. Reserved tag numbers may not be used by
-  // fields or extension ranges in the same message. Reserved ranges may
-  // not overlap.
-  message ReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-  }
-  repeated ReservedRange reserved_range = 9;
-  // Reserved field names, which may not be used by fields in the same message.
-  // A given name may only be reserved once.
-  repeated string reserved_name = 10 [ctype = STRING_PIECE];
-}
-
-message ExtensionRangeOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// Describes a field within a message.
-message FieldDescriptorProto {
-  enum Type {
-    // 0 is reserved for errors.
-    // Order is weird for historical reasons.
-    TYPE_DOUBLE = 1;
-    TYPE_FLOAT = 2;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-    // negative values are likely.
-    TYPE_INT64 = 3;
-    TYPE_UINT64 = 4;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-    // negative values are likely.
-    TYPE_INT32 = 5;
-    TYPE_FIXED64 = 6;
-    TYPE_FIXED32 = 7;
-    TYPE_BOOL = 8;
-    TYPE_STRING = 9;
-    // Tag-delimited aggregate.
-    // Group type is deprecated and not supported in proto3. However, Proto3
-    // implementations should still be able to parse the group wire format and
-    // treat group fields as unknown fields.
-    TYPE_GROUP = 10;
-    TYPE_MESSAGE = 11;  // Length-delimited aggregate.
-
-    // New in version 2.
-    TYPE_BYTES = 12;
-    TYPE_UINT32 = 13;
-    TYPE_ENUM = 14;
-    TYPE_SFIXED32 = 15;
-    TYPE_SFIXED64 = 16;
-    TYPE_SINT32 = 17;  // Uses ZigZag encoding.
-    TYPE_SINT64 = 18;  // Uses ZigZag encoding.
-  }
-
-  enum Label {
-    // 0 is reserved for errors
-    LABEL_OPTIONAL = 1;
-    LABEL_REQUIRED = 2;
-    LABEL_REPEATED = 3;
-  }
-
-  optional string name = 1 [ctype = STRING_PIECE];
-  optional int32 number = 3;
-  optional Label label = 4;
-
-  // If type_name is set, this need not be set.  If both this and type_name
-  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-  optional Type type = 5;
-
-  // For message and enum types, this is the name of the type.  If the name
-  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-  // rules are used to find the type (i.e. first the nested types within this
-  // message are searched, then within the parent, on up to the root
-  // namespace).
-  optional string type_name = 6 [ctype = STRING_PIECE];
-
-  // For extensions, this is the name of the type being extended.  It is
-  // resolved in the same manner as type_name.
-  optional string extendee = 2 [ctype = STRING_PIECE];
-
-  // For numeric types, contains the original text representation of the value.
-  // For booleans, "true" or "false".
-  // For strings, contains the default text contents (not escaped in any way).
-  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
-  optional string default_value = 7 [ctype = STRING_PIECE];
-
-  // If set, gives the index of a oneof in the containing type's oneof_decl
-  // list.  This field is a member of that oneof.
-  optional int32 oneof_index = 9;
-
-  // JSON name of this field. The value is set by protocol compiler. If the
-  // user has set a "json_name" option on this field, that option's value
-  // will be used. Otherwise, it's deduced from the field's name by converting
-  // it to camelCase.
-  optional string json_name = 10 [ctype = STRING_PIECE];
-
-  optional FieldOptions options = 8;
-
-  // If true, this is a proto3 "optional". When a proto3 field is optional, it
-  // tracks presence regardless of field type.
-  //
-  // When proto3_optional is true, this field must be belong to a oneof to
-  // signal to old proto3 clients that presence is tracked for this field. This
-  // oneof is known as a "synthetic" oneof, and this field must be its sole
-  // member (each proto3 optional field gets its own synthetic oneof). Synthetic
-  // oneofs exist in the descriptor only, and do not generate any API. Synthetic
-  // oneofs must be ordered after all "real" oneofs.
-  //
-  // For message fields, proto3_optional doesn't create any semantic change,
-  // since non-repeated message fields always track presence. However it still
-  // indicates the semantic detail of whether the user wrote "optional" or not.
-  // This can be useful for round-tripping the .proto file. For consistency we
-  // give message fields a synthetic oneof also, even though it is not required
-  // to track presence. This is especially important because the parser can't
-  // tell if a field is a message or an enum, so it must always create a
-  // synthetic oneof.
-  //
-  // Proto2 optional fields do not set this flag, because they already indicate
-  // optional with `LABEL_OPTIONAL`.
-  optional bool proto3_optional = 17;
-}
-
-// Describes a oneof.
-message OneofDescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-  optional OneofOptions options = 2;
-}
-
-// Describes an enum type.
-message EnumDescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-
-  repeated EnumValueDescriptorProto value = 2;
-
-  optional EnumOptions options = 3;
-
-  // Range of reserved numeric values. Reserved values may not be used by
-  // entries in the same enum. Reserved ranges may not overlap.
-  //
-  // Note that this is distinct from DescriptorProto.ReservedRange in that it
-  // is inclusive such that it can appropriately represent the entire int32
-  // domain.
-  message EnumReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Inclusive.
-  }
-
-  // Range of reserved numeric values. Reserved numeric values may not be used
-  // by enum values in the same enum declaration. Reserved ranges may not
-  // overlap.
-  repeated EnumReservedRange reserved_range = 4;
-
-  // Reserved enum value names, which may not be reused. A given name may only
-  // be reserved once.
-  repeated string reserved_name = 5 [ctype = STRING_PIECE];
-}
-
-// Describes a value within an enum.
-message EnumValueDescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-  optional int32 number = 2;
-
-  optional EnumValueOptions options = 3;
-}
-
-// Describes a service.
-message ServiceDescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-  repeated MethodDescriptorProto method = 2;
-
-  optional ServiceOptions options = 3;
-}
-
-// Describes a method of a service.
-message MethodDescriptorProto {
-  optional string name = 1 [ctype = STRING_PIECE];
-
-  // Input and output type names.  These are resolved in the same way as
-  // FieldDescriptorProto.type_name, but must refer to a message type.
-  optional string input_type = 2 [ctype = STRING_PIECE];
-  optional string output_type = 3 [ctype = STRING_PIECE];
-
-  optional MethodOptions options = 4;
-
-  // Identifies if client streams multiple client messages
-  optional bool client_streaming = 5 [default = false];
-  // Identifies if server streams multiple server messages
-  optional bool server_streaming = 6 [default = false];
-}
-
-// ===================================================================
-// Options
-
-// Each of the definitions above may have "options" attached.  These are
-// just annotations which may cause code to be generated slightly differently
-// or may contain hints for code that manipulates protocol messages.
-//
-// Clients may define custom options as extensions of the *Options messages.
-// These extensions may not yet be known at parsing time, so the parser cannot
-// store the values in them.  Instead it stores them in a field in the *Options
-// message called uninterpreted_option. This field must have the same name
-// across all *Options messages. We then use this field to populate the
-// extensions when we build a descriptor, at which point all protos have been
-// parsed and so all extensions are known.
-//
-// Extension numbers for custom options may be chosen as follows:
-// * For options which will only be used within a single application or
-//   organization, or for experimental options, use field numbers 50000
-//   through 99999.  It is up to you to ensure that you do not use the
-//   same number for multiple options.
-// * For options which will be published and used publicly by multiple
-//   independent entities, e-mail protobuf-global-extension-registry@google.com
-//   to reserve extension numbers. Simply provide your project name (e.g.
-//   Objective-C plugin) and your project website (if available) -- there's no
-//   need to explain how you intend to use them. Usually you only need one
-//   extension number. You can declare multiple options with only one extension
-//   number by putting them in a sub-message. See the Custom Options section of
-//   the docs for examples:
-//   https://developers.google.com/protocol-buffers/docs/proto#options
-//   If this turns out to be popular, a web service will be set up
-//   to automatically assign option numbers.
-
-message FileOptions {
-  // Sets the Java package where classes generated from this .proto will be
-  // placed.  By default, the proto package is used, but this is often
-  // inappropriate because proto packages do not normally start with backwards
-  // domain names.
-  optional string java_package = 1 [ctype = STRING_PIECE];
-
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
-  optional string java_outer_classname = 8 [ctype = STRING_PIECE];
-
-  // If set true, then the Java code generator will generate a separate .java
-  // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
-  // generated to contain the file's getDescriptor() method as well as any
-  // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default = false];
-
-  // This option does nothing.
-  optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-
-  // If set true, then the Java2 code generator will generate code that
-  // throws an exception whenever an attempt is made to assign a non-UTF-8
-  // byte sequence to a string field.
-  // Message reflection will do the same.
-  // However, an extension field still accepts non-UTF-8 byte sequences.
-  // This option has no effect on when used with the lite runtime.
-  optional bool java_string_check_utf8 = 27 [default = false];
-
-  // Generated classes can be optimized for speed or code size.
-  enum OptimizeMode {
-    SPEED = 1;         // Generate complete code for parsing, serialization,
-                       // etc.
-    CODE_SIZE = 2;     // Use ReflectionOps to implement these methods.
-    LITE_RUNTIME = 3;  // Generate code using MessageLite and the lite runtime.
-  }
-  optional OptimizeMode optimize_for = 9 [default = SPEED];
-
-  // Sets the Go package where structs generated from this .proto will be
-  // placed. If omitted, the Go package will be derived from the following:
-  //   - The basename of the package import path, if provided.
-  //   - Otherwise, the package statement in the .proto file, if present.
-  //   - Otherwise, the basename of the .proto file, without extension.
-  optional string go_package = 11 [ctype = STRING_PIECE];
-
-  // Should generic services be generated in each language?  "Generic" services
-  // are not specific to any particular RPC system.  They are generated by the
-  // main code generators in each language (without additional plugins).
-  // Generic services were the only kind of service generation supported by
-  // early versions of google.protobuf.
-  //
-  // Generic services are now considered deprecated in favor of using plugins
-  // that generate code specific to your particular RPC system.  Therefore,
-  // these default to false.  Old code which depends on generic services should
-  // explicitly set them to true.
-  optional bool cc_generic_services = 16 [default = false];
-  optional bool java_generic_services = 17 [default = false];
-  optional bool py_generic_services = 18 [default = false];
-  optional bool php_generic_services = 42 [default = false];
-
-  // Is this file deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for everything in the file, or it will be completely ignored; in the very
-  // least, this is a formalization for deprecating files.
-  optional bool deprecated = 23 [default = false];
-
-  // Enables the use of arenas for the proto messages in this file. This applies
-  // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default = true];
-
-  // Sets the objective c class prefix which is prepended to all objective c
-  // generated classes from this .proto. There is no default.
-  optional string objc_class_prefix = 36 [ctype = STRING_PIECE];
-
-  // Namespace for generated classes; defaults to the package.
-  optional string csharp_namespace = 37 [ctype = STRING_PIECE];
-
-  // By default Swift generators will take the proto package and CamelCase it
-  // replacing '.' with underscore and use that to prefix the types/symbols
-  // defined. When this options is provided, they will use this value instead
-  // to prefix the types/symbols defined.
-  optional string swift_prefix = 39 [ctype = STRING_PIECE];
-
-  // Sets the php class prefix which is prepended to all php generated classes
-  // from this .proto. Default is empty.
-  optional string php_class_prefix = 40 [ctype = STRING_PIECE];
-
-  // Use this option to change the namespace of php generated classes. Default
-  // is empty. When this option is empty, the package name will be used for
-  // determining the namespace.
-  optional string php_namespace = 41 [ctype = STRING_PIECE];
-
-  // Use this option to change the namespace of php generated metadata classes.
-  // Default is empty. When this option is empty, the proto file name will be
-  // used for determining the namespace.
-  optional string php_metadata_namespace = 44 [ctype = STRING_PIECE];
-
-  // Use this option to change the package of ruby generated classes. Default
-  // is empty. When this option is not set, the package name will be used for
-  // determining the ruby package.
-  optional string ruby_package = 45 [ctype = STRING_PIECE];
-
-  // The parser stores options it doesn't recognize here.
-  // See the documentation for the "Options" section above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message.
-  // See the documentation for the "Options" section above.
-  extensions 1000 to max;
-
-  reserved 38;
-}
-
-message MessageOptions {
-  // Set true to use the old proto1 MessageSet wire format for extensions.
-  // This is provided for backwards-compatibility with the MessageSet wire
-  // format.  You should not use this for any other reason:  It's less
-  // efficient, has fewer features, and is more complicated.
-  //
-  // The message must be defined exactly as follows:
-  //   message Foo {
-  //     option message_set_wire_format = true;
-  //     extensions 4 to max;
-  //   }
-  // Note that the message cannot have any defined fields; MessageSets only
-  // have extensions.
-  //
-  // All extensions of your type must be singular messages; e.g. they cannot
-  // be int32s, enums, or repeated messages.
-  //
-  // Because this is an option, the above two restrictions are not enforced by
-  // the protocol compiler.
-  optional bool message_set_wire_format = 1 [default = false];
-
-  // Disables the generation of the standard "descriptor()" accessor, which can
-  // conflict with a field of the same name.  This is meant to make migration
-  // from proto1 easier; new code should avoid fields named "descriptor".
-  optional bool no_standard_descriptor_accessor = 2 [default = false];
-
-  // Is this message deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the message, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating messages.
-  optional bool deprecated = 3 [default = false];
-
-  // Whether the message is an automatically generated map entry type for the
-  // maps field.
-  //
-  // For maps fields:
-  //     map<KeyType, ValueType> map_field = 1;
-  // The parsed descriptor looks like:
-  //     message MapFieldEntry {
-  //         option map_entry = true;
-  //         optional KeyType key = 1;
-  //         optional ValueType value = 2;
-  //     }
-  //     repeated MapFieldEntry map_field = 1;
-  //
-  // Implementations may choose not to generate the map_entry=true message, but
-  // use a native map in the target language to hold the keys and values.
-  // The reflection APIs in such implementations still need to work as
-  // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
-  optional bool map_entry = 7;
-
-  reserved 8;  // javalite_serializable
-  reserved 9;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message FieldOptions {
-  // The ctype option instructs the C++ code generator to use a different
-  // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
-  optional CType ctype = 1 [default = STRING];
-  enum CType {
-    // Default mode.
-    STRING = 0;
-
-    CORD = 1;
-
-    STRING_PIECE = 2;
-  }
-  // The packed option can be enabled for repeated primitive fields to enable
-  // a more efficient representation on the wire. Rather than repeatedly
-  // writing the tag and type for each element, the entire array is encoded as
-  // a single length-delimited blob. In proto3, only explicit setting it to
-  // false will avoid using packed encoding.
-  optional bool packed = 2;
-
-  // The jstype option determines the JavaScript type used for values of the
-  // field.  The option is permitted only for 64 bit integral and fixed types
-  // (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-  // is represented as JavaScript string, which avoids loss of precision that
-  // can happen when a large value is converted to a floating point JavaScript.
-  // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-  // use the JavaScript "number" type.  The behavior of the default option
-  // JS_NORMAL is implementation dependent.
-  //
-  // This option is an enum to permit additional types to be added, e.g.
-  // goog.math.Integer.
-  optional JSType jstype = 6 [default = JS_NORMAL];
-  enum JSType {
-    // Use the default type.
-    JS_NORMAL = 0;
-
-    // Use JavaScript strings.
-    JS_STRING = 1;
-
-    // Use JavaScript numbers.
-    JS_NUMBER = 2;
-  }
-
-  // Should this field be parsed lazily?  Lazy applies only to message-type
-  // fields.  It means that when the outer message is initially parsed, the
-  // inner message's contents will not be parsed but instead stored in encoded
-  // form.  The inner message will actually be parsed when it is first accessed.
-  //
-  // This is only a hint.  Implementations are free to choose whether to use
-  // eager or lazy parsing regardless of the value of this option.  However,
-  // setting this option true suggests that the protocol author believes that
-  // using lazy parsing on this field is worth the additional bookkeeping
-  // overhead typically needed to implement it.
-  //
-  // This option does not affect the public interface of any generated code;
-  // all method signatures remain the same.  Furthermore, thread-safety of the
-  // interface is not affected by this option; const methods remain safe to
-  // call from multiple threads concurrently, while non-const methods continue
-  // to require exclusive access.
-  //
-  //
-  // Note that implementations may choose not to check required fields within
-  // a lazy sub-message.  That is, calling IsInitialized() on the outer message
-  // may return true even if the inner message has missing required fields.
-  // This is necessary because otherwise the inner message would have to be
-  // parsed in order to perform the check, defeating the purpose of lazy
-  // parsing.  An implementation which chooses not to check required fields
-  // must be consistent about it.  That is, for any particular sub-message, the
-  // implementation must either *always* check its required fields, or *never*
-  // check its required fields, regardless of whether or not the message has
-  // been parsed.
-  optional bool lazy = 5 [default = false];
-
-  // Is this field deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for accessors, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating fields.
-  optional bool deprecated = 3 [default = false];
-
-  // For Google-internal migration only. Do not use.
-  optional bool weak = 10 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 4;  // removed jtype
-}
-
-message OneofOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumOptions {
-  // Set this option to true to allow mapping different tag names to the same
-  // value.
-  optional bool allow_alias = 2;
-
-  // Is this enum deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating enums.
-  optional bool deprecated = 3 [default = false];
-
-  reserved 5;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumValueOptions {
-  // Is this enum value deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum value, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating enum values.
-  optional bool deprecated = 1 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message ServiceOptions {
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this service deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the service, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating services.
-  optional bool deprecated = 33 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message MethodOptions {
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this method deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the method, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating methods.
-  optional bool deprecated = 33 [default = false];
-
-  // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-  // or neither? HTTP based RPC implementation may choose GET verb for safe
-  // methods, and PUT verb for idempotent methods instead of the default POST.
-  enum IdempotencyLevel {
-    IDEMPOTENCY_UNKNOWN = 0;
-    NO_SIDE_EFFECTS = 1;  // implies idempotent
-    IDEMPOTENT = 2;       // idempotent, but may have side effects
-  }
-  optional IdempotencyLevel idempotency_level = 34
-      [default = IDEMPOTENCY_UNKNOWN];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-message UninterpretedOption {
-  // The name of the uninterpreted option.  Each string represents a segment in
-  // a dot-separated name.  is_extension is true iff a segment represents an
-  // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
-  message NamePart {
-    optional string name_part = 1 [ctype = STRING_PIECE];
-    optional bool is_extension = 2;
-  }
-  repeated NamePart name = 2;
-
-  // The value of the uninterpreted option, in whatever type the tokenizer
-  // identified it as during parsing. Exactly one of these should be set.
-  optional string identifier_value = 3 [ctype = STRING_PIECE];
-  optional uint64 positive_int_value = 4;
-  optional int64 negative_int_value = 5;
-  optional double double_value = 6;
-  optional bytes string_value = 7;
-  optional string aggregate_value = 8 [ctype = STRING_PIECE];
-}
-
-// ===================================================================
-// Optional source code info
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-message SourceCodeInfo {
-  // A Location identifies a piece of source code in a .proto file which
-  // corresponds to a particular definition.  This information is intended
-  // to be useful to IDEs, code indexers, documentation generators, and similar
-  // tools.
-  //
-  // For example, say we have a file like:
-  //   message Foo {
-  //     optional string foo = 1 [ctype = STRING_PIECE];
-  //   }
-  // Let's look at just the field definition:
-  //   optional string foo = 1 [ctype = STRING_PIECE];
-  //   ^       ^^     ^^  ^  ^^^
-  //   a       bc     de  f  ghi
-  // We have the following locations:
-  //   span   path               represents
-  //   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-  //   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-  //   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-  //   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-  //   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-  //
-  // Notes:
-  // - A location may refer to a repeated field itself (i.e. not to any
-  //   particular index within it).  This is used whenever a set of elements are
-  //   logically enclosed in a single code segment.  For example, an entire
-  //   extend block (possibly containing multiple extension definitions) will
-  //   have an outer location whose path refers to the "extensions" repeated
-  //   field without an index.
-  // - Multiple locations may have the same path.  This happens when a single
-  //   logical declaration is spread out across multiple places.  The most
-  //   obvious example is the "extend" block again -- there may be multiple
-  //   extend blocks in the same scope, each of which will have the same path.
-  // - A location's span is not always a subset of its parent's span.  For
-  //   example, the "extendee" of an extension declaration appears at the
-  //   beginning of the "extend" block and is shared by all extensions within
-  //   the block.
-  // - Just because a location's span is a subset of some other location's span
-  //   does not mean that it is a descendant.  For example, a "group" defines
-  //   both a type and a field in a single declaration.  Thus, the locations
-  //   corresponding to the type and field and their components will overlap.
-  // - Code which tries to interpret locations should probably be designed to
-  //   ignore those that it doesn't understand, as more types of locations could
-  //   be recorded in the future.
-  repeated Location location = 1;
-  message Location {
-    // Identifies which part of the FileDescriptorProto was defined at this
-    // location.
-    //
-    // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
-    //   [ 4, 3, 2, 7, 1 ]
-    // refers to:
-    //   file.message_type(3)  // 4, 3
-    //       .field(7)         // 2, 7
-    //       .name()           // 1
-    // This is because FileDescriptorProto.message_type has field number 4:
-    //   repeated DescriptorProto message_type = 4;
-    // and DescriptorProto.field has field number 2:
-    //   repeated FieldDescriptorProto field = 2;
-    // and FieldDescriptorProto.name has field number 1:
-    //   optional string name = 1 [ctype = STRING_PIECE];
-    //
-    // Thus, the above path gives the location of a field name.  If we removed
-    // the last element:
-    //   [ 4, 3, 2, 7 ]
-    // this path refers to the whole field declaration (from the beginning
-    // of the label to the terminating semicolon).
-    repeated int32 path = 1 [packed = true];
-
-    // Always has exactly three or four elements: start line, start column,
-    // end line (optional, otherwise assumed same as start line), end column.
-    // These are packed into a single field for efficiency.  Note that line
-    // and column numbers are zero-based -- typically you will want to add
-    // 1 to each before displaying to a user.
-    repeated int32 span = 2 [packed = true];
-
-    // If this SourceCodeInfo represents a complete declaration, these are any
-    // comments appearing before and after the declaration which appear to be
-    // attached to the declaration.
-    //
-    // A series of line comments appearing on consecutive lines, with no other
-    // tokens appearing on those lines, will be treated as a single comment.
-    //
-    // leading_detached_comments will keep paragraphs of comments that appear
-    // before (but not connected to) the current element. Each paragraph,
-    // separated by empty lines, will be one comment element in the repeated
-    // field.
-    //
-    // Only the comment content is provided; comment markers (e.g. //) are
-    // stripped out.  For block comments, leading whitespace and an asterisk
-    // will be stripped from the beginning of each line other than the first.
-    // Newlines are included in the output.
-    //
-    // Examples:
-    //
-    //   optional int32 foo = 1;  // Comment attached to foo.
-    //   // Comment attached to bar.
-    //   optional int32 bar = 2;
-    //
-    //   optional string baz = 3 [ctype = STRING_PIECE];
-    //   // Comment attached to baz.
-    //   // Another line attached to baz.
-    //
-    //   // Comment attached to qux.
-    //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
-    //
-    //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
-    //   // both.
-    //
-    //   // Detached comment for corge paragraph 2.
-    //
-    //   optional string corge = 5 [ctype = STRING_PIECE];
-    //   /* Block comment attached
-    //    * to corge.  Leading asterisks
-    //    * will be removed. */
-    //   /* Block comment attached to
-    //    * grault. */
-    //   optional int32 grault = 6;
-    //
-    //   // ignored detached comments.
-    optional string leading_comments = 3 [ctype = STRING_PIECE];
-    optional string trailing_comments = 4 [ctype = STRING_PIECE];
-    repeated string leading_detached_comments = 6 [ctype = STRING_PIECE];
-  }
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-message GeneratedCodeInfo {
-  // An Annotation connects some span of text in generated code to an element
-  // of its generating .proto file.
-  repeated Annotation annotation = 1;
-  message Annotation {
-    // Identifies the element in the original source .proto file. This field
-    // is formatted the same as SourceCodeInfo.Location.path.
-    repeated int32 path = 1 [packed = true];
-
-    // Identifies the filesystem path to the original source .proto.
-    optional string source_file = 2 [ctype = STRING_PIECE];
-
-    // Identifies the starting offset in bytes in the generated code
-    // that relates to the identified object.
-    optional int32 begin = 3;
-
-    // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
-    // the last relevant byte (so the length of the text = end - begin).
-    optional int32 end = 4;
-  }
-}
diff --git a/third_party/upb/benchmarks/empty.proto b/third_party/upb/benchmarks/empty.proto
deleted file mode 100644
index bcccaf9abee09..0000000000000
--- a/third_party/upb/benchmarks/empty.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-syntax = "proto3";
-
-package upb_benchmark;
-
-message Empty {}
diff --git a/third_party/upb/benchmarks/gen_protobuf_binary_cc.py b/third_party/upb/benchmarks/gen_protobuf_binary_cc.py
deleted file mode 100644
index 41fb100ed5daa..0000000000000
--- a/third_party/upb/benchmarks/gen_protobuf_binary_cc.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import re
-
-include = sys.argv[1]
-msg_basename = sys.argv[2]
-count = 1
-
-m = re.search(r'(.*\D)(\d+)$', sys.argv[2])
-if m:
-  msg_basename = m.group(1)
-  count = int(m.group(2))
-
-print('''
-#include "{include}"
-
-char buf[1];
-
-int main() {{
-'''.format(include=include))
-
-def RefMessage(name):
-  print('''
-  {{
-    {name} proto;
-    proto.ParseFromArray(buf, 0);
-    proto.SerializePartialToArray(&buf[0], 0);
-  }}
-  '''.format(name=name))
-
-RefMessage(msg_basename)
-
-for i in range(2, count + 1):
-  RefMessage(msg_basename + str(i))
-
-print('''
-  return 0;
-}''')
diff --git a/third_party/upb/benchmarks/gen_synthetic_protos.py b/third_party/upb/benchmarks/gen_synthetic_protos.py
deleted file mode 100644
index 99f83c15e161c..0000000000000
--- a/third_party/upb/benchmarks/gen_synthetic_protos.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import random
-
-base = sys.argv[1]
-
-field_freqs = [
-    (('bool', 'optional'), 8.321),
-    (('bool', 'repeated'), 0.033),
-    (('bytes', 'optional'), 0.809),
-    (('bytes', 'repeated'), 0.065),
-    (('double', 'optional'), 2.845),
-    (('double', 'repeated'), 0.143),
-    (('fixed32', 'optional'), 0.084),
-    (('fixed32', 'repeated'), 0.012),
-    (('fixed64', 'optional'), 0.204),
-    (('fixed64', 'repeated'), 0.027),
-    (('float', 'optional'), 2.355),
-    (('float', 'repeated'), 0.132),
-    (('int32', 'optional'), 6.717),
-    (('int32', 'repeated'), 0.366),
-    (('int64', 'optional'), 9.678),
-    (('int64', 'repeated'), 0.425),
-    (('sfixed32', 'optional'), 0.018),
-    (('sfixed32', 'repeated'), 0.005),
-    (('sfixed64', 'optional'), 0.022),
-    (('sfixed64', 'repeated'), 0.005),
-    (('sint32', 'optional'), 0.026),
-    (('sint32', 'repeated'), 0.009),
-    (('sint64', 'optional'), 0.018),
-    (('sint64', 'repeated'), 0.006),
-    (('string', 'optional'), 25.461),
-    (('string', 'repeated'), 2.606),
-    (('Enum', 'optional'), 6.16),
-    (('Enum', 'repeated'), 0.576),
-    (('Message', 'optional'), 22.472),
-    (('Message', 'repeated'), 7.766),
-    (('uint32', 'optional'), 1.289),
-    (('uint32', 'repeated'), 0.051),
-    (('uint64', 'optional'), 1.044),
-    (('uint64', 'repeated'), 0.079),
-]
-
-population = [item[0] for item in field_freqs]
-weights = [item[1] for item in field_freqs]
-
-def choices(k):
-  if sys.version_info >= (3, 6):
-    return random.choices(population=population, weights=weights, k=k)
-  else:
-    print("WARNING: old Python version, field types are not properly weighted!")
-    return [random.choice(population) for _ in range(k)]
-
-with open(base + "/100_msgs.proto", "w") as f:
-  f.write('syntax = "proto3";\n')
-  f.write('package upb_benchmark;\n')
-  f.write('message Message {}\n')
-  for i in range(2, 101):
-    f.write('message Message{i} {{}}\n'.format(i=i))
-
-with open(base + "/200_msgs.proto", "w") as f:
-  f.write('syntax = "proto3";\n')
-  f.write('package upb_benchmark;\n')
-  f.write('message Message {}\n')
-  for i in range(2, 501):
-    f.write('message Message{i} {{}}\n'.format(i=i))
-
-with open(base + "/100_fields.proto", "w") as f:
-  f.write('syntax = "proto2";\n')
-  f.write('package upb_benchmark;\n')
-  f.write('enum Enum { ZERO = 0; }\n')
-  f.write('message Message {\n')
-  i = 1
-  random.seed(a=0, version=2)
-  for field in choices(100):
-    field_type, label = field
-    f.write('  {label} {field_type} field{i} = {i};\n'.format(i=i, label=label, field_type=field_type))
-    i += 1
-  f.write('}\n')
-
-with open(base + "/200_fields.proto", "w") as f:
-  f.write('syntax = "proto2";\n')
-  f.write('package upb_benchmark;\n')
-  f.write('enum Enum { ZERO = 0; }\n')
-  f.write('message Message {\n')
-  i = 1
-  random.seed(a=0, version=2)
-  for field in choices(200):
-    field_type, label = field
-    f.write('  {label} {field_type} field{i} = {i};\n'.format(i=i, label=label,field_type=field_type))
-    i += 1
-  f.write('}\n')
diff --git a/third_party/upb/benchmarks/gen_upb_binary_c.py b/third_party/upb/benchmarks/gen_upb_binary_c.py
deleted file mode 100644
index 8ef512571ea4b..0000000000000
--- a/third_party/upb/benchmarks/gen_upb_binary_c.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import re
-
-include = sys.argv[1]
-msg_basename = sys.argv[2]
-count = 1
-
-m = re.search(r'(.*\D)(\d+)$', sys.argv[2])
-if m:
-  msg_basename = m.group(1)
-  count = int(m.group(2))
-
-print('''
-#include "{include}"
-
-char buf[1];
-
-int main() {{
-  upb_Arena *arena = upb_Arena_New();
-  size_t size;
-'''.format(include=include))
-
-def RefMessage(name):
-  print('''
-  {{
-    {name} *proto = {name}_parse(buf, 1, arena);
-    {name}_serialize(proto, arena, &size);
-  }}
-  '''.format(name=name))
-
-RefMessage(msg_basename)
-
-for i in range(2, count + 1):
-  RefMessage(msg_basename + str(i))
-
-print('''
-  return 0;
-}''')
diff --git a/third_party/upb/cmake/BUILD.bazel b/third_party/upb/cmake/BUILD.bazel
deleted file mode 100644
index a09712a100e17..0000000000000
--- a/third_party/upb/cmake/BUILD.bazel
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    ":build_defs.bzl",
-    "staleness_test",
-)
-load(
-    "//bazel:build_defs.bzl",
-    "make_shell_script",
-)
-
-licenses(["notice"])
-
-exports_files(["staleness_test.py"])
-
-py_library(
-    name = "staleness_test_lib",
-    testonly = 1,
-    srcs = ["staleness_test_lib.py"],
-    # This is public only for use by the staleness_test() macro. Please do not
-    # depend on this target directly.
-    visibility = ["//visibility:public"],
-)
-
-py_binary(
-    name = "make_cmakelists",
-    srcs = ["make_cmakelists.py"],
-)
-
-genrule(
-    name = "gen_cmakelists",
-    srcs = [
-        "//:BUILD",
-        "//:WORKSPACE",
-        "//bazel:workspace_deps.bzl",
-    ],
-    outs = ["generated-in/CMakeLists.txt"],
-    cmd = "$(location :make_cmakelists) $@",
-    tools = [":make_cmakelists"],
-)
-
-genrule(
-    name = "copy_protos",
-    srcs = ["//:descriptor_upb_proto"],
-    outs = [
-        "generated-in/google/protobuf/descriptor.upb.c",
-        "generated-in/google/protobuf/descriptor.upb.h",
-    ],
-    cmd = "cp $(SRCS) $(@D)/generated-in/google/protobuf",
-)
-
-staleness_test(
-    name = "test_generated_files",
-    outs = [
-        "CMakeLists.txt",
-        "google/protobuf/descriptor.upb.c",
-        "google/protobuf/descriptor.upb.h",
-    ],
-    generated_pattern = "generated-in/%s",
-    tags = ["manual"],
-)
-
-# Test the CMake build #########################################################
-
-make_shell_script(
-    name = "gen_run_cmake_build",
-    out = "run_cmake_build.sh",
-    contents = "set -ex\n" +
-               "(cd cmake/generated-in && rsync -avR . ..)\n" +
-               "mkdir build && cd build && cmake ../cmake && make -j8 && make test",
-)
-
-sh_test(
-    name = "cmake_build",
-    srcs = ["run_cmake_build.sh"],
-    data = [
-        ":copy_protos",
-        ":gen_cmakelists",
-        "//:cmake_files",
-        "//upb/mini_descriptor:cmake_files",
-        "//upb/mini_table:cmake_files",
-        "@utf8_range//:utf8_range_srcs",
-    ],
-    target_compatible_with = select({
-        "@platforms//os:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = ["@bazel_tools//tools/bash/runfiles"],
-)
diff --git a/third_party/upb/cmake/CMakeLists.txt b/third_party/upb/cmake/CMakeLists.txt
deleted file mode 100644
index a77f4d1b675c4..0000000000000
--- a/third_party/upb/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,536 +0,0 @@
-# This file was generated from BUILD using tools/make_cmakelists.py.
-
-cmake_minimum_required(VERSION 3.10...3.24)
-
-project(upb)
-set(CMAKE_C_STANDARD 99)
-
-
-# Prevent CMake from setting -rdynamic on Linux (!!).
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
-
-# Set default build type.
-if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-      "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
-      FORCE)
-endif()
-
-# When using Ninja, compiler output won't be colorized without this.
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG(-fdiagnostics-color=always SUPPORTS_COLOR_ALWAYS)
-if(SUPPORTS_COLOR_ALWAYS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
-endif()
-
-# Implement ASAN/UBSAN options
-if(UPB_ENABLE_ASAN)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
-endif()
-
-if(UPB_ENABLE_UBSAN)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
-endif()
-
-if(NOT TARGET utf8_range)
-  if(EXISTS ../external/utf8_range)
-    # utf8_range is already installed
-    include_directories(../external/utf8_range)
-  else()
-    include(FetchContent)
-    FetchContent_Declare(
-      utf8_range
-      GIT_REPOSITORY "https://github.com/protocolbuffers/utf8_range.git"
-      GIT_TAG "de0b4a8ff9b5d4c98108bdfe723291a33c52c54f"
-    )
-    FetchContent_GetProperties(utf8_range)
-    if(NOT utf8_range_POPULATED)
-      FetchContent_Populate(utf8_range)
-      include_directories(${utf8_range_SOURCE_DIR})
-    endif()
-  endif()
-endif()
-
-if(APPLE)
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace")
-elseif(UNIX)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
-endif()
-
-enable_testing()
-
-
-add_library(port INTERFACE
-    
-)
-target_include_directories(port INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-
-add_library(upb INTERFACE
-    
-)
-target_include_directories(upb INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(upb INTERFACE
-  base
-  collections_internal
-  fastdecode
-  hash
-  lex
-  mem
-  message_internal
-  port
-  wire
-  /upb/mini_table)
-
-add_library(base 
-    ../upb/base/status.c
-  ../upb/base/descriptor_constants.h
-  ../upb/base/log2.h
-  ../upb/base/status.h
-  ../upb/base/string_view.h
-)
-target_include_directories(base PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(base
-  port)
-
-add_library(message INTERFACE
-    
-)
-target_include_directories(message INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message INTERFACE
-  mem
-  message_internal
-  port
-  /upb/mini_table)
-
-add_library(message_internal 
-    ../upb/message/message.c
-  ../upb/message/extension_internal.h
-  ../upb/message/internal.h
-  ../upb/message/message.h
-)
-target_include_directories(message_internal PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_internal
-  base
-  hash
-  mem
-  port
-  /upb/mini_table)
-
-add_library(message_tagged_ptr INTERFACE
-    
-)
-target_include_directories(message_tagged_ptr INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_tagged_ptr INTERFACE
-  port)
-
-add_library(message_accessors_internal INTERFACE
-    
-)
-target_include_directories(message_accessors_internal INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_accessors_internal INTERFACE
-  collections_internal
-  message_internal
-  mini_table_internal
-  port)
-
-add_library(message_accessors 
-    ../upb/message/accessors.c
-  ../upb/message/accessors_internal.h
-  ../upb/message/accessors.h
-)
-target_include_directories(message_accessors PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_accessors
-  collections_internal
-  eps_copy_input_stream
-  message_internal
-  mini_table
-  port
-  upb
-  wire
-  wire_reader
-  /upb/mini_table:internal)
-
-add_library(message_promote 
-    ../upb/message/promote.c
-  ../upb/message/promote.h
-)
-target_include_directories(message_promote PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_promote
-  collections_internal
-  eps_copy_input_stream
-  hash
-  message_accessors
-  message_internal
-  port
-  upb
-  wire
-  wire_reader
-  /upb/mini_table)
-
-add_library(message_copy 
-    ../upb/message/copy.c
-  ../upb/message/copy.h
-)
-target_include_directories(message_copy PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_copy
-  collections_internal
-  message_accessors
-  message_internal
-  port
-  upb
-  /upb/mini_table)
-
-add_library(message_split64 INTERFACE
-    
-)
-target_include_directories(message_split64 INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_split64 INTERFACE
-  message_accessors
-  port)
-
-add_library(fastdecode INTERFACE
-    
-)
-target_include_directories(fastdecode INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(fastdecode INTERFACE
-  base
-  collections_internal
-  hash
-  mem_internal
-  message_internal
-  port
-  wire
-  /upb/mini_table)
-
-add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    
-)
-target_include_directories(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-  collections_internal
-  message_accessors
-  message_accessors_internal
-  message_internal
-  upb
-  wire_internal
-  /upb/mini_descriptor
-  /upb/mini_table)
-
-add_library(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    
-)
-target_include_directories(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-  base
-  collections_internal
-  hash
-  message_copy
-  upb
-  /upb/mini_table)
-
-add_library(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    
-)
-target_include_directories(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-  reflection_internal
-  /upb/mini_descriptor)
-
-add_library(collections INTERFACE
-    
-)
-target_include_directories(collections INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(collections INTERFACE
-  base
-  collections_internal
-  mem
-  port)
-
-add_library(message_rep_internal INTERFACE
-    
-)
-target_include_directories(message_rep_internal INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_rep_internal INTERFACE
-  base
-  hash)
-
-add_library(collections_internal 
-    ../upb/collections/array.c
-  ../upb/collections/map.c
-  ../upb/collections/map_sorter.c
-  ../upb/collections/array.h
-  ../upb/collections/array_internal.h
-  ../upb/collections/map.h
-  ../upb/collections/map_gencode_util.h
-  ../upb/collections/map_internal.h
-  ../upb/collections/map_sorter_internal.h
-  ../upb/collections/message_value.h
-)
-target_include_directories(collections_internal PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(collections_internal
-  base
-  hash
-  mem
-  message_internal
-  message_rep_internal
-  message_tagged_ptr
-  port
-  /upb/mini_table)
-
-add_library(collections_split64 INTERFACE
-    
-)
-target_include_directories(collections_split64 INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(collections_split64 INTERFACE
-  collections
-  port)
-
-add_library(textformat 
-    ../upb/text/encode.c
-  ../upb/text/encode.h
-  ../upb/text_encode.h
-)
-target_include_directories(textformat PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(textformat
-  collections_internal
-  eps_copy_input_stream
-  lex
-  port
-  reflection
-  wire
-  wire_reader
-  wire_types)
-
-add_library(mem INTERFACE
-    
-)
-target_include_directories(mem INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(mem INTERFACE
-  mem_internal
-  port)
-
-add_library(mem_internal 
-    ../upb/mem/alloc.c
-  ../upb/mem/arena.c
-  ../upb/mem/alloc.h
-  ../upb/mem/arena.h
-  ../upb/mem/arena_internal.h
-)
-target_include_directories(mem_internal PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(mem_internal
-  port)
-
-add_library(wire INTERFACE
-    
-)
-target_include_directories(wire INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(wire INTERFACE
-  mem
-  message_internal
-  port
-  wire_internal
-  /upb/mini_table)
-
-add_library(wire_internal 
-    ../upb/wire/decode.c
-  ../upb/wire/decode_fast.c
-  ../upb/wire/encode.c
-  ../upb/wire/common.h
-  ../upb/wire/common_internal.h
-  ../upb/wire/decode.h
-  ../upb/wire/decode_fast.h
-  ../upb/wire/decode_internal.h
-  ../upb/wire/encode.h
-  ../upb/wire/swap_internal.h
-)
-target_include_directories(wire_internal PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(wire_internal
-  base
-  collections_internal
-  eps_copy_input_stream
-  mem_internal
-  message_accessors_internal
-  message_internal
-  message_rep_internal
-  port
-  wire_reader
-  wire_types
-  /upb/mini_table
-  utf8_range)
-
-add_library(wire_types INTERFACE
-    
-)
-target_include_directories(wire_types INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-
-add_library(eps_copy_input_stream 
-    ../upb/wire/eps_copy_input_stream.c
-  ../upb/wire/eps_copy_input_stream.h
-)
-target_include_directories(eps_copy_input_stream PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(eps_copy_input_stream
-  mem
-  port)
-
-add_library(wire_reader 
-    ../upb/wire/reader.c
-  ../upb/wire/swap_internal.h
-  ../upb/wire/reader.h
-)
-target_include_directories(wire_reader PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(wire_reader
-  eps_copy_input_stream
-  port
-  wire_types)
-
-add_library(hash 
-    ../upb/hash/common.c
-  ../upb/hash/common.h
-  ../upb/hash/int_table.h
-  ../upb/hash/str_table.h
-)
-target_include_directories(hash PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(hash
-  base
-  mem
-  port)
-
-add_library(lex 
-    ../upb/lex/atoi.c
-  ../upb/lex/round_trip.c
-  ../upb/lex/strtod.c
-  ../upb/lex/unicode.c
-  ../upb/lex/atoi.h
-  ../upb/lex/round_trip.h
-  ../upb/lex/strtod.h
-  ../upb/lex/unicode.h
-)
-target_include_directories(lex PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(lex
-  port)
-
-
diff --git a/third_party/upb/cmake/build_defs.bzl b/third_party/upb/cmake/build_defs.bzl
deleted file mode 100644
index 157c3cb053a02..0000000000000
--- a/third_party/upb/cmake/build_defs.bzl
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Bazel support functions related to CMake support."""
-
-def staleness_test(name, outs, generated_pattern, target_files = None, tags = [], **kwargs):
-    """Tests that checked-in file(s) match the contents of generated file(s).
-
-    The resulting test will verify that all output files exist and have the
-    correct contents.  If the test fails, it can be invoked with --fix to
-    bring the checked-in files up to date.
-
-    Args:
-      name: Name of the rule.
-      outs: the checked-in files that are copied from generated files.
-      generated_pattern: the pattern for transforming each "out" file into a
-        generated file.  For example, if generated_pattern="generated/%s" then
-        a file foo.txt will look for generated file generated/foo.txt.
-      target_files: A glob representing all of the files that should be
-      covered by this rule.  Files in this glob but not generated will
-      be deleted.  (Not currently implemented in OSS).
-      **kwargs: Additional keyword arguments to pass through to py_test().
-    """
-
-    script_name = name + ".py"
-    script_src = Label("//cmake:staleness_test.py")
-
-    # Filter out non-existing rules so Blaze doesn't error out before we even
-    # run the test.
-    existing_outs = native.glob(include = outs)
-
-    # The file list contains a few extra bits of information at the end.
-    # These get unpacked by the Config class in staleness_test_lib.py.
-    file_list = outs + [generated_pattern, native.package_name() or ".", name]
-
-    native.genrule(
-        name = name + "_makescript",
-        outs = [script_name],
-        srcs = [script_src],
-        testonly = 1,
-        cmd = "cp $< $@; " +
-              "sed -i.bak -e 's|INSERT_FILE_LIST_HERE|" + "\\\n  ".join(file_list) + "|' $@",
-    )
-
-    native.py_test(
-        name = name,
-        srcs = [script_name],
-        data = existing_outs + [generated_pattern % file for file in outs],
-        python_version = "PY3",
-        deps = [
-            Label("//cmake:staleness_test_lib"),
-        ],
-        tags = ["staleness_test"] + tags,
-        **kwargs
-    )
diff --git a/third_party/upb/cmake/google/protobuf/descriptor.upb.c b/third_party/upb/cmake/google/protobuf/descriptor.upb.c
deleted file mode 100644
index 24b4f8a6044af..0000000000000
--- a/third_party/upb/cmake/google/protobuf/descriptor.upb.c
+++ /dev/null
@@ -1,1327 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/descriptor.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
-  {.submsg = &google_protobuf_FileDescriptorProto_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init = {
-  &google_protobuf_FileDescriptorSet_submsgs[0],
-  &google_protobuf_FileDescriptorSet__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max192b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[6] = {
-  {.submsg = &google_protobuf_DescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_ServiceDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_FileOptions_msg_init},
-  {.submsg = &google_protobuf_SourceCodeInfo_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
-  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init = {
-  &google_protobuf_FileDescriptorProto_submsgs[0],
-  &google_protobuf_FileDescriptorProto__fields[0],
-  UPB_SIZE(72, 144), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x002800003f00001a, &upb_prs_1bt},
-    {0x003000003f000022, &upb_prm_1bt_max128b},
-    {0x003800003f01002a, &upb_prm_1bt_max64b},
-    {0x004000003f020032, &upb_prm_1bt_max64b},
-    {0x004800003f03003a, &upb_prm_1bt_max128b},
-    {0x0050000003040042, &upb_psm_1bt_max256b},
-    {0x005800000405004a, &upb_psm_1bt_max64b},
-    {0x006000003f000050, &upb_prv4_1bt},
-    {0x006800003f000058, &upb_prv4_1bt},
-    {0x0070000005000062, &upb_pss_1bt},
-    {0x008000000600006a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msg_init},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_MessageOptions_msg_init},
-  {.submsg = &google_protobuf_OneofDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_DescriptorProto_ReservedRange_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
-  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_msg_init = {
-  &google_protobuf_DescriptorProto_submsgs[0],
-  &google_protobuf_DescriptorProto__fields[0],
-  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x002000003f01001a, &upb_prm_1bt_max128b},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x003000003f03002a, &upb_prm_1bt_max64b},
-    {0x003800003f040032, &upb_prm_1bt_max128b},
-    {0x004000000205003a, &upb_psm_1bt_max64b},
-    {0x004800003f060042, &upb_prm_1bt_max64b},
-    {0x005000003f07004a, &upb_prm_1bt_max64b},
-    {0x005800003f000052, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init = {
-  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
-  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x001000000300001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init = {
-  NULL,
-  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_Declaration_msg_init},
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init = {
-  &google_protobuf_ExtensionRangeOptions_submsgs[0],
-  &google_protobuf_ExtensionRangeOptions__fields[0],
-  UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000002010392, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800003f023eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init = {
-  NULL,
-  &google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
-  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0010000002000012, &upb_pss_1bt},
-    {0x002000000300001a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000004000028, &upb_psb1_1bt},
-    {0x0009000005000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_FieldOptions_msg_init},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
-  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init = {
-  &google_protobuf_FieldDescriptorProto_submsgs[0],
-  &google_protobuf_FieldDescriptorProto__fields[0],
-  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pss_1bt},
-    {0x0028000002000012, &upb_pss_1bt},
-    {0x0004000003000018, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0038000006000032, &upb_pss_1bt},
-    {0x004800000700003a, &upb_pss_1bt},
-    {0x0058000008000042, &upb_psm_1bt_max64b},
-    {0x0010000009000048, &upb_psv4_1bt},
-    {0x006000000a000052, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001400000b000188, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_OneofOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
-  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init = {
-  &google_protobuf_OneofDescriptorProto_submsgs[0],
-  &google_protobuf_OneofDescriptorProto__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_EnumValueDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_EnumOptions_msg_init},
-  {.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
-  {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init = {
-  &google_protobuf_EnumDescriptorProto_submsgs[0],
-  &google_protobuf_EnumDescriptorProto__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max64b},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-    {0x002800003f020022, &upb_prm_1bt_max64b},
-    {0x003000003f00002a, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
-  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init = {
-  NULL,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
-  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000001000008, &upb_psv4_1bt},
-    {0x0008000002000010, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_EnumValueOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init = {
-  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
-  &google_protobuf_EnumValueDescriptorProto__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0004000002000010, &upb_psv4_1bt},
-    {0x001800000300001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
-  {.submsg = &google_protobuf_MethodDescriptorProto_msg_init},
-  {.submsg = &google_protobuf_ServiceOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init = {
-  &google_protobuf_ServiceDescriptorProto_submsgs[0],
-  &google_protobuf_ServiceDescriptorProto__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x001800003f000012, &upb_prm_1bt_max128b},
-    {0x002000000201001a, &upb_psm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_MethodOptions_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
-  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init = {
-  &google_protobuf_MethodDescriptorProto_submsgs[0],
-  &google_protobuf_MethodDescriptorProto__fields[0],
-  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x002800000300001a, &upb_pss_1bt},
-    {0x0038000004000022, &upb_psm_1bt_max64b},
-    {0x0001000005000028, &upb_psb1_1bt},
-    {0x0002000006000030, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FileOptions__fields[22] = {
-  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileOptions_msg_init = {
-  &google_protobuf_FileOptions_submsgs[0],
-  &google_protobuf_FileOptions__fields[0],
-  UPB_SIZE(112, 200), 22, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001800000100000a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0028000002000042, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000004000050, &upb_psb1_1bt},
-    {0x003800000500005a, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0009000006000180, &upb_psb1_2bt},
-    {0x000a000007000188, &upb_psb1_2bt},
-    {0x000b000008000190, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000c0000090001a0, &upb_psb1_2bt},
-    {0x005800000e0002aa, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000d00000a0001b8, &upb_psb1_2bt},
-    {0x00780000100002c2, &upb_pss_2bt},
-    {0x00880000110002ca, &upb_pss_2bt},
-    {0x00100000120002d0, &upb_psb1_2bt},
-    {0x000e00000b0001d8, &upb_psb1_2bt},
-    {0x00980000130002e2, &upb_pss_2bt},
-    {0x00a80000140002ea, &upb_pss_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000f00000c0001f8, &upb_psb1_2bt},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MessageOptions_msg_init = {
-  &google_protobuf_MessageOptions_submsgs[0],
-  &google_protobuf_MessageOptions__fields[0],
-  UPB_SIZE(16, 24), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0002000002000010, &upb_psb1_1bt},
-    {0x0003000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0004000004000038, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0005000005000058, &upb_psb1_1bt},
-    {0x0008000006000062, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = {
-  {.submsg = &google_protobuf_FieldOptions_EditionDefault_msg_init},
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_FieldOptions_CType_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
-  {.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = {
-  {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_msg_init = {
-  &google_protobuf_FieldOptions_submsgs[0],
-  &google_protobuf_FieldOptions__fields[0],
-  UPB_SIZE(40, 56), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0008000002000010, &upb_psb1_1bt},
-    {0x0009000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000a000004000028, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0010000006000050, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0011000007000078, &upb_psb1_1bt},
-    {0x0012000008000180, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x002000003f0001a2, &upb_prm_2bt_max64b},
-    {0x002800000a0101aa, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003000003f023eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_EditionDefault_msg_init = {
-  NULL,
-  &google_protobuf_FieldOptions_EditionDefault__fields[0],
-  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0018000002000012, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofOptions_msg_init = {
-  &google_protobuf_OneofOptions_submsgs[0],
-  &google_protobuf_OneofOptions__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
-  {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumOptions_msg_init = {
-  &google_protobuf_EnumOptions_submsgs[0],
-  &google_protobuf_EnumOptions__fields[0],
-  UPB_SIZE(16, 24), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000010, &upb_psb1_1bt},
-    {0x0002000002000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0003000003000030, &upb_psb1_1bt},
-    {0x000800000400003a, &upb_psm_1bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = {
-  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueOptions_msg_init = {
-  &google_protobuf_EnumValueOptions_submsgs[0],
-  &google_protobuf_EnumValueOptions__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000008, &upb_psb1_1bt},
-    {0x0008000002000012, &upb_psm_1bt_max64b},
-    {0x0002000003000018, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
-  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceOptions_msg_init = {
-  &google_protobuf_ServiceOptions_submsgs[0],
-  &google_protobuf_ServiceOptions__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000288, &upb_psb1_2bt},
-    {0x0008000002000292, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
-  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
-  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodOptions_msg_init = {
-  &google_protobuf_MethodOptions_submsgs[0],
-  &google_protobuf_MethodOptions__fields[0],
-  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0001000001000288, &upb_psb1_2bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000300029a, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f013eba, &upb_prm_2bt_max128b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_NamePart_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
-  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_msg_init = {
-  &google_protobuf_UninterpretedOption_submsgs[0],
-  &google_protobuf_UninterpretedOption__fields[0],
-  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f000012, &upb_prm_1bt_max64b},
-    {0x001000000100001a, &upb_pss_1bt},
-    {0x0020000002000020, &upb_psv8_1bt},
-    {0x0028000003000028, &upb_psv8_1bt},
-    {0x0030000004000031, &upb_psf8_1bt},
-    {0x003800000500003a, &upb_psb_1bt},
-    {0x0048000006000042, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
-  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init = {
-  NULL,
-  &google_protobuf_UninterpretedOption_NamePart__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800000100000a, &upb_pss_1bt},
-    {0x0001000002000010, &upb_psb1_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[7] = {
-  {.submsg = &google_protobuf_FeatureSet_msg_init},
-  {.subenum = &google_protobuf_FeatureSet_FieldPresence_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_EnumType_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_StringFieldValidation_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
-  {.subenum = &google_protobuf_FeatureSet_JsonFormat_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_FeatureSet__fields[7] = {
-  {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FeatureSet_msg_init = {
-  &google_protobuf_FeatureSet_submsgs[0],
-  &google_protobuf_FeatureSet__fields[0],
-  UPB_SIZE(32, 40), 7, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(248), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0020000007003eba, &upb_psm_2bt_max64b},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_SourceCodeInfo_Location_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init = {
-  &google_protobuf_SourceCodeInfo_submsgs[0],
-  &google_protobuf_SourceCodeInfo__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max128b},
-  })
-};
-
-static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
-  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init = {
-  NULL,
-  &google_protobuf_SourceCodeInfo_Location__fields[0],
-  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000800003f00000a, &upb_ppv4_1bt},
-    {0x001000003f000012, &upb_ppv4_1bt},
-    {0x001800000100001a, &upb_pss_1bt},
-    {0x0028000002000022, &upb_pss_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x003800003f000032, &upb_prs_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msg_init},
-};
-
-static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
-  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init = {
-  &google_protobuf_GeneratedCodeInfo_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo__fields[0],
-  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x000000003f00000a, &upb_prm_1bt_max64b},
-  })
-};
-
-static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
-  {.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
-};
-
-static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
-  {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init = {
-  &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
-  UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
-  UPB_FASTTABLE_INIT({
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x001000003f00000a, &upb_ppv4_1bt},
-    {0x0018000001000012, &upb_pss_1bt},
-    {0x0004000002000018, &upb_psv4_1bt},
-    {0x0008000003000020, &upb_psv4_1bt},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
-  })
-};
-
-static const upb_MiniTable *messages_layout[30] = {
-  &google_protobuf_FileDescriptorSet_msg_init,
-  &google_protobuf_FileDescriptorProto_msg_init,
-  &google_protobuf_DescriptorProto_msg_init,
-  &google_protobuf_DescriptorProto_ExtensionRange_msg_init,
-  &google_protobuf_DescriptorProto_ReservedRange_msg_init,
-  &google_protobuf_ExtensionRangeOptions_msg_init,
-  &google_protobuf_ExtensionRangeOptions_Declaration_msg_init,
-  &google_protobuf_FieldDescriptorProto_msg_init,
-  &google_protobuf_OneofDescriptorProto_msg_init,
-  &google_protobuf_EnumDescriptorProto_msg_init,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init,
-  &google_protobuf_EnumValueDescriptorProto_msg_init,
-  &google_protobuf_ServiceDescriptorProto_msg_init,
-  &google_protobuf_MethodDescriptorProto_msg_init,
-  &google_protobuf_FileOptions_msg_init,
-  &google_protobuf_MessageOptions_msg_init,
-  &google_protobuf_FieldOptions_msg_init,
-  &google_protobuf_FieldOptions_EditionDefault_msg_init,
-  &google_protobuf_OneofOptions_msg_init,
-  &google_protobuf_EnumOptions_msg_init,
-  &google_protobuf_EnumValueOptions_msg_init,
-  &google_protobuf_ServiceOptions_msg_init,
-  &google_protobuf_MethodOptions_msg_init,
-  &google_protobuf_UninterpretedOption_msg_init,
-  &google_protobuf_UninterpretedOption_NamePart_msg_init,
-  &google_protobuf_FeatureSet_msg_init,
-  &google_protobuf_SourceCodeInfo_msg_init,
-  &google_protobuf_SourceCodeInfo_Location_msg_init,
-  &google_protobuf_GeneratedCodeInfo_msg_init,
-  &google_protobuf_GeneratedCodeInfo_Annotation_msg_init,
-};
-
-const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
-    64,
-    0,
-    {
-        0x3,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
-    64,
-    0,
-    {
-        0xf,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FeatureSet_StringFieldValidation_enum_init = {
-    64,
-    0,
-    {
-        0xf,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
-    64,
-    0,
-    {
-        0xe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
-    64,
-    0,
-    {
-        0x7fffe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
-    64,
-    0,
-    {
-        0x3ff,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
-    64,
-    0,
-    {
-        0xe,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
-    64,
-    0,
-    {
-        0x7,
-        0x0,
-    },
-};
-
-static const upb_MiniTableEnum *enums_layout[16] = {
-  &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
-  &google_protobuf_FeatureSet_EnumType_enum_init,
-  &google_protobuf_FeatureSet_FieldPresence_enum_init,
-  &google_protobuf_FeatureSet_JsonFormat_enum_init,
-  &google_protobuf_FeatureSet_MessageEncoding_enum_init,
-  &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
-  &google_protobuf_FeatureSet_StringFieldValidation_enum_init,
-  &google_protobuf_FieldDescriptorProto_Label_enum_init,
-  &google_protobuf_FieldDescriptorProto_Type_enum_init,
-  &google_protobuf_FieldOptions_CType_enum_init,
-  &google_protobuf_FieldOptions_JSType_enum_init,
-  &google_protobuf_FieldOptions_OptionRetention_enum_init,
-  &google_protobuf_FieldOptions_OptionTargetType_enum_init,
-  &google_protobuf_FileOptions_OptimizeMode_enum_init,
-  &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
-  &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
-};
-
-const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
-  messages_layout,
-  enums_layout,
-  NULL,
-  30,
-  16,
-  0,
-};
-
-#include "upb/port/undef.inc"
-
diff --git a/third_party/upb/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/cmake/google/protobuf/descriptor.upb.h
deleted file mode 100644
index 80cf72e001f4c..0000000000000
--- a/third_party/upb/cmake/google/protobuf/descriptor.upb.h
+++ /dev/null
@@ -1,6236 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
-typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
-typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
-typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
-typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
-typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
-typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration;
-typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
-typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
-typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
-typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
-typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
-typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
-typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
-typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
-typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault;
-typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
-typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
-typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
-typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
-typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
-typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
-typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
-typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet;
-typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
-typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
-typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
-typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
-extern const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init;
-extern const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init;
-extern const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init;
-extern const upb_MiniTable google_protobuf_FileOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MessageOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_EditionDefault_msg_init;
-extern const upb_MiniTable google_protobuf_OneofOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumOptions_msg_init;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;
-extern const upb_MiniTable google_protobuf_MethodOptions_msg_init;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_msg_init;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init;
-extern const upb_MiniTable google_protobuf_FeatureSet_msg_init;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init;
-
-typedef enum {
-  google_protobuf_ExtensionRangeOptions_DECLARATION = 0,
-  google_protobuf_ExtensionRangeOptions_UNVERIFIED = 1
-} google_protobuf_ExtensionRangeOptions_VerificationState;
-
-typedef enum {
-  google_protobuf_FeatureSet_ENUM_TYPE_UNKNOWN = 0,
-  google_protobuf_FeatureSet_OPEN = 1,
-  google_protobuf_FeatureSet_CLOSED = 2
-} google_protobuf_FeatureSet_EnumType;
-
-typedef enum {
-  google_protobuf_FeatureSet_FIELD_PRESENCE_UNKNOWN = 0,
-  google_protobuf_FeatureSet_EXPLICIT = 1,
-  google_protobuf_FeatureSet_IMPLICIT = 2,
-  google_protobuf_FeatureSet_LEGACY_REQUIRED = 3
-} google_protobuf_FeatureSet_FieldPresence;
-
-typedef enum {
-  google_protobuf_FeatureSet_JSON_FORMAT_UNKNOWN = 0,
-  google_protobuf_FeatureSet_ALLOW = 1,
-  google_protobuf_FeatureSet_LEGACY_BEST_EFFORT = 2
-} google_protobuf_FeatureSet_JsonFormat;
-
-typedef enum {
-  google_protobuf_FeatureSet_MESSAGE_ENCODING_UNKNOWN = 0,
-  google_protobuf_FeatureSet_LENGTH_PREFIXED = 1,
-  google_protobuf_FeatureSet_DELIMITED = 2
-} google_protobuf_FeatureSet_MessageEncoding;
-
-typedef enum {
-  google_protobuf_FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN = 0,
-  google_protobuf_FeatureSet_PACKED = 1,
-  google_protobuf_FeatureSet_EXPANDED = 2
-} google_protobuf_FeatureSet_RepeatedFieldEncoding;
-
-typedef enum {
-  google_protobuf_FeatureSet_STRING_FIELD_VALIDATION_UNKNOWN = 0,
-  google_protobuf_FeatureSet_MANDATORY = 1,
-  google_protobuf_FeatureSet_HINT = 2,
-  google_protobuf_FeatureSet_NONE = 3
-} google_protobuf_FeatureSet_StringFieldValidation;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
-  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
-  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
-} google_protobuf_FieldDescriptorProto_Label;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
-  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
-  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
-  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
-  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
-  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
-  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
-  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
-  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
-  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
-} google_protobuf_FieldDescriptorProto_Type;
-
-typedef enum {
-  google_protobuf_FieldOptions_STRING = 0,
-  google_protobuf_FieldOptions_CORD = 1,
-  google_protobuf_FieldOptions_STRING_PIECE = 2
-} google_protobuf_FieldOptions_CType;
-
-typedef enum {
-  google_protobuf_FieldOptions_JS_NORMAL = 0,
-  google_protobuf_FieldOptions_JS_STRING = 1,
-  google_protobuf_FieldOptions_JS_NUMBER = 2
-} google_protobuf_FieldOptions_JSType;
-
-typedef enum {
-  google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0,
-  google_protobuf_FieldOptions_RETENTION_RUNTIME = 1,
-  google_protobuf_FieldOptions_RETENTION_SOURCE = 2
-} google_protobuf_FieldOptions_OptionRetention;
-
-typedef enum {
-  google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0,
-  google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1,
-  google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2,
-  google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3,
-  google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4,
-  google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5,
-  google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6,
-  google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7,
-  google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8,
-  google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9
-} google_protobuf_FieldOptions_OptionTargetType;
-
-typedef enum {
-  google_protobuf_FileOptions_SPEED = 1,
-  google_protobuf_FileOptions_CODE_SIZE = 2,
-  google_protobuf_FileOptions_LITE_RUNTIME = 3
-} google_protobuf_FileOptions_OptimizeMode;
-
-typedef enum {
-  google_protobuf_GeneratedCodeInfo_Annotation_NONE = 0,
-  google_protobuf_GeneratedCodeInfo_Annotation_SET = 1,
-  google_protobuf_GeneratedCodeInfo_Annotation_ALIAS = 2
-} google_protobuf_GeneratedCodeInfo_Annotation_Semantic;
-
-typedef enum {
-  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
-  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
-  google_protobuf_MethodOptions_IDEMPOTENT = 2
-} google_protobuf_MethodOptions_IdempotencyLevel;
-
-
-extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_StringFieldValidation_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
-extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
-extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
-
-/* google.protobuf.FileDescriptorSet */
-
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google_protobuf_FileDescriptorSet_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorSet_file(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FileDescriptorProto */
-
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_message_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_enum_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_service(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_extension(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
-  const google_protobuf_FileOptions* default_val = NULL;
-  const google_protobuf_FileOptions* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  const google_protobuf_SourceCodeInfo* default_val = NULL;
-  const google_protobuf_SourceCodeInfo* ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_public_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_FileDescriptorProto_weak_dependency(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_ServiceDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msg_init, arena);
-    if (sub) google_protobuf_FileDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msg_init, arena);
-    if (sub) google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.DescriptorProto */
-
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_field(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_nested_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_enum_type(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_extension_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_extension(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
-  const google_protobuf_MessageOptions* default_val = NULL;
-  const google_protobuf_MessageOptions* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_oneof_decl(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_reserved_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_protobuf_DescriptorProto* msg) {
-  size_t size;
-  google_protobuf_DescriptorProto_reserved_name(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msg_init, arena);
-    if (sub) google_protobuf_DescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_OneofDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.DescriptorProto.ExtensionRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const google_protobuf_ExtensionRangeOptions* default_val = NULL;
-  const google_protobuf_ExtensionRangeOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
-  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msg_init, arena);
-    if (sub) google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.DescriptorProto.ReservedRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.ExtensionRangeOptions */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_declaration(const google_protobuf_ExtensionRangeOptions* msg) {
-  size_t size;
-  google_protobuf_ExtensionRangeOptions_declaration(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  size_t size;
-  google_protobuf_ExtensionRangeOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_ExtensionRangeOptions_Declaration* sub = (struct google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_Declaration_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_ExtensionRangeOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.ExtensionRangeOptions.Declaration */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_Declaration_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_Declaration_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
-  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
-  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FieldDescriptorProto */
-
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
-  const google_protobuf_FieldOptions* default_val = NULL;
-  const google_protobuf_FieldOptions* ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msg_init, arena);
-    if (sub) google_protobuf_FieldDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.OneofDescriptorProto */
-
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
-  const google_protobuf_OneofOptions* default_val = NULL;
-  const google_protobuf_OneofOptions* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msg_init, arena);
-    if (sub) google_protobuf_OneofDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.EnumDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_value(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
-  const google_protobuf_EnumOptions* default_val = NULL;
-  const google_protobuf_EnumOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_reserved_range(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_EnumDescriptorProto_reserved_name(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumValueDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msg_init, arena);
-    if (sub) google_protobuf_EnumDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.EnumValueDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const google_protobuf_EnumValueOptions* default_val = NULL;
-  const google_protobuf_EnumValueOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msg_init, arena);
-    if (sub) google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.ServiceDescriptorProto */
-
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  size_t size;
-  google_protobuf_ServiceDescriptorProto_method(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  const google_protobuf_ServiceOptions* default_val = NULL;
-  const google_protobuf_ServiceOptions* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_MethodDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msg_init, arena);
-    if (sub) google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.MethodDescriptorProto */
-
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
-  const google_protobuf_MethodOptions* default_val = NULL;
-  const google_protobuf_MethodOptions* ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msg_init, arena);
-    if (sub) google_protobuf_MethodDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FileOptions */
-
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FileOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  bool default_val = true;
-  bool ret;
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  size_t size;
-  google_protobuf_FileOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FileOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.MessageOptions */
-
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MessageOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MessageOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  size_t size;
-  google_protobuf_MessageOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_MessageOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FieldOptions */
-
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_targets(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_targets(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_edition_defaults(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_edition_defaults(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  size_t size;
-  google_protobuf_FieldOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FieldOptions_EditionDefault* sub = (struct google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google_protobuf_FieldOptions_EditionDefault_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FieldOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.FieldOptions.EditionDefault */
-
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google_protobuf_FieldOptions_EditionDefault_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_EditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_EditionDefault_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_EditionDefault_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FieldOptions_EditionDefault_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.OneofOptions */
-
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
-  return (google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_OneofOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  size_t size;
-  google_protobuf_OneofOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_OneofOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.EnumOptions */
-
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  size_t size;
-  google_protobuf_EnumOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_EnumOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.EnumValueOptions */
-
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_EnumValueOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  size_t size;
-  google_protobuf_EnumValueOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
-  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_EnumValueOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.ServiceOptions */
-
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_ServiceOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  size_t size;
-  google_protobuf_ServiceOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_ServiceOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.MethodOptions */
-
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msg_init, arena);
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodOptions_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_MethodOptions_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  size_t size;
-  google_protobuf_MethodOptions_uninterpreted_option(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
-  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
-  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_MethodOptions_set_features(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.UninterpretedOption */
-
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msg_init, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
-  size_t size;
-  google_protobuf_UninterpretedOption_name(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  int64_t default_val = (int64_t)0ll;
-  int64_t ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
-  double default_val = 0;
-  double ret;
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
-  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.UninterpretedOption.NamePart */
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msg_init, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  bool default_val = false;
-  bool ret;
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
-  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.FeatureSet */
-
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* arena) {
-  return (google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-}
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FeatureSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FeatureSet_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FeatureSet_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_FeatureSet_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_string_field_validation(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_string_field_validation(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_string_field_validation(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_FeatureSet_clear_raw_features(google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSet_raw_features(const google_protobuf_FeatureSet* msg) {
-  const google_protobuf_FeatureSet* default_val = NULL;
-  const google_protobuf_FeatureSet* ret;
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_FeatureSet_has_raw_features(const google_protobuf_FeatureSet* msg) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {1, 4, 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {2, 8, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {3, 12, 3, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_string_field_validation(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {4, 16, 4, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {5, 20, 5, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) {
-  const upb_MiniTableField field = {6, 24, 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_FeatureSet_set_raw_features(google_protobuf_FeatureSet *msg, google_protobuf_FeatureSet* value) {
-  const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 7, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSet_mutable_raw_features(google_protobuf_FeatureSet* msg, upb_Arena* arena) {
-  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSet_raw_features(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google_protobuf_FeatureSet_msg_init, arena);
-    if (sub) google_protobuf_FeatureSet_set_raw_features(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo */
-
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msg_init, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_location(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_SourceCodeInfo_Location**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo.Location */
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msg_init, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_path(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_span(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_span(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  size_t size;
-  google_protobuf_SourceCodeInfo_Location_leading_detached_comments(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-
-/* google.protobuf.GeneratedCodeInfo */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_msg_init, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  size_t size;
-  google_protobuf_GeneratedCodeInfo_annotation(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msg_init, arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.GeneratedCodeInfo.Annotation */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msg_init, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msg_init, options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-      (upb_Message*)msg, &field, arena);
-  if (size) {
-    *size = arr ? arr->size : 0;
-  }
-  return arr;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  size_t size;
-  google_protobuf_GeneratedCodeInfo_Annotation_path(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  int32_t default_val = 0;
-  int32_t ret;
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (int32_t*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
-
-/* Max size 32 is google.protobuf.FileOptions */
-/* Max size 64 is google.protobuf.FileOptions */
-#define _UPB_MAXOPT_SIZE UPB_SIZE(112, 200)
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
diff --git a/third_party/upb/cmake/make_cmakelists.py b/third_party/upb/cmake/make_cmakelists.py
deleted file mode 100755
index 7b2851f7fe5f9..0000000000000
--- a/third_party/upb/cmake/make_cmakelists.py
+++ /dev/null
@@ -1,411 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A tool to convert {WORKSPACE, BUILD} -> CMakeLists.txt.
-
-This tool is very upb-specific at the moment, and should not be seen as a
-generic Bazel -> CMake converter.
-"""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import sys
-import textwrap
-import os
-
-def StripFirstChar(deps):
-  return [dep[1:] for dep in deps]
-
-def IsSourceFile(name):
-  return name.endswith(".c") or name.endswith(".cc")
-
-
-ADD_LIBRARY_FORMAT = """
-add_library(%(name)s %(type)s
-    %(sources)s
-)
-target_include_directories(%(name)s %(keyword)s
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-"""
-
-
-class BuildFileFunctions(object):
-  def __init__(self, converter):
-    self.converter = converter
-
-  def _add_deps(self, kwargs, keyword=""):
-    if "deps" not in kwargs:
-      return
-    self.converter.toplevel += "target_link_libraries(%s%s\n  %s)\n" % (
-        kwargs["name"],
-        keyword,
-        "\n  ".join(StripFirstChar(kwargs["deps"]))
-    )
-
-  def load(self, *args):
-    pass
-  
-  def cc_library(self, **kwargs):
-    if kwargs["name"].endswith("amalgamation"):
-      return
-    if kwargs["name"] == "upbc_generator":
-      return
-    if kwargs["name"] == "lupb":
-      return
-    if "testonly" in kwargs:
-      return
-    files = kwargs.get("srcs", []) + kwargs.get("hdrs", [])
-    found_files = []
-    pregenerated_files = [
-        "CMakeLists.txt", "descriptor.upb.h", "descriptor.upb.c"
-    ]
-    for file in files:
-      if os.path.basename(file) in pregenerated_files:
-        found_files.append("../cmake/" + file)
-      else:
-        found_files.append("../" + file)
-
-    if list(filter(IsSourceFile, files)):
-      # Has sources, make this a normal library.
-      self.converter.toplevel += ADD_LIBRARY_FORMAT % {
-          "name": kwargs["name"],
-          "type": "",
-          "keyword": "PUBLIC",
-          "sources": "\n  ".join(found_files),
-      }
-      self._add_deps(kwargs)
-    else:
-      # Header-only library, have to do a couple things differently.
-      # For some info, see:
-      #  http://mariobadr.com/creating-a-header-only-library-with-cmake.html
-      self.converter.toplevel += ADD_LIBRARY_FORMAT % {
-          "name": kwargs["name"],
-          "type": "INTERFACE",
-          "keyword": "INTERFACE",
-          "sources": "",
-      }
-      self._add_deps(kwargs, " INTERFACE")
-
-  def cc_binary(self, **kwargs):
-    pass
-
-  def cc_test(self, **kwargs):
-    # Disable this until we properly support upb_proto_library().
-    # self.converter.toplevel += "add_executable(%s\n  %s)\n" % (
-    #     kwargs["name"],
-    #     "\n  ".join(kwargs["srcs"])
-    # )
-    # self.converter.toplevel += "add_test(NAME %s COMMAND %s)\n" % (
-    #     kwargs["name"],
-    #     kwargs["name"],
-    # )
-
-    # if "data" in kwargs:
-    #   for data_dep in kwargs["data"]:
-    #     self.converter.toplevel += textwrap.dedent("""\
-    #       add_custom_command(
-    #           TARGET %s POST_BUILD
-    #           COMMAND ${CMAKE_COMMAND} -E copy
-    #                   ${CMAKE_SOURCE_DIR}/%s
-    #                   ${CMAKE_CURRENT_BINARY_DIR}/%s)\n""" % (
-    #       kwargs["name"], data_dep, data_dep
-    #     ))
-
-    # self._add_deps(kwargs)
-    pass
-
-  def cc_fuzz_test(self, **kwargs):
-    pass
-
-  def pkg_files(self, **kwargs):
-    pass
-
-  def py_library(self, **kwargs):
-    pass
-
-  def py_binary(self, **kwargs):
-    pass
-
-  def lua_proto_library(self, **kwargs):
-    pass
-
-  def sh_test(self, **kwargs):
-    pass
-
-  def make_shell_script(self, **kwargs):
-    pass
-
-  def exports_files(self, files, **kwargs):
-    pass
-
-  def proto_library(self, **kwargs):
-    pass
-
-  def cc_proto_library(self, **kwargs):
-    pass
-
-  def staleness_test(self, **kwargs):
-    pass
-
-  def upb_amalgamation(self, **kwargs):
-    pass
-
-  def upb_proto_library(self, **kwargs):
-    pass
-
-  def upb_proto_library_copts(self, **kwargs):
-    pass
-
-  def upb_proto_reflection_library(self, **kwargs):
-    pass
-
-  def upb_proto_srcs(self, **kwargs):
-    pass
-
-  def genrule(self, **kwargs):
-    pass
-
-  def config_setting(self, **kwargs):
-    pass
-
-  def upb_fasttable_enabled(self, **kwargs):
-    pass
-
-  def select(self, arg_dict):
-    return []
-
-  def glob(self, *args, **kwargs):
-    return []
-
-  def licenses(self, *args):
-    pass
-
-  def filegroup(self, **kwargs):
-    pass
-
-  def map_dep(self, arg):
-    return arg
-
-  def package_group(self, **kwargs):
-    pass
-
-  def bool_flag(self, **kwargs):
-    pass
-
-  def bootstrap_upb_proto_library(self, **kwargs):
-    pass
-
-  def bootstrap_cc_library(self, **kwargs):
-    pass
-
-  def alias(self, **kwargs):
-    pass
-
-
-class WorkspaceFileFunctions(object):
-  def __init__(self, converter):
-    self.converter = converter
-
-  def load(self, *args, **kwargs):
-    pass
-
-  def workspace(self, **kwargs):
-    self.converter.prelude += "project(%s)\n" % (kwargs["name"])
-    self.converter.prelude += "set(CMAKE_C_STANDARD 99)\n"
-
-  def maybe(self, rule, **kwargs):
-    if kwargs["name"] == "utf8_range":
-      self.converter.utf8_range_commit = kwargs["commit"]
-    pass
-
-  def http_archive(self, **kwargs):
-    pass
-
-  def git_repository(self, **kwargs):
-    pass
-
-  def new_git_repository(self, **kwargs):
-    pass
-
-  def bazel_version_repository(self, **kwargs):
-    pass
-
-  def protobuf_deps(self):
-    pass
-
-  def utf8_range_deps(self):
-    pass
-
-  def pip_parse(self, **kwargs):
-    pass
-
-  def rules_fuzzing_dependencies(self):
-    pass
-
-  def rules_fuzzing_init(self):
-    pass
-
-  def rules_pkg_dependencies(self):
-    pass
-
-  def system_python(self, **kwargs):
-    pass
-
-  def register_system_python(self, **kwargs):
-    pass
-
-  def register_toolchains(self, toolchain):
-    pass
-
-  def python_source_archive(self, **kwargs):
-    pass
-
-  def python_nuget_package(self, **kwargs):
-    pass
-
-  def install_deps(self):
-    pass
-
-  def fuzzing_py_install_deps(self):
-    pass
-
-  def googletest_deps(self):
-    pass
-
-
-class Converter(object):
-  def __init__(self):
-    self.prelude = ""
-    self.toplevel = ""
-    self.if_lua = ""
-    self.utf8_range_commit = ""
-
-  def convert(self):
-    return self.template % {
-        "prelude": converter.prelude,
-        "toplevel": converter.toplevel,
-        "utf8_range_commit": converter.utf8_range_commit,
-    }
-
-  template = textwrap.dedent("""\
-    # This file was generated from BUILD using tools/make_cmakelists.py.
-
-    cmake_minimum_required(VERSION 3.10...3.24)
-
-    %(prelude)s
-
-    # Prevent CMake from setting -rdynamic on Linux (!!).
-    SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-    SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
-
-    # Set default build type.
-    if(NOT CMAKE_BUILD_TYPE)
-      message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
-      set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-          "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
-          FORCE)
-    endif()
-
-    # When using Ninja, compiler output won't be colorized without this.
-    include(CheckCXXCompilerFlag)
-    CHECK_CXX_COMPILER_FLAG(-fdiagnostics-color=always SUPPORTS_COLOR_ALWAYS)
-    if(SUPPORTS_COLOR_ALWAYS)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
-    endif()
-
-    # Implement ASAN/UBSAN options
-    if(UPB_ENABLE_ASAN)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
-    endif()
-
-    if(UPB_ENABLE_UBSAN)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
-    endif()
-
-    if(NOT TARGET utf8_range)
-      if(EXISTS ../external/utf8_range)
-        # utf8_range is already installed
-        include_directories(../external/utf8_range)
-      else()
-        include(FetchContent)
-        FetchContent_Declare(
-          utf8_range
-          GIT_REPOSITORY "https://github.com/protocolbuffers/utf8_range.git"
-          GIT_TAG "%(utf8_range_commit)s"
-        )
-        FetchContent_GetProperties(utf8_range)
-        if(NOT utf8_range_POPULATED)
-          FetchContent_Populate(utf8_range)
-          include_directories(${utf8_range_SOURCE_DIR})
-        endif()
-      endif()
-    endif()
-
-    if(APPLE)
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace")
-    elseif(UNIX)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
-    endif()
-
-    enable_testing()
-
-    %(toplevel)s
-
-  """)
-
-data = {}
-converter = Converter()
-
-def GetDict(obj):
-  ret = {}
-  ret["UPB_DEFAULT_COPTS"] = []  # HACK
-  ret["UPB_DEFAULT_CPPOPTS"] = []  # HACK
-  for k in dir(obj):
-    if not k.startswith("_"):
-      ret[k] = getattr(obj, k);
-  return ret
-
-globs = GetDict(converter)
-
-workspace_dict = GetDict(WorkspaceFileFunctions(converter))
-exec(open("bazel/workspace_deps.bzl").read(), workspace_dict)
-exec(open("WORKSPACE").read(), workspace_dict)
-exec(open("BUILD").read(), GetDict(BuildFileFunctions(converter)))
-
-with open(sys.argv[1], "w") as f:
-  f.write(converter.convert())
diff --git a/third_party/upb/cmake/push_auto_update.sh b/third_party/upb/cmake/push_auto_update.sh
deleted file mode 100755
index 10e8354e13d6b..0000000000000
--- a/third_party/upb/cmake/push_auto_update.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# This script updates checked-in generated files (currently CMakeLists.txt,
-# descriptor.upb.h, and descriptor.upb.c), commits the resulting change, and
-# pushes it. This does not do anything useful when run manually, but should be
-# run by our GitHub action instead.
-
-set -ex
-
-# Exit early if the previous commit was made by the bot. This reduces the risk
-# of a bug causing an infinite loop of auto-generated commits.
-if (git log -1 --pretty=format:'%an' | grep -q "Protobuf Team Bot"); then
-  echo "Previous commit was authored by bot"
-  exit 0
-fi
-
-cd $(dirname -- "$0")/..
-bazel test //cmake:test_generated_files || bazel-bin/cmake/test_generated_files --fix
-
-# Try to determine the most recent pull request number.
-title=$(git log -1 --pretty='%s')
-pr_from_merge=$(echo "$title" | sed -n 's/^Merge pull request #\([0-9]\+\).*/\1/p')
-pr_from_squash=$(echo "$title" | sed -n 's/^.*(#\([0-9]\+\))$/\1/p')
-
-pr_number=""
-if [ ! -z "$pr_from_merge" ]; then
-  pr_number="$pr_from_merge"
-elif [ ! -z "$pr_from_squash" ]; then
-  pr_number="$pr_from_squash"
-fi
-
-if [ ! -z "$pr_number" ]; then
-  commit_message="Auto-generate CMake file lists after PR #$pr_number"
-else
-  # If we are unable to determine the pull request number, we fall back on this
-  # default commit message. Typically this should not occur, but could happen
-  # if a pull request was merged via a rebase.
-  commit_message="Auto-generate CMake file lists"
-fi
-
-git add -A
-git diff --staged --quiet || git commit -am "$commit_message"
-git push
diff --git a/third_party/upb/cmake/staleness_test.py b/third_party/upb/cmake/staleness_test.py
deleted file mode 100644
index a21501f7f6336..0000000000000
--- a/third_party/upb/cmake/staleness_test.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""The py_test() script for staleness_test() rules.
-
-Note that this file is preprocessed!  The INSERT_<...> text below is replaced
-with the actual list of files before we actually run the script.
-"""
-
-from __future__ import absolute_import
-
-from cmake import staleness_test_lib
-import unittest
-import sys
-
-file_list = """
-  INSERT_FILE_LIST_HERE
-""".split()
-
-config = staleness_test_lib.Config(file_list)
-
-
-class TestFilesMatch(unittest.TestCase):
-
-  def testFilesMatch(self):
-    errors = staleness_test_lib.CheckFilesMatch(config)
-    self.assertFalse(errors, errors)
-
-
-if len(sys.argv) > 1 and sys.argv[1] == "--fix":
-  staleness_test_lib.FixFiles(config)
-else:
-  unittest.main()
diff --git a/third_party/upb/docs/render.py b/third_party/upb/docs/render.py
deleted file mode 100755
index 017978c8e7f33..0000000000000
--- a/third_party/upb/docs/render.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-
-import subprocess
-import sys
-import shutil
-import os
-
-if len(sys.argv) < 2:
-    print("Must pass a filename argument")
-    sys.exit(1)
-
-in_filename = sys.argv[1]
-out_filename = in_filename.replace(".in.md", ".md")
-out_dir = in_filename.replace(".in.md", "")
-
-if in_filename == out_filename:
-    print("File must end in .in.md")
-    sys.exit(1)
-
-if os.path.isdir(out_dir):
-    shutil.rmtree(out_dir)
-
-os.mkdir(out_dir)
-file_num = 1
-
-with open(out_filename, "wb") as out_file, open(in_filename, "rb") as in_file:
-    for line in in_file:
-        if line.startswith(b"```dot"):
-            dot_lines = []
-            while True:
-                dot_line = next(in_file)
-                if dot_line == b"```\n":
-                    break
-                dot_lines.append(dot_line)
-            dot_input = b"".join(dot_lines)
-            svg_filename = out_dir + "/" + str(file_num) + ".svg"
-            svg = subprocess.check_output(['dot', '-Tsvg', '-o', svg_filename], input=dot_input)
-            out_file.write(b"<div align=center>\n")
-            out_file.write(b"<img src='%s'/>\n" % (svg_filename.encode('utf-8')))
-            out_file.write(b"</div>\n")
-            file_num += 1
-        else:
-            out_file.write(line)
diff --git a/third_party/upb/docs/style-guide.md b/third_party/upb/docs/style-guide.md
deleted file mode 100644
index e02571b5240ad..0000000000000
--- a/third_party/upb/docs/style-guide.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# C style guide
-
-<!--*
-# Document freshness: For more information, see go/fresh-source.
-freshness: { owner: 'haberman' reviewed: '2022-05-08' }
-*-->
-
-Since upb is written in pure C, we supplement the
-[Google C++ style guide](https://google.github.io/styleguide/cppguide.html) with
-some C-specific guidance.
-
-Everything written here is intended to follow the spirit of the C++ style guide.
-
-upb is currently inconsistent about following these conventions. It is intended
-that all code will be updated to match these guidelines. The priority is
-converting public interfaces as these are more difficult to change later.
-
-## Naming
-
-### Functions and Types
-
-C does not have namespaces. Anywhere you would normally use a namespace
-separator (`::`) in C++, we use an underscore (`_`) in C:
-
-```c++
-// C equivalent for upb::Arena::New()
-upb_Arena* upb_Arena_New();
-```
-
-Since we rely on `_` to be our namespace separator, we never use it to merely
-separate words in function or type names:
-
-```c++
-// BAD: this would be interpreted as upb::FieldDef::has::default().
-bool upb_FieldDef_has_default(const upb_FieldDef* f);
-
-// GOOD: this is equivalent to upb::FieldDef::HasDefault().
-bool upb_FieldDef_HasDefault(const upb_FieldDef* f);
-```
-
-For multi-word namespaces, we use `PascalCase`:
-
-```c++
-// `PyUpb` is the namespace.
-PyObject* PyUpb_CMessage_GetAttr(PyObject* _self, PyObject* attr);
-```
-
-### Private Functions and Members
-
-Since we do not have `private` in C++, we use a leading underscore convention
-to mark internal functions and variables that should only be accessed from
-upb:
-
-```c++
-// Internal-only function.
-int64_t _upb_Int64_FromLL();
-
-// Internal-only members. Underscore prefixes are only necessary when the
-// structure is defined in a header file.
-typedef struct {
-  const int32_t* _values;  // List of values <0 or >63
-  uint64_t _mask;          // Bits are set for acceptable value 0 <= x < 64
-  int _value_count;
-} upb_MiniTableEnum;
-```
diff --git a/third_party/upb/docs/vs-cpp-protos.md b/third_party/upb/docs/vs-cpp-protos.md
deleted file mode 100644
index fe2a864e4de39..0000000000000
--- a/third_party/upb/docs/vs-cpp-protos.md
+++ /dev/null
@@ -1,261 +0,0 @@
-<!--*
-# Document freshness: For more information, see go/fresh-source.
-freshness: { owner: 'haberman' reviewed: '2023-02-24' }
-*-->
-
-# upb vs. C++ Protobuf Design
-
-[upb](https://github.com/protocolbuffers/upb) is a small C protobuf library.
-While some of the design follows in the footsteps of the C++ Protobuf Library,
-upb departs from C++'s design in several key ways.  This document compares
-and contrasts the two libraries on several design points.
-
-## Design Goals
-
-Before we begin, it is worth calling out that upb and C++ have different design
-goals, and this motivates some of the differences we will see.
-
-C++ protobuf is a user-level library: it is designed to be used directly by C++
-applications.  These applications will expect a full-featured C++ API surface
-that uses C++ idioms.  The C++ library is also willing to add features to
-increase server performance, even if these features would add size or complexity
-to the library.  Because C++ protobuf is a user-level library, API stability is
-of utmost importance: breaking API changes are rare and carefully managed when
-they do occur.  The focus on C++ also means that ABI compatibility with C is not
-a priority.
-
-upb, on the other hand, is designed primarily to be wrapped by other languages.
-It is a C protobuf kernel that forms the basis on which a user-level protobuf
-library can be built.  This means we prefer to keep the API surface as small and
-orthogonal as possible.  While upb supports all protobuf features required for
-full conformance, upb prioritizes simplicity and small code size, and avoids
-adding features like lazy fields that can accelerate some use cases but at great
-cost in terms of complexity.  As upb is not aimed directly at users, there is
-much more freedom to make API-breaking changes when necessary, which helps the
-core to stay small and simple.  We want to be compatible with all FFI
-interfaces, so C ABI compatibility is a must.
-
-Despite these differences, C++ protos and upb offer [roughly the same core set
-of features](https://github.com/protocolbuffers/upb#features).
-
-## Arenas
-
-upb and C++ protos both offer arena allocation, but there are some key
-differences.
-
-### C++
-
-As a matter of history, when C++ protos were open-sourced in 2008, they did not
-support arenas.  Originally there was only unique ownership, whereby each
-message uniquely owns all child messages and will free them when the parent is
-freed.
-
-Arena allocation was added as a feature in 2014 as a way of dramatically
-reducing allocation and (especially) deallocation costs.  But the library was
-not at liberty to remove the unique ownership model, because it would break far
-too many users.  As a result, C++ has supported a **hybrid allocation model**
-ever since, allowing users to allocate messages either directly from the
-stack/heap or from an arena.  The library attempts to ensure that there are
-no dangling pointers by performing automatic copies in some cases (for example
-`a->set_allocated_b(b)`, where `a` and `b` are on different arenas).
-
-C++'s arena object itself `google::protobuf::Arena` is **thread-safe** by
-design, which allows users to allocate from multiple threads simultaneously
-without external synchronization.  The user can supply an initial block of
-memory to the arena, and can choose some parameters to control the arena block
-size.  The user can also supply block alloc/dealloc functions, but the alloc
-function is expected to always return some memory.  The C++ library in general
-does not attempt to handle out of memory conditions.
-
-### upb
-
-upb uses **arena allocation exclusively**. All messages must be allocated from
-an arena, and can only be freed by freeing the arena.  It is entirely the user's
-responsibility to ensure that there are no dangling pointers: when a user sets a
-message field, this will always trivially overwrite the pointer and will never
-perform an implicit copy.
-
-upb's `upb::Arena` is **thread-compatible**, which means it cannot be used
-concurrently without synchronization. The arena can be seeded with an initial
-block of memory, but it does not explicitly support any parameters for choosing
-block size. It supports a custom alloc/dealloc function, and this function is
-allowed to return `NULL` if no dynamic memory is available. This allows upb
-arenas to have a max/fixed size, and makes it possible in theory to write code
-that is tolerant to out-of-memory errors.
-
-upb's arena also supports a novel operation known as **fuse**, which joins two
-arenas together into a single lifetime.  Though both arenas must still be freed
-separately, none of the memory will actually be freed until *both* arenas have
-been freed.  This is useful for avoiding dangling pointers when reparenting a
-message with one that may be on a different arena.
-
-### Comparison
-
-**hybrid allocation vs. arena-only**
-
-* The C++ hybrid allocation model introduces a great deal of complexity and
-  unpredictability into the library.  upb benefits from having a much simpler
-  and more predictable design.
-* Some of the complexity in C++'s hybrid model arises from the fact that arenas
-  were added after the fact.  Designing for a hybrid model from the outset
-  would likely yield a simpler result.
-* Unique ownership does support some usage patterns that arenas cannot directly
-  accommodate.  For example, you can reparent a message and the child will precisely
-  follow the lifetime of its new parent.  An arena would require you to either
-  perform a deep copy or extend the lifetime.
-
-**thread-compatible vs. thread-safe arena**
-
-* A thread-safe arena (as in C++) is safer and easier to use.  A thread-compatible
-  arena requires that the user prove that the arena cannot be used concurrently.
-* [Thread Sanitizer](https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual)
-  is far more accessible than it was in 2014 (when C++ introduced a thread-safe
-  arena).  We now have more tools at our disposal to ensure that we do not trigger
-  data races in a thread-compatible arena like upb.
-* Thread-compatible arenas are more performant.
-* Thread-compatible arenas have a far simpler implementation.  The C++ thread-safe
-  arena relies on thread-local variables, which introduce complications on some
-  platforms.  It also requires far more subtle reasoning for correctness and
-  performance.
-
-**fuse vs. no fuse**
-
-* The `upb_Arena_Fuse()` operation is a key part of how upb supports reparenting
-  of messages when the parent may be on a different arena.  Without this, upb has
-  no way of supporting `foo.bar = bar` in dynamic languages without performing a
-  deep copy.
-* A downside of `upb_Arena_Fuse()` is that passing an arena to a function can allow
-  that function to extend the lifetime of the arena in potentially
-  unpredictable ways.  This can be prevented if necessary, as fuse can fail, eg. if
-  one arena has an initial block.  But this adds some complexity by requiring callers
-  to handle the case where fuse fails.
-
-## Code Generation vs. Tables
-
-The C++ protobuf library has always been built around code generation, while upb
-generates only tables.  In other words, `foo.pb.cc` files contain functions,
-whereas `foo.upb.c` files emit only data structures.
-
-### C++
-
-C++ generated code emits a large number of functions into `foo.pb.cc` files.
-An incomplete list:
-
-* `FooMsg::FooMsg()` (constructor): initializes all fields to their default value.
-* `FooMsg::~FooMsg()` (destructor): frees any present child messages.
-* `FooMsg::Clear()`: clears all fields back to their default/empty value.
-* `FooMsg::_InternalParse()`: generated code for parsing a message.
-* `FooMsg::_InternalSerialize()`: generated code for serializing a message.
-* `FooMsg::ByteSizeLong()`: calculates serialized size, as a first pass before serializing.
-* `FooMsg::MergeFrom()`: copies/appends present fields from another message.
-* `FooMsg::IsInitialized()`: checks whether required fields are set.
-
-This code lives in the `.text` section and contains function calls to the generated
-classes for child messages.
-
-### upb
-
-upb does not generate any code into `foo.upb.c` files, only data structures.  upb uses a
-compact data table known as a *mini table* to represent the schema and all fields.
-
-upb uses mini tables to perform all of the operations that would traditionally be done
-with generated code.  Revisiting the list from the previous section:
-
-* `FooMsg::FooMsg()` (constructor): upb instead initializes all messages with `memset(msg, 0, size)`.
-   Non-zero defaults are injected in the accessors.
-* `FooMsg::~FooMsg()` (destructor): upb messages are freed by freeing the arena.
-* `FooMsg::Clear()`: can be performed with `memset(msg, 0, size)`.
-* `FooMsg::_InternalParse()`: upb's parser uses mini tables as data, instead of generating code.
-* `FooMsg::_InternalSerialize()`: upb's serializer also uses mini-tables instead of generated code.
-* `FooMsg::ByteSizeLong()`: upb performs serialization in reverse so that an initial pass is not required.
-* `FooMsg::MergeFrom()`: upb supports this via serialize+parse from the other message.
-* `FooMsg::IsInitialized()`: upb's encoder and decoder have special flags to check for required fields.
-  A util library `upb/util/required_fields.h` handles the corner cases.
-
-### Comparison
-
-If we compare compiled code size, upb is far smaller.  Here is a comparison of the code
-size of a trivial binary that does nothing but a parse and serialize of `descriptor.proto`.
-This means we are seeing both the overhead of the core library itself as well as the
-generated code (or table) for `descriptor.proto`.  (For extra clarity we should break this
-down by generated code vs core library in the future).
-
-
-| Library         | `.text` | `.data` | `.bss` |
-|------------     |---------|---------|--------|
-| upb             |  26Ki   | 0.6Ki   | 0.01Ki |
-| C++ (lite)      | 187Ki   | 2.8Ki   | 1.25Ki |
-| C++ (code size) | 904Ki   | 6.1Ki   | 1.88Ki |
-| C++ (full)      | 983Ki   | 6.1Ki   | 1.88Ki |
-
-"C++ (code size)" refers to protos compiled with `optimize_for = CODE_SIZE`, a mode
-in which generated code contains reflection only, in an attempt to make the
-generated code size smaller (however it requires the full runtime instead
-of the lite runtime).
-
-## Bifurcated vs. Optional Reflection
-
-upb and C++ protos both offer reflection without making it mandatory.  However
-the models for enabling/disabling reflection are very different.
-
-### C++
-
-C++ messages offer full reflection by default.  Messages in C++ generally
-derive from `Message`, and the base class provides a member function
-`Reflection* Message::GetReflection()` which returns the reflection object.
-
-It follows that any message deriving from `Message` will always have reflection
-linked into the binary, whether or not the reflection object is ever used.
-Because `GetReflection()` is a function on the base class, it is not possible
-to statically determine if a given message's reflection is used:
-
-```c++
-Reflection* GetReflection(const Message& message) {
-    // Can refer to any message in the whole binary.
-    return message.GetReflection();
-}
-```
-
-The C++ library does provide a way of omitting reflection: `MessageLite`.  We can
-cause a message to be lite in two different ways:
-
-* `optimize_for = LITE_RUNTIME` in a `.proto` file will cause all messages in that
-  file to be lite.
-* `lite` as a codegen param: this will force all messages to lite, even if the
-  `.proto` file does not have `optimize_for = LITE_RUNTIME`.
-
-A lite message will derive from `MessageLite` instead of `Message`.  Since
-`MessageLite` has no `GetReflection()` function, this means no reflection is
-available, so we can avoid taking the code size hit.
-
-### upb
-
-upb does not have the `Message` vs. `MessageLite` bifurcation.  There is only one
-kind of message type `upb_Message`, which means there is no need to configure in
-a `.proto` file which messages will need reflection and which will not.
-Every message has the *option* to link in reflection from a separate `foo.upbdefs.o`
-file, without needing to change the message itself in any way.
-
-upb does not provide the equivalent of `Message::GetReflection()`: there is no
-facility for retrieving the reflection of a message whose type is not known statically.
-It would be possible to layer such a facility on top of the upb core, though this
-would probably require some kind of code generation.
-
-### Comparison
-
-* Most messages in C++ will not bother to declare themselves as "lite".  This means
-  that many C++ messages will link in reflection even when it is never used, bloating
-  binaries unnecessarily.
-* `optimize_for = LITE_RUNTIME` is difficult to use in practice, because it prevents 
-  any non-lite protos from `import`ing that file.
-* Forcing all protos to lite via a codegen parameter (for example, when building for
-  mobile) is more practical than `optimize_for = LITE_RUNTIME`.  But this will break
-  the compile for any code that tries to upcast to `Message`, or tries to use a
-  non-lite method.
-* The one major advantage of the C++ model is that it can support `msg.DebugString()`
-  on a type-erased proto.  For upb you have to explicitly pass the `upb_MessageDef*`
-  separately if you want to perform an operation like printing a proto to text format.
-
-## Explicit Registration vs. Globals
-
-TODO
diff --git a/third_party/upb/docs/wrapping-upb.md b/third_party/upb/docs/wrapping-upb.md
deleted file mode 100644
index 5f2dddc554d08..0000000000000
--- a/third_party/upb/docs/wrapping-upb.md
+++ /dev/null
@@ -1,444 +0,0 @@
-
-<!---
-This document contains embedded graphviz diagrams inside ```dot blocks.
-
-To convert it to rendered form using render.py:
-  $ ./render.py wrapping-upb.in.md
-
-You can also live-preview this document with all diagrams using Markdown Preview Enhanced
-in Visual Studio Code:
-  https://marketplace.visualstudio.com/items?itemName=shd101wyy.markdown-preview-enhanced
---->
-
-# Building a protobuf library on upb
-
-This is a guide for creating a new protobuf implementation based on upb.  It
-starts from the beginning and walks you through the process, highlighting
-some important design choices you will need to make.
-
-## Overview
-
-A protobuf implementation consists of two main pieces:
-
-1. a code generator, run at compile time, to turn `.proto` files into source
-   files in your language (we will call this "zlang", assuming an extension of ".z").
-2. a runtime component, which implements the wire format and provides the data
-   structures for representing protobuf data and metadata.
-
-<br/>
-
-```dot {align="center"}
-digraph {
-    rankdir=LR; 
-    newrank=true;
-    node [style="rounded,filled" shape=box]
-    "foo.proto" -> protoc;
-    "foo.proto" [shape=folder];
-    protoc [fillcolor=lightgrey];
-    protoc -> "protoc-gen-zlang";
-    "protoc-gen-zlang" -> "foo.z";
-    "protoc-gen-zlang" [fillcolor=palegreen3];
-    "foo.z" [shape=folder];
-    labelloc="b";
-    label="Compile Time";
-}
-```
-
-<br/>
-
-```dot {align="center"}
-digraph {
-    newrank=true;
-    node [style="rounded,filled" shape=box fillcolor=lightgrey]
-    "foo.z" -> "zlang/upb glue (FFI)";
-    "zlang/upb glue (FFI)" -> "upb (C)";
-    "zlang/upb glue (FFI)" [fillcolor=palegreen3];
-    labelloc="b";
-    label="Runtime";
-}
-```
-
-The parts in green are what you will need to implement.
-
-Note that your code generator (`protoc-gen-zlang`) does *not* need to generate
-any C code (eg. `foo.c`). While upb itself is written in C, upb's parsers and
-serializers are fully table-driven, which means there is never any need or even
-benefit to generating C code for each proto. upb is capable of full-speed
-parsing even when schema data is loaded at runtime from strings embedded into
-`foo.z`. This is a key benefit of upb compared with C++ protos, which have
-traditionally relied on generated parsers in `foo.pb.cc` files to achieve full
-parsing speed, and suffered a ~10x speed penalty in the parser when the schema
-data was loaded at runtime.
-
-## Prerequisites
-
-There are a few things that the language runtime must provide in order to wrap
-upb.
-
-1.  **FFI**: To wrap upb, your language must be able to call into a C API
-    through a Foreign Function Interface (FFI). Most languages support FFI in
-    some form, either through "native extensions" (in which you write some C
-    code to implement new methods in your language) or through a direct FFI (in
-    which you can call into regular C functions directly from your language
-    using a special library).
-2.  **Finalizers, Destructors, or Cleaners**: The runtime must provide
-    finalizers or destructors of some sort. There must be a way of triggering a
-    call to a C function when the language garbage collects or otherwise
-    destroys an object. We don't care much whether it is a finalizer, a
-    destructor, or a cleaner, as long as it gets called eventually when the
-    object is destroyed. upb allocates memory in C space, and a finalizer is our
-    only way of making sure that memory is freed and does not leak.
-3.  **HashMap with weak values**: (optional) This is not a strong requirement,
-    but it is sometimes helpful to have a global hashmap with weak values to act
-    as a `upb_msg* -> wrapper` object cache. We want the values to be weak (not
-    the keys). There is some question about whether we want to continue to use
-    this pattern going forward.
-
-## Reflection vs. MiniTables
-
-The first key design decision you will need to make is whether your generated
-code will access message data via reflection or minitables. Generally more
-dynamic languages will want to use reflection and more static languages will
-want to use minitables.
-
-### Reflection
-
-Reflection-based data access makes the most sense in highly dynamic language
-interpreters, where method dispatch is generally resolved via strings and hash
-table lookups.  
-
-In such languages, you can often implement a special method like `__getattr__`
-(Python) or `method_missing` (Ruby) that receives the method name as a string.
-Using upb's reflection, you can look up a field name using the method name,
-thereby using a hash table belonging to upb instead of one provided by the
-language.
-
-```python
-class FooMessage:
-  # Written in Python for illustration, but in practice we will want to
-  # implement this in C for speed.
-  def __getattr__(self, name):
-    field = FooMessage.descriptor.fields_by_name[name]
-    return field.get_value(self)
-```
-
-Using this design, we only need to attach a single `__getattr__` method to each
-message class, instead of defining a getter/setter for each field. In this way
-we can avoid duplicating hash tables between upb and the language interpreter,
-reducing memory usage.
-
-Reflection-based access requires loading full reflection at runtime. Your
-generated code will need to embed serialized descriptors (ie. a serialized
-message of `descriptor.proto`), which has some amount of size overhead and
-exposes all message/field names to the binary. It also forces a hash table
-lookup in the critical path of field access. If method calls in your language
-already have this overhead, then this is no added burden, but for statically
-dispatched languages it would cause extra overhead.
-
-If we take this path to its logical conclusion, all class creation can be
-performed fully dynamically, using only a binary descriptor as input. The
-"generated code" becomes little more than an embedded descriptor plus a
-library call to load it. Python has recently gone down this path. Generated
-code now looks something like this:
-
-```python
-# main_pb2.py
-from google3.net.proto2.python.internal import builder as _builder
-from google3.net.proto2.python.public import descriptor_pool as _descriptor_pool
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile("<...>")
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google3.main_pb2', globals())
-```
-
-This is all the runtime needs to create all of the classes for messages defined
-in that serialized descriptor.  This code has no pretense of readability, but
-a separate `.pyi` stub file provides a fully expanded and readable list of all
-methods a user can expect to be available:
-
-```python
-# main_pb2.pyi
-from google3.net.proto2.python.public import descriptor as _descriptor
-from google3.net.proto2.python.public import message as _message
-from typing import ClassVar as _ClassVar, Optional as _Optional
-
-DESCRIPTOR: _descriptor.FileDescriptor
-
-class MyMessage(_message.Message):
-    __slots__ = ["my_field"]
-    MY_FIELD_FIELD_NUMBER: _ClassVar[int]
-    my_field: str
-    def __init__(self, my_field: _Optional[str] = ...) -> None: ...
-```
-
-To use reflection-based access:
-
-1. Load and access descriptor data using the interfaces in upb/def.h.
-2. Access message data using the interfaces in upb/reflection.h.
-
-### MiniTables
-
-MiniTables are a "lite" schema representation that are much smaller than
-reflection. MiniTables omit names, options, and almost everything else from the
-`.proto` file, retaining only enough information to parse and serialize binary
-format.
-
-MiniTables can be loaded into upb through *MiniDescriptors*. MiniDescriptors are
-a byte-oriented format that can be embedded into your generated code and passed
-to upb to construct MiniTables. MiniDescriptors only use printable characters,
-and therefore do not require escaping when embedding them into generated code
-strings. Overall the size savings of MiniDescriptors are ~60x compared with
-regular descriptors.
-
-MiniTables and MiniDescriptors are a natural choice for compiled languages that
-resolve method calls at compile time. For languages that are sometimes compiled
-and sometimes interpreted, there might not be an obvious choice. When a method
-call is statically bound, we want to remove as much overhead as possible,
-especially from accessors. In the extreme case, we can use unsafe APIs to read
-raw memory at a known offset:
-
-```java
-// Example of a maximally-optimized generated accessor.
-class FooMessage {
-    public long getBarField() {
-        // Using Unsafe should give us performance that is comparable to a
-        // native member access.
-        //
-        // The constant "24" is obtained from upb at compile time.
-        sun.misc.Unsafe.getLong(this.ptr, 24);
-    }
-}
-```
-
-This design is very low-level, and tightly couples the generated code to one
-specific version of the schema and compiler.  A slower but safer version would
-look up a field by field number:
-
-```java
-// Example of a more loosely-coupled accessor.
-class FooMessage {
-    public long getBarField() {
-        // The constant "2" is the field number.  Internally this will look
-        // up the number "2" in the MiniTable and use that to read the value
-        // from the message.
-        upb.glue.getLong(this.ptr, 2);
-    }
-}
-```
-
-One downside of MiniTables is that they cannot support parsing or serializing
-to JSON or TextFormat, because they do not know the field names.  It should be
-possible to generate reflection data "on the side", into separate generated
-code files, so that reflection is only pulled in if it is being used.  However
-APIs to do this do not exist yet.
-
-To use MiniTable-based access:
-
-1. Load and access MiniDescriptors data using the interfaces in upb/mini_table.h.
-2. Access message data using the interfaces in upb/message/accessors.h.
-
-## Memory Management
-
-One of the core design challenges when wrapping upb is memory management.  Every
-language runtime will have some memory management system, whether it is
-garbage collection, reference counting, manual memory management, or some hybrid
-of these.  upb is written in C and uses arenas for memory management, but upb is
-designed to integrate with a wide variety of memory management schemes, and it
-provides a number of tools for making this integration as smooth as possible.
-
-### Arenas
-
-upb defines data structures in C to represent messages, arrays (repeated
-fields), and maps.  A protobuf message is a hierarchical tree of these objects.
-For example, a relatively simple protobuf tree might look something like this:
-
-```dot {align="center"}
-digraph G {
-  rankdir=LR;
-  newrank=true;
-  node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=1, ordering=out]
-  upb_msg -> upb_msg2;
-  upb_msg -> upb_array;
-  upb_msg [label="upb Message" fillcolor=1]
-  upb_msg2 [label="upb Message"];
-  upb_array [label="upb Array"]
-}
-```
-
-All upb objects are allocated from an arena.  An arena lets you allocate objects
-individually, but you cannot free individual objects; you can only free the arena
-as a whole.  When the arena is freed, all of the individual objects allocated
-from that arena are freed together.
-
-```dot {align="center"}
-digraph G {
-  rankdir=LR;
-  newrank=true;
-  subgraph cluster_0 {
-    label = "upb Arena"
-    graph[style="rounded,filled" fillcolor=gray]
-    node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=1, ordering=out]
-    upb_msg -> upb_array;
-    upb_msg -> upb_msg2;
-    upb_msg [label="upb Message" fillcolor=1]
-    upb_msg2 [label="upb Message"];
-    upb_array [label="upb Array"];
-  }
-}
-```
-
-In simple cases, the entire tree of objects will all live in a single arena.
-This has the nice property that there cannot be any dangling pointers between
-objects, since all objects are freed at the same time.
-
-However upb allows you to create links between any two objects, whether or
-not they are in the same arena.  The library does not know or care what arenas
-the objects are in when you create links between them.
-
-```dot {align="center"}
-digraph G {
-  rankdir=LR;
-  newrank=true;
-  subgraph cluster_0 {
-    label = "upb Arena 1"
-    graph[style="rounded,filled" fillcolor=gray]
-    node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=1, ordering=out]
-    upb_msg -> upb_array;
-    upb_msg -> upb_msg2;
-    upb_msg [label="upb Message 1" fillcolor=1]
-    upb_msg2 [label="upb Message 2"];
-    upb_array [label="upb Array"];
-  }
-  subgraph cluster_1 {
-    label = "upb Arena 2"
-    graph[style="rounded,filled" fillcolor=gray]
-    node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=1]
-    upb_msg3;
-  }
-  upb_msg2 -> upb_msg3;
-  upb_msg3 [label="upb Message 3"];
-}
-```
-
-When objects are on separate arenas, it is the user's responsibility to ensure
-that there are no dangling pointers.  In the example above, this means Arena 2
-must outlive Message 1 and Message 2.
-
-### Integrating GC with upb
-
-In languages with automatic memory management, the goal is to handle all of the
-arenas behind the scenes, so that the user does not have to manage them manually
-or even know that they exist.
-
-We can achieve this goal if we set up the object graph in a particular way.  The
-general strategy is to create wrapper objects around all of the C objects,
-including the arena.  Our key goal is to make sure the arena wrapper is not
-GC'd until all of the C objects in that arena have become unreachable.
-
-For this example, we will assume we are wrapping upb in Python:
-
-```dot {align="center"}
-digraph G {
-  rankdir=LR;
-  newrank=true;
-  compound=true;
-
-  subgraph cluster_1 {
-    label = "upb Arena"
-    graph[style="rounded,filled" fillcolor=gray]
-    node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=1, ordering=out]
-    upb_msg -> upb_array [style=dashed];
-    upb_msg -> upb_msg2 [style=dashed];
-    upb_msg [label="upb Message" fillcolor=1]
-    upb_msg2 [label="upb Message"];
-    upb_array [label="upb Array"]
-    dummy [style=invis]
-  }
-  subgraph cluster_python {
-    node [style="rounded,filled" shape=box colorscheme=accent8 fillcolor=2]
-    peripheries=0
-    py_upb_msg [label="Python Message"];
-    py_upb_msg2 [label="Python Message"];
-    py_upb_arena [label="Python Arena"];
-  }
-  py_upb_msg -> upb_msg [style=dashed];
-  py_upb_msg2->upb_msg2 [style=dashed];
-  py_upb_msg2 -> py_upb_arena [color=springgreen4];
-  py_upb_msg -> py_upb_arena [color=springgreen4];
-  py_upb_arena -> dummy [lhead=cluster_1, color=red];
-  {
-     rank=same;
-     upb_msg;
-     py_upb_msg;
-  }
-  {
-     rank=same;
-     upb_array;
-     upb_msg2;
-     py_upb_msg2;
-  }
-  {  rank=same;
-     dummy;
-     py_upb_arena;
-  }
-  dummy->upb_array [style=invis];
-  dummy->upb_msg2 [style=invis];
-
-  subgraph cluster_01 {
-    node [shape=plaintext]
-    peripheries=0
-    key [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">
-      <tr><td align="right" port="i1">raw ptr</td></tr>
-      <tr><td align="right" port="i2">unique ptr</td></tr>
-      <tr><td align="right" port="i3">shared (GC) ptr</td></tr>
-      </table>>]
-    key2 [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">
-      <tr><td port="i1">&nbsp;</td></tr>
-      <tr><td port="i2">&nbsp;</td></tr>
-      <tr><td port="i3">&nbsp;</td></tr>
-      </table>>]
-    key:i1:e -> key2:i1:w [style=dashed]
-    key:i2:e -> key2:i2:w [color=red]
-    key:i3:e -> key2:i3:w [color=springgreen4]
-  }
-    key2:i1:w -> upb_msg [style=invis];
-  {
-    rank=same;
-    key;
-    upb_msg;
-  }
-}
-```
-
-In this example we have three different kinds of pointers:
-
-* **raw ptr**: This is a pointer that carries no ownership.
-* **unique ptr**: This is a pointer has *unique ownership* of the target.  The owner
-  will free the target in its destructor (or finalizer, or cleaner).  There can
-  only be a single unique pointer to a given object.
-* **shared (GC) ptr**: This is a pointer that has *shared ownership* of the
-  target.  Many objects can point to the target, and the target will be deleted
-  only when all such references are gone.  In a runtime with automatic memory
-  management (GC), this is a reference that participates in GC.  In Python such
-  references use reference counting, but in other VMs they may use mark and
-  sweep or some other form of GC instead.
-
-The Python Message wrappers have only raw pointers to the underlying message,
-but they contain a shared pointer to the arena that will ensure that the raw
-pointer remains valid.  Only when all message wrapper objects are destroyed
-will the Python Arena become unreachable, and the upb arena ultimately freed.
-
-### Links between arenas with "Fuse"
-
-The design given above works well for objects that live in a single arena. But
-what if a user wants to create a link between two objects in different arenas?
-
-TODO
-
-## UTF-8 vs. UTF-16
-
-TODO
-
-## Object Cache
-
-TODO
diff --git a/third_party/upb/lua/BUILD.bazel b/third_party/upb/lua/BUILD.bazel
deleted file mode 100644
index a8a204af1b3a9..0000000000000
--- a/third_party/upb/lua/BUILD.bazel
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_COPTS",
-    "UPB_DEFAULT_CPPOPTS",
-)
-load(
-    "//lua:lua_proto_library.bzl",
-    "lua_proto_library",
-)
-
-licenses(["notice"])
-
-cc_library(
-    name = "lupb",
-    srcs = [
-        "def.c",
-        "msg.c",
-        "upb.c",
-    ],
-    hdrs = [
-        "upb.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:json",
-        "//:reflection",
-        "//:textformat",
-        "//:upb",
-        "@lua//:liblua",
-    ],
-)
-
-cc_binary(
-    name = "protoc-gen-lua",
-    srcs = ["upbc.cc"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_google_absl//absl/strings",
-        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
-    ],
-)
-
-exports_files(["upb.lua"])
-
-cc_test(
-    name = "test_lua",
-    srcs = ["main.c"],
-    copts = UPB_DEFAULT_COPTS,
-    data = [
-        "test_upb.lua",
-        ":descriptor_proto_lua",
-        ":empty_proto_lua",
-        ":test_messages_proto2_proto_lua",
-        ":test_messages_proto3_proto_lua",
-        ":test_proto_lua",
-        "//:third_party/lunit/console.lua",
-        "//:third_party/lunit/lunit.lua",
-        "//lua:upb.lua",
-        "@com_google_protobuf//:descriptor_proto",
-        "@com_google_protobuf//conformance:conformance_proto",
-    ],
-    linkstatic = 1,
-    deps = [
-        "//lua:lupb",
-        "@lua//:liblua",
-    ],
-)
-
-proto_library(
-    name = "test_proto",
-    testonly = 1,
-    srcs = ["test.proto"],
-    deps = ["@com_google_protobuf//:timestamp_proto"],
-)
-
-lua_proto_library(
-    name = "test_proto_lua",
-    testonly = 1,
-    deps = [":test_proto"],
-)
-
-lua_proto_library(
-    name = "descriptor_proto_lua",
-    deps = ["@com_google_protobuf//:descriptor_proto"],
-)
-
-lua_proto_library(
-    name = "empty_proto_lua",
-    deps = ["@com_google_protobuf//:empty_proto"],
-)
-
-lua_proto_library(
-    name = "test_messages_proto3_proto_lua",
-    testonly = 1,
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto3_proto"],
-)
-
-lua_proto_library(
-    name = "test_messages_proto2_proto_lua",
-    testonly = 1,
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto2_proto"],
-)
diff --git a/third_party/upb/lua/README.md b/third_party/upb/lua/README.md
deleted file mode 100644
index 9374f266fca65..0000000000000
--- a/third_party/upb/lua/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# upb Lua bindings
-
-These are some bare-bones upb bindings for Lua.
-
-These bindings exist primarily for experimentation and testing.
-They are incomplete and are not really intended for use in any application.
-This is by no means a complete or supported protobuf library, and in fact
-we don't even claim it to be functional.
diff --git a/third_party/upb/lua/def.c b/third_party/upb/lua/def.c
deleted file mode 100644
index 90161ec819576..0000000000000
--- a/third_party/upb/lua/def.c
+++ /dev/null
@@ -1,940 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/reflection/def.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lauxlib.h"
-#include "lua/upb.h"
-#include "upb/reflection.h"
-
-#define LUPB_ENUMDEF "lupb.enumdef"
-#define LUPB_ENUMVALDEF "lupb.enumvaldef"
-#define LUPB_FIELDDEF "lupb.fielddef"
-#define LUPB_FILEDEF "lupb.filedef"
-#define LUPB_MSGDEF "lupb.msgdef"
-#define LUPB_ONEOFDEF "lupb.oneof"
-#define LUPB_SYMTAB "lupb.defpool"
-#define LUPB_OBJCACHE "lupb.objcache"
-
-static void lupb_DefPool_pushwrapper(lua_State* L, int narg, const void* def,
-                                     const char* type);
-
-/* lupb_wrapper ***************************************************************/
-
-/* Wrappers around upb def objects.  The userval contains a reference to the
- * defpool. */
-
-#define LUPB_SYMTAB_INDEX 1
-
-typedef struct {
-  const void* def; /* upb_MessageDef, upb_EnumDef, upb_OneofDef, etc. */
-} lupb_wrapper;
-
-static const void* lupb_wrapper_check(lua_State* L, int narg,
-                                      const char* type) {
-  lupb_wrapper* w = luaL_checkudata(L, narg, type);
-  return w->def;
-}
-
-static void lupb_wrapper_pushdefpool(lua_State* L, int narg) {
-  lua_getiuservalue(L, narg, LUPB_SYMTAB_INDEX);
-}
-
-/* lupb_wrapper_pushwrapper()
- *
- * For a given def wrapper at index |narg|, pushes a wrapper for the given |def|
- * and the given |type|.  The new wrapper will be part of the same defpool. */
-static void lupb_wrapper_pushwrapper(lua_State* L, int narg, const void* def,
-                                     const char* type) {
-  lupb_wrapper_pushdefpool(L, narg);
-  lupb_DefPool_pushwrapper(L, -1, def, type);
-  lua_replace(L, -2); /* Remove defpool from stack. */
-}
-
-/* lupb_MessageDef_pushsubmsgdef()
- *
- * Pops the msgdef wrapper at the top of the stack and replaces it with a msgdef
- * wrapper for field |f| of this msgdef (submsg may not be direct, for example
- * it may be the submessage of the map value).
- */
-void lupb_MessageDef_pushsubmsgdef(lua_State* L, const upb_FieldDef* f) {
-  const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-  assert(m);
-  lupb_wrapper_pushwrapper(L, -1, m, LUPB_MSGDEF);
-  lua_replace(L, -2); /* Replace msgdef with submsgdef. */
-}
-
-/* lupb_FieldDef **************************************************************/
-
-const upb_FieldDef* lupb_FieldDef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_FIELDDEF);
-}
-
-static int lupb_FieldDef_ContainingOneof(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  const upb_OneofDef* o = upb_FieldDef_ContainingOneof(f);
-  lupb_wrapper_pushwrapper(L, 1, o, LUPB_ONEOFDEF);
-  return 1;
-}
-
-static int lupb_FieldDef_ContainingType(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  const upb_MessageDef* m = upb_FieldDef_ContainingType(f);
-  lupb_wrapper_pushwrapper(L, 1, m, LUPB_MSGDEF);
-  return 1;
-}
-
-static int lupb_FieldDef_Default(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  upb_CType type = upb_FieldDef_CType(f);
-  if (type == kUpb_CType_Message) {
-    return luaL_error(L, "Message fields do not have explicit defaults.");
-  }
-  lupb_pushmsgval(L, 0, type, upb_FieldDef_Default(f));
-  return 1;
-}
-
-static int lupb_FieldDef_Type(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushnumber(L, upb_FieldDef_Type(f));
-  return 1;
-}
-
-static int lupb_FieldDef_HasSubDef(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushboolean(L, upb_FieldDef_HasSubDef(f));
-  return 1;
-}
-
-static int lupb_FieldDef_Index(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushinteger(L, upb_FieldDef_Index(f));
-  return 1;
-}
-
-static int lupb_FieldDef_IsExtension(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushboolean(L, upb_FieldDef_IsExtension(f));
-  return 1;
-}
-
-static int lupb_FieldDef_Label(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushinteger(L, upb_FieldDef_Label(f));
-  return 1;
-}
-
-static int lupb_FieldDef_Name(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushstring(L, upb_FieldDef_Name(f));
-  return 1;
-}
-
-static int lupb_FieldDef_Number(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  int32_t num = upb_FieldDef_Number(f);
-  if (num) {
-    lua_pushinteger(L, num);
-  } else {
-    lua_pushnil(L);
-  }
-  return 1;
-}
-
-static int lupb_FieldDef_IsPacked(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushboolean(L, upb_FieldDef_IsPacked(f));
-  return 1;
-}
-
-static int lupb_FieldDef_MessageSubDef(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-  lupb_wrapper_pushwrapper(L, 1, m, LUPB_MSGDEF);
-  return 1;
-}
-
-static int lupb_FieldDef_EnumSubDef(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  const upb_EnumDef* e = upb_FieldDef_EnumSubDef(f);
-  lupb_wrapper_pushwrapper(L, 1, e, LUPB_ENUMDEF);
-  return 1;
-}
-
-static int lupb_FieldDef_CType(lua_State* L) {
-  const upb_FieldDef* f = lupb_FieldDef_check(L, 1);
-  lua_pushinteger(L, upb_FieldDef_CType(f));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_FieldDef_m[] = {
-    {"containing_oneof", lupb_FieldDef_ContainingOneof},
-    {"containing_type", lupb_FieldDef_ContainingType},
-    {"default", lupb_FieldDef_Default},
-    {"descriptor_type", lupb_FieldDef_Type},
-    {"has_subdef", lupb_FieldDef_HasSubDef},
-    {"index", lupb_FieldDef_Index},
-    {"is_extension", lupb_FieldDef_IsExtension},
-    {"label", lupb_FieldDef_Label},
-    {"name", lupb_FieldDef_Name},
-    {"number", lupb_FieldDef_Number},
-    {"packed", lupb_FieldDef_IsPacked},
-    {"msgsubdef", lupb_FieldDef_MessageSubDef},
-    {"enumsubdef", lupb_FieldDef_EnumSubDef},
-    {"type", lupb_FieldDef_CType},
-    {NULL, NULL}};
-
-/* lupb_OneofDef **************************************************************/
-
-const upb_OneofDef* lupb_OneofDef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_ONEOFDEF);
-}
-
-static int lupb_OneofDef_ContainingType(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, 1);
-  const upb_MessageDef* m = upb_OneofDef_ContainingType(o);
-  lupb_wrapper_pushwrapper(L, 1, m, LUPB_MSGDEF);
-  return 1;
-}
-
-static int lupb_OneofDef_Field(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, 1);
-  int32_t idx = lupb_checkint32(L, 2);
-  int count = upb_OneofDef_FieldCount(o);
-
-  if (idx < 0 || idx >= count) {
-    const char* msg =
-        lua_pushfstring(L, "index %d exceeds field count %d", idx, count);
-    return luaL_argerror(L, 2, msg);
-  }
-
-  lupb_wrapper_pushwrapper(L, 1, upb_OneofDef_Field(o, idx), LUPB_FIELDDEF);
-  return 1;
-}
-
-static int lupb_oneofiter_next(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, lua_upvalueindex(1));
-  int* index = lua_touserdata(L, lua_upvalueindex(2));
-  const upb_FieldDef* f;
-  if (*index == upb_OneofDef_FieldCount(o)) return 0;
-  f = upb_OneofDef_Field(o, (*index)++);
-  lupb_wrapper_pushwrapper(L, lua_upvalueindex(1), f, LUPB_FIELDDEF);
-  return 1;
-}
-
-static int lupb_OneofDef_Fields(lua_State* L) {
-  int* index = lua_newuserdata(L, sizeof(int));
-  lupb_OneofDef_check(L, 1);
-  *index = 0;
-
-  /* Closure upvalues are: oneofdef, index. */
-  lua_pushcclosure(L, &lupb_oneofiter_next, 2);
-  return 1;
-}
-
-static int lupb_OneofDef_len(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, 1);
-  lua_pushinteger(L, upb_OneofDef_FieldCount(o));
-  return 1;
-}
-
-/* lupb_OneofDef_lookupfield()
- *
- * Handles:
- *   oneof.lookup_field(field_number)
- *   oneof.lookup_field(field_name)
- */
-static int lupb_OneofDef_lookupfield(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, 1);
-  const upb_FieldDef* f;
-
-  switch (lua_type(L, 2)) {
-    case LUA_TNUMBER:
-      f = upb_OneofDef_LookupNumber(o, lua_tointeger(L, 2));
-      break;
-    case LUA_TSTRING:
-      f = upb_OneofDef_LookupName(o, lua_tostring(L, 2));
-      break;
-    default: {
-      const char* msg = lua_pushfstring(L, "number or string expected, got %s",
-                                        luaL_typename(L, 2));
-      return luaL_argerror(L, 2, msg);
-    }
-  }
-
-  lupb_wrapper_pushwrapper(L, 1, f, LUPB_FIELDDEF);
-  return 1;
-}
-
-static int lupb_OneofDef_Name(lua_State* L) {
-  const upb_OneofDef* o = lupb_OneofDef_check(L, 1);
-  lua_pushstring(L, upb_OneofDef_Name(o));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_OneofDef_m[] = {
-    {"containing_type", lupb_OneofDef_ContainingType},
-    {"field", lupb_OneofDef_Field},
-    {"fields", lupb_OneofDef_Fields},
-    {"lookup_field", lupb_OneofDef_lookupfield},
-    {"name", lupb_OneofDef_Name},
-    {NULL, NULL}};
-
-static const struct luaL_Reg lupb_OneofDef_mm[] = {{"__len", lupb_OneofDef_len},
-                                                   {NULL, NULL}};
-
-/* lupb_MessageDef
- * ****************************************************************/
-
-typedef struct {
-  const upb_MessageDef* md;
-} lupb_MessageDef;
-
-const upb_MessageDef* lupb_MessageDef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_MSGDEF);
-}
-
-static int lupb_MessageDef_FieldCount(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushinteger(L, upb_MessageDef_FieldCount(m));
-  return 1;
-}
-
-static int lupb_MessageDef_OneofCount(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushinteger(L, upb_MessageDef_OneofCount(m));
-  return 1;
-}
-
-static bool lupb_MessageDef_pushnested(lua_State* L, int msgdef, int name) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, msgdef);
-  lupb_wrapper_pushdefpool(L, msgdef);
-  upb_DefPool* defpool = lupb_DefPool_check(L, -1);
-  lua_pop(L, 1);
-
-  /* Construct full package.Message.SubMessage name. */
-  lua_pushstring(L, upb_MessageDef_FullName(m));
-  lua_pushstring(L, ".");
-  lua_pushvalue(L, name);
-  lua_concat(L, 3);
-  const char* nested_name = lua_tostring(L, -1);
-
-  /* Try lookup. */
-  const upb_MessageDef* nested =
-      upb_DefPool_FindMessageByName(defpool, nested_name);
-  if (!nested) return false;
-  lupb_wrapper_pushwrapper(L, msgdef, nested, LUPB_MSGDEF);
-  return true;
-}
-
-/* lupb_MessageDef_Field()
- *
- * Handles:
- *   msg.field(field_number) -> fielddef
- *   msg.field(field_name) -> fielddef
- */
-static int lupb_MessageDef_Field(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  const upb_FieldDef* f;
-
-  switch (lua_type(L, 2)) {
-    case LUA_TNUMBER:
-      f = upb_MessageDef_FindFieldByNumber(m, lua_tointeger(L, 2));
-      break;
-    case LUA_TSTRING:
-      f = upb_MessageDef_FindFieldByName(m, lua_tostring(L, 2));
-      break;
-    default: {
-      const char* msg = lua_pushfstring(L, "number or string expected, got %s",
-                                        luaL_typename(L, 2));
-      return luaL_argerror(L, 2, msg);
-    }
-  }
-
-  lupb_wrapper_pushwrapper(L, 1, f, LUPB_FIELDDEF);
-  return 1;
-}
-
-/* lupb_MessageDef_FindByNameWithSize()
- *
- * Handles:
- *   msg.lookup_name(name) -> fielddef or oneofdef
- */
-static int lupb_MessageDef_FindByNameWithSize(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  const upb_FieldDef* f;
-  const upb_OneofDef* o;
-
-  if (!upb_MessageDef_FindByName(m, lua_tostring(L, 2), &f, &o)) {
-    lua_pushnil(L);
-  } else if (o) {
-    lupb_wrapper_pushwrapper(L, 1, o, LUPB_ONEOFDEF);
-  } else {
-    lupb_wrapper_pushwrapper(L, 1, f, LUPB_FIELDDEF);
-  }
-
-  return 1;
-}
-
-/* lupb_MessageDef_Name()
- *
- * Handles:
- *   msg.name() -> string
- */
-static int lupb_MessageDef_Name(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushstring(L, upb_MessageDef_Name(m));
-  return 1;
-}
-
-static int lupb_msgfielditer_next(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, lua_upvalueindex(1));
-  int* index = lua_touserdata(L, lua_upvalueindex(2));
-  const upb_FieldDef* f;
-  if (*index == upb_MessageDef_FieldCount(m)) return 0;
-  f = upb_MessageDef_Field(m, (*index)++);
-  lupb_wrapper_pushwrapper(L, lua_upvalueindex(1), f, LUPB_FIELDDEF);
-  return 1;
-}
-
-static int lupb_MessageDef_Fields(lua_State* L) {
-  int* index = lua_newuserdata(L, sizeof(int));
-  lupb_MessageDef_check(L, 1);
-  *index = 0;
-
-  /* Closure upvalues are: msgdef, index. */
-  lua_pushcclosure(L, &lupb_msgfielditer_next, 2);
-  return 1;
-}
-
-static int lupb_MessageDef_File(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  const upb_FileDef* file = upb_MessageDef_File(m);
-  lupb_wrapper_pushwrapper(L, 1, file, LUPB_FILEDEF);
-  return 1;
-}
-
-static int lupb_MessageDef_FullName(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushstring(L, upb_MessageDef_FullName(m));
-  return 1;
-}
-
-static int lupb_MessageDef_index(lua_State* L) {
-  if (!lupb_MessageDef_pushnested(L, 1, 2)) {
-    luaL_error(L, "No such nested message");
-  }
-  return 1;
-}
-
-static int lupb_msgoneofiter_next(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, lua_upvalueindex(1));
-  int* index = lua_touserdata(L, lua_upvalueindex(2));
-  const upb_OneofDef* o;
-  if (*index == upb_MessageDef_OneofCount(m)) return 0;
-  o = upb_MessageDef_Oneof(m, (*index)++);
-  lupb_wrapper_pushwrapper(L, lua_upvalueindex(1), o, LUPB_ONEOFDEF);
-  return 1;
-}
-
-static int lupb_MessageDef_Oneofs(lua_State* L) {
-  int* index = lua_newuserdata(L, sizeof(int));
-  lupb_MessageDef_check(L, 1);
-  *index = 0;
-
-  /* Closure upvalues are: msgdef, index. */
-  lua_pushcclosure(L, &lupb_msgoneofiter_next, 2);
-  return 1;
-}
-
-static int lupb_MessageDef_IsMapEntry(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushboolean(L, upb_MessageDef_IsMapEntry(m));
-  return 1;
-}
-
-static int lupb_MessageDef_Syntax(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushinteger(L, upb_MessageDef_Syntax(m));
-  return 1;
-}
-
-static int lupb_MessageDef_tostring(lua_State* L) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  lua_pushfstring(L, "<upb.MessageDef name=%s, field_count=%d>",
-                  upb_MessageDef_FullName(m),
-                  (int)upb_MessageDef_FieldCount(m));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_MessageDef_mm[] = {
-    {"__call", lupb_MessageDef_call},
-    {"__index", lupb_MessageDef_index},
-    {"__len", lupb_MessageDef_FieldCount},
-    {"__tostring", lupb_MessageDef_tostring},
-    {NULL, NULL}};
-
-static const struct luaL_Reg lupb_MessageDef_m[] = {
-    {"field", lupb_MessageDef_Field},
-    {"fields", lupb_MessageDef_Fields},
-    {"field_count", lupb_MessageDef_FieldCount},
-    {"file", lupb_MessageDef_File},
-    {"full_name", lupb_MessageDef_FullName},
-    {"lookup_name", lupb_MessageDef_FindByNameWithSize},
-    {"name", lupb_MessageDef_Name},
-    {"oneof_count", lupb_MessageDef_OneofCount},
-    {"oneofs", lupb_MessageDef_Oneofs},
-    {"syntax", lupb_MessageDef_Syntax},
-    {"_map_entry", lupb_MessageDef_IsMapEntry},
-    {NULL, NULL}};
-
-/* lupb_EnumDef ***************************************************************/
-
-const upb_EnumDef* lupb_EnumDef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_ENUMDEF);
-}
-
-static int lupb_EnumDef_len(lua_State* L) {
-  const upb_EnumDef* e = lupb_EnumDef_check(L, 1);
-  lua_pushinteger(L, upb_EnumDef_ValueCount(e));
-  return 1;
-}
-
-static int lupb_EnumDef_File(lua_State* L) {
-  const upb_EnumDef* e = lupb_EnumDef_check(L, 1);
-  const upb_FileDef* file = upb_EnumDef_File(e);
-  lupb_wrapper_pushwrapper(L, 1, file, LUPB_FILEDEF);
-  return 1;
-}
-
-/* lupb_EnumDef_Value()
- *
- * Handles:
- *   enum.value(number) -> enumval
- *   enum.value(name) -> enumval
- */
-static int lupb_EnumDef_Value(lua_State* L) {
-  const upb_EnumDef* e = lupb_EnumDef_check(L, 1);
-  const upb_EnumValueDef* ev;
-
-  switch (lua_type(L, 2)) {
-    case LUA_TNUMBER:
-      ev = upb_EnumDef_FindValueByNumber(e, lupb_checkint32(L, 2));
-      break;
-    case LUA_TSTRING:
-      ev = upb_EnumDef_FindValueByName(e, lua_tostring(L, 2));
-      break;
-    default: {
-      const char* msg = lua_pushfstring(L, "number or string expected, got %s",
-                                        luaL_typename(L, 2));
-      return luaL_argerror(L, 2, msg);
-    }
-  }
-
-  lupb_wrapper_pushwrapper(L, 1, ev, LUPB_ENUMVALDEF);
-  return 1;
-}
-
-static const struct luaL_Reg lupb_EnumDef_mm[] = {{"__len", lupb_EnumDef_len},
-                                                  {NULL, NULL}};
-
-static const struct luaL_Reg lupb_EnumDef_m[] = {
-    {"file", lupb_EnumDef_File}, {"value", lupb_EnumDef_Value}, {NULL, NULL}};
-
-/* lupb_EnumValueDef
- * ************************************************************/
-
-const upb_EnumValueDef* lupb_enumvaldef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_ENUMVALDEF);
-}
-
-static int lupb_EnumValueDef_Enum(lua_State* L) {
-  const upb_EnumValueDef* ev = lupb_enumvaldef_check(L, 1);
-  const upb_EnumDef* e = upb_EnumValueDef_Enum(ev);
-  lupb_wrapper_pushwrapper(L, 1, e, LUPB_ENUMDEF);
-  return 1;
-}
-
-static int lupb_EnumValueDef_FullName(lua_State* L) {
-  const upb_EnumValueDef* ev = lupb_enumvaldef_check(L, 1);
-  lua_pushstring(L, upb_EnumValueDef_FullName(ev));
-  return 1;
-}
-
-static int lupb_EnumValueDef_Name(lua_State* L) {
-  const upb_EnumValueDef* ev = lupb_enumvaldef_check(L, 1);
-  lua_pushstring(L, upb_EnumValueDef_Name(ev));
-  return 1;
-}
-
-static int lupb_EnumValueDef_Number(lua_State* L) {
-  const upb_EnumValueDef* ev = lupb_enumvaldef_check(L, 1);
-  lupb_pushint32(L, upb_EnumValueDef_Number(ev));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_enumvaldef_m[] = {
-    {"enum", lupb_EnumValueDef_Enum},
-    {"full_name", lupb_EnumValueDef_FullName},
-    {"name", lupb_EnumValueDef_Name},
-    {"number", lupb_EnumValueDef_Number},
-    {NULL, NULL}};
-
-/* lupb_FileDef ***************************************************************/
-
-const upb_FileDef* lupb_FileDef_check(lua_State* L, int narg) {
-  return lupb_wrapper_check(L, narg, LUPB_FILEDEF);
-}
-
-static int lupb_FileDef_Dependency(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  int index = luaL_checkint(L, 2);
-  const upb_FileDef* dep = upb_FileDef_Dependency(f, index);
-  lupb_wrapper_pushwrapper(L, 1, dep, LUPB_FILEDEF);
-  return 1;
-}
-
-static int lupb_FileDef_DependencyCount(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushnumber(L, upb_FileDef_DependencyCount(f));
-  return 1;
-}
-
-static int lupb_FileDef_enum(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  int index = luaL_checkint(L, 2);
-  const upb_EnumDef* e = upb_FileDef_TopLevelEnum(f, index);
-  lupb_wrapper_pushwrapper(L, 1, e, LUPB_ENUMDEF);
-  return 1;
-}
-
-static int lupb_FileDef_enumcount(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushnumber(L, upb_FileDef_TopLevelEnumCount(f));
-  return 1;
-}
-
-static int lupb_FileDef_msg(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  int index = luaL_checkint(L, 2);
-  const upb_MessageDef* m = upb_FileDef_TopLevelMessage(f, index);
-  lupb_wrapper_pushwrapper(L, 1, m, LUPB_MSGDEF);
-  return 1;
-}
-
-static int lupb_FileDef_msgcount(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushnumber(L, upb_FileDef_TopLevelMessageCount(f));
-  return 1;
-}
-
-static int lupb_FileDef_Name(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushstring(L, upb_FileDef_Name(f));
-  return 1;
-}
-
-static int lupb_FileDef_Package(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushstring(L, upb_FileDef_Package(f));
-  return 1;
-}
-
-static int lupb_FileDef_Pool(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  const upb_DefPool* defpool = upb_FileDef_Pool(f);
-  lupb_wrapper_pushwrapper(L, 1, defpool, LUPB_SYMTAB);
-  return 1;
-}
-
-static int lupb_FileDef_Syntax(lua_State* L) {
-  const upb_FileDef* f = lupb_FileDef_check(L, 1);
-  lua_pushnumber(L, upb_FileDef_Syntax(f));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_FileDef_m[] = {
-    {"dep", lupb_FileDef_Dependency},
-    {"depcount", lupb_FileDef_DependencyCount},
-    {"enum", lupb_FileDef_enum},
-    {"enumcount", lupb_FileDef_enumcount},
-    {"msg", lupb_FileDef_msg},
-    {"msgcount", lupb_FileDef_msgcount},
-    {"name", lupb_FileDef_Name},
-    {"package", lupb_FileDef_Package},
-    {"defpool", lupb_FileDef_Pool},
-    {"syntax", lupb_FileDef_Syntax},
-    {NULL, NULL}};
-
-/* lupb_DefPool
- * ****************************************************************/
-
-/* The defpool owns all defs.  Thus GC-rooting the defpool ensures that all
- * underlying defs stay alive.
- *
- * The defpool's userval is a cache of def* -> object. */
-
-#define LUPB_CACHE_INDEX 1
-
-typedef struct {
-  upb_DefPool* defpool;
-} lupb_DefPool;
-
-upb_DefPool* lupb_DefPool_check(lua_State* L, int narg) {
-  lupb_DefPool* ldefpool = luaL_checkudata(L, narg, LUPB_SYMTAB);
-  if (!ldefpool->defpool) {
-    luaL_error(L, "called into dead object");
-  }
-  return ldefpool->defpool;
-}
-
-void lupb_DefPool_pushwrapper(lua_State* L, int narg, const void* def,
-                              const char* type) {
-  narg = lua_absindex(L, narg);
-  assert(luaL_testudata(L, narg, LUPB_SYMTAB));
-
-  if (def == NULL) {
-    lua_pushnil(L);
-    return;
-  }
-
-  lua_getiuservalue(L, narg, LUPB_CACHE_INDEX); /* Get cache. */
-
-  /* Index by "def" pointer. */
-  lua_rawgetp(L, -1, def);
-
-  /* Stack is now: cache, cached value. */
-  if (lua_isnil(L, -1)) {
-    /* Create new wrapper. */
-    lupb_wrapper* w = lupb_newuserdata(L, sizeof(*w), 1, type);
-    w->def = def;
-    lua_replace(L, -2); /* Replace nil */
-
-    /* Set defpool as userval. */
-    lua_pushvalue(L, narg);
-    lua_setiuservalue(L, -2, LUPB_SYMTAB_INDEX);
-
-    /* Add wrapper to the the cache. */
-    lua_pushvalue(L, -1);
-    lua_rawsetp(L, -3, def);
-  }
-
-  lua_replace(L, -2); /* Remove cache, leaving only the wrapper. */
-}
-
-/* upb_DefPool_New()
- *
- * Handles:
- *   upb.DefPool() -> <new instance>
- */
-static int lupb_DefPool_New(lua_State* L) {
-  lupb_DefPool* ldefpool =
-      lupb_newuserdata(L, sizeof(*ldefpool), 1, LUPB_SYMTAB);
-  ldefpool->defpool = upb_DefPool_New();
-
-  /* Create our object cache. */
-  lua_newtable(L);
-
-  /* Cache metatable: specifies that values are weak. */
-  lua_createtable(L, 0, 1);
-  lua_pushstring(L, "v");
-  lua_setfield(L, -2, "__mode");
-  lua_setmetatable(L, -2);
-
-  /* Put the defpool itself in the cache metatable. */
-  lua_pushvalue(L, -2);
-  lua_rawsetp(L, -2, ldefpool->defpool);
-
-  /* Set the cache as our userval. */
-  lua_setiuservalue(L, -2, LUPB_CACHE_INDEX);
-
-  return 1;
-}
-
-static int lupb_DefPool_gc(lua_State* L) {
-  lupb_DefPool* ldefpool = luaL_checkudata(L, 1, LUPB_SYMTAB);
-  upb_DefPool_Free(ldefpool->defpool);
-  ldefpool->defpool = NULL;
-  return 0;
-}
-
-static int lupb_DefPool_AddFile(lua_State* L) {
-  size_t len;
-  upb_DefPool* s = lupb_DefPool_check(L, 1);
-  const char* str = luaL_checklstring(L, 2, &len);
-  upb_Arena* arena = lupb_Arena_pushnew(L);
-  const google_protobuf_FileDescriptorProto* file;
-  const upb_FileDef* file_def;
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-  file = google_protobuf_FileDescriptorProto_parse(str, len, arena);
-
-  if (!file) {
-    luaL_argerror(L, 2, "failed to parse descriptor");
-  }
-
-  file_def = upb_DefPool_AddFile(s, file, &status);
-  lupb_checkstatus(L, &status);
-
-  lupb_DefPool_pushwrapper(L, 1, file_def, LUPB_FILEDEF);
-
-  return 1;
-}
-
-static int lupb_DefPool_addset(lua_State* L) {
-  size_t i, n, len;
-  const google_protobuf_FileDescriptorProto* const* files;
-  google_protobuf_FileDescriptorSet* set;
-  upb_DefPool* s = lupb_DefPool_check(L, 1);
-  const char* str = luaL_checklstring(L, 2, &len);
-  upb_Arena* arena = lupb_Arena_pushnew(L);
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-  set = google_protobuf_FileDescriptorSet_parse(str, len, arena);
-
-  if (!set) {
-    luaL_argerror(L, 2, "failed to parse descriptor");
-  }
-
-  files = google_protobuf_FileDescriptorSet_file(set, &n);
-  for (i = 0; i < n; i++) {
-    upb_DefPool_AddFile(s, files[i], &status);
-    lupb_checkstatus(L, &status);
-  }
-
-  return 0;
-}
-
-static int lupb_DefPool_FindMessageByName(lua_State* L) {
-  const upb_DefPool* s = lupb_DefPool_check(L, 1);
-  const upb_MessageDef* m =
-      upb_DefPool_FindMessageByName(s, luaL_checkstring(L, 2));
-  lupb_DefPool_pushwrapper(L, 1, m, LUPB_MSGDEF);
-  return 1;
-}
-
-static int lupb_DefPool_FindEnumByName(lua_State* L) {
-  const upb_DefPool* s = lupb_DefPool_check(L, 1);
-  const upb_EnumDef* e = upb_DefPool_FindEnumByName(s, luaL_checkstring(L, 2));
-  lupb_DefPool_pushwrapper(L, 1, e, LUPB_ENUMDEF);
-  return 1;
-}
-
-static int lupb_DefPool_FindEnumByNameval(lua_State* L) {
-  const upb_DefPool* s = lupb_DefPool_check(L, 1);
-  const upb_EnumValueDef* e =
-      upb_DefPool_FindEnumByNameval(s, luaL_checkstring(L, 2));
-  lupb_DefPool_pushwrapper(L, 1, e, LUPB_ENUMVALDEF);
-  return 1;
-}
-
-static int lupb_DefPool_tostring(lua_State* L) {
-  lua_pushfstring(L, "<upb.DefPool>");
-  return 1;
-}
-
-static const struct luaL_Reg lupb_DefPool_m[] = {
-    {"add_file", lupb_DefPool_AddFile},
-    {"add_set", lupb_DefPool_addset},
-    {"lookup_msg", lupb_DefPool_FindMessageByName},
-    {"lookup_enum", lupb_DefPool_FindEnumByName},
-    {"lookup_enumval", lupb_DefPool_FindEnumByNameval},
-    {NULL, NULL}};
-
-static const struct luaL_Reg lupb_DefPool_mm[] = {
-    {"__gc", lupb_DefPool_gc},
-    {"__tostring", lupb_DefPool_tostring},
-    {NULL, NULL}};
-
-/* lupb toplevel **************************************************************/
-
-static void lupb_setfieldi(lua_State* L, const char* field, int i) {
-  lua_pushinteger(L, i);
-  lua_setfield(L, -2, field);
-}
-
-static const struct luaL_Reg lupbdef_toplevel_m[] = {
-    {"DefPool", lupb_DefPool_New}, {NULL, NULL}};
-
-void lupb_def_registertypes(lua_State* L) {
-  lupb_setfuncs(L, lupbdef_toplevel_m);
-
-  /* Register types. */
-  lupb_register_type(L, LUPB_ENUMDEF, lupb_EnumDef_m, lupb_EnumDef_mm);
-  lupb_register_type(L, LUPB_ENUMVALDEF, lupb_enumvaldef_m, NULL);
-  lupb_register_type(L, LUPB_FIELDDEF, lupb_FieldDef_m, NULL);
-  lupb_register_type(L, LUPB_FILEDEF, lupb_FileDef_m, NULL);
-  lupb_register_type(L, LUPB_MSGDEF, lupb_MessageDef_m, lupb_MessageDef_mm);
-  lupb_register_type(L, LUPB_ONEOFDEF, lupb_OneofDef_m, lupb_OneofDef_mm);
-  lupb_register_type(L, LUPB_SYMTAB, lupb_DefPool_m, lupb_DefPool_mm);
-
-  /* Register constants. */
-  lupb_setfieldi(L, "LABEL_OPTIONAL", kUpb_Label_Optional);
-  lupb_setfieldi(L, "LABEL_REQUIRED", kUpb_Label_Required);
-  lupb_setfieldi(L, "LABEL_REPEATED", kUpb_Label_Repeated);
-
-  lupb_setfieldi(L, "TYPE_DOUBLE", kUpb_CType_Double);
-  lupb_setfieldi(L, "TYPE_FLOAT", kUpb_CType_Float);
-  lupb_setfieldi(L, "TYPE_INT64", kUpb_CType_Int64);
-  lupb_setfieldi(L, "TYPE_UINT64", kUpb_CType_UInt64);
-  lupb_setfieldi(L, "TYPE_INT32", kUpb_CType_Int32);
-  lupb_setfieldi(L, "TYPE_BOOL", kUpb_CType_Bool);
-  lupb_setfieldi(L, "TYPE_STRING", kUpb_CType_String);
-  lupb_setfieldi(L, "TYPE_MESSAGE", kUpb_CType_Message);
-  lupb_setfieldi(L, "TYPE_BYTES", kUpb_CType_Bytes);
-  lupb_setfieldi(L, "TYPE_UINT32", kUpb_CType_UInt32);
-  lupb_setfieldi(L, "TYPE_ENUM", kUpb_CType_Enum);
-
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_DOUBLE", kUpb_FieldType_Double);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_FLOAT", kUpb_FieldType_Float);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_INT64", kUpb_FieldType_Int64);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_UINT64", kUpb_FieldType_UInt64);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_INT32", kUpb_FieldType_Int32);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_FIXED64", kUpb_FieldType_Fixed64);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_FIXED32", kUpb_FieldType_Fixed32);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_BOOL", kUpb_FieldType_Bool);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_STRING", kUpb_FieldType_String);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_GROUP", kUpb_FieldType_Group);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_MESSAGE", kUpb_FieldType_Message);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_BYTES", kUpb_FieldType_Bytes);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_UINT32", kUpb_FieldType_UInt32);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_ENUM", kUpb_FieldType_Enum);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_SFIXED32", kUpb_FieldType_SFixed32);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_SFIXED64", kUpb_FieldType_SFixed64);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_SINT32", kUpb_FieldType_SInt32);
-  lupb_setfieldi(L, "DESCRIPTOR_TYPE_SINT64", kUpb_FieldType_SInt64);
-
-  lupb_setfieldi(L, "SYNTAX_PROTO2", kUpb_Syntax_Proto2);
-  lupb_setfieldi(L, "SYNTAX_PROTO3", kUpb_Syntax_Proto3);
-}
diff --git a/third_party/upb/lua/lua_proto_library.bzl b/third_party/upb/lua/lua_proto_library.bzl
deleted file mode 100644
index cc1486a60bffb..0000000000000
--- a/third_party/upb/lua/lua_proto_library.bzl
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""lua_proto_library(): a rule for building Lua protos."""
-
-load("@bazel_skylib//lib:paths.bzl", "paths")
-
-# Generic support code #########################################################
-
-# begin:github_only
-_is_google3 = False
-# end:github_only
-
-# begin:google_only
-# _is_google3 = True
-# end:google_only
-
-def _get_real_short_path(file):
-    # For some reason, files from other archives have short paths that look like:
-    #   ../com_google_protobuf/google/protobuf/descriptor.proto
-    short_path = file.short_path
-    if short_path.startswith("../"):
-        second_slash = short_path.index("/", 3)
-        short_path = short_path[second_slash + 1:]
-
-    # Sometimes it has another few prefixes like:
-    #   _virtual_imports/any_proto/google/protobuf/any.proto
-    #   benchmarks/_virtual_imports/100_msgs_proto/benchmarks/100_msgs.proto
-    # We want just google/protobuf/any.proto.
-    virtual_imports = "_virtual_imports/"
-    if virtual_imports in short_path:
-        short_path = short_path.split(virtual_imports)[1].split("/", 1)[1]
-    return short_path
-
-def _get_real_root(ctx, file):
-    real_short_path = _get_real_short_path(file)
-    root = file.path[:-len(real_short_path) - 1]
-    if not _is_google3 and ctx.rule.attr.strip_import_prefix:
-        root = paths.join(root, ctx.rule.attr.strip_import_prefix[1:])
-    return root
-
-def _generate_output_file(ctx, src, extension):
-    package = ctx.label.package
-    if not _is_google3 and ctx.rule.attr.strip_import_prefix and ctx.rule.attr.strip_import_prefix != "/":
-        package = package[len(ctx.rule.attr.strip_import_prefix):]
-    real_short_path = _get_real_short_path(src)
-    real_short_path = paths.relativize(real_short_path, package)
-    output_filename = paths.replace_extension(real_short_path, extension)
-    ret = ctx.actions.declare_file(output_filename)
-    return ret
-
-# upb_proto_library / upb_proto_reflection_library shared code #################
-
-_LuaFilesInfo = provider(
-    "A set of lua files generated from .proto files",
-    fields = ["files"],
-)
-
-def _compile_upb_protos(ctx, proto_info, proto_sources):
-    files = [_generate_output_file(ctx, name, "_pb.lua") for name in proto_sources]
-    transitive_sets = proto_info.transitive_descriptor_sets.to_list()
-    ctx.actions.run(
-        inputs = depset(
-            direct = [proto_info.direct_descriptor_set],
-            transitive = [proto_info.transitive_descriptor_sets],
-        ),
-        tools = [ctx.executable._upbc],
-        outputs = files,
-        executable = ctx.executable._protoc,
-        arguments = [
-                        "--lua_out=" + _get_real_root(ctx, files[0]),
-                        "--plugin=protoc-gen-lua=" + ctx.executable._upbc.path,
-                        "--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]),
-                    ] +
-                    [_get_real_short_path(file) for file in proto_sources],
-        progress_message = "Generating Lua protos for :" + ctx.label.name,
-    )
-    return files
-
-def _lua_proto_rule_impl(ctx):
-    if len(ctx.attr.deps) != 1:
-        fail("only one deps dependency allowed.")
-    dep = ctx.attr.deps[0]
-    if _LuaFilesInfo not in dep:
-        fail("proto_library rule must generate _LuaFilesInfo (aspect should have handled this).")
-    files = dep[_LuaFilesInfo].files
-    return [
-        DefaultInfo(
-            files = files,
-            data_runfiles = ctx.runfiles(files = files.to_list()),
-        ),
-    ]
-
-def _lua_proto_library_aspect_impl(target, ctx):
-    proto_info = target[ProtoInfo]
-    files = _compile_upb_protos(ctx, proto_info, proto_info.direct_sources)
-    deps = ctx.rule.attr.deps
-    transitive = [dep[_LuaFilesInfo].files for dep in deps if _LuaFilesInfo in dep]
-    return [_LuaFilesInfo(files = depset(direct = files, transitive = transitive))]
-
-# lua_proto_library() ##########################################################
-
-_lua_proto_library_aspect = aspect(
-    attrs = {
-        "_upbc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//lua:protoc-gen-lua",
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-    },
-    implementation = _lua_proto_library_aspect_impl,
-    provides = [_LuaFilesInfo],
-    attr_aspects = ["deps"],
-    fragments = ["cpp"],
-)
-
-lua_proto_library = rule(
-    output_to_genfiles = True,
-    implementation = _lua_proto_rule_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects = [_lua_proto_library_aspect],
-            allow_rules = ["proto_library"],
-            providers = [ProtoInfo],
-        ),
-    },
-)
diff --git a/third_party/upb/lua/main.c b/third_party/upb/lua/main.c
deleted file mode 100644
index 9daf50987bd8b..0000000000000
--- a/third_party/upb/lua/main.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
-#include <signal.h>
-
-#include "lua/upb.h"
-
-lua_State* L;
-
-static void interrupt(lua_State* L, lua_Debug* ar) {
-  (void)ar;
-  lua_sethook(L, NULL, 0, 0);
-  luaL_error(L, "SIGINT");
-}
-
-static void sighandler(int i) {
-  fprintf(stderr, "Signal!\n");
-  signal(i, SIG_DFL);
-  lua_sethook(L, interrupt, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
-}
-
-const char* init =
-    "package.preload['lupb'] = ... "
-    "package.path = '"
-    "./?.lua;"
-    "./third_party/lunit/?.lua;"
-    "external/com_google_protobuf/?.lua;"
-    "external/com_google_protobuf/src/?.lua;"
-    "bazel-bin/?.lua;"
-    "bazel-bin/external/com_google_protobuf/src/?.lua;"
-    "bazel-bin/external/com_google_protobuf/?.lua;"
-    "bazel-bin/external/com_google_protobuf/?.lua;"
-    "lua/?.lua"
-    "'";
-
-int main(int argc, char** argv) {
-  int ret = 0;
-  L = luaL_newstate();
-  luaL_openlibs(L);
-  lua_pushcfunction(L, luaopen_lupb);
-  ret = luaL_loadstring(L, init);
-  lua_pushcfunction(L, luaopen_lupb);
-
-  signal(SIGINT, sighandler);
-  ret = ret || lua_pcall(L, 1, LUA_MULTRET, 0) ||
-        luaL_dofile(L, "lua/test_upb.lua");
-  signal(SIGINT, SIG_DFL);
-
-  if (ret) {
-    fprintf(stderr, "error testing Lua: %s\n", lua_tostring(L, -1));
-    ret = 1;
-  }
-
-  lua_close(L);
-  return ret;
-}
diff --git a/third_party/upb/lua/msg.c b/third_party/upb/lua/msg.c
deleted file mode 100644
index 094ec570d6cd3..0000000000000
--- a/third_party/upb/lua/msg.c
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * lupb_Message -- Message/Array/Map objects in Lua/C that wrap upb/msg.h
- */
-
-#include "upb/msg.h"
-
-#include <float.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lauxlib.h"
-#include "lua/upb.h"
-#include "upb/collections/map.h"
-#include "upb/json/decode.h"
-#include "upb/json/encode.h"
-#include "upb/port/def.inc"
-#include "upb/reflection/message.h"
-#include "upb/text/encode.h"
-
-/*
- * Message/Map/Array objects.  These objects form a directed graph: a message
- * can contain submessages, arrays, and maps, which can then point to other
- * messages.  This graph can technically be cyclic, though this is an error and
- * a cyclic graph cannot be serialized.  So it's better to think of this as a
- * tree of objects.
- *
- * The actual data exists at the upb level (upb_Message, upb_Map, upb_Array),
- * independently of Lua.  The upb objects contain all the canonical data and
- * edges between objects.  Lua wrapper objects expose the upb objects to Lua,
- * but ultimately they are just wrappers.  They pass through all reads and
- * writes to the underlying upb objects.
- *
- * Each upb object lives in a upb arena.  We have a Lua object to wrap the upb
- * arena, but arenas are never exposed to the user.  The Lua arena object just
- * serves to own the upb arena and free it at the proper time, once the Lua GC
- * has determined that there are no more references to anything that lives in
- * that arena.  All wrapper objects strongly reference the arena to which they
- * belong.
- *
- * A global object cache stores a mapping of C pointer (upb_Message*,
- * upb_Array*, upb_Map*) to a corresponding Lua wrapper.  These references are
- * weak so that the wrappers can be collected if they are no longer needed.  A
- * new wrapper object can always be recreated later.
- *
- *                          +-----+
- *            lupb_Arena    |cache|-weak-+
- *                 |  ^     +-----+      |
- *                 |  |                  V
- * Lua level       |  +------------lupb_Message
- * ----------------|-----------------|------------------------------------------
- * upb level       |                 |
- *                 |            +----V----------------------------------+
- *                 +->upb_Arena | upb_Message  ...(empty arena storage) |
- *                              +---------------------------------------+
- *
- * If the user creates a reference between two objects that have different
- * arenas, we need to fuse the two arenas together, so that the blocks will
- * outlive both arenas.
- *
- *                 +-------------------------->(fused)<----------------+
- *                 |                                                   |
- *                 V                           +-----+                 V
- *            lupb_Arena                +-weak-|cache|-weak-+     lupb_Arena
- *                 |  ^                 |      +-----+      |        ^  |
- *                 |  |                 V                   V        |  |
- * Lua level       |  +------------lupb_Message        lupb_Message--+  |
- * ----------------|-----------------|----------------------|-----------|------
- * upb level       |                 |                      |           |
- *                 |            +----V--------+        +----V--------+  V
- *                 +->upb_Arena | upb_Message |        | upb_Message | upb_Arena
- *                              +------|------+        +--^----------+
- *                                     +------------------+
- * Key invariants:
- *   1. every wrapper references the arena that contains it.
- *   2. every fused arena includes all arenas that own upb objects reachable
- *      from that arena.  In other words, when a wrapper references an arena,
- *      this is sufficient to ensure that any upb object reachable from that
- *      wrapper will stay alive.
- *
- * Additionally, every message object contains a strong reference to the
- * corresponding Descriptor object.  Likewise, array/map objects reference a
- * Descriptor object if they are typed to store message values.
- */
-
-#define LUPB_ARENA "lupb.arena"
-#define LUPB_ARRAY "lupb.array"
-#define LUPB_MAP "lupb.map"
-#define LUPB_MSG "lupb.msg"
-
-#define LUPB_ARENA_INDEX 1
-#define LUPB_MSGDEF_INDEX 2 /* For msg, and map/array that store msg */
-
-static void lupb_Message_Newmsgwrapper(lua_State* L, int narg,
-                                       upb_MessageValue val);
-static upb_Message* lupb_msg_check(lua_State* L, int narg);
-
-static upb_CType lupb_checkfieldtype(lua_State* L, int narg) {
-  uint32_t n = lupb_checkuint32(L, narg);
-  bool ok = n >= kUpb_CType_Bool && n <= kUpb_CType_Bytes;
-  luaL_argcheck(L, ok, narg, "invalid field type");
-  return n;
-}
-
-char cache_key;
-
-/* lupb_cacheinit()
- *
- * Creates the global cache used by lupb_cacheget() and lupb_cacheset().
- */
-static void lupb_cacheinit(lua_State* L) {
-  /* Create our object cache. */
-  lua_newtable(L);
-
-  /* Cache metatable gives the cache weak values */
-  lua_createtable(L, 0, 1);
-  lua_pushstring(L, "v");
-  lua_setfield(L, -2, "__mode");
-  lua_setmetatable(L, -2);
-
-  /* Set cache in the registry. */
-  lua_rawsetp(L, LUA_REGISTRYINDEX, &cache_key);
-}
-
-/* lupb_cacheget()
- *
- * Pushes cache[key] and returns true if this key is present in the cache.
- * Otherwise returns false and leaves nothing on the stack.
- */
-static bool lupb_cacheget(lua_State* L, const void* key) {
-  if (key == NULL) {
-    lua_pushnil(L);
-    return true;
-  }
-
-  lua_rawgetp(L, LUA_REGISTRYINDEX, &cache_key);
-  lua_rawgetp(L, -1, key);
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 2); /* Pop table, nil. */
-    return false;
-  } else {
-    lua_replace(L, -2); /* Replace cache table. */
-    return true;
-  }
-}
-
-/* lupb_cacheset()
- *
- * Sets cache[key] = val, where "val" is the value at the top of the stack.
- * Does not pop the value.
- */
-static void lupb_cacheset(lua_State* L, const void* key) {
-  lua_rawgetp(L, LUA_REGISTRYINDEX, &cache_key);
-  lua_pushvalue(L, -2);
-  lua_rawsetp(L, -2, key);
-  lua_pop(L, 1); /* Pop table. */
-}
-
-/* lupb_Arena *****************************************************************/
-
-/* lupb_Arena only exists to wrap a upb_Arena.  It is never exposed to users; it
- * is an internal memory management detail.  Other wrapper objects refer to this
- * object from their userdata to keep the arena-owned data alive.
- */
-
-typedef struct {
-  upb_Arena* arena;
-} lupb_Arena;
-
-static upb_Arena* lupb_Arena_check(lua_State* L, int narg) {
-  lupb_Arena* a = luaL_checkudata(L, narg, LUPB_ARENA);
-  return a->arena;
-}
-
-upb_Arena* lupb_Arena_pushnew(lua_State* L) {
-  lupb_Arena* a = lupb_newuserdata(L, sizeof(lupb_Arena), 1, LUPB_ARENA);
-  a->arena = upb_Arena_New();
-  return a->arena;
-}
-
-/**
- * lupb_Arena_Fuse()
- *
- * Merges |from| into |to| so that there is a single arena group that contains
- * both, and both arenas will point at this new table. */
-static void lupb_Arena_Fuse(lua_State* L, int to, int from) {
-  upb_Arena* to_arena = lupb_Arena_check(L, to);
-  upb_Arena* from_arena = lupb_Arena_check(L, from);
-  upb_Arena_Fuse(to_arena, from_arena);
-}
-
-static void lupb_Arena_Fuseobjs(lua_State* L, int to, int from) {
-  lua_getiuservalue(L, to, LUPB_ARENA_INDEX);
-  lua_getiuservalue(L, from, LUPB_ARENA_INDEX);
-  lupb_Arena_Fuse(L, lua_absindex(L, -2), lua_absindex(L, -1));
-  lua_pop(L, 2);
-}
-
-static int lupb_Arena_gc(lua_State* L) {
-  upb_Arena* a = lupb_Arena_check(L, 1);
-  upb_Arena_Free(a);
-  return 0;
-}
-
-static const struct luaL_Reg lupb_Arena_mm[] = {{"__gc", lupb_Arena_gc},
-                                                {NULL, NULL}};
-
-/* lupb_Arenaget()
- *
- * Returns the arena from the given message, array, or map object.
- */
-static upb_Arena* lupb_Arenaget(lua_State* L, int narg) {
-  upb_Arena* arena;
-  lua_getiuservalue(L, narg, LUPB_ARENA_INDEX);
-  arena = lupb_Arena_check(L, -1);
-  lua_pop(L, 1);
-  return arena;
-}
-
-/* upb <-> Lua type conversion ************************************************/
-
-/* Whether string data should be copied into the containing arena.  We can
- * avoid a copy if the string data is only needed temporarily (like for a map
- * lookup).
- */
-typedef enum {
-  LUPB_COPY, /* Copy string data into the arena. */
-  LUPB_REF   /* Reference the Lua copy of the string data. */
-} lupb_copy_t;
-
-/**
- * lupb_tomsgval()
- *
- * Converts the given Lua value |narg| to a upb_MessageValue.
- */
-static upb_MessageValue lupb_tomsgval(lua_State* L, upb_CType type, int narg,
-                                      int container, lupb_copy_t copy) {
-  upb_MessageValue ret;
-  switch (type) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Enum:
-      ret.int32_val = lupb_checkint32(L, narg);
-      break;
-    case kUpb_CType_Int64:
-      ret.int64_val = lupb_checkint64(L, narg);
-      break;
-    case kUpb_CType_UInt32:
-      ret.uint32_val = lupb_checkuint32(L, narg);
-      break;
-    case kUpb_CType_UInt64:
-      ret.uint64_val = lupb_checkuint64(L, narg);
-      break;
-    case kUpb_CType_Double:
-      ret.double_val = lupb_checkdouble(L, narg);
-      break;
-    case kUpb_CType_Float:
-      ret.float_val = lupb_checkfloat(L, narg);
-      break;
-    case kUpb_CType_Bool:
-      ret.bool_val = lupb_checkbool(L, narg);
-      break;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      size_t len;
-      const char* ptr = lupb_checkstring(L, narg, &len);
-      switch (copy) {
-        case LUPB_COPY: {
-          upb_Arena* arena = lupb_Arenaget(L, container);
-          char* data = upb_Arena_Malloc(arena, len);
-          memcpy(data, ptr, len);
-          ret.str_val = upb_StringView_FromDataAndSize(data, len);
-          break;
-        }
-        case LUPB_REF:
-          ret.str_val = upb_StringView_FromDataAndSize(ptr, len);
-          break;
-      }
-      break;
-    }
-    case kUpb_CType_Message:
-      ret.msg_val = lupb_msg_check(L, narg);
-      /* Typecheck message. */
-      lua_getiuservalue(L, container, LUPB_MSGDEF_INDEX);
-      lua_getiuservalue(L, narg, LUPB_MSGDEF_INDEX);
-      luaL_argcheck(L, lua_rawequal(L, -1, -2), narg, "message type mismatch");
-      lua_pop(L, 2);
-      break;
-  }
-  return ret;
-}
-
-void lupb_pushmsgval(lua_State* L, int container, upb_CType type,
-                     upb_MessageValue val) {
-  switch (type) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Enum:
-      lupb_pushint32(L, val.int32_val);
-      return;
-    case kUpb_CType_Int64:
-      lupb_pushint64(L, val.int64_val);
-      return;
-    case kUpb_CType_UInt32:
-      lupb_pushuint32(L, val.uint32_val);
-      return;
-    case kUpb_CType_UInt64:
-      lupb_pushuint64(L, val.uint64_val);
-      return;
-    case kUpb_CType_Double:
-      lua_pushnumber(L, val.double_val);
-      return;
-    case kUpb_CType_Float:
-      lua_pushnumber(L, val.float_val);
-      return;
-    case kUpb_CType_Bool:
-      lua_pushboolean(L, val.bool_val);
-      return;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      lua_pushlstring(L, val.str_val.data, val.str_val.size);
-      return;
-    case kUpb_CType_Message:
-      assert(container);
-      if (!lupb_cacheget(L, val.msg_val)) {
-        lupb_Message_Newmsgwrapper(L, container, val);
-      }
-      return;
-  }
-  LUPB_UNREACHABLE();
-}
-
-/* lupb_array *****************************************************************/
-
-typedef struct {
-  upb_Array* arr;
-  upb_CType type;
-} lupb_array;
-
-static lupb_array* lupb_array_check(lua_State* L, int narg) {
-  return luaL_checkudata(L, narg, LUPB_ARRAY);
-}
-
-/**
- * lupb_array_checkindex()
- *
- * Checks the array index at Lua stack index |narg| to verify that it is an
- * integer between 1 and |max|, inclusively.  Also corrects it to be zero-based
- * for C.
- */
-static int lupb_array_checkindex(lua_State* L, int narg, uint32_t max) {
-  uint32_t n = lupb_checkuint32(L, narg);
-  luaL_argcheck(L, n != 0 && n <= max, narg, "invalid array index");
-  return n - 1; /* Lua uses 1-based indexing. */
-}
-
-/* lupb_array Public API */
-
-/* lupb_Array_New():
- *
- * Handles:
- *   Array(upb.TYPE_INT32)
- *   Array(message_type)
- */
-static int lupb_Array_New(lua_State* L) {
-  int arg_count = lua_gettop(L);
-  lupb_array* larray;
-  upb_Arena* arena;
-
-  if (lua_type(L, 1) == LUA_TNUMBER) {
-    upb_CType type = lupb_checkfieldtype(L, 1);
-    larray = lupb_newuserdata(L, sizeof(*larray), 1, LUPB_ARRAY);
-    larray->type = type;
-  } else {
-    lupb_MessageDef_check(L, 1);
-    larray = lupb_newuserdata(L, sizeof(*larray), 2, LUPB_ARRAY);
-    larray->type = kUpb_CType_Message;
-    lua_pushvalue(L, 1);
-    lua_setiuservalue(L, -2, LUPB_MSGDEF_INDEX);
-  }
-
-  arena = lupb_Arena_pushnew(L);
-  lua_setiuservalue(L, -2, LUPB_ARENA_INDEX);
-
-  larray->arr = upb_Array_New(arena, larray->type);
-  lupb_cacheset(L, larray->arr);
-
-  if (arg_count > 1) {
-    /* Set initial fields from table. */
-    int msg = arg_count + 1;
-    lua_pushnil(L);
-    while (lua_next(L, 2) != 0) {
-      lua_pushvalue(L, -2); /* now stack is key, val, key */
-      lua_insert(L, -3);    /* now stack is key, key, val */
-      lua_settable(L, msg);
-    }
-  }
-
-  return 1;
-}
-
-/* lupb_Array_Newindex():
- *
- * Handles:
- *   array[idx] = val
- *
- * idx can be within the array or one past the end to extend.
- */
-static int lupb_Array_Newindex(lua_State* L) {
-  lupb_array* larray = lupb_array_check(L, 1);
-  size_t size = upb_Array_Size(larray->arr);
-  uint32_t n = lupb_array_checkindex(L, 2, size + 1);
-  upb_MessageValue msgval = lupb_tomsgval(L, larray->type, 3, 1, LUPB_COPY);
-
-  if (n == size) {
-    upb_Array_Append(larray->arr, msgval, lupb_Arenaget(L, 1));
-  } else {
-    upb_Array_Set(larray->arr, n, msgval);
-  }
-
-  if (larray->type == kUpb_CType_Message) {
-    lupb_Arena_Fuseobjs(L, 1, 3);
-  }
-
-  return 0; /* 1 for chained assignments? */
-}
-
-/* lupb_array_index():
- *
- * Handles:
- *   array[idx] -> val
- *
- * idx must be within the array.
- */
-static int lupb_array_index(lua_State* L) {
-  lupb_array* larray = lupb_array_check(L, 1);
-  size_t size = upb_Array_Size(larray->arr);
-  uint32_t n = lupb_array_checkindex(L, 2, size);
-  upb_MessageValue val = upb_Array_Get(larray->arr, n);
-
-  lupb_pushmsgval(L, 1, larray->type, val);
-
-  return 1;
-}
-
-/* lupb_array_len():
- *
- * Handles:
- *   #array -> len
- */
-static int lupb_array_len(lua_State* L) {
-  lupb_array* larray = lupb_array_check(L, 1);
-  lua_pushnumber(L, upb_Array_Size(larray->arr));
-  return 1;
-}
-
-static const struct luaL_Reg lupb_array_mm[] = {
-    {"__index", lupb_array_index},
-    {"__len", lupb_array_len},
-    {"__newindex", lupb_Array_Newindex},
-    {NULL, NULL}};
-
-/* lupb_map *******************************************************************/
-
-typedef struct {
-  upb_Map* map;
-  upb_CType key_type;
-  upb_CType value_type;
-} lupb_map;
-
-#define MAP_MSGDEF_INDEX 1
-
-static lupb_map* lupb_map_check(lua_State* L, int narg) {
-  return luaL_checkudata(L, narg, LUPB_MAP);
-}
-
-/* lupb_map Public API */
-
-/**
- * lupb_Map_New
- *
- * Handles:
- *   new_map = upb.Map(key_type, value_type)
- *   new_map = upb.Map(key_type, value_msgdef)
- */
-static int lupb_Map_New(lua_State* L) {
-  upb_Arena* arena;
-  lupb_map* lmap;
-
-  if (lua_type(L, 2) == LUA_TNUMBER) {
-    lmap = lupb_newuserdata(L, sizeof(*lmap), 1, LUPB_MAP);
-    lmap->value_type = lupb_checkfieldtype(L, 2);
-  } else {
-    lupb_MessageDef_check(L, 2);
-    lmap = lupb_newuserdata(L, sizeof(*lmap), 2, LUPB_MAP);
-    lmap->value_type = kUpb_CType_Message;
-    lua_pushvalue(L, 2);
-    lua_setiuservalue(L, -2, MAP_MSGDEF_INDEX);
-  }
-
-  arena = lupb_Arena_pushnew(L);
-  lua_setiuservalue(L, -2, LUPB_ARENA_INDEX);
-
-  lmap->key_type = lupb_checkfieldtype(L, 1);
-  lmap->map = upb_Map_New(arena, lmap->key_type, lmap->value_type);
-  lupb_cacheset(L, lmap->map);
-
-  return 1;
-}
-
-/**
- * lupb_map_index
- *
- * Handles:
- *   map[key]
- */
-static int lupb_map_index(lua_State* L) {
-  lupb_map* lmap = lupb_map_check(L, 1);
-  upb_MessageValue key = lupb_tomsgval(L, lmap->key_type, 2, 1, LUPB_REF);
-  upb_MessageValue val;
-
-  if (upb_Map_Get(lmap->map, key, &val)) {
-    lupb_pushmsgval(L, 1, lmap->value_type, val);
-  } else {
-    lua_pushnil(L);
-  }
-
-  return 1;
-}
-
-/**
- * lupb_map_len
- *
- * Handles:
- *   map_len = #map
- */
-static int lupb_map_len(lua_State* L) {
-  lupb_map* lmap = lupb_map_check(L, 1);
-  lua_pushnumber(L, upb_Map_Size(lmap->map));
-  return 1;
-}
-
-/**
- * lupb_Map_Newindex
- *
- * Handles:
- *   map[key] = val
- *   map[key] = nil  # to remove from map
- */
-static int lupb_Map_Newindex(lua_State* L) {
-  lupb_map* lmap = lupb_map_check(L, 1);
-  upb_Map* map = lmap->map;
-  upb_MessageValue key = lupb_tomsgval(L, lmap->key_type, 2, 1, LUPB_REF);
-
-  if (lua_isnil(L, 3)) {
-    upb_Map_Delete(map, key, NULL);
-  } else {
-    upb_MessageValue val = lupb_tomsgval(L, lmap->value_type, 3, 1, LUPB_COPY);
-    upb_Map_Set(map, key, val, lupb_Arenaget(L, 1));
-    if (lmap->value_type == kUpb_CType_Message) {
-      lupb_Arena_Fuseobjs(L, 1, 3);
-    }
-  }
-
-  return 0;
-}
-
-static int lupb_MapIterator_Next(lua_State* L) {
-  int map = lua_upvalueindex(2);
-  size_t* iter = lua_touserdata(L, lua_upvalueindex(1));
-  lupb_map* lmap = lupb_map_check(L, map);
-
-  upb_MessageValue key, val;
-  if (upb_Map_Next(lmap->map, &key, &val, iter)) {
-    lupb_pushmsgval(L, map, lmap->key_type, key);
-    lupb_pushmsgval(L, map, lmap->value_type, val);
-    return 2;
-  } else {
-    return 0;
-  }
-}
-
-/**
- * lupb_map_pairs()
- *
- * Handles:
- *   pairs(map)
- */
-static int lupb_map_pairs(lua_State* L) {
-  size_t* iter = lua_newuserdata(L, sizeof(*iter));
-  lupb_map_check(L, 1);
-
-  *iter = kUpb_Map_Begin;
-  lua_pushvalue(L, 1);
-
-  /* Upvalues are [iter, lupb_map]. */
-  lua_pushcclosure(L, &lupb_MapIterator_Next, 2);
-
-  return 1;
-}
-
-/* upb_mapiter ]]] */
-
-static const struct luaL_Reg lupb_map_mm[] = {{"__index", lupb_map_index},
-                                              {"__len", lupb_map_len},
-                                              {"__newindex", lupb_Map_Newindex},
-                                              {"__pairs", lupb_map_pairs},
-                                              {NULL, NULL}};
-
-/* lupb_Message
- * *******************************************************************/
-
-typedef struct {
-  upb_Message* msg;
-} lupb_Message;
-
-/* lupb_Message helpers */
-
-static upb_Message* lupb_msg_check(lua_State* L, int narg) {
-  lupb_Message* msg = luaL_checkudata(L, narg, LUPB_MSG);
-  return msg->msg;
-}
-
-static const upb_MessageDef* lupb_Message_Getmsgdef(lua_State* L, int msg) {
-  lua_getiuservalue(L, msg, LUPB_MSGDEF_INDEX);
-  const upb_MessageDef* m = lupb_MessageDef_check(L, -1);
-  lua_pop(L, 1);
-  return m;
-}
-
-static const upb_FieldDef* lupb_msg_tofield(lua_State* L, int msg, int field) {
-  size_t len;
-  const char* fieldname = luaL_checklstring(L, field, &len);
-  const upb_MessageDef* m = lupb_Message_Getmsgdef(L, msg);
-  return upb_MessageDef_FindFieldByNameWithSize(m, fieldname, len);
-}
-
-static const upb_FieldDef* lupb_msg_checkfield(lua_State* L, int msg,
-                                               int field) {
-  const upb_FieldDef* f = lupb_msg_tofield(L, msg, field);
-  if (f == NULL) {
-    luaL_error(L, "no such field '%s'", lua_tostring(L, field));
-  }
-  return f;
-}
-
-upb_Message* lupb_msg_pushnew(lua_State* L, int narg) {
-  const upb_MessageDef* m = lupb_MessageDef_check(L, narg);
-  lupb_Message* lmsg = lupb_newuserdata(L, sizeof(lupb_Message), 2, LUPB_MSG);
-  upb_Arena* arena = lupb_Arena_pushnew(L);
-
-  lua_setiuservalue(L, -2, LUPB_ARENA_INDEX);
-  lua_pushvalue(L, 1);
-  lua_setiuservalue(L, -2, LUPB_MSGDEF_INDEX);
-
-  lmsg->msg = upb_Message_New(upb_MessageDef_MiniTable(m), arena);
-  lupb_cacheset(L, lmsg->msg);
-  return lmsg->msg;
-}
-
-/**
- * lupb_Message_Newmsgwrapper()
- *
- * Creates a new wrapper for a message, copying the arena and msgdef references
- * from |narg| (which should be an array or map).
- */
-static void lupb_Message_Newmsgwrapper(lua_State* L, int narg,
-                                       upb_MessageValue val) {
-  lupb_Message* lmsg = lupb_newuserdata(L, sizeof(*lmsg), 2, LUPB_MSG);
-  lmsg->msg = (upb_Message*)val.msg_val; /* XXX: cast isn't great. */
-  lupb_cacheset(L, lmsg->msg);
-
-  /* Copy both arena and msgdef into the wrapper. */
-  lua_getiuservalue(L, narg, LUPB_ARENA_INDEX);
-  lua_setiuservalue(L, -2, LUPB_ARENA_INDEX);
-  lua_getiuservalue(L, narg, LUPB_MSGDEF_INDEX);
-  lua_setiuservalue(L, -2, LUPB_MSGDEF_INDEX);
-}
-
-/**
- * lupb_Message_Newud()
- *
- * Creates the Lua userdata for a new wrapper object, adding a reference to
- * the msgdef if necessary.
- */
-static void* lupb_Message_Newud(lua_State* L, int narg, size_t size,
-                                const char* type, const upb_FieldDef* f) {
-  if (upb_FieldDef_CType(f) == kUpb_CType_Message) {
-    /* Wrapper needs a reference to the msgdef. */
-    void* ud = lupb_newuserdata(L, size, 2, type);
-    lua_getiuservalue(L, narg, LUPB_MSGDEF_INDEX);
-    lupb_MessageDef_pushsubmsgdef(L, f);
-    lua_setiuservalue(L, -2, LUPB_MSGDEF_INDEX);
-    return ud;
-  } else {
-    return lupb_newuserdata(L, size, 1, type);
-  }
-}
-
-/**
- * lupb_Message_Newwrapper()
- *
- * Creates a new Lua wrapper object to wrap the given array, map, or message.
- */
-static void lupb_Message_Newwrapper(lua_State* L, int narg,
-                                    const upb_FieldDef* f,
-                                    upb_MutableMessageValue val) {
-  if (upb_FieldDef_IsMap(f)) {
-    const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key_f =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_KeyFieldNumber);
-    const upb_FieldDef* val_f =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_ValueFieldNumber);
-    lupb_map* lmap =
-        lupb_Message_Newud(L, narg, sizeof(*lmap), LUPB_MAP, val_f);
-    lmap->key_type = upb_FieldDef_CType(key_f);
-    lmap->value_type = upb_FieldDef_CType(val_f);
-    lmap->map = val.map;
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    lupb_array* larr =
-        lupb_Message_Newud(L, narg, sizeof(*larr), LUPB_ARRAY, f);
-    larr->type = upb_FieldDef_CType(f);
-    larr->arr = val.array;
-  } else {
-    lupb_Message* lmsg =
-        lupb_Message_Newud(L, narg, sizeof(*lmsg), LUPB_MSG, f);
-    lmsg->msg = val.msg;
-  }
-
-  /* Copy arena ref to new wrapper.  This may be a different arena than the
-   * underlying data was originally constructed from, but if so both arenas
-   * must be in the same group. */
-  lua_getiuservalue(L, narg, LUPB_ARENA_INDEX);
-  lua_setiuservalue(L, -2, LUPB_ARENA_INDEX);
-
-  lupb_cacheset(L, val.msg);
-}
-
-/**
- * lupb_msg_typechecksubmsg()
- *
- * Typechecks the given array, map, or msg against this upb_FieldDef.
- */
-static void lupb_msg_typechecksubmsg(lua_State* L, int narg, int msgarg,
-                                     const upb_FieldDef* f) {
-  /* Typecheck this map's msgdef against this message field. */
-  lua_getiuservalue(L, narg, LUPB_MSGDEF_INDEX);
-  lua_getiuservalue(L, msgarg, LUPB_MSGDEF_INDEX);
-  lupb_MessageDef_pushsubmsgdef(L, f);
-  luaL_argcheck(L, lua_rawequal(L, -1, -2), narg, "message type mismatch");
-  lua_pop(L, 2);
-}
-
-/* lupb_Message Public API */
-
-/**
- * lupb_MessageDef_call
- *
- * Handles:
- *   new_msg = MessageClass()
- *   new_msg = MessageClass{foo = "bar", baz = 3, quux = {foo = 3}}
- */
-int lupb_MessageDef_call(lua_State* L) {
-  int arg_count = lua_gettop(L);
-  lupb_msg_pushnew(L, 1);
-
-  if (arg_count > 1) {
-    /* Set initial fields from table. */
-    int msg = arg_count + 1;
-    lua_pushnil(L);
-    while (lua_next(L, 2) != 0) {
-      lua_pushvalue(L, -2); /* now stack is key, val, key */
-      lua_insert(L, -3);    /* now stack is key, key, val */
-      lua_settable(L, msg);
-    }
-  }
-
-  return 1;
-}
-
-/**
- * lupb_msg_index
- *
- * Handles:
- *   msg.foo
- *   msg["foo"]
- *   msg[field_descriptor]  # (for extensions) (TODO)
- */
-static int lupb_msg_index(lua_State* L) {
-  upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_FieldDef* f = lupb_msg_checkfield(L, 1, 2);
-
-  if (upb_FieldDef_IsRepeated(f) || upb_FieldDef_IsSubMessage(f)) {
-    /* Wrapped type; get or create wrapper. */
-    upb_Arena* arena = upb_FieldDef_IsRepeated(f) ? lupb_Arenaget(L, 1) : NULL;
-    upb_MutableMessageValue val = upb_Message_Mutable(msg, f, arena);
-    if (!lupb_cacheget(L, val.msg)) {
-      lupb_Message_Newwrapper(L, 1, f, val);
-    }
-  } else {
-    /* Value type, just push value and return .*/
-    upb_MessageValue val = upb_Message_GetFieldByDef(msg, f);
-    lupb_pushmsgval(L, 0, upb_FieldDef_CType(f), val);
-  }
-
-  return 1;
-}
-
-/**
- * lupb_Message_Newindex()
- *
- * Handles:
- *   msg.foo = bar
- *   msg["foo"] = bar
- *   msg[field_descriptor] = bar  # (for extensions) (TODO)
- */
-static int lupb_Message_Newindex(lua_State* L) {
-  upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_FieldDef* f = lupb_msg_checkfield(L, 1, 2);
-  upb_MessageValue msgval;
-  bool merge_arenas = true;
-
-  if (upb_FieldDef_IsMap(f)) {
-    lupb_map* lmap = lupb_map_check(L, 3);
-    const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key_f =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_KeyFieldNumber);
-    const upb_FieldDef* val_f =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_ValueFieldNumber);
-    upb_CType key_type = upb_FieldDef_CType(key_f);
-    upb_CType value_type = upb_FieldDef_CType(val_f);
-    luaL_argcheck(L, lmap->key_type == key_type, 3, "key type mismatch");
-    luaL_argcheck(L, lmap->value_type == value_type, 3, "value type mismatch");
-    if (value_type == kUpb_CType_Message) {
-      lupb_msg_typechecksubmsg(L, 3, 1, val_f);
-    }
-    msgval.map_val = lmap->map;
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    lupb_array* larr = lupb_array_check(L, 3);
-    upb_CType type = upb_FieldDef_CType(f);
-    luaL_argcheck(L, larr->type == type, 3, "array type mismatch");
-    if (type == kUpb_CType_Message) {
-      lupb_msg_typechecksubmsg(L, 3, 1, f);
-    }
-    msgval.array_val = larr->arr;
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    upb_Message* msg = lupb_msg_check(L, 3);
-    lupb_msg_typechecksubmsg(L, 3, 1, f);
-    msgval.msg_val = msg;
-  } else {
-    msgval = lupb_tomsgval(L, upb_FieldDef_CType(f), 3, 1, LUPB_COPY);
-    merge_arenas = false;
-  }
-
-  if (merge_arenas) {
-    lupb_Arena_Fuseobjs(L, 1, 3);
-  }
-
-  upb_Message_SetFieldByDef(msg, f, msgval, lupb_Arenaget(L, 1));
-
-  /* Return the new value for chained assignments. */
-  lua_pushvalue(L, 3);
-  return 1;
-}
-
-/**
- * lupb_msg_tostring()
- *
- * Handles:
- *   tostring(msg)
- *   print(msg)
- *   etc.
- */
-static int lupb_msg_tostring(lua_State* L) {
-  upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_MessageDef* m;
-  char buf[1024];
-  size_t size;
-
-  lua_getiuservalue(L, 1, LUPB_MSGDEF_INDEX);
-  m = lupb_MessageDef_check(L, -1);
-
-  size = upb_TextEncode(msg, m, NULL, 0, buf, sizeof(buf));
-
-  if (size < sizeof(buf)) {
-    lua_pushlstring(L, buf, size);
-  } else {
-    char* ptr = malloc(size + 1);
-    upb_TextEncode(msg, m, NULL, 0, ptr, size + 1);
-    lua_pushlstring(L, ptr, size);
-    free(ptr);
-  }
-
-  return 1;
-}
-
-static const struct luaL_Reg lupb_msg_mm[] = {
-    {"__index", lupb_msg_index},
-    {"__newindex", lupb_Message_Newindex},
-    {"__tostring", lupb_msg_tostring},
-    {NULL, NULL}};
-
-/* lupb_Message toplevel
- * **********************************************************/
-
-static int lupb_getoptions(lua_State* L, int narg) {
-  int options = 0;
-  if (lua_gettop(L) >= narg) {
-    size_t len = lua_rawlen(L, narg);
-    for (size_t i = 1; i <= len; i++) {
-      lua_rawgeti(L, narg, i);
-      options |= lupb_checkuint32(L, -1);
-      lua_pop(L, 1);
-    }
-  }
-  return options;
-}
-
-/**
- * lupb_decode()
- *
- * Handles:
- *   msg = upb.decode(MessageClass, bin_string)
- */
-static int lupb_decode(lua_State* L) {
-  size_t len;
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  const char* pb = lua_tolstring(L, 2, &len);
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-  upb_Message* msg = lupb_msg_pushnew(L, 1);
-  upb_Arena* arena = lupb_Arenaget(L, -1);
-  char* buf;
-
-  /* Copy input data to arena, message will reference it. */
-  buf = upb_Arena_Malloc(arena, len);
-  memcpy(buf, pb, len);
-
-  upb_DecodeStatus status = upb_Decode(buf, len, msg, layout, NULL,
-                                       kUpb_DecodeOption_AliasString, arena);
-
-  if (status != kUpb_DecodeStatus_Ok) {
-    lua_pushstring(L, "Error decoding protobuf.");
-    return lua_error(L);
-  }
-
-  return 1;
-}
-
-/**
- * lupb_Encode()
- *
- * Handles:
- *   bin_string = upb.encode(msg)
- */
-static int lupb_Encode(lua_State* L) {
-  const upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_MessageDef* m = lupb_Message_Getmsgdef(L, 1);
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-  int options = lupb_getoptions(L, 2);
-  upb_Arena* arena = lupb_Arena_pushnew(L);
-  char* buf;
-  size_t size;
-  upb_EncodeStatus status =
-      upb_Encode(msg, (const void*)layout, options, arena, &buf, &size);
-  if (status != kUpb_EncodeStatus_Ok) {
-    lua_pushstring(L, "Error encoding protobuf.");
-    return lua_error(L);
-  }
-
-  lua_pushlstring(L, buf, size);
-
-  return 1;
-}
-
-/**
- * lupb_jsondecode()
- *
- * Handles:
- *   text_string = upb.json_decode(MessageClass, json_str,
- * {upb.JSONDEC_IGNOREUNKNOWN})
- */
-static int lupb_jsondecode(lua_State* L) {
-  size_t len;
-  const upb_MessageDef* m = lupb_MessageDef_check(L, 1);
-  const char* json = lua_tolstring(L, 2, &len);
-  int options = lupb_getoptions(L, 3);
-  upb_Message* msg;
-  upb_Arena* arena;
-  upb_Status status;
-
-  msg = lupb_msg_pushnew(L, 1);
-  arena = lupb_Arenaget(L, -1);
-  upb_Status_Clear(&status);
-  upb_JsonDecode(json, len, msg, m, NULL, options, arena, &status);
-  lupb_checkstatus(L, &status);
-
-  return 1;
-}
-
-/**
- * lupb_jsonencode()
- *
- * Handles:
- *   text_string = upb.json_encode(msg, {upb.JSONENC_EMITDEFAULTS})
- */
-static int lupb_jsonencode(lua_State* L) {
-  upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_MessageDef* m = lupb_Message_Getmsgdef(L, 1);
-  int options = lupb_getoptions(L, 2);
-  char buf[1024];
-  size_t size;
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-  size = upb_JsonEncode(msg, m, NULL, options, buf, sizeof(buf), &status);
-  lupb_checkstatus(L, &status);
-
-  if (size < sizeof(buf)) {
-    lua_pushlstring(L, buf, size);
-  } else {
-    char* ptr = malloc(size + 1);
-    upb_JsonEncode(msg, m, NULL, options, ptr, size + 1, &status);
-    lupb_checkstatus(L, &status);
-    lua_pushlstring(L, ptr, size);
-    free(ptr);
-  }
-
-  return 1;
-}
-
-/**
- * lupb_textencode()
- *
- * Handles:
- *   text_string = upb.text_encode(msg, {upb.TXTENC_SINGLELINE})
- */
-static int lupb_textencode(lua_State* L) {
-  upb_Message* msg = lupb_msg_check(L, 1);
-  const upb_MessageDef* m = lupb_Message_Getmsgdef(L, 1);
-  int options = lupb_getoptions(L, 2);
-  char buf[1024];
-  size_t size;
-
-  size = upb_TextEncode(msg, m, NULL, options, buf, sizeof(buf));
-
-  if (size < sizeof(buf)) {
-    lua_pushlstring(L, buf, size);
-  } else {
-    char* ptr = malloc(size + 1);
-    upb_TextEncode(msg, m, NULL, options, ptr, size + 1);
-    lua_pushlstring(L, ptr, size);
-    free(ptr);
-  }
-
-  return 1;
-}
-
-static void lupb_setfieldi(lua_State* L, const char* field, int i) {
-  lua_pushinteger(L, i);
-  lua_setfield(L, -2, field);
-}
-
-static const struct luaL_Reg lupb_msg_toplevel_m[] = {
-    {"Array", lupb_Array_New},        {"Map", lupb_Map_New},
-    {"decode", lupb_decode},          {"encode", lupb_Encode},
-    {"json_decode", lupb_jsondecode}, {"json_encode", lupb_jsonencode},
-    {"text_encode", lupb_textencode}, {NULL, NULL}};
-
-void lupb_msg_registertypes(lua_State* L) {
-  lupb_setfuncs(L, lupb_msg_toplevel_m);
-
-  lupb_register_type(L, LUPB_ARENA, NULL, lupb_Arena_mm);
-  lupb_register_type(L, LUPB_ARRAY, NULL, lupb_array_mm);
-  lupb_register_type(L, LUPB_MAP, NULL, lupb_map_mm);
-  lupb_register_type(L, LUPB_MSG, NULL, lupb_msg_mm);
-
-  lupb_setfieldi(L, "TXTENC_SINGLELINE", UPB_TXTENC_SINGLELINE);
-  lupb_setfieldi(L, "TXTENC_SKIPUNKNOWN", UPB_TXTENC_SKIPUNKNOWN);
-  lupb_setfieldi(L, "TXTENC_NOSORT", UPB_TXTENC_NOSORT);
-
-  lupb_setfieldi(L, "ENCODE_DETERMINISTIC", kUpb_EncodeOption_Deterministic);
-  lupb_setfieldi(L, "ENCODE_SKIPUNKNOWN", kUpb_EncodeOption_SkipUnknown);
-
-  lupb_setfieldi(L, "JSONENC_EMITDEFAULTS", upb_JsonEncode_EmitDefaults);
-  lupb_setfieldi(L, "JSONENC_PROTONAMES", upb_JsonEncode_UseProtoNames);
-
-  lupb_setfieldi(L, "JSONDEC_IGNOREUNKNOWN", upb_JsonDecode_IgnoreUnknown);
-
-  lupb_cacheinit(L);
-}
diff --git a/third_party/upb/lua/test.proto b/third_party/upb/lua/test.proto
deleted file mode 100644
index fafa753cfc1d7..0000000000000
--- a/third_party/upb/lua/test.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-
-syntax = "proto2";
-
-import "google/protobuf/timestamp.proto";
-
-package upb_lua_test;
-
-message MapTest {
-  map<string, double> map_string_double = 1;
-}
-
-message PackedTest {
-  repeated bool bool_packed = 1 [packed = true];
-  repeated int32 i32_packed = 2 [packed = true];
-  repeated int64 i64_packed = 3 [packed = true];
-  repeated fixed32 f32_packed = 4 [packed = true];
-  repeated fixed64 f64_packed = 5 [packed = true];
-}
-
-message UnpackedTest {
-  repeated bool bool_packed = 1 [packed = false];
-  repeated int32 i32_packed = 2 [packed = false];
-  repeated int64 i64_packed = 3 [packed = false];
-  repeated fixed32 f32_packed = 4 [packed = false];
-  repeated fixed64 f64_packed = 5 [packed = false];
-}
-
-message TestLargeFieldNumber {
-  optional int32 i32 = 456214797;
-}
-
-message TestTimestamp {
-  optional google.protobuf.Timestamp ts = 1;
-}
-
-message HelloRequest {
-  optional uint32 id = 1;
-  optional uint32 random_name_a0 = 2;
-  optional uint32 random_name_a1 = 3;
-  optional uint32 random_name_a2 = 4;
-  optional uint32 random_name_a3 = 5;
-  optional uint32 random_name_a4 = 6;
-  optional uint32 random_name_a5 = 7;
-  optional uint32 random_name_a6 = 8;
-  optional uint32 random_name_a7 = 9;
-  optional uint32 random_name_a8 = 10;
-  optional uint32 random_name_a9 = 11;
-  optional uint32 random_name_b0 = 12;
-  optional uint32 random_name_b1 = 13;
-  optional uint32 random_name_b2 = 14;
-  optional uint32 random_name_b3 = 15;
-  optional uint32 random_name_b4 = 16;
-  optional uint32 random_name_b5 = 17;
-  optional uint32 random_name_b6 = 18;
-  optional uint32 random_name_b7 = 19;
-  optional uint32 random_name_b8 = 20;
-  optional uint32 random_name_b9 = 21;
-  optional uint32 random_name_c0 = 22;
-  optional uint32 random_name_c1 = 23;
-  optional uint32 random_name_c2 = 24;
-  optional uint32 random_name_c3 = 25;
-  optional uint32 random_name_c4 = 26;
-  optional uint32 random_name_c5 = 27;
-  optional uint32 random_name_c6 = 28;
-  optional uint32 random_name_c7 = 29;
-  optional uint32 random_name_c8 = 30;
-  optional uint32 random_name_c9 = 31;
-  optional string version = 32;
-}
diff --git a/third_party/upb/lua/test_upb.lua b/third_party/upb/lua/test_upb.lua
deleted file mode 100644
index f50eed0a2fb13..0000000000000
--- a/third_party/upb/lua/test_upb.lua
+++ /dev/null
@@ -1,846 +0,0 @@
---[[--------------------------------------------------------------------------
-
-  Copyright (c) 2009-2021, Google LLC
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of Google LLC nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---]]--------------------------------------------------------------------------
-
-local upb = require "lupb"
-local lunit = require "lunit"
-local upb_test = require "lua.test_pb"
-local test_messages_proto3 = require "google.protobuf.test_messages_proto3_pb"
-local test_messages_proto2 = require "google.protobuf.test_messages_proto2_pb"
-local descriptor = require "google.protobuf.descriptor_pb"
-local empty = require "google.protobuf.empty_pb"
-
-if _VERSION >= 'Lua 5.2' then
-  _ENV = lunit.module("testupb", "seeall")
-else
-  module("testupb", lunit.testcase, package.seeall)
-end
-
-function iter_to_array(iter)
-  local arr = {}
-  for v in iter do
-    arr[#arr + 1] = v
-  end
-  return arr
-end
-
-function test_def_readers()
-  local m = test_messages_proto3.TestAllTypesProto3
-  assert_equal("TestAllTypesProto3", m:name())
-  assert_equal("protobuf_test_messages.proto3.TestAllTypesProto3", m:full_name())
-
-  -- field
-  local f = m:field("optional_int32")
-  local f2 = m:field(1)
-  assert_equal(f, f2)
-  assert_equal(1, f:number())
-  assert_equal("optional_int32", f:name())
-  assert_equal(upb.LABEL_OPTIONAL, f:label())
-  assert_equal(upb.DESCRIPTOR_TYPE_INT32, f:descriptor_type())
-  assert_equal(upb.TYPE_INT32, f:type())
-  assert_nil(f:containing_oneof())
-  assert_equal(m, f:containing_type())
-  assert_equal(0, f:default())
-  local message_field_count = 0
-  for field in m:fields() do
-    message_field_count = message_field_count + 1
-  end
-  assert_equal(message_field_count, #m)
-
-  local message_oneof_count = 0
-  for oneof in m:oneofs() do
-    message_oneof_count = message_oneof_count + 1
-  end
-  assert_equal(message_oneof_count, m:oneof_count())
-
-  -- oneof
-  local o = m:lookup_name("oneof_field")
-  assert_equal("oneof_field", o:name())
-  assert_equal(m, o:containing_type())
-  local oneof_field_count = 0
-  for field in o:fields() do
-    oneof_field_count = oneof_field_count + 1
-  end
-  assert_equal(oneof_field_count, #o)
-
-  -- enum
-  local e = test_messages_proto3['TestAllTypesProto3.NestedEnum']
-  assert_true(#e > 3 and #e < 10)
-  assert_equal(2, e:value("BAZ"):number())
-end
-
-function test_msg_map()
-  msg = test_messages_proto3.TestAllTypesProto3()
-  msg.map_int32_int32[5] = 10
-  msg.map_int32_int32[6] = 12
-  assert_equal(10, msg.map_int32_int32[5])
-  assert_equal(12, msg.map_int32_int32[6])
-
-  -- Test overwrite.
-  msg.map_int32_int32[5] = 20
-  assert_equal(20, msg.map_int32_int32[5])
-  assert_equal(12, msg.map_int32_int32[6])
-  msg.map_int32_int32[5] = 10
-
-  -- Test delete.
-  msg.map_int32_int32[5] = nil
-  assert_nil(msg.map_int32_int32[5])
-  assert_equal(12, msg.map_int32_int32[6])
-  msg.map_int32_int32[5] = 10
-
-  local serialized = upb.encode(msg)
-  assert_true(#serialized > 0)
-  local msg2 = upb.decode(test_messages_proto3.TestAllTypesProto3, serialized)
-  assert_equal(10, msg2.map_int32_int32[5])
-  assert_equal(12, msg2.map_int32_int32[6])
-end
-
-function test_map_sorting()
-  function msg_with_int32_entries(start, expand)
-    local msg = test_messages_proto3.TestAllTypesProto3()
-    for i=start,start + 8 do
-      msg.map_int32_int32[i] = i * 2
-    end
-
-    if expand then
-      for i=start+20,200 do
-        msg.map_int32_int32[i] = i
-      end
-      for i=start+20,200 do
-        msg.map_int32_int32[i] = nil
-      end
-    end
-    return msg
-  end
-
-  function msg_with_msg_entries(expand)
-    local msg = test_messages_proto3.TestAllTypesProto3()
-    -- 8! = 40320 possible orderings makes it overwhelmingly likely that two
-    -- random orderings will be different.
-    for i=1,8 do
-      local submsg = test_messages_proto3.TestAllTypesProto3.NestedMessage()
-      submsg.corecursive = msg_with_int32_entries(i, expand)
-      msg.map_string_nested_message[tostring(i)] = submsg
-    end
-
-    expand = false
-    if expand then
-      for i=21,2000 do
-        local submsg = test_messages_proto3.TestAllTypesProto3.NestedMessage()
-        submsg.corecursive = msg_with_int32_entries(i, expand)
-        msg.map_string_nested_message[tostring(i)] = submsg
-      end
-      for i=21,2000 do
-        msg.map_string_nested_message[tostring(i)] = nil
-      end
-    end
-    return msg
-  end
-
-  -- Create two messages with the same contents but (hopefully) different
-  -- map table orderings.
-  local msg = msg_with_msg_entries(false)
-  local msg2 = msg_with_msg_entries(true)
-
-  local text1 = upb.text_encode(msg)
-  local text2 = upb.text_encode(msg2)
-  assert_equal(text1, text2)
-
-  local binary1 = upb.encode(msg, {upb.ENCODE_DETERMINISTIC})
-  local binary2 = upb.encode(msg2, {upb.ENCODE_DETERMINISTIC})
-  assert_equal(binary1, binary2)
-
-  -- Non-sorted map should compare different.
-  local text3 = upb.text_encode(msg, {upb.TXTENC_NOSORT})
-  assert_not_equal(text1, text3)
-
-  local binary3 = upb.encode(msg)
-  assert_not_equal(binary1, binary3)
-end
-
-function test_utf8()
-  local proto2_msg = test_messages_proto2.TestAllTypesProto2()
-  proto2_msg.optional_string = "\xff"
-  local serialized = upb.encode(proto2_msg)
-
-  -- Decoding invalid UTF-8 succeeds in proto2.
-  upb.decode(test_messages_proto2.TestAllTypesProto2, serialized)
-
-  -- Decoding invalid UTF-8 fails in proto2.
-  assert_error_match("Error decoding protobuf", function()
-    upb.decode(test_messages_proto3.TestAllTypesProto3, serialized)
-  end)
-
-  -- TODO(haberman): should proto3 accessors also check UTF-8 at set time?
-end
-
-function test_string_double_map()
-  msg = upb_test.MapTest()
-  msg.map_string_double["one"] = 1.0
-  msg.map_string_double["two point five"] = 2.5
-  assert_equal(1, msg.map_string_double["one"])
-  assert_equal(2.5, msg.map_string_double["two point five"])
-
-  -- Test overwrite.
-  msg.map_string_double["one"] = 2
-  assert_equal(2, msg.map_string_double["one"])
-  assert_equal(2.5, msg.map_string_double["two point five"])
-  msg.map_string_double["one"] = 1.0
-
-  -- Test delete.
-  msg.map_string_double["one"] = nil
-  assert_nil(msg.map_string_double["one"])
-  assert_equal(2.5, msg.map_string_double["two point five"])
-  msg.map_string_double["one"] = 1
-
-  local serialized = upb.encode(msg)
-  assert_true(#serialized > 0)
-  local msg2 = upb.decode(upb_test.MapTest, serialized)
-  assert_equal(1, msg2.map_string_double["one"])
-  assert_equal(2.5, msg2.map_string_double["two point five"])
-end
-
-function test_string_double_map()
-  local function fill_msg(msg)
-    msg.i32_packed[1] = 100
-    msg.i32_packed[2] = 200
-    msg.i32_packed[3] = 50000
-
-    msg.i64_packed[1] = 101
-    msg.i64_packed[2] = 201
-    msg.i64_packed[3] = 50001
-
-    msg.f32_packed[1] = 102
-    msg.f32_packed[2] = 202
-    msg.f32_packed[3] = 50002
-
-    msg.f64_packed[1] = 103
-    msg.f64_packed[2] = 203
-    msg.f64_packed[3] = 50003
-  end
-
-  local function check_msg(msg)
-    assert_equal(100, msg.i32_packed[1])
-    assert_equal(200, msg.i32_packed[2])
-    assert_equal(50000, msg.i32_packed[3])
-    assert_equal(3, #msg.i32_packed)
-
-    assert_equal(101, msg.i64_packed[1])
-    assert_equal(201, msg.i64_packed[2])
-    assert_equal(50001, msg.i64_packed[3])
-    assert_equal(3, #msg.i64_packed)
-
-    assert_equal(102, msg.f32_packed[1])
-    assert_equal(202, msg.f32_packed[2])
-    assert_equal(50002, msg.f32_packed[3])
-    assert_equal(3, #msg.f32_packed)
-
-    assert_equal(103, msg.f64_packed[1])
-    assert_equal(203, msg.f64_packed[2])
-    assert_equal(50003, msg.f64_packed[3])
-    assert_equal(3, #msg.f64_packed)
-  end
-
-  local msg = upb_test.PackedTest()
-  fill_msg(msg)
-  check_msg(msg)
-
-  local serialized_packed = upb.encode(msg)
-  local msg2 = upb.decode(upb_test.PackedTest, serialized_packed)
-  local msg3 = upb.decode(upb_test.UnpackedTest, serialized_packed)
-  check_msg(msg2)
-  check_msg(msg3)
-
-  serialized_unpacked = upb.encode(msg3)
-  local msg4 = upb.decode(upb_test.PackedTest, serialized_unpacked)
-  local msg5 = upb.decode(upb_test.PackedTest, serialized_unpacked)
-  check_msg(msg4)
-  check_msg(msg5)
-
-end
-
-function test_msg_string_map()
-  msg = test_messages_proto3.TestAllTypesProto3()
-  msg.map_string_string["foo"] = "bar"
-  msg.map_string_string["baz"] = "quux"
-  assert_nil(msg.map_string_string["abc"])
-  assert_equal("bar", msg.map_string_string["foo"])
-  assert_equal("quux", msg.map_string_string["baz"])
-
-  -- Test overwrite.
-  msg.map_string_string["foo"] = "123"
-  assert_equal("123", msg.map_string_string["foo"])
-  assert_equal("quux", msg.map_string_string["baz"])
-  msg.map_string_string["foo"] = "bar"
-
-  -- Test delete
-  msg.map_string_string["foo"] = nil
-  assert_nil(msg.map_string_string["foo"])
-  assert_equal("quux", msg.map_string_string["baz"])
-  msg.map_string_string["foo"] = "bar"
-
-  local serialized = upb.encode(msg)
-  assert_true(#serialized > 0)
-  local msg2 = upb.decode(test_messages_proto3.TestAllTypesProto3, serialized)
-  assert_equal("bar", msg2.map_string_string["foo"])
-  assert_equal("quux", msg2.map_string_string["baz"])
-end
-
-function test_msg_array()
-  msg = test_messages_proto3.TestAllTypesProto3()
-
-  assert_not_nil(msg.repeated_int32)
-  assert_equal(msg.repeated_int32, msg.repeated_int32)
-  assert_equal(0, #msg.repeated_int32)
-
-  msg.repeated_int32[1] = 2
-  assert_equal(1, #msg.repeated_int32);
-  assert_equal(2, msg.repeated_int32[1]);
-
-  -- Can't assign a scalar; array is expected.
-  assert_error_match("lupb.array expected", function() msg.repeated_int32 = 5 end)
-
-  -- Can't assign array of the wrong type.
-  local function assign_int64()
-    msg.repeated_int32 = upb.Array(upb.TYPE_INT64)
-  end
-  assert_error_match("array type mismatch", assign_int64)
-
-  local arr = upb.Array(upb.TYPE_INT32)
-  arr[1] = 6
-  assert_equal(1, #arr)
-  msg.repeated_int32 = arr
-  assert_equal(msg.repeated_int32, msg.repeated_int32)
-  assert_equal(arr, msg.repeated_int32)
-  assert_equal(1, #msg.repeated_int32)
-  assert_equal(6, msg.repeated_int32[1])
-
-  -- Can't assign other Lua types.
-  assert_error_match("array expected", function() msg.repeated_int32 = "abc" end)
-  assert_error_match("array expected", function() msg.repeated_int32 = true end)
-  assert_error_match("array expected", function() msg.repeated_int32 = false end)
-  assert_error_match("array expected", function() msg.repeated_int32 = nil end)
-  assert_error_match("array expected", function() msg.repeated_int32 = {} end)
-  assert_error_match("array expected", function() msg.repeated_int32 = print end)
-end
-
-function test_array_append()
-  local arr = upb.Array(upb.TYPE_INT32)
-  for i=1,200000 do
-    arr[i] = i
-  end
-  for i=1,200000 do
-    assert_equal(i, arr[i])
-  end
-end
-
-function test_msg_submsg()
-  --msg = test_messages_proto3.TestAllTypesProto3()
-  msg = test_messages_proto3['TestAllTypesProto3']()
-
-  assert_nil(msg.optional_nested_message)
-
-  -- Can't assign message of the wrong type.
-  local function assign_int64()
-    msg.optional_nested_message = test_messages_proto3.TestAllTypesProto3()
-  end
-  assert_error_match("message type mismatch", assign_int64)
-
-  local nested = test_messages_proto3['TestAllTypesProto3.NestedMessage']()
-  msg.optional_nested_message = nested
-  assert_equal(nested, msg.optional_nested_message)
-
-  -- Can't assign other Lua types.
-  assert_error_match("msg expected", function() msg.optional_nested_message = "abc" end)
-  assert_error_match("msg expected", function() msg.optional_nested_message = true end)
-  assert_error_match("msg expected", function() msg.optional_nested_message = false end)
-  assert_error_match("msg expected", function() msg.optional_nested_message = nil end)
-  assert_error_match("msg expected", function() msg.optional_nested_message = {} end)
-  assert_error_match("msg expected", function() msg.optional_nested_message = print end)
-end
-
--- Lua 5.1 and 5.2 have slightly different semantics for how a finalizer
--- can be defined in Lua.
-if _VERSION >= 'Lua 5.2' then
-  function defer(fn)
-    setmetatable({}, { __gc = fn })
-  end
-else
-  function defer(fn)
-    getmetatable(newproxy(true)).__gc = fn
-  end
-end
-
-function test_finalizer()
-  -- Tests that we correctly handle a call into an already-finalized object.
-  -- Collectible objects are finalized in the opposite order of creation.
-  do
-    local t = {}
-    defer(function()
-      assert_error_match("called into dead object", function()
-        -- Generic def call.
-        t[1]:lookup_msg("abc")
-      end)
-    end)
-    t = {
-      upb.DefPool(),
-    }
-  end
-  collectgarbage()
-end
-
--- in-range of 64-bit types but not exactly representable as double
-local bad64 = 2^68 - 1
-
-local numeric_types = {
-  [upb.TYPE_UINT32] = {
-    valid_val = 2^32 - 1,
-    too_big = 2^32,
-    too_small = -1,
-    other_bad = 5.1
-  },
-  [upb.TYPE_UINT64] = {
-    valid_val = 2^63,
-    too_big = 2^64,
-    too_small = -1,
-    other_bad = bad64
-  },
-  [upb.TYPE_INT32] = {
-    valid_val = 2^31 - 1,
-    too_big = 2^31,
-    too_small = -2^31 - 1,
-    other_bad = 5.1
-  },
-  -- Enums don't exist at a language level in Lua, so we just represent enum
-  -- values as int32s.
-  [upb.TYPE_ENUM] = {
-    valid_val = 2^31 - 1,
-    too_big = 2^31,
-    too_small = -2^31 - 1,
-    other_bad = 5.1
-  },
-  [upb.TYPE_INT64] = {
-    valid_val = 2^62,
-    too_big = 2^63,
-    too_small = -2^64,
-    other_bad = bad64
-  },
-  [upb.TYPE_FLOAT] = {
-    valid_val = 340282306073709652508363335590014353408
-  },
-  [upb.TYPE_DOUBLE] = {
-    valid_val = 10^101
-  },
-}
-
-function test_utf8()
-  local invalid_utf8 = "\xff"
-  local proto2_msg = test_messages_proto2.TestAllTypesProto2{
-    optional_string = invalid_utf8,
-  }
-
-  -- As proto2, invalid UTF-8 parses and serializes fine.
-  local serialized = upb.encode(proto2_msg)
-  local proto2_msg2 = upb.decode(test_messages_proto2.TestAllTypesProto2, serialized)
-
-  -- Decoding as proto3 fails.
-  assert_error(function()
-    upb.decode(test_messages_proto3.TestAllTypesProto3, serialized)
-  end)
-end
-
-function test_msg_primitives()
-  local msg = test_messages_proto3.TestAllTypesProto3{
-    optional_int32 = 10,
-    optional_uint32 = 20,
-    optional_int64 = 30,
-    optional_uint64 = 40,
-    optional_double = 50,
-    optional_float = 60,
-    optional_sint32 = 70,
-    optional_sint64 = 80,
-    optional_fixed32 = 90,
-    optional_fixed64 = 100,
-    optional_sfixed32 = 110,
-    optional_sfixed64 = 120,
-    optional_bool = true,
-    optional_string = "abc",
-    optional_nested_message = test_messages_proto3['TestAllTypesProto3.NestedMessage']{a = 123},
-  }
-
-  -- Attempts to access non-existent fields fail.
-  assert_error_match("no such field", function() msg.no_such = 1 end)
-
-  assert_equal(10, msg.optional_int32)
-  assert_equal(20, msg.optional_uint32)
-  assert_equal(30, msg.optional_int64)
-  assert_equal(40, msg.optional_uint64)
-  assert_equal(50, msg.optional_double)
-  assert_equal(60, msg.optional_float)
-  assert_equal(70, msg.optional_sint32)
-  assert_equal(80, msg.optional_sint64)
-  assert_equal(90, msg.optional_fixed32)
-  assert_equal(100, msg.optional_fixed64)
-  assert_equal(110, msg.optional_sfixed32)
-  assert_equal(120, msg.optional_sfixed64)
-  assert_equal(true, msg.optional_bool)
-  assert_equal("abc", msg.optional_string)
-  assert_equal(123, msg.optional_nested_message.a)
-end
-
-
-function test_string_array()
-  local function test_for_string_type(upb_type)
-    local array = upb.Array(upb_type)
-    assert_equal(0, #array)
-
-    -- 0 is never a valid index in Lua.
-    assert_error_match("array index", function() return array[0] end)
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[1] end)
-
-    array[1] = "foo"
-    assert_equal("foo", array[1])
-    assert_equal(1, #array)
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[2] end)
-
-    local array2 = upb.Array(upb_type)
-    assert_equal(0, #array2)
-
-    array[2] = "bar"
-    assert_equal("foo", array[1])
-    assert_equal("bar", array[2])
-    assert_equal(2, #array)
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[3] end)
-
-    -- Can't assign other Lua types.
-    assert_error_match("Expected string", function() array[3] = 123 end)
-    assert_error_match("Expected string", function() array[3] = true end)
-    assert_error_match("Expected string", function() array[3] = false end)
-    assert_error_match("Expected string", function() array[3] = nil end)
-    assert_error_match("Expected string", function() array[3] = {} end)
-    assert_error_match("Expected string", function() array[3] = print end)
-    assert_error_match("Expected string", function() array[3] = array end)
-  end
-
-  test_for_string_type(upb.TYPE_STRING)
-  test_for_string_type(upb.TYPE_BYTES)
-end
-
-function test_numeric_array()
-  local function test_for_numeric_type(upb_type)
-    local array = upb.Array(upb_type)
-    local vals = numeric_types[upb_type]
-    assert_equal(0, #array)
-
-    -- 0 is never a valid index in Lua.
-    assert_error_match("array index", function() return array[0] end)
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[1] end)
-
-    array[1] = vals.valid_val
-    assert_equal(vals.valid_val, array[1])
-    assert_equal(1, #array)
-    assert_equal(vals.valid_val, array[1])
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[2] end)
-
-    array[2] = 10
-    assert_equal(vals.valid_val, array[1])
-    assert_equal(10, array[2])
-    assert_equal(2, #array)
-    -- Past the end of the array.
-    assert_error_match("array index", function() return array[3] end)
-
-    -- Values that are out of range.
-    local errmsg = "not an integer or out of range"
-    if vals.too_small then
-      assert_error_match(errmsg, function() array[3] = vals.too_small end)
-    end
-    if vals.too_big then
-      assert_error_match(errmsg, function() array[3] = vals.too_big end)
-    end
-    if vals.other_bad then
-      assert_error_match(errmsg, function() array[3] = vals.other_bad end)
-    end
-
-    -- Can't assign other Lua types.
-    errmsg = "bad argument #3"
-    assert_error_match(errmsg, function() array[3] = "abc" end)
-    assert_error_match(errmsg, function() array[3] = true end)
-    assert_error_match(errmsg, function() array[3] = false end)
-    assert_error_match(errmsg, function() array[3] = nil end)
-    assert_error_match(errmsg, function() array[3] = {} end)
-    assert_error_match(errmsg, function() array[3] = print end)
-    assert_error_match(errmsg, function() array[3] = array end)
-  end
-
-  for k in pairs(numeric_types) do
-    test_for_numeric_type(k)
-  end
-end
-
-function test_numeric_map()
-  local function test_for_numeric_types(key_type, val_type)
-    local map = upb.Map(key_type, val_type)
-    local key_vals = numeric_types[key_type]
-    local val_vals = numeric_types[val_type]
-
-    assert_equal(0, #map)
-
-    -- Unset keys return nil
-    assert_nil(map[key_vals.valid_val])
-
-    map[key_vals.valid_val] = val_vals.valid_val
-    assert_equal(1, #map)
-    assert_equal(val_vals.valid_val, map[key_vals.valid_val])
-
-    i = 0
-    for k, v in pairs(map) do
-      assert_equal(key_vals.valid_val, k)
-      assert_equal(val_vals.valid_val, v)
-    end
-
-    -- Out of range key/val
-    local errmsg = "not an integer or out of range"
-    if key_vals.too_small then
-      assert_error_match(errmsg, function() map[key_vals.too_small] = 1 end)
-    end
-    if key_vals.too_big then
-      assert_error_match(errmsg, function() map[key_vals.too_big] = 1 end)
-    end
-    if key_vals.other_bad then
-      assert_error_match(errmsg, function() map[key_vals.other_bad] = 1 end)
-    end
-
-    if val_vals.too_small then
-      assert_error_match(errmsg, function() map[1] = val_vals.too_small end)
-    end
-    if val_vals.too_big then
-      assert_error_match(errmsg, function() map[1] = val_vals.too_big end)
-    end
-    if val_vals.other_bad then
-      assert_error_match(errmsg, function() map[1] = val_vals.other_bad end)
-    end
-  end
-
-  for k in pairs(numeric_types) do
-    for v in pairs(numeric_types) do
-      test_for_numeric_types(k, v)
-    end
-  end
-end
-
-function test_unknown()
-  local bytes = string.rep("\x38\x00", 1000)
-  for i=1,1000 do
-    local msg = upb.decode(test_messages_proto3.TestAllTypesProto3, bytes)
-  end
-end
-
-function test_foo()
-  local defpool = upb.DefPool()
-  local filename = "external/com_google_protobuf/src/google/protobuf/descriptor_proto-descriptor-set.proto.bin"
-  local file = io.open(filename, "rb") or io.open("bazel-bin/" .. filename, "rb")
-  assert_not_nil(file)
-  local descriptor = file:read("*a")
-  assert_true(#descriptor > 0)
-  defpool:add_set(descriptor)
-  local FileDescriptorSet = defpool:lookup_msg("google.protobuf.FileDescriptorSet")
-  assert_not_nil(FileDescriptorSet)
-  set = FileDescriptorSet()
-  assert_equal(#set.file, 0)
-  assert_error_match("lupb.array expected", function () set.file = 1 end)
-
-  set = upb.decode(FileDescriptorSet, descriptor)
-
-  -- Test that we can at least call this without crashing.
-  set_textformat = tostring(set)
-
-  -- print(set_textformat)
-  assert_equal(#set.file, 1)
-  assert_equal(set.file[1].name, "google/protobuf/descriptor.proto")
-end
-
-function test_descriptor()
-  local defpool = upb.DefPool()
-  local file_proto = descriptor.FileDescriptorProto {
-    name = "test.proto",
-    message_type = upb.Array(descriptor.DescriptorProto, {
-      descriptor.DescriptorProto{
-        name = "ABC",
-      },
-    })
-  }
-  local file = defpool:add_file(upb.encode(file_proto))
-  assert_equal(file:defpool(), defpool)
-end
-
-function test_descriptor_error()
-  local defpool = upb.DefPool()
-  local file = descriptor.FileDescriptorProto()
-  file.name = "test.proto"
-  file.message_type[1] = descriptor.DescriptorProto{
-    name = "ABC"
-  }
-  file.message_type[2] = descriptor.DescriptorProto{
-    name = "BC."
-  }
-  assert_error(function () defpool:add_file(upb.encode(file)) end)
-  assert_nil(defpool:lookup_msg("ABC"))
-end
-
-function test_duplicate_enumval()
-  local defpool = upb.DefPool()
-  local file_proto = descriptor.FileDescriptorProto {
-    name = "test.proto",
-    message_type = upb.Array(descriptor.DescriptorProto, {
-      descriptor.DescriptorProto{
-        name = "ABC",
-      },
-    }),
-    enum_type = upb.Array(descriptor.EnumDescriptorProto, {
-      descriptor.EnumDescriptorProto{
-        name = "MyEnum",
-        value = upb.Array(descriptor.EnumValueDescriptorProto, {
-          descriptor.EnumValueDescriptorProto{
-            name = "ABC",
-            number = 1,
-          }
-        }),
-      },
-    })
-  }
-  assert_error(function () defpool:add_file(upb.encode(file_proto)) end)
-end
-
-function test_duplicate_filename_error()
-  local defpool = upb.DefPool()
-  local file = descriptor.FileDescriptorProto()
-  file.name = "test.proto"
-  defpool:add_file(upb.encode(file))
-  -- Second add with the same filename fails.
-  assert_error(function () defpool:add_file(upb.encode(file)) end)
-end
-
-function test_encode_skipunknown()
-  -- Test that upb.ENCODE_SKIPUNKNOWN does not encode unknown fields.
-  local msg = test_messages_proto3.TestAllTypesProto3{
-    optional_int32 = 10,
-    optional_uint32 = 20,
-    optional_int64 = 30,
-  }
-  -- SKIPUNKNOWN here tests that it does *not* affect regular fields.
-  local serialized = upb.encode(msg, {upb.ENCODE_SKIPUNKNOWN})
-  assert_true(#serialized > 0)
-  local empty_with_unknown = upb.decode(empty.Empty, serialized)
-  assert_true(#upb.encode(empty_with_unknown) > 0)
-  -- Verify that unknown fields are not serialized.
-  assert_true(#upb.encode(empty_with_unknown, {upb.ENCODE_SKIPUNKNOWN}) == 0)
-end
-
-function test_json_emit_defaults()
-  local msg = test_messages_proto3.TestAllTypesProto3()
-  local json = upb.json_encode(msg, {upb.JSONENC_EMITDEFAULTS})
-end
-
-function test_json_locale()
-  local msg = test_messages_proto3.TestAllTypesProto3()
-  msg.optional_double = 1.1
-  local original_locale = os.setlocale(nil)
-  os.setlocale("C")
-  local json = upb.json_encode(msg)
-  os.setlocale("de_DE.utf8")
-  assert_equal(json, upb.json_encode(msg))
-  os.setlocale(original_locale)  -- Restore.
-end
-
-function test_encode_depth_limit()
-  local msg = test_messages_proto3.TestAllTypesProto3()
-  msg.recursive_message = msg
-  assert_error(function() upb.encode(msg) end)
-end
-
-function test_large_field_number()
-  local msg = upb_test.TestLargeFieldNumber()
-  msg.i32 = 5
-  local serialized = upb.encode(msg)
-  local msg2 = upb.decode(upb_test.TestLargeFieldNumber, serialized)
-  assert_equal(msg.i32, msg2.i32)
-end
-
-function test_timestamp_minutes()
-  local msg = upb.json_decode(upb_test.TestTimestamp, '{"ts": "2000-01-01T00:00:00-06:59"}')
-  assert_equal(msg.ts.seconds, 946684800 + ((6 * 60) + 59) * 60)
-end
-
-function test_gc()
-  local top = test_messages_proto3.TestAllTypesProto3()
-  local n = 100
-  local m
-
-  for i=1,n do
-    local inner = test_messages_proto3.TestAllTypesProto3()
-    m = inner
-    for j=1,n do
-      local tmp = m
-      m = test_messages_proto3.TestAllTypesProto3()
-      -- This will cause the arenas to fuse. But we stop referring to the child,
-      -- so the Lua object is eligible for collection (and therefore its original
-      -- arena can be collected too). Only the fusing will keep the C mem alivd.
-      m.recursive_message = tmp
-
-    end
-    top.recursive_message = m
-  end
-
-  collectgarbage()
-
-  for i=1,n do
-    -- Verify we can touch all the messages again and without accessing freed
-    -- memory.
-    m = m.recursive_message
-    assert_not_nil(m)
-  end
-end
-
-function test_b9440()
-  local m = upb_test.HelloRequest()
-  m.id = 8
-  assert_equal(8, m.id)
-  m.version = "1"
-  assert_equal(8, m.id)
-end
-
-local stats = lunit.main()
-
-if stats.failed > 0 or stats.errors > 0 then
-  error("One or more errors in test suite")
-end
diff --git a/third_party/upb/lua/upb.c b/third_party/upb/lua/upb.c
deleted file mode 100644
index 8c73e5fb7f40f..0000000000000
--- a/third_party/upb/lua/upb.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * require("lua") -- A Lua extension for upb.
- *
- * Exposes only the core library
- * (sub-libraries are exposed in other extensions).
- *
- * 64-bit woes: Lua can only represent numbers of type lua_Number (which is
- * double unless the user specifically overrides this).  Doubles can represent
- * the entire range of 64-bit integers, but lose precision once the integers are
- * greater than 2^53.
- *
- * Lua 5.3 is adding support for integers, which will allow for 64-bit
- * integers (which can be interpreted as signed or unsigned).
- *
- * LuaJIT supports 64-bit signed and unsigned boxed representations
- * through its "cdata" mechanism, but this is not portable to regular Lua.
- *
- * Hopefully Lua 5.3 will come soon enough that we can either use Lua 5.3
- * integer support or LuaJIT 64-bit cdata for users that need the entire
- * domain of [u]int64 values.
- */
-
-#include "lua/upb.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lauxlib.h"
-#include "upb/msg.h"
-
-/* Lua compatibility code *****************************************************/
-
-/* Shims for upcoming Lua 5.3 functionality. */
-static bool lua_isinteger(lua_State* L, int argn) {
-  LUPB_UNUSED(L);
-  LUPB_UNUSED(argn);
-  return false;
-}
-
-/* Utility functions **********************************************************/
-
-void lupb_checkstatus(lua_State* L, upb_Status* s) {
-  if (!upb_Status_IsOk(s)) {
-    lua_pushstring(L, upb_Status_ErrorMessage(s));
-    lua_error(L);
-  }
-}
-
-/* Pushes a new userdata with the given metatable. */
-void* lupb_newuserdata(lua_State* L, size_t size, int n, const char* type) {
-#if LUA_VERSION_NUM >= 504
-  void* ret = lua_newuserdatauv(L, size, n);
-#else
-  void* ret = lua_newuserdata(L, size);
-  lua_createtable(L, 0, n);
-  lua_setuservalue(L, -2);
-#endif
-
-  /* Set metatable. */
-  luaL_getmetatable(L, type);
-  assert(!lua_isnil(L, -1)); /* Should have been created by luaopen_upb. */
-  lua_setmetatable(L, -2);
-
-  return ret;
-}
-
-#if LUA_VERSION_NUM < 504
-int lua_setiuservalue(lua_State* L, int index, int n) {
-  lua_getuservalue(L, index);
-  lua_insert(L, -2);
-  lua_rawseti(L, -2, n);
-  lua_pop(L, 1);
-  return 1;
-}
-
-int lua_getiuservalue(lua_State* L, int index, int n) {
-  lua_getuservalue(L, index);
-  lua_rawgeti(L, -1, n);
-  lua_replace(L, -2);
-  return 1;
-}
-#endif
-
-/* We use this function as the __index metamethod when a type has both methods
- * and an __index metamethod. */
-int lupb_indexmm(lua_State* L) {
-  /* Look up in __index table (which is a closure param). */
-  lua_pushvalue(L, 2);
-  lua_rawget(L, lua_upvalueindex(1));
-  if (!lua_isnil(L, -1)) {
-    return 1;
-  }
-
-  /* Not found, chain to user __index metamethod. */
-  lua_pushvalue(L, lua_upvalueindex(2));
-  lua_pushvalue(L, 1);
-  lua_pushvalue(L, 2);
-  lua_call(L, 2, 1);
-  return 1;
-}
-
-void lupb_register_type(lua_State* L, const char* name, const luaL_Reg* m,
-                        const luaL_Reg* mm) {
-  luaL_newmetatable(L, name);
-
-  if (mm) {
-    lupb_setfuncs(L, mm);
-  }
-
-  if (m) {
-    lua_createtable(L, 0, 0); /* __index table */
-    lupb_setfuncs(L, m);
-
-    /* Methods go in the mt's __index slot.  If the user also specified an
-     * __index metamethod, use our custom lupb_indexmm() that can check both. */
-    lua_getfield(L, -2, "__index");
-    if (lua_isnil(L, -1)) {
-      lua_pop(L, 1);
-    } else {
-      lua_pushcclosure(L, &lupb_indexmm, 2);
-    }
-    lua_setfield(L, -2, "__index");
-  }
-
-  lua_pop(L, 1); /* The mt. */
-}
-
-/* Scalar type mapping ********************************************************/
-
-/* Functions that convert scalar/primitive values (numbers, strings, bool)
- * between Lua and C/upb.  Handles type/range checking. */
-
-bool lupb_checkbool(lua_State* L, int narg) {
-  if (!lua_isboolean(L, narg)) {
-    luaL_error(L, "must be true or false");
-  }
-  return lua_toboolean(L, narg);
-}
-
-/* Unlike luaL_checkstring(), this does not allow implicit conversion to
- * string. */
-const char* lupb_checkstring(lua_State* L, int narg, size_t* len) {
-  if (lua_type(L, narg) != LUA_TSTRING) {
-    luaL_error(L, "Expected string");
-  }
-
-  return lua_tolstring(L, narg, len);
-}
-
-/* Unlike luaL_checkinteger, these do not implicitly convert from string or
- * round an existing double value.  We allow floating-point input, but only if
- * the actual value is integral. */
-#define INTCHECK(type, ctype, min, max)                                        \
-  ctype lupb_check##type(lua_State* L, int narg) {                             \
-    double n;                                                                  \
-    if (lua_isinteger(L, narg)) {                                              \
-      return lua_tointeger(L, narg);                                           \
-    }                                                                          \
-                                                                               \
-    /* Prevent implicit conversion from string. */                             \
-    luaL_checktype(L, narg, LUA_TNUMBER);                                      \
-    n = lua_tonumber(L, narg);                                                 \
-                                                                               \
-    /* Check this double has no fractional part and remains in bounds.         \
-     * Consider INT64_MIN and INT64_MAX:                                       \
-     * 1. INT64_MIN -(2^63) is a power of 2, so this converts to a double.     \
-     * 2. INT64_MAX (2^63 - 1) is not a power of 2, and conversion of          \
-     * out-of-range integer values to a double can lead to undefined behavior. \
-     * On some compilers, this conversion can return 0, but it also can return \
-     * the max value. To deal with this, we can first divide by 2 to prevent   \
-     * the overflow, multiply it back, and add 1 to find the true limit. */    \
-    double i;                                                                  \
-    double max_value = (((double)max / 2) * 2) + 1;                            \
-    if ((modf(n, &i) != 0.0) || n < min || n >= max_value) {                   \
-      luaL_error(L, "number %f was not an integer or out of range for " #type, \
-                 n);                                                           \
-    }                                                                          \
-    return (ctype)n;                                                           \
-  }                                                                            \
-  void lupb_push##type(lua_State* L, ctype val) {                              \
-    /* TODO: push integer for Lua >= 5.3, 64-bit cdata for LuaJIT. */          \
-    /* This is lossy for some [u]int64 values, which isn't great, but */       \
-    /* crashing when we encounter these values seems worse. */                 \
-    lua_pushnumber(L, val);                                                    \
-  }
-
-INTCHECK(int64, int64_t, INT64_MIN, INT64_MAX)
-INTCHECK(int32, int32_t, INT32_MIN, INT32_MAX)
-INTCHECK(uint64, uint64_t, 0, UINT64_MAX)
-INTCHECK(uint32, uint32_t, 0, UINT32_MAX)
-
-double lupb_checkdouble(lua_State* L, int narg) {
-  /* If we were being really hard-nosed here, we'd check whether the input was
-   * an integer that has no precise double representation.  But doubles aren't
-   * generally expected to be exact like integers are, and worse this could
-   * cause data-dependent runtime errors: one run of the program could work fine
-   * because the integer calculations happened to be exactly representable in
-   * double, while the next could crash because of subtly different input. */
-
-  luaL_checktype(L, narg, LUA_TNUMBER); /* lua_tonumber() auto-converts. */
-  return lua_tonumber(L, narg);
-}
-
-float lupb_checkfloat(lua_State* L, int narg) {
-  /* We don't worry about checking whether the input can be exactly converted to
-   * float -- see above. */
-
-  luaL_checktype(L, narg, LUA_TNUMBER); /* lua_tonumber() auto-converts. */
-  return lua_tonumber(L, narg);
-}
-
-void lupb_pushdouble(lua_State* L, double d) { lua_pushnumber(L, d); }
-
-void lupb_pushfloat(lua_State* L, float d) { lua_pushnumber(L, d); }
-
-/* Library entry point ********************************************************/
-
-int luaopen_lupb(lua_State* L) {
-#if LUA_VERSION_NUM == 501
-  const struct luaL_Reg funcs[] = {{NULL, NULL}};
-  luaL_register(L, "upb_c", funcs);
-#else
-  lua_createtable(L, 0, 8);
-#endif
-  lupb_def_registertypes(L);
-  lupb_msg_registertypes(L);
-  return 1; /* Return package table. */
-}
diff --git a/third_party/upb/lua/upb.h b/third_party/upb/lua/upb.h
deleted file mode 100644
index a06d964d5508e..0000000000000
--- a/third_party/upb/lua/upb.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Shared definitions for upb Lua modules.
- */
-
-#ifndef UPB_LUA_UPB_H_
-#define UPB_LUA_UPB_H_
-
-#include "lauxlib.h"
-#include "upb/msg.h"
-#include "upb/reflection/def.h"
-#include "upb/reflection/message.h"
-
-/* Lua changes its API in incompatible ways in every minor release.
- * This is some shim code to paper over the differences. */
-
-#if LUA_VERSION_NUM == 501
-#define lua_rawlen lua_objlen
-#define lua_setuservalue(L, idx) lua_setfenv(L, idx)
-#define lua_getuservalue(L, idx) lua_getfenv(L, idx)
-#define lupb_setfuncs(L, l) luaL_register(L, NULL, l)
-#elif LUA_VERSION_NUM >= 502 && LUA_VERSION_NUM <= 504
-#define lupb_setfuncs(L, l) luaL_setfuncs(L, l, 0)
-#else
-#error Only Lua 5.1-5.4 are supported
-#endif
-
-/* Create a new userdata with the given type and |n| uservals, which are popped
- * from the stack to initialize the userdata. */
-void* lupb_newuserdata(lua_State* L, size_t size, int n, const char* type);
-
-#if LUA_VERSION_NUM < 504
-/* Polyfills for this Lua 5.4 function.  Pushes userval |n| for the userdata at
- * |index|. */
-int lua_setiuservalue(lua_State* L, int index, int n);
-int lua_getiuservalue(lua_State* L, int index, int n);
-#endif
-
-/* Registers a type with the given name, methods, and metamethods. */
-void lupb_register_type(lua_State* L, const char* name, const luaL_Reg* m,
-                        const luaL_Reg* mm);
-
-/* Checks the given upb_Status and throws a Lua error if it is not ok. */
-void lupb_checkstatus(lua_State* L, upb_Status* s);
-
-int luaopen_lupb(lua_State* L);
-
-/* C <-> Lua value conversions. ***********************************************/
-
-/* Custom check/push functions.  Unlike the Lua equivalents, they are pinned to
- * specific C types (instead of lua_Number, etc), and do not allow any implicit
- * conversion or data loss. */
-int64_t lupb_checkint64(lua_State* L, int narg);
-int32_t lupb_checkint32(lua_State* L, int narg);
-uint64_t lupb_checkuint64(lua_State* L, int narg);
-uint32_t lupb_checkuint32(lua_State* L, int narg);
-double lupb_checkdouble(lua_State* L, int narg);
-float lupb_checkfloat(lua_State* L, int narg);
-bool lupb_checkbool(lua_State* L, int narg);
-const char* lupb_checkstring(lua_State* L, int narg, size_t* len);
-const char* lupb_checkname(lua_State* L, int narg);
-
-void lupb_pushint64(lua_State* L, int64_t val);
-void lupb_pushint32(lua_State* L, int32_t val);
-void lupb_pushuint64(lua_State* L, uint64_t val);
-void lupb_pushuint32(lua_State* L, uint32_t val);
-
-/** From def.c. ***************************************************************/
-
-const upb_MessageDef* lupb_MessageDef_check(lua_State* L, int narg);
-const upb_EnumDef* lupb_EnumDef_check(lua_State* L, int narg);
-const upb_FieldDef* lupb_FieldDef_check(lua_State* L, int narg);
-upb_DefPool* lupb_DefPool_check(lua_State* L, int narg);
-void lupb_MessageDef_pushsubmsgdef(lua_State* L, const upb_FieldDef* f);
-
-void lupb_def_registertypes(lua_State* L);
-
-/** From msg.c. ***************************************************************/
-
-void lupb_pushmsgval(lua_State* L, int container, upb_CType type,
-                     upb_MessageValue val);
-int lupb_MessageDef_call(lua_State* L);
-upb_Arena* lupb_Arena_pushnew(lua_State* L);
-
-void lupb_msg_registertypes(lua_State* L);
-
-#define lupb_assert(L, predicate) \
-  if (!(predicate))               \
-    luaL_error(L, "internal error: %s, %s:%d ", #predicate, __FILE__, __LINE__);
-
-#define LUPB_UNUSED(var) (void)var
-
-#if defined(__GNUC__) || defined(__clang__)
-#define LUPB_UNREACHABLE()   \
-  do {                       \
-    assert(0);               \
-    __builtin_unreachable(); \
-  } while (0)
-#else
-#define LUPB_UNREACHABLE() \
-  do {                     \
-    assert(0);             \
-  } while (0)
-#endif
-
-#endif /* UPB_LUA_UPB_H_ */
diff --git a/third_party/upb/lua/upb.lua b/third_party/upb/lua/upb.lua
deleted file mode 100644
index 35333097c65d0..0000000000000
--- a/third_party/upb/lua/upb.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---[[--------------------------------------------------------------------------
-
-  Copyright (c) 2009-2021, Google LLC
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of Google LLC nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---]]--------------------------------------------------------------------------
-
-local upb = require("lupb")
-
-upb.generated_pool = upb.DefPool()
-
-local module_metatable = {
-  __index = function(t, k)
-    local package = t._filedef:package()
-    if package then
-      k = package .. "." .. k
-    end
-    local pool = upb.generated_pool
-    local def = pool:lookup_msg(k) or pool:lookup_enum(k)
-    local v = nil
-    if def and def:file():name() == t._filedef:name() then
-      v = def
-      t[k] = v
-    end
-    return v
-  end
-}
-
-function upb._generated_module(desc_string)
-  local file = upb.generated_pool:add_file(desc_string)
-  local module = {_filedef = file}
-  setmetatable(module, module_metatable)
-  return module
-end
-
-return upb
diff --git a/third_party/upb/lua/upbc.cc b/third_party/upb/lua/upbc.cc
deleted file mode 100644
index e857f7aae9f7f..0000000000000
--- a/third_party/upb/lua/upbc.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "google/protobuf/descriptor.pb.h"
-#include "absl/strings/str_replace.h"
-#include "absl/strings/string_view.h"
-#include "absl/strings/substitute.h"
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/io/printer.h"
-
-namespace protoc = ::google::protobuf::compiler;
-namespace protobuf = ::google::protobuf;
-
-class LuaGenerator : public protoc::CodeGenerator {
-  bool Generate(const protobuf::FileDescriptor* file,
-                const std::string& parameter, protoc::GeneratorContext* context,
-                std::string* error) const override;
-};
-
-static std::string StripExtension(absl::string_view fname) {
-  size_t lastdot = fname.find_last_of('.');
-  if (lastdot == std::string::npos) {
-    return std::string(fname);
-  }
-  return std::string(fname.substr(0, lastdot));
-}
-
-static std::string Filename(const protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + "_pb.lua";
-}
-
-static std::string ModuleName(const protobuf::FileDescriptor* file) {
-  std::string ret = StripExtension(file->name()) + "_pb";
-  return absl::StrReplaceAll(ret, {{"/", "."}});
-}
-
-static void PrintHexDigit(char digit, protobuf::io::Printer* printer) {
-  char text;
-  if (digit < 10) {
-    text = '0' + digit;
-  } else {
-    text = 'A' + (digit - 10);
-  }
-  printer->WriteRaw(&text, 1);
-}
-
-static void PrintString(int max_cols, absl::string_view* str,
-                        protobuf::io::Printer* printer) {
-  printer->Print("\'");
-  while (max_cols > 0 && !str->empty()) {
-    char ch = (*str)[0];
-    if (ch == '\\') {
-      printer->PrintRaw("\\\\");
-      max_cols--;
-    } else if (ch == '\'') {
-      printer->PrintRaw("\\'");
-      max_cols--;
-    } else if (isprint(ch)) {
-      printer->WriteRaw(&ch, 1);
-      max_cols--;
-    } else {
-      unsigned char byte = ch;
-      printer->PrintRaw("\\x");
-      PrintHexDigit(byte >> 4, printer);
-      PrintHexDigit(byte & 15, printer);
-      max_cols -= 4;
-    }
-    str->remove_prefix(1);
-  }
-  printer->Print("\'");
-}
-
-bool LuaGenerator::Generate(const protobuf::FileDescriptor* file,
-                            const std::string& /* parameter */,
-                            protoc::GeneratorContext* context,
-                            std::string* /* error */) const {
-  std::string filename = Filename(file);
-  protobuf::io::ZeroCopyOutputStream* out = context->Open(filename);
-  protobuf::io::Printer printer(out, '$');
-
-  for (int i = 0; i < file->dependency_count(); i++) {
-    const protobuf::FileDescriptor* dep = file->dependency(i);
-    printer.Print("require('$name$')\n", "name", ModuleName(dep));
-  }
-
-  printer.Print("local upb = require('upb')\n");
-
-  protobuf::FileDescriptorProto file_proto;
-  file->CopyTo(&file_proto);
-  std::string file_data;
-  file_proto.SerializeToString(&file_data);
-
-  printer.Print("local descriptor = table.concat({\n");
-  absl::string_view data(file_data);
-  while (!data.empty()) {
-    printer.Print("  ");
-    PrintString(72, &data, &printer);
-    printer.Print(",\n");
-  }
-  printer.Print("})\n");
-
-  printer.Print("return upb._generated_module(descriptor)\n");
-
-  return true;
-}
-
-int main(int argc, char** argv) {
-  LuaGenerator generator;
-  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
-}
diff --git a/third_party/upb/protos/BUILD b/third_party/upb/protos/BUILD
deleted file mode 100644
index a5a84b4a64ae9..0000000000000
--- a/third_party/upb/protos/BUILD
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_CPPOPTS",
-)
-load(
-    "//protos/bazel:upb_cc_proto_library.bzl",
-    "upb_cc_proto_library_copts",
-)
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-cc_library(
-    name = "repeated_field",
-    hdrs = [
-        "repeated_field.h",
-        "repeated_field_iterator.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":protos",
-        ":protos_traits",
-        "//:collections_internal",
-        "//:message_copy",
-        "//:mini_table",
-        "//:port",
-        "//:upb",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
-cc_library(
-    name = "protos",
-    srcs = [
-        "protos.cc",
-    ],
-    hdrs = [
-        "protos.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:message_copy",
-        "//:message_promote",
-        "//:mini_table",
-        "//:upb",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
-    ],
-)
-
-# Internally used type traits.
-cc_library(
-    name = "protos_traits",
-    hdrs = [
-        "protos_traits.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:private"],
-)
-
-cc_library(
-    name = "protos_internal",
-    hdrs = ["protos_internal.h"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":protos",
-        "//:mini_table",
-        "//:upb",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings:str_format",
-    ],
-)
-
-# Common support code for C++ generated code.
-cc_library(
-    name = "generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-    hdrs = [
-        "protos_internal.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":protos",
-        ":protos_internal",
-        ":repeated_field",
-    ],
-)
-
-cc_test(
-    name = "protos_internal_test",
-    srcs = ["protos_internal_test.cc"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    deps = [
-        ":protos_internal",
-        "//:upb",
-        "//protos_generator/tests:test_model_upb_cc_proto",
-        "//protos_generator/tests:test_model_upb_proto",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-upb_cc_proto_library_copts(
-    name = "upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-)
-
-cc_test(
-    name = "repeated_field_iterator_test",
-    srcs = ["repeated_field_iterator_test.cc"],
-    deps = [
-        ":repeated_field",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/third_party/upb/protos/bazel/BUILD b/third_party/upb/protos/bazel/BUILD
deleted file mode 100644
index e56be4c452f69..0000000000000
--- a/third_party/upb/protos/bazel/BUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-bzl_library(
-    name = "upb_cc_proto_library_bzl",
-    srcs = ["upb_cc_proto_library.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@bazel_skylib//lib:paths",
-        "//bazel:upb_proto_library_bzl",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
-    ],
-)
diff --git a/third_party/upb/protos/bazel/upb_cc_proto_library.bzl b/third_party/upb/protos/bazel/upb_cc_proto_library.bzl
deleted file mode 100644
index d6b996997e5a8..0000000000000
--- a/third_party/upb/protos/bazel/upb_cc_proto_library.bzl
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Public rules for using upb protos:
-  - upb_cc_proto_library()
-"""
-
-load("@bazel_skylib//lib:paths.bzl", "paths")
-load("//bazel:upb_proto_library.bzl", "GeneratedSrcsInfo", "UpbWrappedCcInfo", "upb_proto_library_aspect")
-
-# begin:google_only
-# load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
-#
-# end:google_only
-# begin:github_only
-# Compatibility code for Bazel 4.x. Remove this when we drop support for Bazel 4.x.
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
-
-def use_cpp_toolchain():
-    return ["@bazel_tools//tools/cpp:toolchain_type"]
-# end:github_only
-
-# Generic support code #########################################################
-
-# begin:github_only
-_is_google3 = False
-# end:github_only
-
-# begin:google_only
-# _is_google3 = True
-# end:google_only
-
-def _get_real_short_path(file):
-    # For some reason, files from other archives have short paths that look like:
-    #   ../com_google_protobuf/google/protobuf/descriptor.proto
-    short_path = file.short_path
-    if short_path.startswith("../"):
-        second_slash = short_path.index("/", 3)
-        short_path = short_path[second_slash + 1:]
-
-    # Sometimes it has another few prefixes like:
-    #   _virtual_imports/any_proto/google/protobuf/any.proto
-    #   benchmarks/_virtual_imports/100_msgs_proto/benchmarks/100_msgs.proto
-    # We want just google/protobuf/any.proto.
-    virtual_imports = "_virtual_imports/"
-    if virtual_imports in short_path:
-        short_path = short_path.split(virtual_imports)[1].split("/", 1)[1]
-    return short_path
-
-def _get_real_root(file):
-    real_short_path = _get_real_short_path(file)
-    return file.path[:-len(real_short_path) - 1]
-
-def _generate_output_file(ctx, src, extension):
-    real_short_path = _get_real_short_path(src)
-    real_short_path = paths.relativize(real_short_path, ctx.label.package)
-    output_filename = paths.replace_extension(real_short_path, extension)
-    ret = ctx.actions.declare_file(output_filename)
-    return ret
-
-def _filter_none(elems):
-    out = []
-    for elem in elems:
-        if elem:
-            out.append(elem)
-    return out
-
-def _cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos):
-    """Like cc_library(), but callable from rules.
-
-    Args:
-      ctx: Rule context.
-      name: Unique name used to generate output files.
-      hdrs: Public headers that can be #included from other rules.
-      srcs: C/C++ source files.
-      copts: Additional options for cc compilation.
-      dep_ccinfos: CcInfo providers of dependencies we should build/link against.
-
-    Returns:
-      CcInfo provider for this compilation.
-    """
-
-    compilation_contexts = [info.compilation_context for info in dep_ccinfos]
-    linking_contexts = [info.linking_context for info in dep_ccinfos]
-    toolchain = find_cpp_toolchain(ctx)
-    feature_configuration = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = toolchain,
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
-
-    (compilation_context, compilation_outputs) = cc_common.compile(
-        actions = ctx.actions,
-        feature_configuration = feature_configuration,
-        cc_toolchain = toolchain,
-        name = name,
-        srcs = srcs,
-        public_hdrs = hdrs,
-        user_compile_flags = copts,
-        compilation_contexts = compilation_contexts,
-    )
-
-    # buildifier: disable=unused-variable
-    (linking_context, linking_outputs) = cc_common.create_linking_context_from_compilation_outputs(
-        actions = ctx.actions,
-        name = name,
-        feature_configuration = feature_configuration,
-        cc_toolchain = toolchain,
-        compilation_outputs = compilation_outputs,
-        linking_contexts = linking_contexts,
-    )
-
-    return CcInfo(
-        compilation_context = compilation_context,
-        linking_context = linking_context,
-    )
-
-# Dummy rule to expose select() copts to aspects  ##############################
-
-UpbCcProtoLibraryCoptsInfo = provider(
-    "Provides copts for upb cc proto targets",
-    fields = {
-        "copts": "copts for upb_cc_proto_library()",
-    },
-)
-
-def upb_cc_proto_library_copts_impl(ctx):
-    return UpbCcProtoLibraryCoptsInfo(copts = ctx.attr.copts)
-
-upb_cc_proto_library_copts = rule(
-    implementation = upb_cc_proto_library_copts_impl,
-    attrs = {"copts": attr.string_list(default = [])},
-)
-
-_UpbCcWrappedCcInfo = provider("Provider for cc_info for protos", fields = ["cc_info"])
-_WrappedCcGeneratedSrcsInfo = provider("Provider for generated sources", fields = ["srcs"])
-
-def _compile_upb_cc_protos(ctx, generator, proto_info, proto_sources):
-    if len(proto_sources) == 0:
-        return GeneratedSrcsInfo(srcs = [], hdrs = [])
-
-    tool = getattr(ctx.executable, "_gen_" + generator)
-    srcs = [_generate_output_file(ctx, name, ".upb.proto.cc") for name in proto_sources]
-    hdrs = [_generate_output_file(ctx, name, ".upb.proto.h") for name in proto_sources]
-    hdrs += [_generate_output_file(ctx, name, ".upb.fwd.h") for name in proto_sources]
-    transitive_sets = proto_info.transitive_descriptor_sets.to_list()
-
-    args = ctx.actions.args()
-    args.use_param_file(param_file_arg = "@%s")
-    args.set_param_file_format("multiline")
-
-    args.add("--" + generator + "_out=" + _get_real_root(srcs[0]))
-    args.add("--plugin=protoc-gen-" + generator + "=" + tool.path)
-    args.add("--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]))
-    args.add_all(proto_sources, map_each = _get_real_short_path)
-
-    ctx.actions.run(
-        inputs = depset(
-            direct = [proto_info.direct_descriptor_set],
-            transitive = [proto_info.transitive_descriptor_sets],
-        ),
-        tools = [tool],
-        outputs = srcs + hdrs,
-        executable = ctx.executable._protoc,
-        arguments = [args],
-        progress_message = "Generating upb cc protos for :" + ctx.label.name,
-    )
-    return GeneratedSrcsInfo(srcs = srcs, hdrs = hdrs)
-
-def _upb_cc_proto_rule_impl(ctx):
-    if len(ctx.attr.deps) != 1:
-        fail("only one deps dependency allowed.")
-    dep = ctx.attr.deps[0]
-
-    if _WrappedCcGeneratedSrcsInfo in dep:
-        srcs = dep[_WrappedCcGeneratedSrcsInfo].srcs
-    else:
-        fail("proto_library rule must generate _WrappedCcGeneratedSrcsInfo (aspect should have " +
-             "handled this).")
-
-    if _UpbCcWrappedCcInfo in dep:
-        cc_info = dep[_UpbCcWrappedCcInfo].cc_info
-    elif UpbWrappedCcInfo in dep:
-        cc_info = dep[UpbWrappedCcInfo].cc_info
-    else:
-        fail("proto_library rule must generate UpbWrappedCcInfo or " +
-             "_UpbCcWrappedCcInfo (aspect should have handled this).")
-
-    lib = cc_info.linking_context.linker_inputs.to_list()[0].libraries[0]
-    files = _filter_none([
-        lib.static_library,
-        lib.pic_static_library,
-        lib.dynamic_library,
-    ])
-    return [
-        DefaultInfo(files = depset(files + srcs.hdrs + srcs.srcs)),
-        srcs,
-        cc_info,
-    ]
-
-def _upb_cc_proto_aspect_impl(target, ctx, generator, cc_provider, file_provider):
-    proto_info = target[ProtoInfo]
-    files = _compile_upb_cc_protos(ctx, generator, proto_info, proto_info.direct_sources)
-    deps = ctx.rule.attr.deps + getattr(ctx.attr, "_" + generator)
-    dep_ccinfos = [dep[CcInfo] for dep in deps if CcInfo in dep]
-    dep_ccinfos += [dep[UpbWrappedCcInfo].cc_info for dep in deps if UpbWrappedCcInfo in dep]
-    dep_ccinfos += [dep[_UpbCcWrappedCcInfo].cc_info for dep in deps if _UpbCcWrappedCcInfo in dep]
-    if UpbWrappedCcInfo not in target:
-        fail("Target should have UpbWrappedCcInfo provider")
-    dep_ccinfos.append(target[UpbWrappedCcInfo].cc_info)
-    cc_info = _cc_library_func(
-        ctx = ctx,
-        name = ctx.rule.attr.name + "." + generator,
-        hdrs = files.hdrs,
-        srcs = files.srcs,
-        copts = ctx.attr._ccopts[UpbCcProtoLibraryCoptsInfo].copts,
-        dep_ccinfos = dep_ccinfos,
-    )
-    return [cc_provider(cc_info = cc_info), file_provider(srcs = files)]
-
-def _upb_cc_proto_library_aspect_impl(target, ctx):
-    return _upb_cc_proto_aspect_impl(target, ctx, "upbprotos", _UpbCcWrappedCcInfo, _WrappedCcGeneratedSrcsInfo)
-
-def _maybe_add(d):
-    if _is_google3:
-        d["_grep_includes"] = attr.label(
-            allow_single_file = True,
-            cfg = "exec",
-            default = "@bazel_tools//tools/cpp:grep-includes",
-        )
-    return d
-
-_upb_cc_proto_library_aspect = aspect(
-    attrs = _maybe_add({
-        "_ccopts": attr.label(
-            default = "//protos:upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
-        ),
-        "_gen_upbprotos": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//protos_generator:protoc-gen-upb-protos",
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-        "_cc_toolchain": attr.label(
-            default = "@bazel_tools//tools/cpp:current_cc_toolchain",
-        ),
-        "_upbprotos": attr.label_list(
-            default = [
-                # TODO: Add dependencies for cc runtime (absl/string etc..)
-                "//:generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-                "//protos:generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-                "@com_google_absl//absl/strings",
-                "@com_google_absl//absl/status:statusor",
-                "//protos",
-                "//protos:repeated_field",
-            ],
-        ),
-    }),
-    implementation = _upb_cc_proto_library_aspect_impl,
-    provides = [
-        _UpbCcWrappedCcInfo,
-        _WrappedCcGeneratedSrcsInfo,
-    ],
-    required_aspect_providers = [
-        UpbWrappedCcInfo,
-    ],
-    attr_aspects = ["deps"],
-    fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(),
-    incompatible_use_toolchain_transition = True,
-)
-
-upb_cc_proto_library = rule(
-    output_to_genfiles = True,
-    implementation = _upb_cc_proto_rule_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects = [
-                upb_proto_library_aspect,
-                _upb_cc_proto_library_aspect,
-            ],
-            allow_rules = ["proto_library"],
-            providers = [ProtoInfo],
-        ),
-        "_ccopts": attr.label(
-            default = "//protos:upb_cc_proto_library_copts__for_generated_code_only_do_not_use",
-        ),
-    },
-)
diff --git a/third_party/upb/protos/protos.cc b/third_party/upb/protos/protos.cc
deleted file mode 100644
index 229ce4cf75417..0000000000000
--- a/third_party/upb/protos/protos.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "protos/protos.h"
-
-#include "absl/strings/str_format.h"
-#include "upb/message/promote.h"
-#include "upb/wire/common.h"
-
-namespace protos {
-
-// begin:google_only
-// absl::Status MessageAllocationError(SourceLocation loc) {
-//   return absl::Status(absl::StatusCode::kInternal,
-//                       "Upb message allocation error", loc);
-// }
-//
-// absl::Status ExtensionNotFoundError(int extension_number, SourceLocation loc) {
-//   return absl::Status(
-//       absl::StatusCode::kInternal,
-//       absl::StrFormat("Extension %d not found", extension_number), loc);
-// }
-//
-// absl::Status MessageEncodeError(upb_EncodeStatus status, SourceLocation loc) {
-//   return absl::Status(absl::StatusCode::kInternal,
-//                       absl::StrFormat("Upb message encoding error %d", status),
-//                       loc
-//
-//   );
-// }
-//
-// absl::Status MessageDecodeError(upb_DecodeStatus status, SourceLocation loc
-//
-// ) {
-//   return absl::Status(absl::StatusCode::kInternal,
-//                       absl::StrFormat("Upb message parse error %d", status), loc
-//
-//   );
-// }
-// end:google_only
-
-// begin:github_only
-absl::Status MessageAllocationError(SourceLocation loc) {
-  return absl::Status(absl::StatusCode::kUnknown,
-                      "Upb message allocation error");
-}
-
-absl::Status ExtensionNotFoundError(int ext_number, SourceLocation loc) {
-  return absl::Status(absl::StatusCode::kUnknown,
-                      absl::StrFormat("Extension %d not found", ext_number));
-}
-
-absl::Status MessageEncodeError(upb_EncodeStatus s, SourceLocation loc) {
-  return absl::Status(absl::StatusCode::kUnknown, "Encoding error");
-}
-
-absl::Status MessageDecodeError(upb_DecodeStatus status, SourceLocation loc
-
-) {
-  return absl::Status(absl::StatusCode::kUnknown, "Upb message parse error");
-}
-// end:github_only
-
-namespace internal {
-
-upb_ExtensionRegistry* GetUpbExtensions(
-    const ExtensionRegistry& extension_registry) {
-  return extension_registry.registry_;
-}
-
-bool HasExtensionOrUnknown(const upb_Message* msg,
-                           const upb_MiniTableExtension* eid) {
-  return _upb_Message_Getext(msg, eid) != nullptr ||
-         upb_MiniTable_FindUnknown(msg, eid->field.number,
-                                   kUpb_WireFormat_DefaultDepthLimit)
-                 .status == kUpb_FindUnknown_Ok;
-}
-
-const upb_Message_Extension* GetOrPromoteExtension(
-    upb_Message* msg, const upb_MiniTableExtension* eid, upb_Arena* arena) {
-  const upb_Message_Extension* ext = _upb_Message_Getext(msg, eid);
-  if (ext == nullptr) {
-    upb_GetExtension_Status ext_status = upb_MiniTable_GetOrPromoteExtension(
-        (upb_Message*)msg, eid, kUpb_WireFormat_DefaultDepthLimit, arena, &ext);
-    if (ext_status != kUpb_GetExtension_Ok) {
-      return nullptr;
-    }
-  }
-  return ext;
-}
-
-absl::StatusOr<absl::string_view> Serialize(const upb_Message* message,
-                                            const upb_MiniTable* mini_table,
-                                            upb_Arena* arena, int options) {
-  size_t len;
-  char* ptr;
-  upb_EncodeStatus status =
-      upb_Encode(message, mini_table, options, arena, &ptr, &len);
-  if (status == kUpb_EncodeStatus_Ok) {
-    return absl::string_view(ptr, len);
-  }
-  return MessageEncodeError(status);
-}
-
-}  // namespace internal
-
-}  // namespace protos
diff --git a/third_party/upb/protos/protos.h b/third_party/upb/protos/protos.h
deleted file mode 100644
index 9095c3b7359e6..0000000000000
--- a/third_party/upb/protos/protos.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_PROTOS_H_
-#define UPB_PROTOS_PROTOS_H_
-
-#include <type_traits>
-#include <vector>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "upb/mem/arena.h"
-#include "upb/message/copy.h"
-#include "upb/message/extension_internal.h"
-#include "upb/upb.hpp"
-#include "upb/wire/decode.h"
-#include "upb/wire/encode.h"
-
-namespace protos {
-
-using Arena = ::upb::Arena;
-class ExtensionRegistry;
-
-template <typename T>
-using Proxy = std::conditional_t<std::is_const<T>::value,
-                                 typename std::remove_const_t<T>::CProxy,
-                                 typename T::Proxy>;
-
-// Provides convenient access to Proxy and CProxy message types.
-//
-// Using rebinding and handling of const, Ptr<Message> and Ptr<const Message>
-// allows copying const with T* const and avoids using non-copyable Proxy types
-// directly.
-template <typename T>
-class Ptr final {
- public:
-  Ptr() = delete;
-
-  // Implicit conversions
-  Ptr(T* m) : p_(m) {}                // NOLINT
-  Ptr(const Proxy<T>* p) : p_(*p) {}  // NOLINT
-  Ptr(Proxy<T> p) : p_(p) {}          // NOLINT
-  Ptr(const Ptr& m) = default;
-
-  Ptr& operator=(Ptr v) & {
-    Proxy<T>::Rebind(p_, v.p_);
-    return *this;
-  }
-
-  Proxy<T> operator*() const { return p_; }
-  Proxy<T>* operator->() const {
-    return const_cast<Proxy<T>*>(std::addressof(p_));
-  }
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wclass-conversion"
-#endif
-  template <typename U = T, std::enable_if_t<!std::is_const<U>::value, int> = 0>
-  operator Ptr<const T>() const {
-    Proxy<const T> p(p_);
-    return Ptr<const T>(&p);
-  }
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
- private:
-  Ptr(void* msg, upb_Arena* arena) : p_(msg, arena) {}  // NOLINT
-
-  friend class Ptr<const T>;
-  friend typename T::Access;
-
-  Proxy<T> p_;
-};
-
-inline absl::string_view UpbStrToStringView(upb_StringView str) {
-  return absl::string_view(str.data, str.size);
-}
-
-// TODO: update bzl and move to upb runtime / protos.cc.
-inline upb_StringView UpbStrFromStringView(absl::string_view str,
-                                           upb_Arena* arena) {
-  const size_t str_size = str.size();
-  char* buffer = static_cast<char*>(upb_Arena_Malloc(arena, str_size));
-  memcpy(buffer, str.data(), str_size);
-  return upb_StringView_FromDataAndSize(buffer, str_size);
-}
-
-template <typename T>
-typename T::Proxy CreateMessage(::protos::Arena& arena) {
-  return typename T::Proxy(upb_Message_New(T::minitable(), arena.ptr()),
-                           arena.ptr());
-}
-
-template <typename T>
-typename T::Proxy CloneMessage(Ptr<T> message, upb::Arena& arena) {
-  return typename T::Proxy(
-      upb_Message_DeepClone(message->msg(), T::minitable(), arena.ptr()),
-      arena.ptr());
-}
-
-template <typename T>
-void DeepCopy(Ptr<const T> source_message, Ptr<T> target_message) {
-  upb_Message_DeepCopy(
-      target_message->msg(), source_message->msg(), T::minitable(),
-      static_cast<upb_Arena*>(target_message->GetInternalArena()));
-}
-
-template <typename T>
-void DeepCopy(Ptr<const T> source_message, T* target_message) {
-  DeepCopy(source_message, protos::Ptr(target_message));
-}
-
-template <typename T>
-void DeepCopy(const T* source_message, Ptr<T> target_message) {
-  DeepCopy(protos::Ptr(source_message), target_message);
-}
-
-template <typename T>
-void DeepCopy(const T* source_message, T* target_message) {
-  DeepCopy(protos::Ptr(source_message), protos::Ptr(target_message));
-}
-
-template <typename T>
-void ClearMessage(Ptr<T> message) {
-  static_assert(!std::is_const_v<T>, "");
-  upb_Message_Clear(message->msg(), T::minitable());
-}
-
-template <typename T>
-void ClearMessage(T* message) {
-  ClearMessage(protos::Ptr(message));
-}
-
-// begin:github_only
-// This type exists to work around an absl type that has not yet been
-// released.
-struct SourceLocation {
-  static SourceLocation current() { return {}; }
-  absl::string_view file_name() { return "<unknown>"; }
-  int line() { return 0; }
-};
-// end:github_only
-
-// begin:google_only
-// using SourceLocation = absl::SourceLocation;
-// end:google_only
-
-absl::Status MessageAllocationError(
-    SourceLocation loc = SourceLocation::current());
-
-absl::Status ExtensionNotFoundError(
-    int extension_number, SourceLocation loc = SourceLocation::current());
-
-absl::Status MessageDecodeError(upb_DecodeStatus status,
-                                SourceLocation loc = SourceLocation::current());
-
-absl::Status MessageEncodeError(upb_EncodeStatus status,
-                                SourceLocation loc = SourceLocation::current());
-
-namespace internal {
-template <typename T>
-T CreateMessage() {
-  return T();
-}
-
-template <typename T>
-typename T::Proxy CreateMessageProxy(void* msg, upb_Arena* arena) {
-  return typename T::Proxy(msg, arena);
-}
-
-template <typename T>
-typename T::CProxy CreateMessage(upb_Message* msg, upb_Arena* arena) {
-  return typename T::CProxy(msg, arena);
-}
-
-class ExtensionMiniTableProvider {
- public:
-  constexpr explicit ExtensionMiniTableProvider(
-      const upb_MiniTableExtension* mini_table_ext)
-      : mini_table_ext_(mini_table_ext) {}
-  const upb_MiniTableExtension* mini_table_ext() const {
-    return mini_table_ext_;
-  }
-
- private:
-  const upb_MiniTableExtension* mini_table_ext_;
-};
-
-// -------------------------------------------------------------------
-// ExtensionIdentifier
-// This is the type of actual extension objects.  E.g. if you have:
-//   extend Foo {
-//     optional MyExtension bar = 1234;
-//   }
-// then "bar" will be defined in C++ as:
-//   ExtensionIdentifier<Foo, MyExtension> bar(&namespace_bar_ext);
-template <typename ExtendeeType, typename ExtensionType>
-class ExtensionIdentifier : public ExtensionMiniTableProvider {
- public:
-  using Extension = ExtensionType;
-  using Extendee = ExtendeeType;
-
-  constexpr explicit ExtensionIdentifier(
-      const upb_MiniTableExtension* mini_table_ext)
-      : ExtensionMiniTableProvider(mini_table_ext) {}
-};
-
-template <typename T>
-void* GetInternalMsg(const T* message) {
-  return message->msg();
-}
-
-template <typename T>
-void* GetInternalMsg(Ptr<T> message) {
-  return message->msg();
-}
-
-template <typename T>
-upb_Arena* GetArena(Ptr<T> message) {
-  return static_cast<upb_Arena*>(message->GetInternalArena());
-}
-
-template <typename T>
-upb_Arena* GetArena(T* message) {
-  return static_cast<upb_Arena*>(message->GetInternalArena());
-}
-
-template <typename T>
-const upb_MiniTable* GetMiniTable(const T*) {
-  return T::minitable();
-}
-
-template <typename T>
-const upb_MiniTable* GetMiniTable(Ptr<T>) {
-  return T::minitable();
-}
-
-upb_ExtensionRegistry* GetUpbExtensions(
-    const ExtensionRegistry& extension_registry);
-
-absl::StatusOr<absl::string_view> Serialize(const upb_Message* message,
-                                            const upb_MiniTable* mini_table,
-                                            upb_Arena* arena, int options);
-
-bool HasExtensionOrUnknown(const upb_Message* msg,
-                           const upb_MiniTableExtension* eid);
-
-const upb_Message_Extension* GetOrPromoteExtension(
-    upb_Message* msg, const upb_MiniTableExtension* eid, upb_Arena* arena);
-
-}  // namespace internal
-
-class ExtensionRegistry {
- public:
-  ExtensionRegistry(
-      const std::vector<const ::protos::internal::ExtensionMiniTableProvider*>&
-          extensions,
-      const upb::Arena& arena)
-      : registry_(upb_ExtensionRegistry_New(arena.ptr())) {
-    if (registry_) {
-      for (const auto& ext_provider : extensions) {
-        const auto* ext = ext_provider->mini_table_ext();
-        bool success = upb_ExtensionRegistry_AddArray(registry_, &ext, 1);
-        if (!success) {
-          registry_ = nullptr;
-          break;
-        }
-      }
-    }
-  }
-
- private:
-  friend upb_ExtensionRegistry* ::protos::internal::GetUpbExtensions(
-      const ExtensionRegistry& extension_registry);
-  upb_ExtensionRegistry* registry_;
-};
-
-template <typename T>
-using EnableIfProtosClass = std::enable_if_t<
-    std::is_base_of<typename T::Access, T>::value &&
-    std::is_base_of<typename T::Access, typename T::ExtendableType>::value>;
-
-template <typename T>
-using EnableIfMutableProto = std::enable_if_t<!std::is_const<T>::value>;
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-bool HasExtension(
-    const Ptr<T>& message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  return ::protos::internal::HasExtensionOrUnknown(
-      ::protos::internal::GetInternalMsg(message), id.mini_table_ext());
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-bool HasExtension(
-    const T* message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  return HasExtension(protos::Ptr(message), id);
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>, typename = EnableIfMutableProto<T>>
-void ClearExtension(
-    const Ptr<T>& message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  static_assert(!std::is_const_v<T>, "");
-  _upb_Message_ClearExtensionField(::protos::internal::GetInternalMsg(message),
-                                   id.mini_table_ext());
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-void ClearExtension(
-    T* message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  ClearExtension(::protos::Ptr(message), id);
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>, typename = EnableIfMutableProto<T>>
-absl::Status SetExtension(
-    const Ptr<T>& message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id,
-    Extension& value) {
-  auto* message_arena = static_cast<upb_Arena*>(message->GetInternalArena());
-  upb_Message_Extension* msg_ext = _upb_Message_GetOrCreateExtension(
-      message->msg(), id.mini_table_ext(), message_arena);
-  if (!msg_ext) {
-    return MessageAllocationError();
-  }
-  auto* extension_arena = static_cast<upb_Arena*>(message->GetInternalArena());
-  if (message_arena != extension_arena) {
-    upb_Arena_Fuse(message_arena, extension_arena);
-  }
-  msg_ext->data.ptr = ::protos::internal::GetInternalMsg(&value);
-  return absl::OkStatus();
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-absl::Status SetExtension(
-    T* message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id,
-    Extension& value) {
-  return ::protos::SetExtension(::protos::Ptr(message), id, value);
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-absl::StatusOr<Ptr<const Extension>> GetExtension(
-    const Ptr<T>& message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  const upb_Message_Extension* ext = ::protos::internal::GetOrPromoteExtension(
-      ::protos::internal::GetInternalMsg(message), id.mini_table_ext(),
-      ::protos::internal::GetArena(message));
-  if (!ext) {
-    return ExtensionNotFoundError(id.mini_table_ext()->field.number);
-  }
-  return Ptr<const Extension>(::protos::internal::CreateMessage<Extension>(
-      ext->data.ptr, ::protos::internal::GetArena(message)));
-}
-
-template <typename T, typename Extendee, typename Extension,
-          typename = EnableIfProtosClass<T>>
-absl::StatusOr<Ptr<const Extension>> GetExtension(
-    const T* message,
-    const ::protos::internal::ExtensionIdentifier<Extendee, Extension>& id) {
-  return GetExtension(protos::Ptr(message), id);
-}
-
-template <typename T>
-bool Parse(Ptr<T>& message, absl::string_view bytes) {
-  upb_Message_Clear(message->msg(), ::protos::internal::GetMiniTable(message));
-  auto* arena = static_cast<upb_Arena*>(message->GetInternalArena());
-  return upb_Decode(bytes.data(), bytes.size(), message->msg(),
-                    ::protos::internal::GetMiniTable(message),
-                    /* extreg= */ nullptr, /* options= */ 0,
-                    arena) == kUpb_DecodeStatus_Ok;
-}
-
-template <typename T>
-bool Parse(Ptr<T>& message, absl::string_view bytes,
-           const ::protos::ExtensionRegistry& extension_registry) {
-  upb_Message_Clear(message->msg(), ::protos::internal::GetMiniTable(message));
-  auto* arena = static_cast<upb_Arena*>(message->GetInternalArena());
-  return upb_Decode(bytes.data(), bytes.size(), message->msg(),
-                    ::protos::internal::GetMiniTable(message),
-                    /* extreg= */
-                    ::protos::internal::GetUpbExtensions(extension_registry),
-                    /* options= */ 0, arena) == kUpb_DecodeStatus_Ok;
-}
-
-template <typename T>
-bool Parse(T* message, absl::string_view bytes,
-           const ::protos::ExtensionRegistry& extension_registry) {
-  return Parse(protos::Ptr(message, bytes, extension_registry));
-}
-
-template <typename T>
-bool Parse(T* message, absl::string_view bytes) {
-  upb_Message_Clear(message->msg(), ::protos::internal::GetMiniTable(message));
-  auto* arena = static_cast<upb_Arena*>(message->GetInternalArena());
-  return upb_Decode(bytes.data(), bytes.size(), message->msg(),
-                    ::protos::internal::GetMiniTable(message),
-                    /* extreg= */ nullptr, /* options= */ 0,
-                    arena) == kUpb_DecodeStatus_Ok;
-}
-
-template <typename T>
-absl::StatusOr<T> Parse(absl::string_view bytes, int options = 0) {
-  T message;
-  auto* arena = static_cast<upb_Arena*>(message.GetInternalArena());
-  upb_DecodeStatus status =
-      upb_Decode(bytes.data(), bytes.size(), message.msg(),
-                 ::protos::internal::GetMiniTable(&message),
-                 /* extreg= */ nullptr, /* options= */ 0, arena);
-  if (status == kUpb_DecodeStatus_Ok) {
-    return message;
-  }
-  return MessageDecodeError(status);
-}
-
-template <typename T>
-absl::StatusOr<T> Parse(absl::string_view bytes,
-                        const ::protos::ExtensionRegistry& extension_registry,
-                        int options = 0) {
-  T message;
-  auto* arena = static_cast<upb_Arena*>(message.GetInternalArena());
-  upb_DecodeStatus status =
-      upb_Decode(bytes.data(), bytes.size(), message.msg(),
-                 ::protos::internal::GetMiniTable(&message),
-                 ::protos::internal::GetUpbExtensions(extension_registry),
-                 /* options= */ 0, arena);
-  if (status == kUpb_DecodeStatus_Ok) {
-    return message;
-  }
-  return MessageDecodeError(status);
-}
-
-template <typename T>
-absl::StatusOr<absl::string_view> Serialize(const T* message, upb::Arena& arena,
-                                            int options = 0) {
-  return ::protos::internal::Serialize(
-      message->msg(), ::protos::internal::GetMiniTable(message), arena.ptr(),
-      options);
-}
-
-template <typename T>
-absl::StatusOr<absl::string_view> Serialize(Ptr<T> message, upb::Arena& arena,
-                                            int options = 0) {
-  return ::protos::internal::Serialize(
-      message->msg(), ::protos::internal::GetMiniTable(message), arena.ptr(),
-      options);
-}
-
-}  // namespace protos
-
-#endif  // UPB_PROTOS_PROTOS_H_
diff --git a/third_party/upb/protos/protos_internal.h b/third_party/upb/protos/protos_internal.h
deleted file mode 100644
index 85ba4d06793cd..0000000000000
--- a/third_party/upb/protos/protos_internal.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_PROTOS_INTERNAL_H_
-#define UPB_PROTOS_PROTOS_INTERNAL_H_
-
-#include "protos/protos.h"
-
-namespace protos::internal {
-
-// Moves ownership of a message created in a source arena.
-//
-// Utility function to provide a way to move ownership across languages or VMs.
-template <typename T>
-T MoveMessage(upb_Message* msg, upb_Arena* arena) {
-  return T(msg, arena);
-}
-
-}  // namespace protos::internal
-#endif
diff --git a/third_party/upb/protos/protos_internal_test.cc b/third_party/upb/protos/protos_internal_test.cc
deleted file mode 100644
index 99bfaa240274c..0000000000000
--- a/third_party/upb/protos/protos_internal_test.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protos/protos_internal.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include "protos_generator/tests/test_model.upb.h"
-#include "protos_generator/tests/test_model.upb.proto.h"
-#include "upb/arena.h"
-
-namespace protos::testing {
-namespace {
-using ::protos_generator::test::protos::TestModel;
-
-TEST(CppGeneratedCode, InternalMoveMessage) {
-  // Generate message (simulating message created in another VM/language)
-  upb_Arena* source_arena = upb_Arena_New();
-  protos_generator_test_TestModel* message =
-      protos_generator_test_TestModel_new(source_arena);
-  ASSERT_NE(message, nullptr);
-  protos_generator_test_TestModel_set_int_value_with_default(message, 123);
-
-  // Move ownership.
-  TestModel model =
-      protos::internal::MoveMessage<TestModel>(message, source_arena);
-  // Now that we have moved ownership, free original arena.
-  upb_Arena_Free(source_arena);
-  EXPECT_EQ(model.int_value_with_default(), 123);
-}
-
-}  // namespace
-}  // namespace protos::testing
diff --git a/third_party/upb/protos/protos_traits.h b/third_party/upb/protos/protos_traits.h
deleted file mode 100644
index 720f2c6ba683d..0000000000000
--- a/third_party/upb/protos/protos_traits.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2009-2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef THIRD_PARTY_UPB_PROTOS_PROTOS_TRAITS_H_
-#define THIRD_PARTY_UPB_PROTOS_PROTOS_TRAITS_H_
-
-#include <type_traits>
-
-namespace protos::internal {
-
-template <typename T, typename T2>
-using add_const_if_T_is_const =
-    std::conditional_t<std::is_const_v<T>, const T2, T2>;
-
-}  // namespace protos::internal
-
-#endif  // THIRD_PARTY_UPB_PROTOS_PROTOS_TRAITS_H_
diff --git a/third_party/upb/protos/repeated_field.h b/third_party/upb/protos/repeated_field.h
deleted file mode 100644
index 98d2f6bfdba0a..0000000000000
--- a/third_party/upb/protos/repeated_field.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2009-2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_REPEATED_FIELD_H_
-#define UPB_PROTOS_REPEATED_FIELD_H_
-
-#include <cstddef>
-#include <iterator>
-#include <type_traits>
-
-#include "absl/base/attributes.h"
-#include "absl/strings/string_view.h"
-#include "protos/protos.h"
-#include "protos/protos_traits.h"
-#include "protos/repeated_field_iterator.h"
-#include "upb/base/string_view.h"
-#include "upb/collections/array.h"
-#include "upb/collections/array_internal.h"
-#include "upb/mem/arena.h"
-#include "upb/message/copy.h"
-
-// Must be last:
-#include "upb/port/def.inc"
-
-namespace protos {
-
-namespace internal {
-
-// Shared implementation of repeated fields for absl::string_view and
-// message types for mutable and immutable variants.
-//
-// Immutable (const accessor), constructs this class with a nullptr upb_Array*
-// when the underlying array in the message is empty.
-//
-// Mutable accessors on the other hand, will allocate a new empty non-null
-// upb_Array* for the message when the RepeatedFieldProxy is constructed.
-template <class T>
-class RepeatedFieldProxyBase {
-  using Array = add_const_if_T_is_const<T, upb_Array>;
-
- public:
-  explicit RepeatedFieldProxyBase(Array* arr, upb_Arena* arena)
-      : arr_(arr), arena_(arena) {}
-
-  size_t size() const { return arr_ != nullptr ? upb_Array_Size(arr_) : 0; }
-
-  bool empty() const { return size() == 0; }
-
- protected:
-  // Returns upb_Array message member.
-  inline upb_Message* GetMessage(size_t n) const;
-
-  Array* arr_;
-  upb_Arena* arena_;
-};
-
-template <class T>
-upb_Message* RepeatedFieldProxyBase<T>::GetMessage(size_t n) const {
-  auto** messages =
-      static_cast<upb_Message**>(upb_Array_MutableDataPtr(this->arr_));
-  return messages[n];
-}
-
-template <class T>
-class RepeatedFieldProxyMutableBase : public RepeatedFieldProxyBase<T> {
- public:
-  RepeatedFieldProxyMutableBase(upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyBase<T>(arr, arena) {}
-
-  void clear() { upb_Array_Resize(this->arr_, 0, this->arena_); }
-};
-
-// RepeatedField proxy for repeated messages.
-template <class T>
-class RepeatedFieldProxy
-    : public std::conditional_t<std::is_const_v<T>, RepeatedFieldProxyBase<T>,
-                                RepeatedFieldProxyMutableBase<T>> {
-  static_assert(!std::is_same_v<T, absl::string_view>, "");
-  static_assert(!std::is_same_v<T, const absl::string_view>, "");
-  static_assert(!std::is_arithmetic_v<T>, "");
-  static constexpr bool kIsConst = std::is_const_v<T>;
-
- public:
-  explicit RepeatedFieldProxy(const upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyBase<T>(arr, arena) {}
-  RepeatedFieldProxy(upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyMutableBase<T>(arr, arena) {}
-  // Constructor used by ::protos::Ptr.
-  RepeatedFieldProxy(const RepeatedFieldProxy&) = default;
-
-  // T::CProxy [] operator specialization.
-  typename T::CProxy operator[](size_t n) const {
-    upb_MessageValue message_value = upb_Array_Get(this->arr_, n);
-    return ::protos::internal::CreateMessage<typename std::remove_const_t<T>>(
-        (upb_Message*)message_value.msg_val, this->arena_);
-  }
-
-  // TODO(b:/280069986) : Audit/Finalize based on Iterator Design.
-  // T::Proxy [] operator specialization.
-  template <int&... DeductionBlocker, bool b = !kIsConst,
-            typename = std::enable_if_t<b>>
-  typename T::Proxy operator[](size_t n) {
-    return ::protos::internal::CreateMessageProxy<T>(this->GetMessage(n),
-                                                     this->arena_);
-  }
-
-  // Mutable message reference specialization.
-  template <int&... DeductionBlocker, bool b = !kIsConst,
-            typename = std::enable_if_t<b>>
-  void push_back(const T& t) {
-    upb_MessageValue message_value;
-    message_value.msg_val = upb_Message_DeepClone(
-        GetInternalMsg(&t), ::protos::internal::GetMiniTable(&t), this->arena_);
-    upb_Array_Append(this->arr_, message_value, this->arena_);
-  }
-
-  // Mutable message add using move.
-  template <int&... DeductionBlocker, bool b = !kIsConst,
-            typename = std::enable_if_t<b>>
-  void push_back(T&& msg) {
-    upb_MessageValue message_value;
-    message_value.msg_val = GetInternalMsg(&msg);
-    upb_Arena_Fuse(GetArena(&msg), this->arena_);
-    upb_Array_Append(this->arr_, message_value, this->arena_);
-    T moved_msg = std::move(msg);
-  }
-
- private:
-  friend class ::protos::Ptr<T>;
-};
-
-// RepeatedField proxy for repeated strings.
-template <class T>
-class RepeatedFieldStringProxy
-    : public std::conditional_t<std::is_const_v<T>, RepeatedFieldProxyBase<T>,
-                                RepeatedFieldProxyMutableBase<T>> {
-  static_assert(std::is_same_v<T, absl::string_view> ||
-                    std::is_same_v<T, const absl::string_view>,
-                "");
-  static constexpr bool kIsConst = std::is_const_v<T>;
-
- public:
-  using value_type = std::remove_const_t<T>;
-  using size_type = size_t;
-  using difference_type = ptrdiff_t;
-  using iterator = internal::Iterator<StringIteratorPolicy<T>>;
-  using reference = typename iterator::reference;
-  using pointer = typename iterator::pointer;
-  using reverse_iterator = std::reverse_iterator<iterator>;
-
-  // Immutable constructor.
-  explicit RepeatedFieldStringProxy(const upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyBase<T>(arr, arena) {}
-  // Mutable constructor.
-  RepeatedFieldStringProxy(upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyMutableBase<T>(arr, arena) {}
-  // Constructor used by ::protos::Ptr.
-  RepeatedFieldStringProxy(const RepeatedFieldStringProxy&) = default;
-
-  reference operator[](size_t n) const { return begin()[n]; }
-
-  template <int&... DeductionBlocker, bool b = !kIsConst,
-            typename = std::enable_if_t<b>>
-  void push_back(T t) {
-    upb_MessageValue message_value;
-    // Copy string to arena.
-    UPB_ASSERT(this->arena_);
-    char* data = (char*)upb_Arena_Malloc(this->arena_, t.size());
-    UPB_ASSERT(data);
-    memcpy(data, t.data(), t.size());
-    message_value.str_val = upb_StringView_FromDataAndSize(data, t.size());
-    upb_Array_Append(this->arr_, message_value, this->arena_);
-  }
-
-  iterator begin() const { return iterator({this->arr_, this->arena_, 0}); }
-  iterator end() const {
-    return iterator({this->arr_, this->arena_, this->size()});
-  }
-  reverse_iterator rbegin() const { return reverse_iterator(end()); }
-  reverse_iterator rend() const { return reverse_iterator(begin()); }
-};
-
-// RepeatedField proxy for repeated scalar types.
-template <typename T>
-class RepeatedFieldScalarProxy
-    : public std::conditional_t<std::is_const_v<T>, RepeatedFieldProxyBase<T>,
-                                RepeatedFieldProxyMutableBase<T>> {
-  static_assert(std::is_arithmetic_v<T>, "");
-  static constexpr bool kIsConst = std::is_const_v<T>;
-
- public:
-  using value_type = std::remove_const_t<T>;
-  using size_type = size_t;
-  using difference_type = ptrdiff_t;
-  using iterator = internal::Iterator<ScalarIteratorPolicy<T>>;
-  using reference = typename iterator::reference;
-  using pointer = typename iterator::pointer;
-  using reverse_iterator = std::reverse_iterator<iterator>;
-
-  explicit RepeatedFieldScalarProxy(const upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyBase<T>(arr, arena) {}
-  RepeatedFieldScalarProxy(upb_Array* arr, upb_Arena* arena)
-      : RepeatedFieldProxyMutableBase<T>(arr, arena) {}
-  // Constructor used by ::protos::Ptr.
-  RepeatedFieldScalarProxy(const RepeatedFieldScalarProxy&) = default;
-
-  T operator[](size_t n) const {
-    upb_MessageValue message_value = upb_Array_Get(this->arr_, n);
-    typename std::remove_const_t<T> val;
-    memcpy(&val, &message_value, sizeof(T));
-    return val;
-  }
-
-  template <int&... DeductionBlocker, bool b = !kIsConst,
-            typename = std::enable_if_t<b>>
-  void push_back(T t) {
-    upb_MessageValue message_value;
-    memcpy(&message_value, &t, sizeof(T));
-    upb_Array_Append(this->arr_, message_value, this->arena_);
-  }
-
-  iterator begin() const { return iterator({unsafe_array()}); }
-  iterator cbegin() const { return begin(); }
-  iterator end() const { return iterator({unsafe_array() + this->size()}); }
-  iterator cend() const { return end(); }
-
-  // Reverse iterator support.
-  reverse_iterator rbegin() const { return reverse_iterator(end()); }
-  reverse_iterator rend() const { return reverse_iterator(begin()); }
-  reverse_iterator crbegin() const { return reverse_iterator(end()); }
-  reverse_iterator crend() const { return reverse_iterator(begin()); }
-
- private:
-  T* unsafe_array() const {
-    if (kIsConst) {
-      const void* unsafe_ptr = ::upb_Array_DataPtr(this->arr_);
-      return static_cast<T*>(const_cast<void*>(unsafe_ptr));
-    }
-    if (!kIsConst) {
-      void* unsafe_ptr =
-          ::upb_Array_MutableDataPtr(const_cast<upb_Array*>(this->arr_));
-      return static_cast<T*>(unsafe_ptr);
-    }
-  }
-};
-
-}  // namespace internal
-
-template <typename T>
-class RepeatedField {
-  static constexpr bool kIsString = std::is_same_v<T, absl::string_view>;
-  static constexpr bool kIsScalar = std::is_arithmetic_v<T>;
-
- public:
-  using Proxy = std::conditional_t<
-      kIsScalar, internal::RepeatedFieldScalarProxy<T>,
-      std::conditional_t<kIsString, internal::RepeatedFieldStringProxy<T>,
-                         internal::RepeatedFieldProxy<T>>>;
-  using CProxy = std::conditional_t<
-      kIsScalar, internal::RepeatedFieldScalarProxy<const T>,
-      std::conditional_t<kIsString, internal::RepeatedFieldStringProxy<const T>,
-                         internal::RepeatedFieldProxy<const T>>>;
-  // TODO(b/286451125): T supports incomplete type from fwd.h forwarding headers
-  // We would like to reference T::CProxy. Validate forwarding header design.
-  using ValueProxy = std::conditional_t<
-      kIsScalar, T,
-      std::conditional_t<kIsString, absl::string_view, ::protos::Ptr<T>>>;
-  using ValueCProxy = std::conditional_t<
-      kIsScalar, const T,
-      std::conditional_t<kIsString, absl::string_view, ::protos::Ptr<const T>>>;
-  using Access = std::conditional_t<
-      kIsScalar, internal::RepeatedFieldScalarProxy<T>,
-      std::conditional_t<kIsString, internal::RepeatedFieldStringProxy<T>,
-                         internal::RepeatedFieldProxy<T>>>;
-};
-
-}  // namespace protos
-
-#include "upb/port/undef.inc"
-
-#endif  // UPB_PROTOS_REPEATED_FIELD_H_
diff --git a/third_party/upb/protos/repeated_field_iterator.h b/third_party/upb/protos/repeated_field_iterator.h
deleted file mode 100644
index 64815d0f192d9..0000000000000
--- a/third_party/upb/protos/repeated_field_iterator.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2009-2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-#define UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-
-#include <cstddef>
-#include <cstring>
-#include <iterator>
-#include <type_traits>
-
-#include "absl/strings/string_view.h"
-#include "protos/protos.h"
-#include "upb/base/string_view.h"
-#include "upb/collections/array.h"
-#include "upb/mem/arena.h"
-#include "upb/message/copy.h"
-
-// Must be last:
-#include "upb/port/def.inc"
-
-namespace protos {
-namespace internal {
-
-// TODO(b/279086429): Implement std iterator for messages
-template <typename T>
-class RepeatedFieldScalarProxy;
-template <typename T>
-class RepeatedFieldStringProxy;
-
-struct IteratorTestPeer;
-
-template <typename T>
-class Iterator;
-
-template <typename PolicyT>
-class ReferenceProxy;
-
-template <typename PolicyT>
-class InjectedRelationalsImpl {
-  using RP = ReferenceProxy<PolicyT>;
-  using V = typename PolicyT::value_type;
-  friend bool operator==(RP a, V b) { return static_cast<V>(a) == b; }
-  friend bool operator==(V a, RP b) { return a == static_cast<V>(b); }
-  friend bool operator==(RP a, RP b) {
-    return static_cast<V>(a) == static_cast<V>(b);
-  }
-  friend bool operator!=(RP a, V b) { return static_cast<V>(a) != b; }
-  friend bool operator!=(V a, RP b) { return a != static_cast<V>(b); }
-  friend bool operator!=(RP a, RP b) {
-    return static_cast<V>(a) != static_cast<V>(b);
-  }
-  friend bool operator<(RP a, V b) { return static_cast<V>(a) < b; }
-  friend bool operator<(V a, RP b) { return a < static_cast<V>(b); }
-  friend bool operator<(RP a, RP b) {
-    return static_cast<V>(a) < static_cast<V>(b);
-  }
-  friend bool operator<=(RP a, V b) { return static_cast<V>(a) <= b; }
-  friend bool operator<=(V a, RP b) { return a <= static_cast<V>(b); }
-  friend bool operator<=(RP a, RP b) {
-    return static_cast<V>(a) <= static_cast<V>(b);
-  }
-  friend bool operator>(RP a, V b) { return static_cast<V>(a) > b; }
-  friend bool operator>(V a, RP b) { return a > static_cast<V>(b); }
-  friend bool operator>(RP a, RP b) {
-    return static_cast<V>(a) > static_cast<V>(b);
-  }
-  friend bool operator>=(RP a, V b) { return static_cast<V>(a) >= b; }
-  friend bool operator>=(V a, RP b) { return a >= static_cast<V>(b); }
-  friend bool operator>=(RP a, RP b) {
-    return static_cast<V>(a) >= static_cast<V>(b);
-  }
-};
-class NoInjectedRelationalsImpl {};
-
-// We need to inject relationals for the string references because the
-// relationals for string_view are templates and won't allow for implicit
-// conversions from ReferenceProxy to string_view before deduction.
-template <typename PolicyT>
-using InjectedRelationals = std::conditional_t<
-    std::is_same_v<std::remove_const_t<typename PolicyT::value_type>,
-                   absl::string_view>,
-    InjectedRelationalsImpl<PolicyT>, NoInjectedRelationalsImpl>;
-
-template <typename PolicyT>
-class ReferenceProxy : InjectedRelationals<PolicyT> {
-  using value_type = typename PolicyT::value_type;
-
- public:
-  ReferenceProxy(const ReferenceProxy&) = default;
-  ReferenceProxy& operator=(const ReferenceProxy& other) {
-    // Assign through the references
-    // TODO(sbenza): Make this better for strings to avoid the copy.
-    it_.Set(other.it_.Get());
-    return *this;
-  }
-  friend void swap(ReferenceProxy a, ReferenceProxy b) { a.it_.swap(b.it_); }
-
-  operator value_type() const { return it_.Get(); }
-  void operator=(const value_type& value) const { it_.Set(value); }
-  void operator=(value_type&& value) const { it_.Set(std::move(value)); }
-  Iterator<PolicyT> operator&() const { return Iterator<PolicyT>(it_); }
-
- private:
-  friend IteratorTestPeer;
-  friend ReferenceProxy<typename PolicyT::AddConst>;
-  friend Iterator<PolicyT>;
-
-  explicit ReferenceProxy(typename PolicyT::Payload elem) : it_(elem) {}
-  typename PolicyT::Payload it_;
-};
-
-template <template <typename> class PolicyTemplate, typename T>
-class ReferenceProxy<PolicyTemplate<const T>>
-    : InjectedRelationals<PolicyTemplate<const T>> {
-  using PolicyT = PolicyTemplate<const T>;
-  using value_type = typename PolicyT::value_type;
-
- public:
-  ReferenceProxy(ReferenceProxy<PolicyTemplate<T>> p) : it_(p.it_) {}
-  ReferenceProxy(const ReferenceProxy&) = default;
-  ReferenceProxy& operator=(const ReferenceProxy&) = delete;
-
-  operator value_type() const { return it_.Get(); }
-  Iterator<PolicyT> operator&() const { return Iterator<PolicyT>(it_); }
-
- private:
-  friend IteratorTestPeer;
-  friend Iterator<PolicyT>;
-
-  explicit ReferenceProxy(typename PolicyT::Payload elem) : it_(elem) {}
-  typename PolicyT::Payload it_;
-};
-
-template <typename PolicyT>
-class Iterator {
- public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = std::remove_const_t<typename PolicyT::value_type>;
-  using difference_type = std::ptrdiff_t;
-  using pointer = Iterator;
-  using reference = ReferenceProxy<PolicyT>;
-
-  constexpr Iterator() noexcept : it_(nullptr) {}
-  Iterator(const Iterator& other) = default;
-  Iterator& operator=(const Iterator& other) = default;
-  template <
-      typename P = PolicyT,
-      typename = std::enable_if_t<std::is_const<typename P::value_type>::value>>
-  Iterator(const Iterator<typename P::RemoveConst>& other) : it_(other.it_) {}
-
-  constexpr reference operator*() const noexcept { return reference(it_); }
-  // No operator-> needed because T is a scalar.
-
- private:
-  // Hide the internal type.
-  using iterator = Iterator;
-
- public:
-  // {inc,dec}rementable
-  constexpr iterator& operator++() noexcept {
-    it_.AddOffset(1);
-    return *this;
-  }
-  constexpr iterator operator++(int) noexcept {
-    auto copy = *this;
-    ++*this;
-    return copy;
-  }
-  constexpr iterator& operator--() noexcept {
-    it_.AddOffset(-1);
-    return *this;
-  }
-  constexpr iterator operator--(int) noexcept {
-    auto copy = *this;
-    --*this;
-    return copy;
-  }
-
-  // equality_comparable
-  friend constexpr bool operator==(const iterator& x,
-                                   const iterator& y) noexcept {
-    return x.it_.Index() == y.it_.Index();
-  }
-  friend constexpr bool operator!=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return !(x == y);
-  }
-
-  // less_than_comparable
-  friend constexpr bool operator<(const iterator& x,
-                                  const iterator& y) noexcept {
-    return x.it_.Index() < y.it_.Index();
-  }
-  friend constexpr bool operator<=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return !(y < x);
-  }
-  friend constexpr bool operator>(const iterator& x,
-                                  const iterator& y) noexcept {
-    return y < x;
-  }
-  friend constexpr bool operator>=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return !(x < y);
-  }
-
-  constexpr iterator& operator+=(difference_type d) noexcept {
-    it_.AddOffset(d);
-    return *this;
-  }
-  constexpr iterator operator+(difference_type d) const noexcept {
-    auto copy = *this;
-    copy += d;
-    return copy;
-  }
-  friend constexpr iterator operator+(const difference_type d,
-                                      iterator it) noexcept {
-    return it + d;
-  }
-
-  constexpr iterator& operator-=(difference_type d) noexcept {
-    it_.AddOffset(-d);
-    return *this;
-  }
-  constexpr iterator operator-(difference_type d) const noexcept {
-    auto copy = *this;
-    copy -= d;
-    return copy;
-  }
-
-  // indexable
-  constexpr reference operator[](difference_type d) const noexcept {
-    auto copy = *this;
-    copy += d;
-    return *copy;
-  }
-
-  // random access iterator
-  friend constexpr difference_type operator-(iterator x, iterator y) noexcept {
-    return x.it_.Index() - y.it_.Index();
-  }
-
- private:
-  friend IteratorTestPeer;
-  friend ReferenceProxy<PolicyT>;
-  friend Iterator<typename PolicyT::AddConst>;
-  template <typename U>
-  friend class RepeatedFieldScalarProxy;
-  template <typename U>
-  friend class RepeatedFieldStringProxy;
-
-  // Create from internal::RepeatedFieldScalarProxy.
-  explicit Iterator(typename PolicyT::Payload it) noexcept : it_(it) {}
-
-  // The internal iterator.
-  typename PolicyT::Payload it_;
-};
-
-template <typename T>
-struct ScalarIteratorPolicy {
-  using value_type = T;
-  using RemoveConst = ScalarIteratorPolicy<std::remove_const_t<T>>;
-  using AddConst = ScalarIteratorPolicy<const T>;
-
-  struct Payload {
-    T* value;
-    void AddOffset(ptrdiff_t offset) { value += offset; }
-    T Get() const { return *value; }
-    void Set(T new_value) const { *value = new_value; }
-    T* Index() const { return value; }
-
-    void swap(Payload& other) {
-      using std::swap;
-      swap(*value, *other.value);
-    }
-
-    operator typename ScalarIteratorPolicy<const T>::Payload() const {
-      return {value};
-    }
-  };
-};
-
-template <typename T>
-struct StringIteratorPolicy {
-  using value_type = T;
-  using RemoveConst = StringIteratorPolicy<std::remove_const_t<T>>;
-  using AddConst = StringIteratorPolicy<const T>;
-
-  struct Payload {
-    using Array =
-        std::conditional_t<std::is_const_v<T>, const upb_Array, upb_Array>;
-    Array* arr;
-    upb_Arena* arena;
-    size_t index;
-
-    void AddOffset(ptrdiff_t offset) { index += offset; }
-    absl::string_view Get() const {
-      upb_MessageValue message_value = upb_Array_Get(arr, index);
-      return absl::string_view(message_value.str_val.data,
-                               message_value.str_val.size);
-    }
-    void Set(absl::string_view new_value) const {
-      char* data =
-          static_cast<char*>(upb_Arena_Malloc(arena, new_value.size()));
-      memcpy(data, new_value.data(), new_value.size());
-      upb_MessageValue message_value;
-      message_value.str_val =
-          upb_StringView_FromDataAndSize(data, new_value.size());
-      upb_Array_Set(arr, index, message_value);
-    }
-    size_t Index() const { return index; }
-
-    void swap(Payload& other) {
-      upb_MessageValue a = upb_Array_Get(this->arr, this->index);
-      upb_MessageValue b = upb_Array_Get(other.arr, other.index);
-      upb_Array_Set(this->arr, this->index, b);
-      upb_Array_Set(other.arr, other.index, a);
-    }
-
-    operator typename StringIteratorPolicy<const T>::Payload() const {
-      return {arr, arena, index};
-    }
-  };
-};
-
-}  // namespace internal
-}  // namespace protos
-
-#endif  // UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
diff --git a/third_party/upb/protos/repeated_field_iterator_test.cc b/third_party/upb/protos/repeated_field_iterator_test.cc
deleted file mode 100644
index fab1f2283363b..0000000000000
--- a/third_party/upb/protos/repeated_field_iterator_test.cc
+++ /dev/null
@@ -1,448 +0,0 @@
-#include "protos/repeated_field_iterator.h"
-
-#include <algorithm>
-#include <array>
-#include <numeric>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using ::testing::ElementsAre;
-
-namespace protos {
-namespace internal {
-
-template <typename T>
-using ScalarRef = ReferenceProxy<ScalarIteratorPolicy<T>>;
-template <typename T>
-using ScalarIterator = Iterator<ScalarIteratorPolicy<T>>;
-
-template <typename T>
-using StringRef = ReferenceProxy<StringIteratorPolicy<T>>;
-template <typename T>
-using StringIterator = Iterator<StringIteratorPolicy<T>>;
-
-struct IteratorTestPeer {
-  template <typename T>
-  static ScalarRef<T> MakeScalarRefProxy(T& ref) {
-    return ScalarRef<T>({&ref});
-  }
-
-  template <typename T>
-  static ScalarIterator<T> MakeScalarIterator(T* ptr) {
-    return ScalarIterator<T>({ptr});
-  }
-
-  template <typename T>
-  static StringRef<T> MakeStringRefProxy(upb_Array* arr, protos::Arena& arena) {
-    return StringRef<T>({arr, arena.ptr(), 0});
-  }
-
-  template <typename T>
-  static StringIterator<T> MakeStringIterator(upb_Array* arr,
-                                              protos::Arena& arena) {
-    return StringIterator<T>({arr, arena.ptr()});
-  }
-};
-
-namespace {
-
-TEST(ScalarReferenceTest, BasicOperationsWork) {
-  int i = 0;
-  ScalarRef<int> p = IteratorTestPeer::MakeScalarRefProxy(i);
-  ScalarRef<const int> cp =
-      IteratorTestPeer::MakeScalarRefProxy(std::as_const(i));
-  EXPECT_EQ(i, 0);
-  p = 17;
-  EXPECT_EQ(i, 17);
-  EXPECT_EQ(p, 17);
-  EXPECT_EQ(cp, 17);
-  i = 13;
-  EXPECT_EQ(p, 13);
-  EXPECT_EQ(cp, 13);
-
-  EXPECT_FALSE((std::is_assignable<decltype(cp), int>::value));
-
-  // Check that implicit conversion works T -> const T
-  ScalarRef<const int> cp2 = p;
-  EXPECT_EQ(cp2, 13);
-
-  EXPECT_FALSE((std::is_convertible<decltype(cp), ScalarRef<int>>::value));
-}
-
-TEST(ScalarReferenceTest, AssignmentAndSwap) {
-  int i = 3;
-  int j = 5;
-  ScalarRef<int> p = IteratorTestPeer::MakeScalarRefProxy(i);
-  ScalarRef<int> p2 = IteratorTestPeer::MakeScalarRefProxy(j);
-
-  EXPECT_EQ(p, 3);
-  EXPECT_EQ(p2, 5);
-  swap(p, p2);
-  EXPECT_EQ(p, 5);
-  EXPECT_EQ(p2, 3);
-
-  p = p2;
-  EXPECT_EQ(p, 3);
-  EXPECT_EQ(p2, 3);
-}
-
-template <typename T, typename U>
-std::array<bool, 6> RunCompares(const T& a, const U& b) {
-  // Verify some basic properties here.
-  // Equivalencies
-  EXPECT_EQ((a == b), (b == a));
-  EXPECT_EQ((a != b), (b != a));
-  EXPECT_EQ((a < b), (b > a));
-  EXPECT_EQ((a > b), (b < a));
-  EXPECT_EQ((a <= b), (b >= a));
-  EXPECT_EQ((a >= b), (b <= a));
-
-  // Opposites
-  EXPECT_NE((a == b), (a != b));
-  EXPECT_NE((a < b), (a >= b));
-  EXPECT_NE((a > b), (a <= b));
-
-  return {{
-      (a == b),
-      (a != b),
-      (a < b),
-      (a <= b),
-      (a > b),
-      (a >= b),
-  }};
-}
-
-template <typename T>
-void TestScalarIterator(T* array) {
-  ScalarIterator<T> it = IteratorTestPeer::MakeScalarIterator(array);
-  // Copy
-  auto it2 = it;
-
-  EXPECT_THAT(RunCompares(it, it2),
-              ElementsAre(true, false, false, true, false, true));
-
-  // Increment
-  EXPECT_EQ(*++it, 11);
-  EXPECT_EQ(*it2, 10);
-  EXPECT_EQ(*it++, 11);
-  EXPECT_EQ(*it2, 10);
-  EXPECT_EQ(*it, 12);
-  EXPECT_EQ(*it2, 10);
-
-  EXPECT_THAT(RunCompares(it, it2),
-              ElementsAre(false, true, false, false, true, true));
-
-  // Assign
-  it2 = it;
-  EXPECT_EQ(*it, 12);
-  EXPECT_EQ(*it2, 12);
-
-  // Decrement
-  EXPECT_EQ(*--it, 11);
-  EXPECT_EQ(*it--, 11);
-  EXPECT_EQ(*it, 10);
-
-  it += 5;
-  EXPECT_EQ(*it, 15);
-  EXPECT_EQ(it - it2, 3);
-  EXPECT_EQ(it2 - it, -3);
-  it -= 3;
-  EXPECT_EQ(*it, 12);
-  EXPECT_EQ(it[6], 18);
-  EXPECT_EQ(it[-1], 11);
-}
-
-TEST(ScalarIteratorTest, BasicOperationsWork) {
-  int array[10] = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-  TestScalarIterator<const int>(array);
-  TestScalarIterator<int>(array);
-}
-
-TEST(ScalarIteratorTest, Convertibility) {
-  int array[10] = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-  ScalarIterator<int> it = IteratorTestPeer::MakeScalarIterator(array);
-  it += 4;
-  ScalarIterator<const int> cit = it;
-  EXPECT_EQ(*it, 14);
-  EXPECT_EQ(*cit, 14);
-  it += 2;
-  EXPECT_EQ(*it, 16);
-  EXPECT_EQ(*cit, 14);
-  cit = it;
-  EXPECT_EQ(*it, 16);
-  EXPECT_EQ(*cit, 16);
-
-  EXPECT_FALSE((std::is_convertible<ScalarIterator<const int>,
-                                    ScalarIterator<int>>::value));
-  EXPECT_FALSE((std::is_assignable<ScalarIterator<int>,
-                                   ScalarIterator<const int>>::value));
-}
-
-TEST(ScalarIteratorTest, MutabilityOnlyWorksOnMutable) {
-  int array[10] = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-  ScalarIterator<int> it = IteratorTestPeer::MakeScalarIterator(array);
-  EXPECT_EQ(array[3], 13);
-  it[3] = 113;
-  EXPECT_EQ(array[3], 113);
-  ScalarIterator<const int> cit = it;
-  EXPECT_FALSE((std::is_assignable<decltype(*cit), int>::value));
-  EXPECT_FALSE((std::is_assignable<decltype(cit[1]), int>::value));
-}
-
-TEST(ScalarIteratorTest, IteratorReferenceInteraction) {
-  int array[10] = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-  ScalarIterator<int> it = IteratorTestPeer::MakeScalarIterator(array);
-  EXPECT_EQ(it[4], 14);
-  // op& from references goes back to iterator.
-  ScalarIterator<int> it2 = &it[4];
-  EXPECT_EQ(it + 4, it2);
-}
-
-TEST(ScalarIteratorTest, IteratorBasedAlgorithmsWork) {
-  // We use a vector here to make testing it easier.
-  std::vector<int> v(10, 0);
-  ScalarIterator<int> it = IteratorTestPeer::MakeScalarIterator(v.data());
-  EXPECT_THAT(v, ElementsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  std::iota(it, it + 10, 10);
-  EXPECT_THAT(v, ElementsAre(10, 11, 12, 13, 14, 15, 16, 17, 18, 19));
-  EXPECT_EQ(it + 5, std::find(it, it + 10, 15));
-  EXPECT_EQ(145, std::accumulate(it, it + 10, 0));
-  std::sort(it, it + 10, [](int a, int b) {
-    return std::tuple(a % 2, a) < std::tuple(b % 2, b);
-  });
-  EXPECT_THAT(v, ElementsAre(10, 12, 14, 16, 18, 11, 13, 15, 17, 19));
-}
-
-const char* CloneString(protos::Arena& arena, absl::string_view str) {
-  char* data = (char*)upb_Arena_Malloc(arena.ptr(), str.size());
-  memcpy(data, str.data(), str.size());
-  return data;
-}
-upb_Array* MakeStringArray(protos::Arena& arena,
-                           const std::vector<std::string>& input) {
-  upb_Array* arr = upb_Array_New(arena.ptr(), kUpb_CType_String);
-  for (absl::string_view str : input) {
-    upb_MessageValue message_value;
-    message_value.str_val =
-        upb_StringView_FromDataAndSize(CloneString(arena, str), str.size());
-    upb_Array_Append(arr, message_value, arena.ptr());
-  }
-  return arr;
-}
-
-TEST(StringReferenceTest, BasicOperationsWork) {
-  protos::Arena arena;
-  upb_Array* arr = MakeStringArray(arena, {""});
-
-  auto read = [&] {
-    upb_MessageValue message_value = upb_Array_Get(arr, 0);
-    return absl::string_view(message_value.str_val.data,
-                             message_value.str_val.size);
-  };
-
-  StringRef<absl::string_view> p =
-      IteratorTestPeer::MakeStringRefProxy<absl::string_view>(arr, arena);
-  StringRef<const absl::string_view> cp =
-      IteratorTestPeer::MakeStringRefProxy<const absl::string_view>(arr, arena);
-  EXPECT_EQ(read(), "");
-  EXPECT_EQ(p, "");
-  p = "ABC";
-  EXPECT_EQ(read(), "ABC");
-  EXPECT_EQ(p, "ABC");
-  EXPECT_EQ(cp, "ABC");
-  const_cast<char*>(read().data())[0] = 'X';
-  EXPECT_EQ(read(), "XBC");
-  EXPECT_EQ(p, "XBC");
-  EXPECT_EQ(cp, "XBC");
-
-  EXPECT_FALSE((std::is_assignable<decltype(cp), int>::value));
-
-  // Check that implicit conversion works T -> const T
-  StringRef<const absl::string_view> cp2 = p;
-  EXPECT_EQ(cp2, "XBC");
-
-  EXPECT_FALSE(
-      (std::is_convertible<decltype(cp), StringRef<absl::string_view>>::value));
-
-  EXPECT_THAT(RunCompares(p, "XBC"),
-              ElementsAre(true, false, false, true, false, true));
-  EXPECT_THAT(RunCompares(p, "YBC"),
-              ElementsAre(false, true, true, true, false, false));
-  EXPECT_THAT(RunCompares(p, "RBC"),
-              ElementsAre(false, true, false, false, true, true));
-  EXPECT_THAT(RunCompares(p, "XB"),
-              ElementsAre(false, true, false, false, true, true));
-  EXPECT_THAT(RunCompares(p, "XBCD"),
-              ElementsAre(false, true, true, true, false, false));
-}
-
-TEST(StringReferenceTest, AssignmentAndSwap) {
-  protos::Arena arena;
-  upb_Array* arr1 = MakeStringArray(arena, {"ABC"});
-  upb_Array* arr2 = MakeStringArray(arena, {"DEF"});
-
-  auto p = IteratorTestPeer::MakeStringRefProxy<absl::string_view>(arr1, arena);
-  auto p2 =
-      IteratorTestPeer::MakeStringRefProxy<absl::string_view>(arr2, arena);
-
-  EXPECT_EQ(p, "ABC");
-  EXPECT_EQ(p2, "DEF");
-  swap(p, p2);
-  EXPECT_EQ(p, "DEF");
-  EXPECT_EQ(p2, "ABC");
-
-  p = p2;
-  EXPECT_EQ(p, "ABC");
-  EXPECT_EQ(p2, "ABC");
-}
-
-template <typename T>
-void TestStringIterator(protos::Arena& arena, upb_Array* array) {
-  StringIterator<T> it = IteratorTestPeer::MakeStringIterator<T>(array, arena);
-  // Copy
-  auto it2 = it;
-
-  EXPECT_THAT(RunCompares(it, it2),
-              ElementsAre(true, false, false, true, false, true));
-
-  // Increment
-  EXPECT_EQ(*++it, "11");
-  EXPECT_EQ(*it2, "10");
-  EXPECT_EQ(*it++, "11");
-  EXPECT_EQ(*it2, "10");
-  EXPECT_EQ(*it, "12");
-  EXPECT_EQ(*it2, "10");
-
-  EXPECT_THAT(RunCompares(it, it2),
-              ElementsAre(false, true, false, false, true, true));
-
-  // Assign
-  it2 = it;
-  EXPECT_EQ(*it, "12");
-  EXPECT_EQ(*it2, "12");
-
-  // Decrement
-  EXPECT_EQ(*--it, "11");
-  EXPECT_EQ(*it--, "11");
-  EXPECT_EQ(*it, "10");
-
-  it += 5;
-  EXPECT_EQ(*it, "15");
-  EXPECT_EQ(it - it2, 3);
-  EXPECT_EQ(it2 - it, -3);
-  it -= 3;
-  EXPECT_EQ(*it, "12");
-  EXPECT_EQ(it[6], "18");
-  EXPECT_EQ(it[-1], "11");
-}
-
-TEST(StringIteratorTest, BasicOperationsWork) {
-  protos::Arena arena;
-  auto* array = MakeStringArray(
-      arena, {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19"});
-  TestStringIterator<const absl::string_view>(arena, array);
-  TestStringIterator<absl::string_view>(arena, array);
-}
-
-TEST(StringIteratorTest, Convertibility) {
-  protos::Arena arena;
-  auto* array = MakeStringArray(
-      arena, {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19"});
-  StringIterator<absl::string_view> it =
-      IteratorTestPeer::MakeStringIterator<absl::string_view>(array, arena);
-  it += 4;
-  StringIterator<const absl::string_view> cit = it;
-  EXPECT_EQ(*it, "14");
-  EXPECT_EQ(*cit, "14");
-  it += 2;
-  EXPECT_EQ(*it, "16");
-  EXPECT_EQ(*cit, "14");
-  cit = it;
-  EXPECT_EQ(*it, "16");
-  EXPECT_EQ(*cit, "16");
-
-  EXPECT_FALSE((std::is_convertible<StringIterator<const absl::string_view>,
-                                    StringIterator<absl::string_view>>::value));
-  EXPECT_FALSE(
-      (std::is_assignable<StringIterator<absl::string_view>,
-                          StringIterator<const absl::string_view>>::value));
-}
-
-TEST(StringIteratorTest, MutabilityOnlyWorksOnMutable) {
-  protos::Arena arena;
-  auto* array = MakeStringArray(
-      arena, {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19"});
-  StringIterator<absl::string_view> it =
-      IteratorTestPeer::MakeStringIterator<absl::string_view>(array, arena);
-
-  auto read = [&] {
-    upb_MessageValue message_value = upb_Array_Get(array, 3);
-    return absl::string_view(message_value.str_val.data,
-                             message_value.str_val.size);
-  };
-
-  EXPECT_EQ(read(), "13");
-  it[3] = "113";
-  EXPECT_EQ(read(), "113");
-  StringIterator<const absl::string_view> cit = it;
-  EXPECT_FALSE((std::is_assignable<decltype(*cit), absl::string_view>::value));
-  EXPECT_FALSE(
-      (std::is_assignable<decltype(cit[1]), absl::string_view>::value));
-}
-
-TEST(StringIteratorTest, IteratorReferenceInteraction) {
-  protos::Arena arena;
-  auto* array = MakeStringArray(
-      arena, {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19"});
-  StringIterator<absl::string_view> it =
-      IteratorTestPeer::MakeStringIterator<absl::string_view>(array, arena);
-  EXPECT_EQ(it[4], "14");
-  // op& from references goes back to iterator.
-  StringIterator<absl::string_view> it2 = &it[4];
-  EXPECT_EQ(it + 4, it2);
-}
-
-TEST(StringIteratorTest, IteratorBasedAlgorithmsWork) {
-  protos::Arena arena;
-  auto* array = MakeStringArray(
-      arena, {"10", "11", "12", "13", "14", "15", "16", "17", "18", "19"});
-  StringIterator<absl::string_view> it =
-      IteratorTestPeer::MakeStringIterator<absl::string_view>(array, arena);
-
-  auto read = [&] {
-    std::vector<absl::string_view> v;
-    for (int i = 0; i < 10; ++i) {
-      upb_MessageValue message_value = upb_Array_Get(array, i);
-      v.emplace_back(message_value.str_val.data, message_value.str_val.size);
-    }
-    return v;
-  };
-
-  EXPECT_THAT(read(), ElementsAre("10", "11", "12", "13", "14",  //
-                                  "15", "16", "17", "18", "19"));
-  std::sort(it, it + 10, [](absl::string_view a, absl::string_view b) {
-    return std::tuple(a[1] % 2, a) < std::tuple(b[1] % 2, b);
-  });
-  EXPECT_THAT(read(), ElementsAre("10", "12", "14", "16", "18",  //
-                                  "11", "13", "15", "17", "19"));
-  // Now sort with the default less.
-  std::sort(it, it + 10);
-  EXPECT_THAT(read(), ElementsAre("10", "11", "12", "13", "14",  //
-                                  "15", "16", "17", "18", "19"));
-
-  // Mutable algorithm
-  std::generate(it, it + 10,
-                [i = 0]() mutable { return std::string(i++, 'x'); });
-  EXPECT_THAT(read(),
-              ElementsAre("", "x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx",
-                          "xxxxxxx", "xxxxxxxx", "xxxxxxxxx"));
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protos
diff --git a/third_party/upb/protos_generator/BUILD b/third_party/upb/protos_generator/BUILD
deleted file mode 100644
index acc0c1a5bb74a..0000000000000
--- a/third_party/upb/protos_generator/BUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_CPPOPTS",
-)
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-cc_binary(
-    name = "protoc-gen-upb-protos",
-    srcs = [
-        "protoc-gen-upb-protos.cc",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":gen_utils",
-        ":generator",
-        ":names",
-        ":output",
-        "//upbc:file_layout",
-        "@com_google_protobuf//:protobuf",
-        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
-    ],
-)
-
-cc_library(
-    name = "generator",
-    srcs = [
-        "gen_accessors.cc",
-        "gen_enums.cc",
-        "gen_extensions.cc",
-        "gen_messages.cc",
-        "gen_repeated_fields.cc",
-    ],
-    hdrs = [
-        "gen_accessors.h",
-        "gen_enums.h",
-        "gen_extensions.h",
-        "gen_messages.h",
-        "gen_repeated_fields.h",
-    ],
-    visibility = ["//visibility:private"],
-    deps = [
-        ":gen_utils",
-        ":names",
-        ":output",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/strings",
-        "//upbc:common",
-        "//upbc:file_layout",
-        "//upbc:keywords",
-        "//upbc:names",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_library(
-    name = "output",
-    srcs = ["output.cc"],
-    hdrs = ["output.h"],
-    visibility = ["//visibility:private"],
-    deps = [
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_library(
-    name = "gen_utils",
-    srcs = ["gen_utils.cc"],
-    hdrs = ["gen_utils.h"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_google_absl//absl/strings",
-        "@com_google_protobuf//:protobuf",
-        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
-    ],
-)
-
-cc_library(
-    name = "names",
-    srcs = ["names.cc"],
-    hdrs = ["names.h"],
-    visibility = ["//visibility:private"],
-    deps = [
-        ":output",
-        "//upbc:keywords",
-    ],
-)
diff --git a/third_party/upb/protos_generator/gen_accessors.cc b/third_party/upb/protos_generator/gen_accessors.cc
deleted file mode 100644
index 1b4f9edaca77c..0000000000000
--- a/third_party/upb/protos_generator/gen_accessors.cc
+++ /dev/null
@@ -1,576 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protos_generator/gen_accessors.h"
-
-#include <string>
-
-#include "absl/container/flat_hash_set.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_repeated_fields.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-#include "protos_generator/output.h"
-#include "upbc/common.h"
-#include "upbc/keywords.h"
-#include "upbc/names.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-using NameToFieldDescriptorMap =
-    absl::flat_hash_map<absl::string_view, const protobuf::FieldDescriptor*>;
-
-void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc,
-                              const protobuf::FieldDescriptor* field,
-                              absl::string_view resolved_field_name,
-                              absl::string_view resolved_upbc_name,
-                              Output& output);
-void WriteFieldAccessorClear(const protobuf::Descriptor* desc,
-                             const protobuf::FieldDescriptor* field,
-                             absl::string_view resolved_field_name,
-                             absl::string_view resolved_upbc_name,
-                             Output& output);
-void WriteMapFieldAccessors(const protobuf::Descriptor* desc,
-                            const protobuf::FieldDescriptor* field,
-                            absl::string_view resolved_field_name,
-                            absl::string_view resolved_upbc_name,
-                            Output& output);
-
-void WriteMapAccessorDefinitions(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 absl::string_view resolved_field_name,
-                                 absl::string_view class_name, Output& output);
-
-// Returns C++ class member name by resolving naming conflicts across
-// proto field names (such as clear_ prefixes) and keyword collisions.
-//
-// The Upb C generator prefixes all accessors with package and class names
-// avoiding collisions. Therefore we need to use raw field names when calling
-// into C accessors but need to fully resolve conflicts for C++ class members.
-std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
-                             const NameToFieldDescriptorMap& field_names);
-
-NameToFieldDescriptorMap CreateFieldNameMap(
-    const protobuf::Descriptor* message) {
-  NameToFieldDescriptorMap field_names;
-  for (int i = 0; i < message->field_count(); i++) {
-    const protobuf::FieldDescriptor* field = message->field(i);
-    field_names.emplace(field->name(), field);
-  }
-  return field_names;
-}
-
-void WriteFieldAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 Output& output) {
-  // Generate const methods.
-  OutputIndenter i(output);
-
-  auto field_names = CreateFieldNameMap(desc);
-  auto upbc_field_names = upbc::CreateFieldNameMap(desc);
-
-  for (const auto* field : FieldNumberOrder(desc)) {
-    std::string resolved_field_name = ResolveFieldName(field, field_names);
-    std::string resolved_upbc_name =
-        upbc::ResolveFieldName(field, upbc_field_names);
-    WriteFieldAccessorHazzer(desc, field, resolved_field_name,
-                             resolved_upbc_name, output);
-    WriteFieldAccessorClear(desc, field, resolved_field_name,
-                            resolved_upbc_name, output);
-
-    if (field->is_map()) {
-      WriteMapFieldAccessors(desc, field, resolved_field_name,
-                             resolved_upbc_name, output);
-    } else if (desc->options().map_entry()) {
-      // TODO(b/237399867) Implement map entry
-    } else if (field->is_repeated()) {
-      WriteRepeatedFieldsInMessageHeader(desc, field, resolved_field_name,
-                                         resolved_upbc_name, output);
-    } else {
-      // non-repeated.
-      if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-        output(R"cc(
-                 $0 $1() const;
-                 void set_$1($0 value);
-               )cc",
-               CppConstType(field), resolved_field_name);
-      } else if (field->cpp_type() ==
-                 protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-        output(R"cc(
-                 $1 $2() const;
-                 $0 mutable_$2();
-               )cc",
-               MessagePtrConstType(field, /* const */ false),
-               MessagePtrConstType(field, /* const */ true),
-               resolved_field_name, resolved_upbc_name);
-      } else {
-        output(
-            R"cc(
-              inline $0 $1() const { return $2_$3(msg_); }
-              inline void set_$1($0 value) { return $2_set_$3(msg_, value); }
-            )cc",
-            CppConstType(field), resolved_field_name, MessageName(desc),
-            resolved_upbc_name);
-      }
-    }
-  }
-}
-
-void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc,
-                              const protobuf::FieldDescriptor* field,
-                              const absl::string_view resolved_field_name,
-                              const absl::string_view resolved_upbc_name,
-                              Output& output) {
-  // Generate hazzer (if any).
-  if (field->has_presence()) {
-    // Has presence.
-    output("inline bool has_$0() const { return $1_has_$2(msg_); }\n",
-           resolved_field_name, MessageName(desc), resolved_upbc_name);
-  }
-}
-
-void WriteFieldAccessorClear(const protobuf::Descriptor* desc,
-                             const protobuf::FieldDescriptor* field,
-                             const absl::string_view resolved_field_name,
-                             const absl::string_view resolved_upbc_name,
-                             Output& output) {
-  if (field->has_presence()) {
-    output("void clear_$0() { $2_clear_$1(msg_); }\n", resolved_field_name,
-           resolved_upbc_name, MessageName(desc));
-  }
-}
-
-void WriteMapFieldAccessors(const protobuf::Descriptor* desc,
-                            const protobuf::FieldDescriptor* field,
-                            const absl::string_view resolved_field_name,
-                            const absl::string_view resolved_upbc_name,
-                            Output& output) {
-  const protobuf::Descriptor* entry = field->message_type();
-  const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
-  const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
-  output(
-      R"cc(
-        inline size_t $0_size() const { return $1_$3_size(msg_); }
-        inline void clear_$0() { $1_clear_$3(msg_); }
-        void delete_$0($2 key);
-      )cc",
-      resolved_field_name, MessageName(desc), CppConstType(key),
-      resolved_upbc_name);
-
-  if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-    output(
-        R"cc(
-          bool set_$0($1 key, $3 value);
-          bool set_$0($1 key, $4 value);
-          absl::StatusOr<$3> get_$0($1 key);
-        )cc",
-        resolved_field_name, CppConstType(key), CppConstType(val),
-        MessagePtrConstType(val, /* is_const */ true),
-        MessagePtrConstType(val, /* is_const */ false));
-  } else {
-    output(
-        R"cc(
-          bool set_$0($1 key, $2 value);
-          absl::StatusOr<$2> get_$0($1 key);
-        )cc",
-        resolved_field_name, CppConstType(key), CppConstType(val));
-  }
-}
-
-void WriteAccessorsInSource(const protobuf::Descriptor* desc, Output& output) {
-  std::string class_name = ClassName(desc);
-  absl::StrAppend(&class_name, "Access");
-  output("namespace internal {\n");
-  const char arena_expression[] = "arena_";
-  auto field_names = CreateFieldNameMap(desc);
-  auto upbc_field_names = upbc::CreateFieldNameMap(desc);
-
-  // Generate const methods.
-  OutputIndenter i(output);
-  for (const auto* field : FieldNumberOrder(desc)) {
-    std::string resolved_field_name = ResolveFieldName(field, field_names);
-    std::string resolved_upbc_name =
-        upbc::ResolveFieldName(field, upbc_field_names);
-    if (field->is_map()) {
-      WriteMapAccessorDefinitions(desc, field, resolved_field_name, class_name,
-                                  output);
-    } else if (desc->options().map_entry()) {
-      // TODO(b/237399867) Implement map entry
-    } else if (field->is_repeated()) {
-      if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-        WriteRepeatedMessageAccessor(desc, field, resolved_field_name,
-                                     class_name, output);
-      } else if (field->cpp_type() ==
-                 protobuf::FieldDescriptor::CPPTYPE_STRING) {
-        WriteRepeatedStringAccessor(desc, field, resolved_field_name,
-                                    class_name, output);
-      } else {
-        WriteRepeatedScalarAccessor(desc, field, resolved_field_name,
-                                    class_name, output);
-      }
-    } else {
-      // non-repeated field.
-      if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-        output(
-            R"cc(
-              $1 $0::$2() const {
-                return ::protos::UpbStrToStringView($3_$4(msg_));
-              }
-            )cc",
-            class_name, CppConstType(field), resolved_field_name,
-            MessageName(desc), resolved_upbc_name);
-        // Set string.
-        output(
-            R"cc(
-              void $0::set_$2($1 value) {
-                $4_set_$3(msg_, ::protos::UpbStrFromStringView(value, $5));
-              }
-            )cc",
-            class_name, CppConstType(field), resolved_field_name,
-            resolved_upbc_name, MessageName(desc), arena_expression);
-      } else if (field->cpp_type() ==
-                 protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-        output(
-            R"cc(
-              $1 $0::$2() const {
-                if (!has_$2()) {
-                  return $4::default_instance();
-                }
-                return ::protos::internal::CreateMessage<$4>(
-                    (upb_Message*)($3_$5(msg_)), arena_);
-              }
-            )cc",
-            class_name, MessagePtrConstType(field, /* is_const */ true),
-            resolved_field_name, MessageName(desc),
-            MessageBaseType(field, /* maybe_const */ false),
-            resolved_upbc_name);
-
-        output(
-            R"cc(
-              $1 $0::mutable_$2() {
-                return ::protos::internal::CreateMessageProxy<$4>(
-                    (upb_Message*)($3_mutable_$5(msg_, $6)), $6);
-              }
-            )cc",
-            class_name, MessagePtrConstType(field, /* is_const */ false),
-            resolved_field_name, MessageName(desc),
-            MessageBaseType(field, /* maybe_const */ false), resolved_upbc_name,
-            arena_expression);
-      }
-    }
-  }
-  output("\n");
-  output("}  // namespace internal\n\n");
-}
-
-void WriteMapAccessorDefinitions(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 const absl::string_view resolved_field_name,
-                                 const absl::string_view class_name,
-                                 Output& output) {
-  const protobuf::Descriptor* entry = field->message_type();
-  const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
-  const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
-  absl::string_view upbc_name = field->name();
-  absl::string_view converted_key_name = "key";
-  absl::string_view optional_conversion_code = "";
-
-  if (key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-    // Insert conversion from absl::string_view to upb_StringView.
-    // Creates upb_StringView on stack to prevent allocation.
-    converted_key_name = "upb_key";
-    optional_conversion_code =
-        "upb_StringView upb_key = {key.data(), key.size()};\n";
-  }
-  if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-    output(
-        R"cc(
-          bool $0::set_$1($2 key, $3 value) {
-            upb_Message* clone = upb_Message_DeepClone(value->msg(), &$9, arena_);
-            $6return $4_$8_set(msg_, $7, ($5*)clone, arena_);
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key),
-        MessagePtrConstType(val, /* is_const */ true), MessageName(message),
-        MessageName(val->message_type()), optional_conversion_code,
-        converted_key_name, upbc_name,
-        ::upbc::MessageInit(val->message_type()->full_name()));
-    output(
-        R"cc(
-          bool $0::set_$1($2 key, $3 value) {
-            upb_Message* clone = upb_Message_DeepClone(value->msg(), &$9, arena_);
-            $6return $4_$8_set(msg_, $7, ($5*)clone, arena_);
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key),
-        MessagePtrConstType(val, /* is_const */ false), MessageName(message),
-        MessageName(val->message_type()), optional_conversion_code,
-        converted_key_name, upbc_name,
-        ::upbc::MessageInit(val->message_type()->full_name()));
-    output(
-        R"cc(
-          absl::StatusOr<$3> $0::get_$1($2 key) {
-            $5* msg_value;
-            $7bool success = $4_$9_get(msg_, $8, &msg_value);
-            if (success) {
-              return ::protos::internal::CreateMessage<$6>(msg_value, arena_);
-            }
-            return absl::NotFoundError("");
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key),
-        MessagePtrConstType(val, /* is_const */ true), MessageName(message),
-        MessageName(val->message_type()),
-        QualifiedClassName(val->message_type()), optional_conversion_code,
-        converted_key_name, upbc_name);
-    output(
-        R"cc(
-          void $0::delete_$1($2 key) { $6$4_$8_delete(msg_, $7); }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key),
-        MessagePtrConstType(val, /* is_const */ false), MessageName(message),
-        MessageName(val->message_type()), optional_conversion_code,
-        converted_key_name, upbc_name);
-  } else if (val->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-    output(
-        R"cc(
-          bool $0::set_$1($2 key, $3 value) {
-            $5return $4_$7_set(msg_, $6,
-                               ::protos::UpbStrFromStringView(value, arena_),
-                               arena_);
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-    output(
-        R"cc(
-          absl::StatusOr<$3> $0::get_$1($2 key) {
-            upb_StringView value;
-            $5bool success = $4_$7_get(msg_, $6, &value);
-            if (success) {
-              return absl::string_view(value.data, value.size);
-            }
-            return absl::NotFoundError("");
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-    output(
-        R"cc(
-          void $0::delete_$1($2 key) { $5$4_$7_delete(msg_, $6); }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-  } else {
-    output(
-        R"cc(
-          bool $0::set_$1($2 key, $3 value) {
-            $5return $4_$7_set(msg_, $6, value, arena_);
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-    output(
-        R"cc(
-          absl::StatusOr<$3> $0::get_$1($2 key) {
-            $3 value;
-            $5bool success = $4_$7_get(msg_, $6, &value);
-            if (success) {
-              return value;
-            }
-            return absl::NotFoundError("");
-          }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-    output(
-        R"cc(
-          void $0::delete_$1($2 key) { $5$4_$7_delete(msg_, $6); }
-        )cc",
-        class_name, resolved_field_name, CppConstType(key), CppConstType(val),
-        MessageName(message), optional_conversion_code, converted_key_name,
-        upbc_name);
-  }
-}
-
-void WriteUsingAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 MessageClassType handle_type, Output& output) {
-  bool read_only = handle_type == MessageClassType::kMessageCProxy;
-
-  // Generate const methods.
-  OutputIndenter i(output);
-  std::string class_name = ClassName(desc);
-  auto field_names = CreateFieldNameMap(desc);
-
-  for (const auto* field : FieldNumberOrder(desc)) {
-    std::string resolved_field_name = ResolveFieldName(field, field_names);
-    // Generate hazzer (if any).
-    if (field->has_presence()) {
-      output("using $0Access::has_$1;\n", class_name, resolved_field_name);
-      output("using $0Access::clear_$1;\n", class_name, resolved_field_name);
-    }
-    if (field->is_map()) {
-      output(
-          R"cc(
-            using $0Access::$1_size;
-            using $0Access::clear_$1;
-            using $0Access::delete_$1;
-            using $0Access::get_$1;
-            using $0Access::set_$1;
-          )cc",
-          class_name, resolved_field_name);
-    } else if (desc->options().map_entry()) {
-      // TODO(b/237399867) Implement map entry
-    } else if (field->is_repeated()) {
-      WriteRepeatedFieldUsingAccessors(field, class_name, resolved_field_name,
-                                       output, read_only);
-    } else {
-      if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-        output("using $0Access::$1;\n", ClassName(desc), resolved_field_name);
-        if (!read_only) {
-          output("using $0Access::mutable_$1;\n", class_name,
-                 resolved_field_name);
-        }
-      } else {
-        output("using $0Access::$1;\n", class_name, resolved_field_name);
-        if (!read_only) {
-          output("using $0Access::set_$1;\n", class_name, resolved_field_name);
-        }
-      }
-    }
-  }
-  for (int i = 0; i < desc->real_oneof_decl_count(); ++i) {
-    const protobuf::OneofDescriptor* oneof = desc->oneof_decl(i);
-    output("using $0Access::$1_case;\n", class_name, oneof->name());
-    output("using $0Access::$1Case;\n", class_name,
-           ToCamelCase(oneof->name(), /*lower_first=*/false));
-    for (int j = 0; j < oneof->field_count(); ++j) {
-      const protobuf::FieldDescriptor* field = oneof->field(j);
-      output("using $0Access::k$1;\n", class_name,
-             ToCamelCase(field->name(), /*lower_first=*/false),
-             field->number());
-    }
-    output("using $0Access::$1_NOT_SET;\n", class_name,
-           absl::AsciiStrToUpper(oneof->name()));
-  }
-  output("using $0Access::msg;\n", class_name);
-}
-
-void WriteOneofAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 Output& output) {
-  // Generate const methods.
-  OutputIndenter i(output);
-  std::string class_name = ClassName(desc);
-  auto field_names = CreateFieldNameMap(desc);
-  for (int i = 0; i < desc->real_oneof_decl_count(); ++i) {
-    const protobuf::OneofDescriptor* oneof = desc->oneof_decl(i);
-    output("enum $0Case {\n",
-           ToCamelCase(oneof->name(), /*lower_first=*/false));
-    for (int j = 0; j < oneof->field_count(); ++j) {
-      const protobuf::FieldDescriptor* field = oneof->field(j);
-      output("  k$0 = $1,\n", ToCamelCase(field->name(), /*lower_first=*/false),
-             field->number());
-    }
-    output("  $0_NOT_SET = 0,\n", absl::AsciiStrToUpper(oneof->name()));
-    output("};\n\n");
-    output("$0Case $1_case() const {\n",
-           ToCamelCase(oneof->name(), /*lower_first=*/false), oneof->name());
-    for (int j = 0; j < oneof->field_count(); ++j) {
-      const protobuf::FieldDescriptor* field = oneof->field(j);
-      std::string resolved_field_name = ResolveFieldName(field, field_names);
-      output("  if (has_$0()) { return k$1; }\n", resolved_field_name,
-             ToCamelCase(field->name(), /*lower_first=*/false));
-    }
-    output("  return $0_NOT_SET;\n", absl::AsciiStrToUpper(oneof->name()));
-    output("}\n;");
-  }
-}
-
-std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
-                             const NameToFieldDescriptorMap& field_names) {
-  // C++ implementation specific reserved names.
-  static const auto& kReservedNames =
-      *new absl::flat_hash_set<absl::string_view>({
-          "msg",
-          "msg_",
-          "arena",
-          "arena_",
-      });
-
-  // C++ specific prefixes used by code generator for field access.
-  static constexpr absl::string_view kClearMethodPrefix = "clear_";
-  static constexpr absl::string_view kSetMethodPrefix = "set_";
-  static constexpr absl::string_view kHasMethodPrefix = "has_";
-  static constexpr absl::string_view kDeleteMethodPrefix = "delete_";
-  static constexpr absl::string_view kAddToRepeatedMethodPrefix = "add_";
-  static constexpr absl::string_view kResizeArrayMethodPrefix = "resize_";
-
-  // List of generated accessor prefixes to check against.
-  // Example:
-  //     optional repeated string phase = 236;
-  //     optional bool clear_phase = 237;
-  static constexpr absl::string_view kAccessorPrefixes[] = {
-      kClearMethodPrefix,       kDeleteMethodPrefix, kAddToRepeatedMethodPrefix,
-      kResizeArrayMethodPrefix, kSetMethodPrefix,    kHasMethodPrefix};
-
-  absl::string_view field_name = field->name();
-  if (kReservedNames.count(field_name) > 0) {
-    if (absl::EndsWith(field_name, "_")) {
-      return absl::StrCat(field_name, "_");
-    } else {
-      return absl::StrCat(field_name, "__");
-    }
-  }
-  for (const auto prefix : kAccessorPrefixes) {
-    // If field name starts with a prefix such as clear_ and the proto
-    // contains a field name with trailing end, depending on type of field
-    // (repeated, map, message) we have a conflict to resolve.
-    if (absl::StartsWith(field_name, prefix)) {
-      auto match = field_names.find(field_name.substr(prefix.size()));
-      if (match != field_names.end()) {
-        const auto* candidate = match->second;
-        if (candidate->is_repeated() || candidate->is_map() ||
-            (candidate->cpp_type() ==
-                 protobuf::FieldDescriptor::CPPTYPE_STRING &&
-             prefix == kClearMethodPrefix) ||
-            prefix == kSetMethodPrefix || prefix == kHasMethodPrefix) {
-          return absl::StrCat(field_name, "_");
-        }
-      }
-    }
-  }
-  return upbc::ResolveKeywordConflict(std::string(field_name));
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_accessors.h b/third_party/upb/protos_generator/gen_accessors.h
deleted file mode 100644
index 64df52352a33b..0000000000000
--- a/third_party/upb/protos_generator/gen_accessors.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef UPB_PROTOS_GENERATOR_ACCESSORS_H_
-#define UPB_PROTOS_GENERATOR_ACCESSORS_H_
-
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-void WriteFieldAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 Output& output);
-void WriteAccessorsInSource(const protobuf::Descriptor* desc, Output& output);
-void WriteUsingAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 MessageClassType handle_type, Output& output);
-void WriteOneofAccessorsInHeader(const protobuf::Descriptor* desc,
-                                 Output& output);
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_ACCESSORS_H_
diff --git a/third_party/upb/protos_generator/gen_enums.cc b/third_party/upb/protos_generator/gen_enums.cc
deleted file mode 100644
index 6e2aa39d683d8..0000000000000
--- a/third_party/upb/protos_generator/gen_enums.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protos_generator/gen_enums.h"
-
-#include <algorithm>
-#include <limits>
-#include <string>
-#include <vector>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-// Convert enum value to C++ literal.
-//
-// In C++, an value of -2147483648 gets interpreted as the negative of
-// 2147483648, and since 2147483648 can't fit in an integer, this produces a
-// compiler warning.  This works around that issue.
-std::string EnumInt32ToString(int number) {
-  if (number == std::numeric_limits<int32_t>::min()) {
-    // This needs to be special-cased, see explanation here:
-    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52661
-    return absl::StrCat(number + 1, " - 1");
-  } else {
-    return absl::StrCat(number);
-  }
-}
-
-std::string EnumTypeName(const protobuf::EnumDescriptor* enum_descriptor) {
-  auto containing_type = enum_descriptor->containing_type();
-  if (containing_type == nullptr) {
-    // enums types with no package name are prefixed with protos_ to prevent
-    // conflicts with generated C headers.
-    if (enum_descriptor->file()->package().empty()) {
-      return absl::StrCat(kNoPackageNamePrefix,
-                          ToCIdent(enum_descriptor->name()));
-    }
-    return ToCIdent(enum_descriptor->name());
-  } else {
-    // Since the enum is in global name space (no package), it will have the
-    // same classified name as the C header include, to prevent collision
-    // rename as above.
-    if (containing_type->file()->package().empty()) {
-      return ToCIdent(absl::StrCat(containing_type->name(), "_",
-                                   kNoPackageNamePrefix,
-                                   enum_descriptor->name()));
-    } else {
-      return ToCIdent(
-          absl::StrCat(containing_type->name(), "_", enum_descriptor->name()));
-    }
-  }
-}
-
-std::string EnumValueSymbolInNameSpace(
-    const protobuf::EnumDescriptor* desc,
-    const protobuf::EnumValueDescriptor* value) {
-  auto containing_type = desc->containing_type();
-  if (containing_type != nullptr) {
-    return ToCIdent(absl::StrCat(containing_type->name(), "_", desc->name(),
-                                 "_", value->name()));
-  } else {
-    // protos enum values with no package name are prefixed with protos_ to
-    // prevent conflicts with generated C headers.
-    if (desc->file()->package().empty()) {
-      return absl::StrCat(kNoPackageNamePrefix, ToCIdent(value->name()));
-    }
-    return ToCIdent(value->name());
-  }
-}
-
-void WriteEnumValues(const protobuf::EnumDescriptor* desc, Output& output) {
-  std::vector<const protobuf::EnumValueDescriptor*> values;
-  auto value_count = desc->value_count();
-  values.reserve(value_count);
-  for (int i = 0; i < value_count; i++) {
-    values.push_back(desc->value(i));
-  }
-  std::sort(values.begin(), values.end(),
-            [](const protobuf::EnumValueDescriptor* a,
-               const protobuf::EnumValueDescriptor* b) {
-              return a->number() < b->number();
-            });
-
-  for (size_t i = 0; i < values.size(); i++) {
-    auto value = values[i];
-    output("  $0", EnumValueSymbolInNameSpace(desc, value));
-    output(" = $0", EnumInt32ToString(value->number()));
-    if (i != values.size() - 1) {
-      output(",");
-    }
-    output("\n");
-  }
-}
-
-void WriteEnumDeclarations(
-    const std::vector<const protobuf::EnumDescriptor*>& enums, Output& output) {
-  for (auto enumdesc : enums) {
-    output("enum $0 : int {\n", EnumTypeName(enumdesc));
-    WriteEnumValues(enumdesc, output);
-    output("};\n\n");
-  }
-}
-
-void WriteHeaderEnumForwardDecls(
-    std::vector<const protobuf::EnumDescriptor*>& enums, Output& output) {
-  for (const auto* enumdesc : enums) {
-    output("enum $0 : int;\n", EnumTypeName(enumdesc));
-  }
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_enums.h b/third_party/upb/protos_generator/gen_enums.h
deleted file mode 100644
index 00c7ca403fc3d..0000000000000
--- a/third_party/upb/protos_generator/gen_enums.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef UPB_PROTOS_GENERATOR_ENUMS_H_
-#define UPB_PROTOS_GENERATOR_ENUMS_H_
-
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-std::string EnumTypeName(const protobuf::EnumDescriptor* enum_descriptor);
-std::string EnumValueSymbolInNameSpace(
-    const protobuf::EnumDescriptor* desc,
-    const protobuf::EnumValueDescriptor* value);
-void WriteHeaderEnumForwardDecls(
-    std::vector<const protobuf::EnumDescriptor*>& enums, Output& output);
-void WriteEnumDeclarations(
-    const std::vector<const protobuf::EnumDescriptor*>& enums, Output& output);
-
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_ENUMS_H_
diff --git a/third_party/upb/protos_generator/gen_extensions.cc b/third_party/upb/protos_generator/gen_extensions.cc
deleted file mode 100644
index 979284da58331..0000000000000
--- a/third_party/upb/protos_generator/gen_extensions.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protos_generator/gen_extensions.h"
-
-#include "absl/strings/str_cat.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-std::string ExtensionIdentifierBase(const protobuf::FieldDescriptor* ext) {
-  assert(ext->is_extension());
-  std::string ext_scope;
-  if (ext->extension_scope()) {
-    return MessageName(ext->extension_scope());
-  } else {
-    return ToCIdent(ext->file()->package());
-  }
-}
-
-std::string ContainingTypeName(const protobuf::FieldDescriptor* ext) {
-  return ext->containing_type()->file() != ext->file()
-             ? QualifiedClassName(ext->containing_type())
-             : ClassName(ext->containing_type());
-}
-
-void WriteExtensionIdentifierHeader(const protobuf::FieldDescriptor* ext,
-                                    Output& output) {
-  std::string mini_table_name =
-      absl::StrCat(ExtensionIdentifierBase(ext), "_", ext->name(), "_ext");
-  if (ext->extension_scope()) {
-    output(
-        R"cc(
-          static const ::protos::internal::ExtensionIdentifier<$0, $1> $2;
-        )cc",
-        ContainingTypeName(ext), CppTypeParameterName(ext), ext->name());
-  } else {
-    output(
-        R"cc(
-          extern const ::protos::internal::ExtensionIdentifier<$0, $1> $2;
-        )cc",
-        ContainingTypeName(ext), CppTypeParameterName(ext), ext->name());
-  }
-}
-
-void WriteExtensionIdentifiersHeader(
-    const std::vector<const protobuf::FieldDescriptor*>& extensions,
-    Output& output) {
-  for (const auto* ext : extensions) {
-    if (!ext->extension_scope()) {
-      WriteExtensionIdentifierHeader(ext, output);
-    }
-  }
-}
-
-void WriteExtensionIdentifier(const protobuf::FieldDescriptor* ext,
-                              Output& output) {
-  std::string mini_table_name =
-      absl::StrCat(ExtensionIdentifierBase(ext), "_", ext->name(), "_ext");
-  if (ext->extension_scope()) {
-    output(
-        R"cc(
-          const ::protos::internal::ExtensionIdentifier<$0, $3> $4::$2(&$1);
-        )cc",
-        ContainingTypeName(ext), mini_table_name, ext->name(),
-        CppTypeParameterName(ext), ClassName(ext->extension_scope()));
-  } else {
-    output(
-        R"cc(
-          const ::protos::internal::ExtensionIdentifier<$0, $3> $2(&$1);
-        )cc",
-        ContainingTypeName(ext), mini_table_name, ext->name(),
-        CppTypeParameterName(ext));
-  }
-}
-
-void WriteExtensionIdentifiers(
-    const std::vector<const protobuf::FieldDescriptor*>& extensions,
-    Output& output) {
-  for (const auto* ext : extensions) {
-    if (!ext->extension_scope()) {
-      WriteExtensionIdentifier(ext, output);
-    }
-  }
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_extensions.h b/third_party/upb/protos_generator/gen_extensions.h
deleted file mode 100644
index 7313acbe70896..0000000000000
--- a/third_party/upb/protos_generator/gen_extensions.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef UPB_PROTOS_GENERATOR_GEN_EXTENSIONS_H_
-#define UPB_PROTOS_GENERATOR_GEN_EXTENSIONS_H_
-
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-void WriteExtensionIdentifiersHeader(
-    const std::vector<const protobuf::FieldDescriptor*>& extensions,
-    Output& output);
-void WriteExtensionIdentifierHeader(const protobuf::FieldDescriptor* ext,
-                                    Output& output);
-void WriteExtensionIdentifiers(
-    const std::vector<const protobuf::FieldDescriptor*>& extensions,
-    Output& output);
-void WriteExtensionIdentifier(const protobuf::FieldDescriptor* ext,
-                              Output& output);
-
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_GEN_EXTENSIONS_H_
diff --git a/third_party/upb/protos_generator/gen_messages.cc b/third_party/upb/protos_generator/gen_messages.cc
deleted file mode 100644
index 669d12226bf8e..0000000000000
--- a/third_party/upb/protos_generator/gen_messages.cc
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "protos_generator/gen_messages.h"
-
-#include <string>
-#include <vector>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "absl/strings/str_cat.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_accessors.h"
-#include "protos_generator/gen_enums.h"
-#include "protos_generator/gen_extensions.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-#include "protos_generator/output.h"
-#include "upbc/common.h"
-#include "upbc/file_layout.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-void WriteModelAccessDeclaration(const protobuf::Descriptor* descriptor,
-                                 Output& output);
-void WriteModelPublicDeclaration(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output);
-void WriteExtensionIdentifiersInClassHeader(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output);
-void WriteModelProxyDeclaration(const protobuf::Descriptor* descriptor,
-                                Output& output);
-void WriteModelCProxyDeclaration(const protobuf::Descriptor* descriptor,
-                                 Output& output);
-void WriteInternalForwardDeclarationsInHeader(
-    const protobuf::Descriptor* message, Output& output);
-void WriteDefaultInstanceHeader(const protobuf::Descriptor* message,
-                                Output& output);
-void WriteExtensionIdentifiersImplementation(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output);
-void WriteUsingEnumsInHeader(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output);
-
-// Writes message class declarations into .upb.proto.h.
-//
-// For each proto Foo, FooAccess and FooProxy/FooCProxy are generated
-// that are exposed to users as Foo , Ptr<Foo> and Ptr<const Foo>.
-void WriteMessageClassDeclarations(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output) {
-  if (IsMapEntryMessage(descriptor)) {
-    // Skip map entry generation. Low level accessors for maps are
-    // generated that don't require a separate map type.
-    return;
-  }
-
-  // Forward declaration of Proto Class for GCC handling of free friend method.
-  output("class $0;\n", ClassName(descriptor));
-  output("namespace internal {\n\n");
-  WriteModelAccessDeclaration(descriptor, output);
-  output("\n");
-  WriteInternalForwardDeclarationsInHeader(descriptor, output);
-  output("\n");
-  output("}  // namespace internal\n\n");
-  WriteModelPublicDeclaration(descriptor, file_exts, file_enums, output);
-  output("namespace internal {\n");
-  WriteModelCProxyDeclaration(descriptor, output);
-  WriteModelProxyDeclaration(descriptor, output);
-  output("}  // namespace internal\n\n");
-}
-
-void WriteModelAccessDeclaration(const protobuf::Descriptor* descriptor,
-                                 Output& output) {
-  output(
-      R"cc(
-        class $0Access {
-         public:
-          $0Access() {}
-          $0Access($1* msg, upb_Arena* arena) : msg_(msg), arena_(arena) {
-            assert(arena != nullptr);
-          }  // NOLINT
-          $0Access(const $1* msg, upb_Arena* arena)
-              : msg_(const_cast<$1*>(msg)), arena_(arena) {
-            assert(arena != nullptr);
-          }  // NOLINT
-          void* GetInternalArena() const { return arena_; }
-      )cc",
-      ClassName(descriptor), MessageName(descriptor));
-  WriteFieldAccessorsInHeader(descriptor, output);
-  WriteOneofAccessorsInHeader(descriptor, output);
-  output.Indent();
-  output(
-      R"cc(
-        private:
-        void* msg() const { return msg_; }
-
-        friend class $2;
-        friend class $0Proxy;
-        friend class $0CProxy;
-        friend void* ::protos::internal::GetInternalMsg<$2>(const $2* message);
-        friend void* ::protos::internal::GetInternalMsg<$2>(::protos::Ptr<$2> message);
-        $1* msg_;
-        upb_Arena* arena_;
-      )cc",
-      ClassName(descriptor), MessageName(descriptor),
-      QualifiedClassName(descriptor));
-  output.Outdent();
-  output("};\n");
-}
-
-void WriteModelPublicDeclaration(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output) {
-  output(
-      R"cc(
-        class $0 final : private internal::$0Access {
-         public:
-          using Access = internal::$0Access;
-          using Proxy = internal::$0Proxy;
-          using CProxy = internal::$0CProxy;
-
-          $0();
-
-          $0(const $0& from);
-          inline $0& operator=(const $3& from) {
-            arena_ = owned_arena_.ptr();
-            msg_ = ($2*)upb_Message_DeepClone(from.msg_, &$1, arena_);
-            return *this;
-          }
-
-          $0(const CProxy& from);
-          $0(const Proxy& from);
-          inline $0& operator=(const CProxy& from) {
-            arena_ = owned_arena_.ptr();
-            msg_ = ($2*)upb_Message_DeepClone(
-                ::protos::internal::GetInternalMsg(&from), &$1, arena_);
-            return *this;
-          }
-          $0($0&& m)
-              : Access(absl::exchange(m.msg_, nullptr),
-                       absl::exchange(m.arena_, nullptr)),
-                owned_arena_(std::move(m.owned_arena_)) {}
-
-          $0& operator=($0&& m) {
-            msg_ = absl::exchange(m.msg_, nullptr);
-            arena_ = absl::exchange(m.arena_, nullptr);
-            owned_arena_ = std::move(m.owned_arena_);
-            return *this;
-          }
-      )cc",
-      ClassName(descriptor), ::upbc::MessageInit(descriptor->full_name()),
-      MessageName(descriptor), QualifiedClassName(descriptor));
-
-  WriteUsingAccessorsInHeader(descriptor, MessageClassType::kMessage, output);
-  WriteUsingEnumsInHeader(descriptor, file_enums, output);
-  WriteDefaultInstanceHeader(descriptor, output);
-  WriteExtensionIdentifiersInClassHeader(descriptor, file_exts, output);
-  if (descriptor->extension_range_count()) {
-    // for typetrait checking
-    output("using ExtendableType = $0;\n", ClassName(descriptor));
-  }
-  // Note: free function friends that are templates such as ::protos::Parse
-  // require explicit <$2> type parameter in declaration to be able to compile
-  // with gcc otherwise the compiler will fail with
-  // "has not been declared within namespace" error. Even though there is a
-  // namespace qualifier, cross namespace matching fails.
-  output.Indent();
-  output(
-      R"cc(
-        static const upb_MiniTable* minitable();
-        using $0Access::GetInternalArena;
-      )cc",
-      ClassName(descriptor));
-  output("\n");
-  output(
-      R"cc(
-        private:
-        $0(upb_Message* msg, upb_Arena* arena) : $0Access() {
-          msg_ = ($1*)msg;
-          arena_ = owned_arena_.ptr();
-          upb_Arena_Fuse(arena_, arena);
-        }
-        ::protos::Arena owned_arena_;
-        friend Proxy;
-        friend CProxy;
-        friend absl::StatusOr<$2>(::protos::Parse<$2>(absl::string_view bytes,
-                                                      int options));
-        friend absl::StatusOr<$2>(::protos::Parse<$2>(
-            absl::string_view bytes,
-            const ::protos::ExtensionRegistry& extension_registry,
-            int options));
-        friend upb_Arena* ::protos::internal::GetArena<$0>($0* message);
-        friend upb_Arena* ::protos::internal::GetArena<$0>(::protos::Ptr<$0> message);
-        friend $0(::protos::internal::MoveMessage<$0>(upb_Message* msg,
-                                                      upb_Arena* arena));
-      )cc",
-      ClassName(descriptor), MessageName(descriptor),
-      QualifiedClassName(descriptor));
-  output.Outdent();
-  output("};\n\n");
-}
-
-void WriteModelProxyDeclaration(const protobuf::Descriptor* descriptor,
-                                Output& output) {
-  // Foo::Proxy.
-  output(
-      R"cc(
-        class $0Proxy final : private internal::$0Access {
-         public:
-          $0Proxy() = delete;
-          $0Proxy(const $0Proxy& m) : internal::$0Access() {
-            msg_ = m.msg_;
-            arena_ = m.arena_;
-          }
-          $0Proxy($0* m) : internal::$0Access() {
-            msg_ = m->msg_;
-            arena_ = m->arena_;
-          }
-          $0Proxy operator=(const $0Proxy& m) {
-            msg_ = m.msg_;
-            arena_ = m.arena_;
-            return *this;
-          }
-          using $0Access::GetInternalArena;
-      )cc",
-      ClassName(descriptor));
-
-  WriteUsingAccessorsInHeader(descriptor, MessageClassType::kMessageProxy,
-                              output);
-  output("\n");
-  output.Indent(1);
-  output(
-      R"cc(
-        private:
-        $0Proxy(void* msg, upb_Arena* arena) : internal::$0Access(($1*)msg, arena) {}
-        friend $0::Proxy(::protos::CreateMessage<$0>(::protos::Arena& arena));
-        friend $0::Proxy(::protos::internal::CreateMessageProxy<$0>(
-            upb_Message*, upb_Arena*));
-        friend class RepeatedFieldProxy;
-        friend class $0CProxy;
-        friend class $0Access;
-        friend class ::protos::Ptr<$0>;
-        friend class ::protos::Ptr<const $0>;
-        static const upb_MiniTable* minitable() { return $0::minitable(); }
-        friend const upb_MiniTable* ::protos::internal::GetMiniTable<$0Proxy>(
-            const $0Proxy* message);
-        friend const upb_MiniTable* ::protos::internal::GetMiniTable<$0Proxy>(
-            ::protos::Ptr<$0Proxy> message);
-        friend upb_Arena* ::protos::internal::GetArena<$2>($2* message);
-        friend upb_Arena* ::protos::internal::GetArena<$2>(::protos::Ptr<$2> message);
-        friend $0Proxy(::protos::CloneMessage(::protos::Ptr<$2> message,
-                                              ::upb::Arena& arena));
-        static void Rebind($0Proxy& lhs, const $0Proxy& rhs) {
-          lhs.msg_ = rhs.msg_;
-          lhs.arena_ = rhs.arena_;
-        }
-      )cc",
-      ClassName(descriptor), MessageName(descriptor),
-      QualifiedClassName(descriptor));
-  output.Outdent(1);
-  output("};\n\n");
-}
-
-void WriteModelCProxyDeclaration(const protobuf::Descriptor* descriptor,
-                                 Output& output) {
-  // Foo::CProxy.
-  output(
-      R"cc(
-        class $0CProxy final : private internal::$0Access {
-         public:
-          $0CProxy() = delete;
-          $0CProxy(const $0* m)
-              : internal::$0Access(m->msg_, ::protos::internal::GetArena(m)) {}
-          $0CProxy($0Proxy m);
-          using $0Access::GetInternalArena;
-      )cc",
-      ClassName(descriptor), MessageName(descriptor));
-
-  WriteUsingAccessorsInHeader(descriptor, MessageClassType::kMessageProxy,
-                              output);
-
-  output.Indent(1);
-  output(
-      R"cc(
-        private:
-        $0CProxy(void* msg, upb_Arena* arena) : internal::$0Access(($1*)msg, arena){};
-        friend $0::CProxy(::protos::internal::CreateMessage<$0>(
-            upb_Message* msg, upb_Arena* arena));
-        friend class RepeatedFieldProxy;
-        friend class ::protos::Ptr<$0>;
-        friend class ::protos::Ptr<const $0>;
-        static const upb_MiniTable* minitable() { return $0::minitable(); }
-        friend const upb_MiniTable* ::protos::internal::GetMiniTable<$0CProxy>(
-            const $0CProxy* message);
-        friend const upb_MiniTable* ::protos::internal::GetMiniTable<$0CProxy>(
-            ::protos::Ptr<$0CProxy> message);
-
-        static void Rebind($0CProxy& lhs, const $0CProxy& rhs) {
-          lhs.msg_ = rhs.msg_;
-          lhs.arena_ = rhs.arena_;
-        }
-      )cc",
-      ClassName(descriptor), MessageName(descriptor));
-  output.Outdent(1);
-  output("};\n\n");
-}
-
-void WriteDefaultInstanceHeader(const protobuf::Descriptor* message,
-                                Output& output) {
-  output("  static ::protos::Ptr<const $0> default_instance();\n",
-         ClassName(message));
-}
-
-void WriteMessageImplementation(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output) {
-  bool message_is_map_entry = descriptor->options().map_entry();
-  if (!message_is_map_entry) {
-    // Constructor.
-    output(
-        R"cc(
-          $0::$0() : $0Access() {
-            arena_ = owned_arena_.ptr();
-            msg_ = $1_new(arena_);
-          }
-          $0::$0(const $0& from) : $0Access() {
-            arena_ = owned_arena_.ptr();
-            msg_ = ($1*)upb_Message_DeepClone(from.msg_, &$2, arena_);
-          }
-          $0::$0(const CProxy& from) : $0Access() {
-            arena_ = owned_arena_.ptr();
-            msg_ = ($1*)upb_Message_DeepClone(
-                ::protos::internal::GetInternalMsg(&from), &$2, arena_);
-          }
-          $0::$0(const Proxy& from) : $0(static_cast<const CProxy&>(from)) {}
-          internal::$0CProxy::$0CProxy($0Proxy m) : $0Access() {
-            arena_ = m.arena_;
-            msg_ = ($1*)::protos::internal::GetInternalMsg(&m);
-          }
-        )cc",
-        ClassName(descriptor), MessageName(descriptor),
-        ::upbc::MessageInit(descriptor->full_name()),
-        QualifiedClassName(descriptor));
-    output("\n");
-    // Minitable
-    output(
-        R"cc(
-          const upb_MiniTable* $0::minitable() { return &$1; }
-        )cc",
-        ClassName(descriptor), ::upbc::MessageInit(descriptor->full_name()));
-    output("\n");
-  }
-
-  WriteAccessorsInSource(descriptor, output);
-
-  if (!message_is_map_entry) {
-    output(
-        R"cc(
-          struct $0DefaultTypeInternal {
-            $1* msg;
-            upb_Arena* arena;
-          };
-          static $0DefaultTypeInternal _$0DefaultTypeBuilder() {
-            upb_Arena* arena = upb_Arena_New();
-            return $0DefaultTypeInternal{$1_new(arena), arena};
-          }
-          $0DefaultTypeInternal _$0_default_instance_ = _$0DefaultTypeBuilder();
-        )cc",
-        ClassName(descriptor), MessageName(descriptor));
-
-    output(
-        R"cc(
-          ::protos::Ptr<const $0> $0::default_instance() {
-            return ::protos::internal::CreateMessage<$0>(
-                (upb_Message *)_$0_default_instance_.msg,
-                _$0_default_instance_.arena);
-          }
-        )cc",
-        ClassName(descriptor));
-
-    WriteExtensionIdentifiersImplementation(descriptor, file_exts, output);
-  }
-}
-
-void WriteInternalForwardDeclarationsInHeader(
-    const protobuf::Descriptor* message, Output& output) {
-  // Write declaration for internal re-usable default_instance without
-  // leaking implementation.
-  output(
-      R"cc(
-        struct $0DefaultTypeInternal;
-        extern $0DefaultTypeInternal _$0_default_instance_;
-      )cc",
-      ClassName(message));
-}
-
-void WriteExtensionIdentifiersInClassHeader(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output) {
-  for (auto* ext : file_exts) {
-    if (ext->extension_scope() &&
-        ext->extension_scope()->full_name() == message->full_name()) {
-      WriteExtensionIdentifierHeader(ext, output);
-    }
-  }
-}
-
-void WriteExtensionIdentifiersImplementation(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output) {
-  for (auto* ext : file_exts) {
-    if (ext->extension_scope() &&
-        ext->extension_scope()->full_name() == message->full_name()) {
-      WriteExtensionIdentifier(ext, output);
-    }
-  }
-}
-
-void WriteUsingEnumsInHeader(
-    const protobuf::Descriptor* message,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output) {
-  for (auto* enum_descriptor : file_enums) {
-    std::string enum_type_name = EnumTypeName(enum_descriptor);
-    std::string enum_resolved_type_name =
-        enum_descriptor->file()->package().empty() &&
-                enum_descriptor->containing_type() == nullptr
-            ? absl::StrCat(kNoPackageNamePrefix,
-                           ToCIdent(enum_descriptor->name()))
-            : enum_type_name;
-    if (enum_descriptor->containing_type() == nullptr ||
-        enum_descriptor->containing_type()->full_name() !=
-            message->full_name()) {
-      continue;
-    }
-    output("using $0", enum_descriptor->name());
-    if (enum_descriptor->options().deprecated()) {
-      output(" ABSL_DEPRECATED(\"Proto enum $0\")", enum_descriptor->name());
-    }
-    output(" = $0;", enum_resolved_type_name);
-    output("\n");
-    int value_count = enum_descriptor->value_count();
-    for (int i = 0; i < value_count; i++) {
-      output("static constexpr $0 $1", enum_descriptor->name(),
-             enum_descriptor->value(i)->name());
-      if (enum_descriptor->options().deprecated() ||
-          enum_descriptor->value(i)->options().deprecated()) {
-        output(" ABSL_DEPRECATED(\"Proto enum value $0\") ",
-               enum_descriptor->value(i)->name());
-      }
-      output(" = $0;\n", EnumValueSymbolInNameSpace(enum_descriptor,
-                                                    enum_descriptor->value(i)));
-    }
-  }
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_messages.h b/third_party/upb/protos_generator/gen_messages.h
deleted file mode 100644
index bf0ab7cb6f234..0000000000000
--- a/third_party/upb/protos_generator/gen_messages.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_GEN_MESSAGES_H_
-#define UPB_PROTOS_GENERATOR_GEN_MESSAGES_H_
-
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-namespace protobuf = ::google::protobuf;
-
-void WriteMessageClassDeclarations(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    const std::vector<const protobuf::EnumDescriptor*>& file_enums,
-    Output& output);
-void WriteMessageImplementation(
-    const protobuf::Descriptor* descriptor,
-    const std::vector<const protobuf::FieldDescriptor*>& file_exts,
-    Output& output);
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_GEN_MESSAGES_H_
diff --git a/third_party/upb/protos_generator/gen_repeated_fields.cc b/third_party/upb/protos_generator/gen_repeated_fields.cc
deleted file mode 100644
index 15219f8444016..0000000000000
--- a/third_party/upb/protos_generator/gen_repeated_fields.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "protos_generator/gen_repeated_fields.h"
-
-#include <string>
-#include <vector>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "absl/strings/string_view.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_accessors.h"
-#include "protos_generator/gen_enums.h"
-#include "protos_generator/gen_extensions.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-#include "protos_generator/output.h"
-#include "upbc/common.h"
-#include "upbc/file_layout.h"
-#include "upbc/names.h"
-
-namespace protos_generator {
-namespace protobuf = ::google::protobuf;
-
-// Adds using accessors to reuse base Access class members from a Proxy/CProxy.
-void WriteRepeatedFieldUsingAccessors(const protobuf::FieldDescriptor* field,
-                                      absl::string_view class_name,
-                                      absl::string_view resolved_field_name,
-                                      Output& output, bool read_only) {
-  if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-    output(
-        R"cc(
-          using $0Access::$1;
-          using $0Access::$1_size;
-        )cc",
-        class_name, resolved_field_name);
-    if (!read_only) {
-      output(
-          R"cc(
-            using $0Access::add_$1;
-            using $0Access::mutable_$1;
-          )cc",
-          class_name, resolved_field_name);
-    }
-  } else {
-    output(
-        R"cc(
-          using $0Access::$1;
-          using $0Access::$1_size;
-        )cc",
-        class_name, resolved_field_name);
-    if (!read_only) {
-      output(
-          R"cc(
-            using $0Access::add_$1;
-            using $0Access::mutable_$1;
-            using $0Access::resize_$1;
-            using $0Access::set_$1;
-          )cc",
-          class_name, resolved_field_name);
-    }
-  }
-}
-
-void WriteRepeatedFieldsInMessageHeader(const protobuf::Descriptor* desc,
-                                        const protobuf::FieldDescriptor* field,
-                                        absl::string_view resolved_field_name,
-                                        absl::string_view resolved_upbc_name,
-                                        Output& output) {
-  output(
-      R"cc(
-        inline size_t $1_size() const {
-          size_t len;
-          $0_$2(msg_, &len);
-          return len;
-        }
-      )cc",
-      MessageName(desc), resolved_field_name, resolved_upbc_name);
-
-  if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
-    output(
-        R"cc(
-          $1 $2(size_t index) const;
-          const ::protos::RepeatedField<const $4>::CProxy $2() const;
-          ::protos::Ptr<::protos::RepeatedField<$4>> mutable_$2();
-          absl::StatusOr<$0> add_$2();
-          $0 mutable_$2(size_t index) const;
-        )cc",
-        MessagePtrConstType(field, /* const */ false),   // $0
-        MessagePtrConstType(field, /* const */ true),    // $1
-        resolved_field_name,                             // $2
-        resolved_upbc_name,                              // $3
-        MessageBaseType(field, /* maybe_const */ false)  // $4
-    );
-  } else if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
-    output(
-        R"cc(
-          $0 $1(size_t index) const;
-          const ::protos::RepeatedField<$0>::CProxy $1() const;
-          ::protos::Ptr<::protos::RepeatedField<$0>> mutable_$1();
-          bool add_$1($0 val);
-          void set_$1(size_t index, $0 val);
-          bool resize_$1(size_t len);
-        )cc",
-        CppConstType(field), resolved_field_name);
-  } else {
-    output(
-        R"cc(
-          $0 $1(size_t index) const;
-          const ::protos::RepeatedField<$0>::CProxy $1() const;
-          ::protos::Ptr<::protos::RepeatedField<$0>> mutable_$1();
-          bool add_$1($0 val);
-          void set_$1(size_t index, $0 val);
-          bool resize_$1(size_t len);
-        )cc",
-        CppConstType(field), resolved_field_name);
-  }
-}
-
-void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
-                                  const protobuf::FieldDescriptor* field,
-                                  const absl::string_view resolved_field_name,
-                                  const absl::string_view class_name,
-                                  Output& output) {
-  const char arena_expression[] = "arena_";
-  absl::string_view upbc_name = field->name();
-  output(
-      R"cc(
-        $1 $0::$2(size_t index) const {
-          size_t len;
-          auto* ptr = $3_$5(msg_, &len);
-          assert(index < len);
-          return ::protos::internal::CreateMessage<$4>(
-              (upb_Message*)*(ptr + index), arena_);
-        }
-      )cc",
-      class_name, MessagePtrConstType(field, /* is_const */ true),
-      resolved_field_name, MessageName(message),
-      MessageBaseType(field, /* maybe_const */ false), upbc_name);
-  output(
-      R"cc(
-        absl::StatusOr<$1> $0::add_$2() {
-          auto new_msg = $3_add_$6(msg_, $5);
-          if (!new_msg) {
-            return ::protos::MessageAllocationError();
-          }
-          return ::protos::internal::CreateMessageProxy<$4>((upb_Message*)new_msg, $5);
-        }
-      )cc",
-      class_name, MessagePtrConstType(field, /* const */ false),
-      resolved_field_name, MessageName(message),
-      MessageBaseType(field, /* maybe_const */ false), arena_expression,
-      upbc_name);
-  output(
-      R"cc(
-        $1 $0::mutable_$2(size_t index) const {
-          size_t len;
-          auto* ptr = $3_$6(msg_, &len);
-          assert(index < len);
-          return ::protos::internal::CreateMessageProxy<$4>(
-              (upb_Message*)*(ptr + index), $5);
-        }
-      )cc",
-      class_name, MessagePtrConstType(field, /* is_const */ false),
-      resolved_field_name, MessageName(message),
-      MessageBaseType(field, /* maybe_const */ false), arena_expression,
-      upbc_name);
-  output(
-      R"cc(
-        const ::protos::RepeatedField<const $1>::CProxy $0::$2() const {
-          size_t size;
-          const upb_Array* arr = _$3_$4_$5(msg_, &size);
-          return ::protos::RepeatedField<const $1>::CProxy(arr, arena_);
-        };
-        ::protos::Ptr<::protos::RepeatedField<$1>> $0::mutable_$2() {
-          size_t size;
-          upb_Array* arr = _$3_$4_$6(msg_, &size, arena_);
-          return ::protos::RepeatedField<$1>::Proxy(arr, arena_);
-        }
-      )cc",
-      class_name,                                       // $0
-      MessageBaseType(field, /* maybe_const */ false),  // $1
-      resolved_field_name,                              // $2
-      MessageName(message),                             // $3
-      upbc_name,                                        // $4
-      upbc::kRepeatedFieldArrayGetterPostfix,           // $5
-      upbc::kRepeatedFieldMutableArrayGetterPostfix     // $6
-  );
-}
-
-void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 const absl::string_view resolved_field_name,
-                                 const absl::string_view class_name,
-                                 Output& output) {
-  absl::string_view upbc_name = field->name();
-  output(
-      R"cc(
-        $1 $0::$2(size_t index) const {
-          size_t len;
-          auto* ptr = $3_mutable_$4(msg_, &len);
-          assert(index < len);
-          return ::protos::UpbStrToStringView(*(ptr + index));
-        }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        bool $0::resize_$1(size_t len) {
-          return $2_resize_$3(msg_, len, arena_);
-        }
-      )cc",
-      class_name, resolved_field_name, MessageName(message), upbc_name);
-  output(
-      R"cc(
-        bool $0::add_$2($1 val) {
-          return $3_add_$4(msg_, ::protos::UpbStrFromStringView(val, arena_), arena_);
-        }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        void $0::set_$2(size_t index, $1 val) {
-          size_t len;
-          auto* ptr = $3_mutable_$4(msg_, &len);
-          assert(index < len);
-          *(ptr + index) = ::protos::UpbStrFromStringView(val, arena_);
-        }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        const ::protos::RepeatedField<$1>::CProxy $0::$2() const {
-          size_t size;
-          const upb_Array* arr = _$3_$4_$5(msg_, &size);
-          return ::protos::RepeatedField<$1>::CProxy(arr, arena_);
-        };
-        ::protos::Ptr<::protos::RepeatedField<$1>> $0::mutable_$2() {
-          size_t size;
-          upb_Array* arr = _$3_$4_$6(msg_, &size, arena_);
-          return ::protos::RepeatedField<$1>::Proxy(arr, arena_);
-        }
-      )cc",
-      class_name,                                    // $0
-      CppConstType(field),                           // $1
-      resolved_field_name,                           // $2
-      MessageName(message),                          // $3
-      upbc_name,                                     // $4
-      upbc::kRepeatedFieldArrayGetterPostfix,        // $5
-      upbc::kRepeatedFieldMutableArrayGetterPostfix  // $6
-  );
-}
-
-void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 const absl::string_view resolved_field_name,
-                                 const absl::string_view class_name,
-                                 Output& output) {
-  absl::string_view upbc_name = field->name();
-  output(
-      R"cc(
-        $1 $0::$2(size_t index) const {
-          size_t len;
-          auto* ptr = $3_mutable_$4(msg_, &len);
-          assert(index < len);
-          return *(ptr + index);
-        }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        bool $0::resize_$1(size_t len) {
-          return $2_resize_$3(msg_, len, arena_);
-        }
-      )cc",
-      class_name, resolved_field_name, MessageName(message), upbc_name);
-  output(
-      R"cc(
-        bool $0::add_$2($1 val) { return $3_add_$4(msg_, val, arena_); }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        void $0::set_$2(size_t index, $1 val) {
-          size_t len;
-          auto* ptr = $3_mutable_$4(msg_, &len);
-          assert(index < len);
-          *(ptr + index) = val;
-        }
-      )cc",
-      class_name, CppConstType(field), resolved_field_name,
-      MessageName(message), upbc_name);
-  output(
-      R"cc(
-        const ::protos::RepeatedField<$1>::CProxy $0::$2() const {
-          size_t size;
-          const upb_Array* arr = _$3_$4_$5(msg_, &size);
-          return ::protos::RepeatedField<$1>::CProxy(arr, arena_);
-        };
-        ::protos::Ptr<::protos::RepeatedField<$1>> $0::mutable_$2() {
-          size_t size;
-          upb_Array* arr = _$3_$4_$6(msg_, &size, arena_);
-          return ::protos::RepeatedField<$1>::Proxy(arr, arena_);
-        }
-      )cc",
-      class_name,                                    // $0
-      CppConstType(field),                           // $1
-      resolved_field_name,                           // $2
-      MessageName(message),                          // $3
-      upbc_name,                                     // $4
-      upbc::kRepeatedFieldArrayGetterPostfix,        // $5
-      upbc::kRepeatedFieldMutableArrayGetterPostfix  // $6
-  );
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_repeated_fields.h b/third_party/upb/protos_generator/gen_repeated_fields.h
deleted file mode 100644
index 622e12148cc25..0000000000000
--- a/third_party/upb/protos_generator/gen_repeated_fields.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
-#define THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
-
-#include "absl/strings/string_view.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-namespace protobuf = ::google::protobuf;
-
-void WriteRepeatedFieldUsingAccessors(const protobuf::FieldDescriptor* field,
-                                      absl::string_view class_name,
-                                      absl::string_view resolved_field_name,
-                                      Output& output, bool read_only);
-
-void WriteRepeatedFieldsInMessageHeader(const protobuf::Descriptor* desc,
-                                        const protobuf::FieldDescriptor* field,
-                                        absl::string_view resolved_field_name,
-                                        absl::string_view resolved_upbc_name,
-                                        Output& output);
-
-void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
-                                  const protobuf::FieldDescriptor* field,
-                                  absl::string_view resolved_field_name,
-                                  absl::string_view class_name, Output& output);
-
-void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 absl::string_view resolved_field_name,
-                                 absl::string_view class_name, Output& output);
-
-void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
-                                 const protobuf::FieldDescriptor* field,
-                                 absl::string_view resolved_field_name,
-                                 absl::string_view class_name, Output& output);
-
-}  // namespace protos_generator
-
-#endif  // THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
diff --git a/third_party/upb/protos_generator/gen_utils.cc b/third_party/upb/protos_generator/gen_utils.cc
deleted file mode 100644
index b4ecf04563058..0000000000000
--- a/third_party/upb/protos_generator/gen_utils.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "protos_generator/gen_utils.h"
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "absl/strings/ascii.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-void AddEnums(const protobuf::Descriptor* message,
-              std::vector<const protobuf::EnumDescriptor*>* enums) {
-  enums->reserve(enums->size() + message->enum_type_count());
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    enums->push_back(message->enum_type(i));
-  }
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    AddEnums(message->nested_type(i), enums);
-  }
-}
-
-std::vector<const protobuf::EnumDescriptor*> SortedEnums(
-    const protobuf::FileDescriptor* file) {
-  std::vector<const protobuf::EnumDescriptor*> enums;
-  enums.reserve(file->enum_type_count());
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    enums.push_back(file->enum_type(i));
-  }
-  for (int i = 0; i < file->message_type_count(); i++) {
-    AddEnums(file->message_type(i), &enums);
-  }
-  return enums;
-}
-
-void AddMessages(const protobuf::Descriptor* message,
-                 std::vector<const protobuf::Descriptor*>* messages) {
-  messages->push_back(message);
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    AddMessages(message->nested_type(i), messages);
-  }
-}
-
-std::vector<const protobuf::Descriptor*> SortedMessages(
-    const protobuf::FileDescriptor* file) {
-  std::vector<const protobuf::Descriptor*> messages;
-  for (int i = 0; i < file->message_type_count(); i++) {
-    AddMessages(file->message_type(i), &messages);
-  }
-  return messages;
-}
-
-void AddExtensionsFromMessage(
-    const protobuf::Descriptor* message,
-    std::vector<const protobuf::FieldDescriptor*>* exts) {
-  for (int i = 0; i < message->extension_count(); i++) {
-    exts->push_back(message->extension(i));
-  }
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    AddExtensionsFromMessage(message->nested_type(i), exts);
-  }
-}
-
-std::vector<const protobuf::FieldDescriptor*> SortedExtensions(
-    const protobuf::FileDescriptor* file) {
-  const int extension_count = file->extension_count();
-  const int message_type_count = file->message_type_count();
-
-  std::vector<const protobuf::FieldDescriptor*> ret;
-  ret.reserve(extension_count + message_type_count);
-
-  for (int i = 0; i < extension_count; i++) {
-    ret.push_back(file->extension(i));
-  }
-  for (int i = 0; i < message_type_count; i++) {
-    AddExtensionsFromMessage(file->message_type(i), &ret);
-  }
-
-  return ret;
-}
-
-std::vector<const protobuf::FieldDescriptor*> FieldNumberOrder(
-    const protobuf::Descriptor* message) {
-  std::vector<const protobuf::FieldDescriptor*> fields;
-  fields.reserve(message->field_count());
-  for (int i = 0; i < message->field_count(); i++) {
-    fields.push_back(message->field(i));
-  }
-  std::sort(fields.begin(), fields.end(),
-            [](const protobuf::FieldDescriptor* a,
-               const protobuf::FieldDescriptor* b) {
-              return a->number() < b->number();
-            });
-  return fields;
-}
-
-std::string ToCamelCase(const std::string& input, bool lower_first) {
-  bool capitalize_next = !lower_first;
-  std::string result;
-  result.reserve(input.size());
-
-  for (char character : input) {
-    if (character == '_') {
-      capitalize_next = true;
-    } else if (capitalize_next) {
-      result.push_back(absl::ascii_toupper(character));
-      capitalize_next = false;
-    } else {
-      result.push_back(character);
-    }
-  }
-
-  // Lower-case the first letter.
-  if (lower_first && !result.empty()) {
-    result[0] = absl::ascii_tolower(result[0]);
-  }
-
-  return result;
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/gen_utils.h b/third_party/upb/protos_generator/gen_utils.h
deleted file mode 100644
index 593c06ae3aa2a..0000000000000
--- a/third_party/upb/protos_generator/gen_utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_GEN_UTILS_H_
-#define UPB_PROTOS_GENERATOR_GEN_UTILS_H_
-
-#include <string>
-#include <vector>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/descriptor.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-enum class MessageClassType {
-  kMessage,
-  kMessageCProxy,
-  kMessageProxy,
-  kMessageAccess,
-};
-
-inline bool IsMapEntryMessage(const protobuf::Descriptor* descriptor) {
-  return descriptor->options().map_entry();
-}
-std::vector<const protobuf::EnumDescriptor*> SortedEnums(
-    const protobuf::FileDescriptor* file);
-std::vector<const protobuf::Descriptor*> SortedMessages(
-    const protobuf::FileDescriptor* file);
-std::vector<const protobuf::FieldDescriptor*> SortedExtensions(
-    const protobuf::FileDescriptor* file);
-std::vector<const protobuf::FieldDescriptor*> FieldNumberOrder(
-    const protobuf::Descriptor* message);
-
-std::string ToCamelCase(const std::string& input, bool lower_first);
-
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_GEN_UTILS_H_
diff --git a/third_party/upb/protos_generator/names.cc b/third_party/upb/protos_generator/names.cc
deleted file mode 100644
index 01490717cd834..0000000000000
--- a/third_party/upb/protos_generator/names.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "protos_generator/names.h"
-
-#include <string>
-
-#include "upbc/keywords.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-namespace {
-
-std::string NamespaceFromPackageName(absl::string_view package_name) {
-  return absl::StrCat(absl::StrReplaceAll(package_name, {{".", "::"}}),
-                      "::protos");
-}
-
-std::string DotsToColons(const std::string& name) {
-  return absl::StrReplaceAll(name, {{".", "::"}});
-}
-
-std::string Namespace(const std::string& package) {
-  if (package.empty()) return "";
-  return "::" + DotsToColons(package);
-}
-
-// Return the qualified C++ name for a file level symbol.
-std::string QualifiedFileLevelSymbol(const protobuf::FileDescriptor* file,
-                                     const std::string& name) {
-  if (file->package().empty()) {
-    return absl::StrCat("::", name);
-  }
-  // Append ::protos postfix to package name.
-  return absl::StrCat(Namespace(file->package()), "::protos::", name);
-}
-
-std::string CppTypeInternal(const protobuf::FieldDescriptor* field,
-                            bool is_const, bool is_type_parameter) {
-  std::string maybe_const = is_const ? "const " : "";
-  switch (field->cpp_type()) {
-    case protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
-      if (is_type_parameter) {
-        return absl::StrCat(maybe_const,
-                            QualifiedClassName(field->message_type()));
-      } else {
-        return absl::StrCat(maybe_const,
-                            QualifiedClassName(field->message_type()), "*");
-      }
-    }
-    case protobuf::FieldDescriptor::CPPTYPE_BOOL:
-      return "bool";
-    case protobuf::FieldDescriptor::CPPTYPE_FLOAT:
-      return "float";
-    case protobuf::FieldDescriptor::CPPTYPE_INT32:
-    case protobuf::FieldDescriptor::CPPTYPE_ENUM:
-      return "int32_t";
-    case protobuf::FieldDescriptor::CPPTYPE_UINT32:
-      return "uint32_t";
-    case protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
-      return "double";
-    case protobuf::FieldDescriptor::CPPTYPE_INT64:
-      return "int64_t";
-    case protobuf::FieldDescriptor::CPPTYPE_UINT64:
-      return "uint64_t";
-    case protobuf::FieldDescriptor::CPPTYPE_STRING:
-      return "absl::string_view";
-    default:
-      ABSL_LOG(FATAL) << "Unexpected type: " << field->cpp_type();
-  }
-}
-
-}  // namespace
-
-std::string ClassName(const protobuf::Descriptor* descriptor) {
-  const protobuf::Descriptor* parent = descriptor->containing_type();
-  std::string res;
-  // Classes in global namespace without package names are prefixed
-  // by protos_ to avoid collision with C compiler structs defined in
-  // proto.upb.h.
-  if ((parent && parent->file()->package().empty()) ||
-      descriptor->file()->package().empty()) {
-    res = std::string(kNoPackageNamePrefix);
-  }
-  if (parent) res += ClassName(parent) + "_";
-  absl::StrAppend(&res, descriptor->name());
-  return ::upbc::ResolveKeywordConflict(res);
-}
-
-std::string QualifiedClassName(const protobuf::Descriptor* descriptor) {
-  return QualifiedFileLevelSymbol(descriptor->file(), ClassName(descriptor));
-}
-
-std::string QualifiedInternalClassName(const protobuf::Descriptor* descriptor) {
-  return QualifiedFileLevelSymbol(
-      descriptor->file(), absl::StrCat("internal::", ClassName(descriptor)));
-}
-
-std::string CppSourceFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.proto.cc";
-}
-
-std::string ForwardingHeaderFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.fwd.h";
-}
-
-std::string UpbCFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.h";
-}
-
-std::string CppHeaderFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.proto.h";
-}
-
-void WriteStartNamespace(const protobuf::FileDescriptor* file, Output& output) {
-  // Skip namespace generation if package name is not specified.
-  if (file->package().empty()) {
-    return;
-  }
-
-  output("namespace $0 {\n\n", NamespaceFromPackageName(file->package()));
-}
-
-void WriteEndNamespace(const protobuf::FileDescriptor* file, Output& output) {
-  if (file->package().empty()) {
-    return;
-  }
-  output("} //  namespace $0\n\n", NamespaceFromPackageName(file->package()));
-}
-
-std::string CppConstType(const protobuf::FieldDescriptor* field) {
-  return CppTypeInternal(field, /* is_const= */ true,
-                         /* is_type_parameter= */ false);
-}
-
-std::string CppTypeParameterName(const protobuf::FieldDescriptor* field) {
-  return CppTypeInternal(field, /* is_const= */ false,
-                         /* is_type_parameter= */ true);
-}
-
-std::string MessageBaseType(const protobuf::FieldDescriptor* field,
-                            bool is_const) {
-  ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
-  std::string maybe_const = is_const ? "const " : "";
-  return maybe_const + QualifiedClassName(field->message_type());
-}
-
-std::string MessagePtrConstType(const protobuf::FieldDescriptor* field,
-                                bool is_const) {
-  ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
-  std::string maybe_const = is_const ? "const " : "";
-  return "::protos::Ptr<" + maybe_const +
-         QualifiedClassName(field->message_type()) + ">";
-}
-
-std::string MessageCProxyType(const protobuf::FieldDescriptor* field,
-                              bool is_const) {
-  ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
-  std::string maybe_const = is_const ? "const " : "";
-  return maybe_const + QualifiedInternalClassName(field->message_type()) +
-         "CProxy";
-}
-
-std::string MessageProxyType(const protobuf::FieldDescriptor* field,
-                             bool is_const) {
-  ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
-  std::string maybe_const = is_const ? "const " : "";
-  return maybe_const + QualifiedInternalClassName(field->message_type()) +
-         "Proxy";
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/names.h b/third_party/upb/protos_generator/names.h
deleted file mode 100644
index afc0419c801fd..0000000000000
--- a/third_party/upb/protos_generator/names.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_NAMES_H_
-#define UPB_PROTOS_GENERATOR_NAMES_H_
-
-#include <string>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "protos_generator/output.h"
-
-namespace protos_generator {
-
-namespace protobuf = ::google::protobuf;
-
-inline constexpr absl::string_view kNoPackageNamePrefix = "protos_";
-
-std::string ClassName(const protobuf::Descriptor* descriptor);
-std::string QualifiedClassName(const protobuf::Descriptor* descriptor);
-std::string QualifiedInternalClassName(const protobuf::Descriptor* descriptor);
-
-std::string CppSourceFilename(const google::protobuf::FileDescriptor* file);
-std::string ForwardingHeaderFilename(const google::protobuf::FileDescriptor* file);
-std::string UpbCFilename(const google::protobuf::FileDescriptor* file);
-std::string CppHeaderFilename(const google::protobuf::FileDescriptor* file);
-
-void WriteStartNamespace(const protobuf::FileDescriptor* file, Output& output);
-void WriteEndNamespace(const protobuf::FileDescriptor* file, Output& output);
-
-std::string CppConstType(const protobuf::FieldDescriptor* field);
-std::string CppTypeParameterName(const protobuf::FieldDescriptor* field);
-
-std::string MessageBaseType(const protobuf::FieldDescriptor* field,
-                            bool is_const);
-// Generate protos::Ptr<const Model> to be used in accessors as public
-// signatures.
-std::string MessagePtrConstType(const protobuf::FieldDescriptor* field,
-                                bool is_const);
-std::string MessageCProxyType(const protobuf::FieldDescriptor* field,
-                              bool is_const);
-std::string MessageProxyType(const protobuf::FieldDescriptor* field,
-                             bool is_const);
-
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_NAMES_H_
diff --git a/third_party/upb/protos_generator/output.cc b/third_party/upb/protos_generator/output.cc
deleted file mode 100644
index 255f63107acce..0000000000000
--- a/third_party/upb/protos_generator/output.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protos_generator/output.h"
-
-#include <string>
-
-#include "absl/strings/str_replace.h"
-
-namespace protos_generator {
-namespace {
-
-namespace protobuf = ::google::protobuf;
-
-}  // namespace
-
-std::string StripExtension(absl::string_view fname) {
-  size_t lastdot = fname.find_last_of('.');
-  if (lastdot == std::string::npos) {
-    return std::string(fname);
-  }
-  return std::string(fname.substr(0, lastdot));
-}
-
-std::string ToCIdent(absl::string_view str) {
-  return absl::StrReplaceAll(str, {{".", "_"}, {"/", "_"}, {"-", "_"}});
-}
-
-std::string ToPreproc(absl::string_view str) {
-  return absl::AsciiStrToUpper(ToCIdent(str));
-}
-
-void EmitFileWarning(const protobuf::FileDescriptor* file, Output& output) {
-  output(
-      R"cc(
-        /* This file was generated by protos_generator (the upb C++ compiler) "
-        from the input
-         * file:
-         *
-         *     $0
-         *
-         * Do not edit -- your changes will be discarded when the file is
-         * regenerated. */
-      )cc",
-      file->name());
-  output("\n");
-}
-
-std::string MessageName(const protobuf::Descriptor* descriptor) {
-  return ToCIdent(descriptor->full_name());
-}
-
-std::string FileLayoutName(const google::protobuf::FileDescriptor* file) {
-  return ToCIdent(file->name()) + "_upb_file_layout";
-}
-
-std::string CHeaderFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.h";
-}
-
-std::string CSourceFilename(const google::protobuf::FileDescriptor* file) {
-  return StripExtension(file->name()) + ".upb.c";
-}
-
-}  // namespace protos_generator
diff --git a/third_party/upb/protos_generator/output.h b/third_party/upb/protos_generator/output.h
deleted file mode 100644
index d0f765321a5bc..0000000000000
--- a/third_party/upb/protos_generator/output.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_OUTPUT_H
-#define UPB_PROTOS_GENERATOR_OUTPUT_H
-
-#include <vector>
-
-#include "absl/log/absl_log.h"
-#include "absl/strings/str_replace.h"
-#include "absl/strings/substitute.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/io/zero_copy_stream.h"
-
-namespace protos_generator {
-
-class Output {
- public:
-  Output(google::protobuf::io::ZeroCopyOutputStream* stream) : stream_(stream) {}
-  ~Output() { stream_->BackUp((int)buffer_size_); }
-
-  template <class... Arg>
-  void operator()(absl::string_view format, const Arg&... arg) {
-    Write(absl::Substitute(format, arg...));
-  }
-
-  // Indentation size in characters.
-  static constexpr size_t kIndentationSize = 2;
-
-  void Indent() { Indent(kIndentationSize); }
-  void Indent(size_t size) { indent_ += size; }
-
-  void Outdent() { Outdent(kIndentationSize); }
-  void Outdent(size_t size) {
-    if (indent_ < size) {
-      ABSL_LOG(FATAL) << "mismatched Output indent/unindent calls";
-    }
-    indent_ -= size;
-  }
-
- private:
-  void Write(absl::string_view data) {
-    std::string stripped;
-    if (absl::StartsWith(data, "\n ")) {
-      size_t indent = data.substr(1).find_first_not_of(' ');
-      if (indent > indent_) {
-        indent -= indent_;
-      }
-      if (indent != absl::string_view::npos) {
-        // Remove indentation from all lines.
-        auto line_prefix = data.substr(0, indent + 1);
-        // The final line has an extra newline and is indented two less, eg.
-        //    R"cc(
-        //      UPB_INLINE $0 $1_$2(const $1 *msg) {
-        //        return $1_has_$2(msg) ? *UPB_PTR_AT(msg, $3, $0) : $4;
-        //      }
-        //    )cc",
-        std::string last_line_prefix = std::string(line_prefix);
-        last_line_prefix.resize(last_line_prefix.size() - 2);
-        data.remove_prefix(line_prefix.size());
-        stripped = absl::StrReplaceAll(
-            data, {{line_prefix, "\n"}, {last_line_prefix, "\n"}});
-        data = stripped;
-      }
-    } else {
-      WriteIndent();
-    }
-    WriteRaw(data);
-  }
-
-  void WriteRaw(absl::string_view data) {
-    while (!data.empty()) {
-      RefreshOutput();
-      size_t to_write = std::min(data.size(), buffer_size_);
-      memcpy(output_buffer_, data.data(), to_write);
-      data.remove_prefix(to_write);
-      output_buffer_ += to_write;
-      buffer_size_ -= to_write;
-    }
-  }
-
-  void WriteIndent() {
-    if (indent_ == 0) {
-      return;
-    }
-    size_t size = indent_;
-    while (size > buffer_size_) {
-      if (buffer_size_ > 0) {
-        memset(output_buffer_, ' ', buffer_size_);
-      }
-      size -= buffer_size_;
-      buffer_size_ = 0;
-      RefreshOutput();
-    }
-    memset(output_buffer_, ' ', size);
-    output_buffer_ += size;
-    buffer_size_ -= size;
-  }
-
-  void RefreshOutput() {
-    while (buffer_size_ == 0) {
-      void* void_buffer;
-      int size;
-      if (!stream_->Next(&void_buffer, &size)) {
-        fprintf(stderr, "upbc: Failed to write to to output\n");
-        abort();
-      }
-      output_buffer_ = static_cast<char*>(void_buffer);
-      buffer_size_ = size;
-    }
-  }
-
-  google::protobuf::io::ZeroCopyOutputStream* stream_;
-  char* output_buffer_ = nullptr;
-  size_t buffer_size_ = 0;
-  // Current indentation size in characters.
-  size_t indent_ = 0;
-  friend class OutputIndenter;
-};
-
-class OutputIndenter {
- public:
-  OutputIndenter(Output& output)
-      : OutputIndenter(output, Output::kIndentationSize) {}
-  OutputIndenter(Output& output, size_t indent_size)
-      : indent_size_(indent_size), output_(output) {
-    output.Indent(indent_size);
-  }
-  ~OutputIndenter() { output_.Outdent(indent_size_); }
-
- private:
-  size_t indent_size_;
-  Output& output_;
-};
-
-std::string StripExtension(absl::string_view fname);
-std::string ToCIdent(absl::string_view str);
-std::string ToPreproc(absl::string_view str);
-void EmitFileWarning(const google::protobuf::FileDescriptor* file, Output& output);
-std::string MessageName(const google::protobuf::Descriptor* descriptor);
-std::string FileLayoutName(const google::protobuf::FileDescriptor* file);
-std::string CHeaderFilename(const google::protobuf::FileDescriptor* file);
-std::string CSourceFilename(const google::protobuf::FileDescriptor* file);
-
-}  // namespace protos_generator
-
-#endif  // UPB_PROTOS_GENERATOR_OUTPUT_H
diff --git a/third_party/upb/protos_generator/protoc-gen-upb-protos.cc b/third_party/upb/protos_generator/protoc-gen-upb-protos.cc
deleted file mode 100644
index bcd3041314e47..0000000000000
--- a/third_party/upb/protos_generator/protoc-gen-upb-protos.cc
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-
-#include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.h"
-#include "protos_generator/gen_enums.h"
-#include "protos_generator/gen_extensions.h"
-#include "protos_generator/gen_messages.h"
-#include "protos_generator/gen_utils.h"
-#include "protos_generator/names.h"
-#include "protos_generator/output.h"
-#include "upbc/file_layout.h"
-
-namespace protos_generator {
-namespace {
-
-namespace protoc = ::google::protobuf::compiler;
-namespace protobuf = ::google::protobuf;
-using FileDescriptor = ::google::protobuf::FileDescriptor;
-
-void WriteSource(const protobuf::FileDescriptor* file, Output& output,
-                 bool fasttable_enabled);
-void WriteHeader(const protobuf::FileDescriptor* file, Output& output);
-void WriteForwardingHeader(const protobuf::FileDescriptor* file,
-                           Output& output);
-void WriteMessageImplementations(const protobuf::FileDescriptor* file,
-                                 Output& output);
-void WriteTypedefForwardingHeader(
-    const protobuf::FileDescriptor* file,
-    const std::vector<const protobuf::Descriptor*>& file_messages,
-    Output& output);
-void WriteHeaderMessageForwardDecls(
-    const protobuf::FileDescriptor* file,
-    Output& output);
-
-class Generator : public protoc::CodeGenerator {
- public:
-  ~Generator() override {}
-  bool Generate(const protobuf::FileDescriptor* file,
-                const std::string& parameter, protoc::GeneratorContext* context,
-                std::string* error) const override;
-  uint64_t GetSupportedFeatures() const override {
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-};
-
-bool Generator::Generate(const protobuf::FileDescriptor* file,
-                         const std::string& parameter,
-                         protoc::GeneratorContext* context,
-                         std::string* error) const {
-  bool fasttable_enabled = false;
-  std::vector<std::pair<std::string, std::string>> params;
-  google::protobuf::compiler::ParseGeneratorParameter(parameter, &params);
-
-  for (const auto& pair : params) {
-    if (pair.first == "fasttable") {
-      fasttable_enabled = true;
-    } else {
-      *error = "Unknown parameter: " + pair.first;
-      return false;
-    }
-  }
-
-  // Write model.upb.fwd.h
-  Output forwarding_header_output(
-      context->Open(ForwardingHeaderFilename(file)));
-  WriteForwardingHeader(file, forwarding_header_output);
-  // Write model.upb.proto.h
-  Output header_output(context->Open(CppHeaderFilename(file)));
-  WriteHeader(file, header_output);
-  // Write model.upb.proto.cc
-  Output cc_output(context->Open(CppSourceFilename(file)));
-  WriteSource(file, cc_output, fasttable_enabled);
-  return true;
-}
-
-// The forwarding header defines Access/Proxy/CProxy for message classes
-// used to include when referencing dependencies to prevent transitive
-// dependency headers from being included.
-void WriteForwardingHeader(const protobuf::FileDescriptor* file,
-                           Output& output) {
-  EmitFileWarning(file, output);
-  output(
-      R"cc(
-#ifndef $0_UPB_FWD_H_
-#define $0_UPB_FWD_H_
-      )cc",
-      ToPreproc(file->name()));
-  output("\n");
-  for (int i = 0; i < file->public_dependency_count(); ++i) {
-    output("#include \"$0\"\n",
-           ForwardingHeaderFilename(file->public_dependency(i)));
-  }
-  if (file->public_dependency_count() > 0) {
-    output("\n");
-  }
-  const std::vector<const protobuf::Descriptor*> this_file_messages =
-      SortedMessages(file);
-  WriteTypedefForwardingHeader(file, this_file_messages, output);
-  output("#endif  /* $0_UPB_FWD_H_ */\n", ToPreproc(file->name()));
-}
-
-void WriteHeader(const protobuf::FileDescriptor* file, Output& output) {
-  EmitFileWarning(file, output);
-  output(
-      R"cc(
-#ifndef $0_UPB_PROTO_H_
-#define $0_UPB_PROTO_H_
-
-#include "protos/protos.h"
-#include "protos/protos_internal.h"
-#include "protos/repeated_field.h"
-#include "upb/upb.hpp"
-
-#include "absl/strings/string_view.h"
-#include "absl/status/statusor.h"
-      )cc",
-      ToPreproc(file->name()));
-
-  // Import headers for proto public dependencies.
-  for (int i = 0; i < file->public_dependency_count(); i++) {
-    if (i == 0) {
-      output("// Public Imports.\n");
-    }
-    output("#include \"$0\"\n", CppHeaderFilename(file->public_dependency(i)));
-    if (i == file->public_dependency_count() - 1) {
-      output("\n");
-    }
-  }
-
-  output("#include \"upb/port/def.inc\"\n");
-
-  const std::vector<const protobuf::Descriptor*> this_file_messages =
-      SortedMessages(file);
-  const std::vector<const protobuf::FieldDescriptor*> this_file_exts =
-      SortedExtensions(file);
-
-  if (!this_file_messages.empty()) {
-    output("\n");
-  }
-
-  WriteHeaderMessageForwardDecls(file, output);
-  WriteStartNamespace(file, output);
-
-  std::vector<const protobuf::EnumDescriptor*> this_file_enums =
-      SortedEnums(file);
-
-  // Write Class and Enums.
-  WriteEnumDeclarations(this_file_enums, output);
-  output("\n");
-
-  for (auto message : this_file_messages) {
-    WriteMessageClassDeclarations(message, this_file_exts, this_file_enums,
-                                  output);
-  }
-  output("\n");
-
-  WriteExtensionIdentifiersHeader(this_file_exts, output);
-  output("\n");
-
-  WriteEndNamespace(file, output);
-
-  output("\n#include \"upb/port/undef.inc\"\n\n");
-  // End of "C" section.
-
-  output("#endif  /* $0_UPB_PROTO_H_ */\n", ToPreproc(file->name()));
-}
-
-// Writes a .upb.cc source file.
-void WriteSource(const protobuf::FileDescriptor* file, Output& output,
-                 bool fasttable_enabled) {
-  EmitFileWarning(file, output);
-
-  output(
-      R"cc(
-#include <stddef.h>
-#include "absl/strings/string_view.h"
-#include "protos/protos.h"
-#include "$0"
-      )cc",
-      CppHeaderFilename(file));
-
-  for (int i = 0; i < file->dependency_count(); i++) {
-    output("#include \"$0\"\n", CppHeaderFilename(file->dependency(i)));
-  }
-  output("#include \"upb/port/def.inc\"\n");
-
-  WriteStartNamespace(file, output);
-  WriteMessageImplementations(file, output);
-  const std::vector<const protobuf::FieldDescriptor*> this_file_exts =
-      SortedExtensions(file);
-  WriteExtensionIdentifiers(this_file_exts, output);
-  WriteEndNamespace(file, output);
-
-  output("#include \"upb/port/undef.inc\"\n\n");
-}
-
-void WriteMessageImplementations(const protobuf::FileDescriptor* file,
-                                 Output& output) {
-  const std::vector<const protobuf::FieldDescriptor*> file_exts =
-      SortedExtensions(file);
-  const std::vector<const protobuf::Descriptor*> this_file_messages =
-      SortedMessages(file);
-  for (auto message : this_file_messages) {
-    WriteMessageImplementation(message, file_exts, output);
-  }
-}
-
-void WriteTypedefForwardingHeader(
-    const protobuf::FileDescriptor* file,
-    const std::vector<const protobuf::Descriptor*>& file_messages,
-    Output& output) {
-  WriteStartNamespace(file, output);
-
-  // Forward-declare types defined in this file.
-  for (auto message : file_messages) {
-    output(
-        R"cc(
-          class $0;
-          namespace internal {
-          class $0Access;
-          class $0Proxy;
-          class $0CProxy;
-          }  // namespace internal
-        )cc",
-        ClassName(message));
-  }
-  output("\n");
-  WriteEndNamespace(file, output);
-}
-
-/// Writes includes for upb C minitables and fwd.h for transitive typedefs.
-void WriteHeaderMessageForwardDecls(
-    const protobuf::FileDescriptor* file,
-    Output& output) {
-  // Import forward-declaration of types defined in this file.
-  output("#include \"$0\"\n", UpbCFilename(file));
-  output("#include \"$0\"\n", ForwardingHeaderFilename(file));
-  // Import forward-declaration of types in dependencies.
-  for (int i = 0; i < file->dependency_count(); ++i) {
-    output("#include \"$0\"\n", ForwardingHeaderFilename(file->dependency(i)));
-  }
-  output("\n");
-}
-
-}  // namespace
-}  // namespace protos_generator
-
-int main(int argc, char** argv) {
-  protos_generator::Generator generator_cc;
-  return google::protobuf::compiler::PluginMain(argc, argv, &generator_cc);
-}
diff --git a/third_party/upb/protos_generator/tests/BUILD b/third_party/upb/protos_generator/tests/BUILD
deleted file mode 100644
index 5e66184c04d08..0000000000000
--- a/third_party/upb/protos_generator/tests/BUILD
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_CPPOPTS",
-)
-load(
-    "//protos/bazel:upb_cc_proto_library.bzl",
-    "upb_cc_proto_library",
-)
-load(
-    "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
-)
-load(
-    "@rules_cc//cc:defs.bzl",
-    "cc_proto_library",
-)
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-proto_library(
-    name = "test_model_proto",
-    srcs = [
-        "child_model.proto",
-        "test_enum.proto",
-        "test_extension.proto",
-        "test_model.proto",
-    ],
-)
-
-proto_library(
-    name = "no_package_proto",
-    srcs = [
-        "no_package.proto",
-    ],
-)
-
-proto_library(
-    name = "naming_conflict_proto",
-    srcs = [
-        "naming_conflict.proto",
-    ],
-)
-
-proto_library(
-    name = "no_package_enum_user_proto",
-    srcs = [
-        "no_package_enum_user.proto",
-    ],
-    deps = [":no_package_proto"],
-)
-
-upb_proto_library(
-    name = "test_model_upb_proto",
-    visibility = [
-        "//protos:__pkg__",
-    ],
-    deps = [":test_model_proto"],
-)
-
-upb_cc_proto_library(
-    name = "test_model_upb_cc_proto",
-    visibility = ["//protos:__pkg__"],
-    deps = [":test_model_proto"],
-)
-
-upb_cc_proto_library(
-    name = "naming_conflict_upb_cc_proto",
-    visibility = ["//protos:__pkg__"],
-    deps = [":naming_conflict_proto"],
-)
-
-upb_cc_proto_library(
-    name = "no_package_upb_cc_proto",
-    deps = [
-        ":no_package_proto",
-    ],
-)
-
-upb_cc_proto_library(
-    name = "no_package_enum_user_upb_cc_proto",
-    deps = [
-        ":no_package_enum_user_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "test_model_cc_proto",
-    deps = [":test_model_proto"],
-)
-
-# begin:google_only
-# proto_library(
-#     name = "legacy_name_proto",
-#     srcs = [
-#         "legacy-name.proto",
-#     ],
-# )
-#
-# upb_cc_proto_library(
-#     name = "legacy_name_test_proto",
-#     visibility = [
-#         "//visibility:private",  # Only private by automation, not intent. Owner may accept CLs adding visibility. See go/scheuklappen#explicit-private.
-#     ],
-#     deps = [":legacy_name_proto"],
-# )
-# end:google_only
-
-cc_test(
-    name = "test_generated_cc_code",
-    srcs = ["test_generated.cc"],
-    copts = UPB_DEFAULT_CPPOPTS,
-    deps = [
-        # begin:google_only
-#         ":legacy_name_test_proto",
-        # end:google_only
-        ":no_package_upb_cc_proto",
-        ":test_model_upb_cc_proto",
-        ":test_model_upb_proto",
-        ":naming_conflict_upb_cc_proto",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "//:upb",
-        "//protos",
-        "//protos:repeated_field",
-    ],
-)
diff --git a/third_party/upb/protos_generator/tests/child_model.proto b/third_party/upb/protos_generator/tests/child_model.proto
deleted file mode 100644
index 05d0c41d4e2a1..0000000000000
--- a/third_party/upb/protos_generator/tests/child_model.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package protos_generator.test;
-
-import public "protos_generator/tests/test_enum.proto";
-
-message ChildModel1 {
-  optional bool child_b1 = 44;
-  optional string child_str1 = 56;
-}
-
-message ChildModel3 {
-  string sub_key = 1;
-  bool bool1 = 2;
-  int32 i32 = 3;
-  optional string opt_str = 4;
-  optional bool opt_bool = 5;
-  optional int32 opt_i32 = 6;
-}
diff --git a/third_party/upb/protos_generator/tests/legacy-name.proto b/third_party/upb/protos_generator/tests/legacy-name.proto
deleted file mode 100644
index 86852190088c6..0000000000000
--- a/third_party/upb/protos_generator/tests/legacy-name.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package protos_generator.test;
-
-// option java_multiple_files = true;
-
-enum LegacyEnum {
-  PHASE_DEFAULT = 0;
-  PHASE_BUSY = 1;
-}
diff --git a/third_party/upb/protos_generator/tests/naming_conflict.proto b/third_party/upb/protos_generator/tests/naming_conflict.proto
deleted file mode 100644
index 35c57e3cb8d03..0000000000000
--- a/third_party/upb/protos_generator/tests/naming_conflict.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-package protos_generator.test;
-
-message HasChildCount {
-  optional HasChildCount has_child_count = 1;
-  optional int32 child_count = 2;
-}
diff --git a/third_party/upb/protos_generator/tests/no_package.proto b/third_party/upb/protos_generator/tests/no_package.proto
deleted file mode 100644
index d928c4a26e2b1..0000000000000
--- a/third_party/upb/protos_generator/tests/no_package.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto2";
-
-// option java_multiple_files = true;
-
-enum EnumWithNoPackage {
-  CELSIUS = 1;
-  FAHRENHEIT = 2;
-}
-
-message MessageWithEnumUpbTest {
-  enum EnumWithNoPackageInMessage {
-    UNKNOWN = 0;
-    AB_1 = 1;
-    CD_2 = 2;
-    EF_3 = 3;
-    GH_4 = 4;
-  }
-}
\ No newline at end of file
diff --git a/third_party/upb/protos_generator/tests/no_package_enum_user.proto b/third_party/upb/protos_generator/tests/no_package_enum_user.proto
deleted file mode 100644
index 43bfb683c9cd6..0000000000000
--- a/third_party/upb/protos_generator/tests/no_package_enum_user.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto2";
-
-package protos_generator.tests;
-
-import "protos_generator/tests/no_package.proto";
-
-// option java_multiple_files = true;
-
-message MyMessage {
-  optional MessageWithEnumUpbTest my_type = 1;
-}
\ No newline at end of file
diff --git a/third_party/upb/protos_generator/tests/test_enum.proto b/third_party/upb/protos_generator/tests/test_enum.proto
deleted file mode 100644
index c5354ccb8dadf..0000000000000
--- a/third_party/upb/protos_generator/tests/test_enum.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package protos_generator.test;
-
-enum TestEnum {
-  DEVICE_UNKNOWN = 0;
-  DEVICE_KEYBOARD = 1;
-  DEVICE_MOUSE = 2;
-  DEVICE_MONITOR = 3;
-}
diff --git a/third_party/upb/protos_generator/tests/test_extension.proto b/third_party/upb/protos_generator/tests/test_extension.proto
deleted file mode 100644
index e7207739f1005..0000000000000
--- a/third_party/upb/protos_generator/tests/test_extension.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto2";
-
-package protos_generator.test.someotherpackage;
-
-import "protos_generator/tests/test_model.proto";
-
-// Define extension that is extending proto outside this package with a type
-// defined in different file.
-
-extend TestModel {
-  optional ThemeExtension styling = 13001;
-}
diff --git a/third_party/upb/protos_generator/tests/test_generated.cc b/third_party/upb/protos_generator/tests/test_generated.cc
deleted file mode 100644
index 8ad4538fa3efb..0000000000000
--- a/third_party/upb/protos_generator/tests/test_generated.cc
+++ /dev/null
@@ -1,1007 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <limits>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-#include "protos/protos.h"
-#include "protos/repeated_field.h"
-#include "protos/repeated_field_iterator.h"
-#include "protos_generator/tests/child_model.upb.proto.h"
-#include "protos_generator/tests/no_package.upb.proto.h"
-#include "protos_generator/tests/test_model.upb.proto.h"
-#include "upb/upb.hpp"
-
-using ::protos_generator::test::protos::ChildModel1;
-using ::protos_generator::test::protos::other_ext;
-using ::protos_generator::test::protos::RED;
-using ::protos_generator::test::protos::TestEnum;
-using ::protos_generator::test::protos::TestModel;
-using ::protos_generator::test::protos::TestModel_Category;
-using ::protos_generator::test::protos::TestModel_Category_IMAGES;
-using ::protos_generator::test::protos::TestModel_Category_NEWS;
-using ::protos_generator::test::protos::TestModel_Category_VIDEO;
-using ::protos_generator::test::protos::theme;
-using ::protos_generator::test::protos::ThemeExtension;
-using ::testing::ElementsAre;
-
-TEST(CppGeneratedCode, Constructor) { TestModel test_model; }
-
-TEST(CppGeneratedCode, MessageEnum) { EXPECT_EQ(5, TestModel_Category_IMAGES); }
-
-TEST(CppGeneratedCode, ImportedEnum) { EXPECT_EQ(3, TestEnum::DEVICE_MONITOR); }
-
-TEST(CppGeneratedCode, Enum) { EXPECT_EQ(1, RED); }
-
-TEST(CppGeneratedCode, EnumNoPackage) { EXPECT_EQ(1, ::protos_CELSIUS); }
-
-TEST(CppGeneratedCode, MessageEnumType) {
-  TestModel_Category category1 = TestModel_Category_IMAGES;
-  TestModel::Category category2 = TestModel::IMAGES;
-  EXPECT_EQ(category1, category2);
-}
-
-TEST(CppGeneratedCode, MessageEnumValue) {
-  EXPECT_EQ(TestModel_Category_IMAGES, TestModel::IMAGES);
-}
-
-TEST(CppGeneratedCode, ArenaConstructor) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(false, testModel.has_b1());
-}
-
-TEST(CppGeneratedCode, Booleans) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_FALSE(testModel.b1());
-  testModel.set_b1(true);
-  EXPECT_TRUE(testModel.b1());
-  testModel.set_b1(false);
-  EXPECT_FALSE(testModel.b1());
-  testModel.set_b1(true);
-  EXPECT_TRUE(testModel.b1());
-  testModel.clear_b1();
-  EXPECT_FALSE(testModel.has_b1());
-}
-
-TEST(CppGeneratedCode, ScalarInt32) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  // Test int32 defaults.
-  EXPECT_EQ(testModel.value(), 0);
-  EXPECT_FALSE(testModel.has_value());
-  // Floating point defautls.
-  EXPECT_EQ(std::numeric_limits<float>::infinity(),
-            testModel.float_value_with_default());
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            testModel.double_value_with_default());
-
-  // Set value.
-  testModel.set_value(5);
-  EXPECT_TRUE(testModel.has_value());
-  EXPECT_EQ(testModel.value(), 5);
-  // Change value.
-  testModel.set_value(10);
-  EXPECT_TRUE(testModel.has_value());
-  EXPECT_EQ(testModel.value(), 10);
-  // Clear value.
-  testModel.clear_value();
-  EXPECT_FALSE(testModel.has_value());
-  EXPECT_EQ(testModel.value(), 0);
-}
-
-const char kTestStr1[] = "abcdefg";
-const char kTestStr2[] = "just another test string";
-
-TEST(CppGeneratedCode, Strings) {
-  TestModel testModel;
-  testModel.set_str1(kTestStr1);
-  testModel.set_str2(kTestStr2);
-  EXPECT_EQ(testModel.str1(), kTestStr1);
-  EXPECT_EQ(testModel.str2(), kTestStr2);
-  EXPECT_TRUE(testModel.has_str1());
-  EXPECT_TRUE(testModel.has_str2());
-
-  testModel.clear_str1();
-  EXPECT_FALSE(testModel.has_str1());
-  EXPECT_TRUE(testModel.has_str2());
-}
-
-TEST(CppGeneratedCode, ScalarUInt32) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  // Test defaults.
-  EXPECT_EQ(testModel.optional_uint32(), 0);
-  EXPECT_FALSE(testModel.has_optional_uint32());
-  // Set value.
-  testModel.set_optional_uint32(0xA0001000);
-  EXPECT_TRUE(testModel.has_optional_uint32());
-  EXPECT_EQ(testModel.optional_uint32(), 0xA0001000);
-  // Change value.
-  testModel.set_optional_uint32(0x70002000);
-  EXPECT_TRUE(testModel.has_optional_uint32());
-  EXPECT_EQ(testModel.optional_uint32(), 0x70002000);
-  // Clear value.
-  testModel.clear_optional_uint32();
-  EXPECT_FALSE(testModel.has_optional_uint32());
-  EXPECT_EQ(testModel.optional_uint32(), 0);
-}
-
-TEST(CppGeneratedCode, ScalarInt64) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  // Test defaults.
-  EXPECT_EQ(testModel.optional_int64(), 0);
-  EXPECT_FALSE(testModel.has_optional_int64());
-  // Set value.
-  testModel.set_optional_int64(0xFF00CCDDA0001000);
-  EXPECT_TRUE(testModel.has_optional_int64());
-  EXPECT_EQ(testModel.optional_int64(), 0xFF00CCDDA0001000);
-  // Change value.
-  testModel.set_optional_int64(0xFF00CCDD70002000);
-  EXPECT_TRUE(testModel.has_optional_int64());
-  EXPECT_EQ(testModel.optional_int64(), 0xFF00CCDD70002000);
-  // Clear value.
-  testModel.clear_optional_int64();
-  EXPECT_FALSE(testModel.has_optional_int64());
-  EXPECT_EQ(testModel.optional_int64(), 0);
-  // Set after clear.
-  testModel.set_optional_int64(0xFF00CCDDA0001000);
-  EXPECT_TRUE(testModel.has_optional_int64());
-  EXPECT_EQ(testModel.optional_int64(), 0xFF00CCDDA0001000);
-}
-
-TEST(CppGeneratedCode, ScalarFloat) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  // Test defaults.
-  EXPECT_EQ(testModel.optional_float(), 0.0f);
-  EXPECT_FALSE(testModel.has_optional_float());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(),
-            testModel.float_value_with_default());
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            testModel.double_value_with_default());
-  // Set value.
-  testModel.set_optional_float(3.14159265f);
-  EXPECT_TRUE(testModel.has_optional_float());
-  EXPECT_NEAR(testModel.optional_float(), 3.14159265f, 1e-9f);
-  // Change value.
-  testModel.set_optional_float(-2.0f);
-  EXPECT_TRUE(testModel.has_optional_float());
-  EXPECT_NEAR(testModel.optional_float(), -2, 1e-9f);
-  // Clear value.
-  testModel.clear_optional_float();
-  EXPECT_FALSE(testModel.has_optional_float());
-  EXPECT_EQ(testModel.optional_float(), 0.0f);
-  // Set after clear.
-  testModel.set_optional_float(3.14159265f);
-  EXPECT_TRUE(testModel.has_optional_float());
-  EXPECT_NEAR(testModel.optional_float(), 3.14159265f, 1e-9f);
-}
-
-TEST(CppGeneratedCode, ScalarDouble) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-  // Test defaults.
-  EXPECT_EQ(testModel.optional_double(), 0.0);
-  EXPECT_FALSE(testModel.has_optional_double());
-  // Set value.
-  testModel.set_optional_double(3.141592653589793);
-  EXPECT_TRUE(testModel.has_optional_double());
-  EXPECT_NEAR(testModel.optional_double(), 3.141592653589793, 1e-16f);
-  // Change value.
-  testModel.set_optional_double(-1.0);
-  EXPECT_TRUE(testModel.has_optional_double());
-  EXPECT_NEAR(testModel.optional_double(), -1.0, 1e-16f);
-  // Clear value.
-  testModel.clear_optional_double();
-  EXPECT_FALSE(testModel.has_optional_double());
-  EXPECT_EQ(testModel.optional_double(), 0.0f);
-  // Set after clear.
-  testModel.set_optional_double(3.141592653589793);
-  EXPECT_TRUE(testModel.has_optional_double());
-  EXPECT_NEAR(testModel.optional_double(), 3.141592653589793, 1e-16f);
-}
-
-TEST(CppGeneratedCode, Enums) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-
-  // Check enum default value.
-  EXPECT_EQ(TestModel_Category_IMAGES, 5);
-
-  // Test defaults.
-  EXPECT_FALSE(testModel.has_category());
-  EXPECT_EQ(testModel.category(), TestModel_Category_IMAGES);
-  // Set value.
-  testModel.set_category(TestModel_Category_NEWS);
-  EXPECT_TRUE(testModel.has_category());
-  EXPECT_EQ(testModel.category(), TestModel_Category_NEWS);
-  // Change value.
-  testModel.set_category(TestModel_Category_VIDEO);
-  EXPECT_TRUE(testModel.has_category());
-  EXPECT_EQ(testModel.category(), TestModel_Category_VIDEO);
-  // Clear value.
-  testModel.clear_category();
-  EXPECT_FALSE(testModel.has_category());
-  EXPECT_EQ(testModel.category(), TestModel_Category_IMAGES);
-  // Set after clear.
-  testModel.set_category(TestModel_Category_VIDEO);
-  EXPECT_TRUE(testModel.has_category());
-  EXPECT_EQ(testModel.category(), TestModel_Category_VIDEO);
-}
-
-TEST(CppGeneratedCode, FieldWithDefaultValue) {
-  ::protos::Arena arena;
-  auto testModel = ::protos::CreateMessage<TestModel>(arena);
-
-  EXPECT_FALSE(testModel.has_int_value_with_default());
-  EXPECT_EQ(testModel.int_value_with_default(), 65);
-  testModel.set_int_value_with_default(10);
-  EXPECT_EQ(testModel.int_value_with_default(), 10);
-
-  EXPECT_FALSE(testModel.has_string_value_with_default());
-  EXPECT_EQ(testModel.string_value_with_default(), "hello");
-  testModel.set_string_value_with_default("new string");
-  EXPECT_EQ(testModel.string_value_with_default(), "new string");
-}
-
-TEST(CppGeneratedCode, OneOfFields) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-
-  EXPECT_FALSE(test_model.has_oneof_member1());
-  EXPECT_FALSE(test_model.has_oneof_member2());
-  EXPECT_EQ(TestModel::CHILD_ONEOF1_NOT_SET, test_model.child_oneof1_case());
-
-  test_model.set_oneof_member1("one of string");
-  EXPECT_TRUE(test_model.has_oneof_member1());
-  EXPECT_FALSE(test_model.has_oneof_member2());
-  EXPECT_EQ(test_model.oneof_member1(), "one of string");
-  EXPECT_EQ(TestModel::kOneofMember1, test_model.child_oneof1_case());
-
-  test_model.set_oneof_member2(true);
-  EXPECT_FALSE(test_model.has_oneof_member1());
-  EXPECT_TRUE(test_model.has_oneof_member2());
-  EXPECT_EQ(test_model.oneof_member2(), true);
-  EXPECT_EQ(TestModel::kOneofMember2, test_model.child_oneof1_case());
-
-  test_model.clear_oneof_member2();
-  EXPECT_FALSE(test_model.has_oneof_member1());
-  EXPECT_FALSE(test_model.has_oneof_member2());
-  EXPECT_EQ(test_model.oneof_member1(), "");
-  EXPECT_EQ(test_model.oneof_member2(), false);
-  EXPECT_EQ(TestModel::CHILD_ONEOF1_NOT_SET, test_model.child_oneof1_case());
-}
-
-TEST(CppGeneratedCode, Messages) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(false, test_model.has_child_model_1());
-  auto child_model = test_model.child_model_1();
-  EXPECT_EQ(false, child_model->has_child_b1());
-  EXPECT_EQ(false, child_model->child_b1());
-  auto mutable_child = test_model.mutable_child_model_1();
-  mutable_child->set_child_b1(true);
-  EXPECT_EQ(true, mutable_child->has_child_b1());
-  EXPECT_EQ(true, mutable_child->child_b1());
-  // The View should not change due to mutation since it
-  // is default_instance.
-  EXPECT_EQ(false, child_model->has_child_b1());
-  // Readonly View should now show change.
-  child_model = test_model.child_model_1();
-  EXPECT_EQ(true, child_model->has_child_b1());
-  EXPECT_EQ(true, child_model->child_b1());
-  // Clear message field.
-  EXPECT_EQ(true, test_model.has_child_model_1());
-  test_model.clear_child_model_1();
-  EXPECT_EQ(false, test_model.has_child_model_1());
-}
-
-TEST(CppGeneratedCode, NestedMessages) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  auto nested_child = test_model.nested_child_1();
-  EXPECT_EQ(0, nested_child->nested_child_name().size());
-  auto mutable_nested_child = test_model.mutable_nested_child_1();
-  EXPECT_EQ(false, mutable_nested_child->has_nested_child_name());
-  mutable_nested_child->set_nested_child_name(kTestStr1);
-  EXPECT_EQ(true, mutable_nested_child->has_nested_child_name());
-}
-
-TEST(CppGeneratedCode, RepeatedMessages) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.child_models_size());
-  // Should be able to clear repeated field when empty.
-  test_model.mutable_child_models()->clear();
-  EXPECT_EQ(0, test_model.child_models_size());
-  // Add 2 children.
-  auto new_child = test_model.add_child_models();
-  EXPECT_EQ(true, new_child.ok());
-  new_child.value()->set_child_str1(kTestStr1);
-  new_child = test_model.add_child_models();
-  EXPECT_EQ(true, new_child.ok());
-  new_child.value()->set_child_str1(kTestStr2);
-  EXPECT_EQ(2, test_model.child_models_size());
-  // Mutable access.
-  auto mutable_first = test_model.mutable_child_models(0);
-  EXPECT_EQ(mutable_first->child_str1(), kTestStr1);
-  mutable_first->set_child_str1("change1");
-  auto mutable_second = test_model.mutable_child_models(1);
-  EXPECT_EQ(mutable_second->child_str1(), kTestStr2);
-  mutable_second->set_child_str1("change2");
-  // Check mutations using views.
-  auto view_first = test_model.child_models(0);
-  EXPECT_EQ(view_first->child_str1(), "change1");
-  auto view_second = test_model.child_models(1);
-  EXPECT_EQ(view_second->child_str1(), "change2");
-}
-
-TEST(CppGeneratedCode, RepeatedScalar) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.value_array_size());
-  // Should be able to clear repeated field when empty.
-  test_model.mutable_value_array()->clear();
-  EXPECT_EQ(0, test_model.value_array_size());
-  // Add 2 children.
-  EXPECT_EQ(true, test_model.add_value_array(5));
-  EXPECT_EQ(true, test_model.add_value_array(6));
-  EXPECT_EQ(2, test_model.value_array_size());
-  EXPECT_EQ(5, test_model.value_array(0));
-  EXPECT_EQ(6, test_model.value_array(1));
-  EXPECT_EQ(true, test_model.resize_value_array(3));
-  EXPECT_EQ(3, test_model.value_array_size());
-  test_model.set_value_array(2, 7);
-  EXPECT_EQ(5, test_model.value_array(0));
-  EXPECT_EQ(6, test_model.value_array(1));
-  EXPECT_EQ(7, test_model.value_array(2));
-}
-
-TEST(CppGeneratedCode, RepeatedFieldClear) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  test_model.mutable_value_array()->push_back(5);
-  test_model.mutable_value_array()->push_back(16);
-  test_model.mutable_value_array()->push_back(27);
-  ASSERT_EQ(test_model.mutable_value_array()->size(), 3);
-  test_model.mutable_value_array()->clear();
-  EXPECT_EQ(test_model.mutable_value_array()->size(), 0);
-}
-
-TEST(CppGeneratedCode, RepeatedFieldProxyForScalars) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.value_array().size());
-  EXPECT_EQ(0, test_model.mutable_value_array()->size());
-
-  test_model.mutable_value_array()->push_back(5);
-  test_model.mutable_value_array()->push_back(16);
-  test_model.mutable_value_array()->push_back(27);
-
-  ASSERT_EQ(test_model.mutable_value_array()->size(), 3);
-  EXPECT_EQ((*test_model.mutable_value_array())[0], 5);
-  EXPECT_EQ((*test_model.mutable_value_array())[1], 16);
-  EXPECT_EQ((*test_model.mutable_value_array())[2], 27);
-
-  const auto value_array = test_model.value_array();
-  ASSERT_EQ(value_array.size(), 3);
-  EXPECT_EQ(value_array[0], 5);
-  EXPECT_EQ(value_array[1], 16);
-  EXPECT_EQ(value_array[2], 27);
-
-  EXPECT_THAT(value_array, ElementsAre(5, 16, 27));
-
-  EXPECT_THAT(std::vector(value_array.begin(), value_array.end()),
-              ElementsAre(5, 16, 27));
-  EXPECT_THAT(std::vector(value_array.cbegin(), value_array.cend()),
-              ElementsAre(5, 16, 27));
-  EXPECT_THAT(std::vector(value_array.rbegin(), value_array.rend()),
-              ElementsAre(27, 16, 5));
-  EXPECT_THAT(std::vector(value_array.crbegin(), value_array.crend()),
-              ElementsAre(27, 16, 5));
-}
-
-TEST(CppGeneratedCode, RepeatedScalarIterator) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  test_model.mutable_value_array()->push_back(5);
-  test_model.mutable_value_array()->push_back(16);
-  test_model.mutable_value_array()->push_back(27);
-  int sum = 0;
-  // Access by value.
-  const ::protos::RepeatedField<int32_t>::CProxy rep1 =
-      test_model.value_array();
-  for (auto i : rep1) {
-    sum += i;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-  // Access by const reference.
-  sum = 0;
-  for (const int& i : *test_model.mutable_value_array()) {
-    sum += i;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-  // Access by forwarding reference.
-  sum = 0;
-  for (auto&& i : *test_model.mutable_value_array()) {
-    sum += i;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-  // Test iterator operators.
-  auto begin = test_model.value_array().begin();
-  auto end = test_model.value_array().end();
-  sum = 0;
-  for (auto it = begin; it != end; ++it) {
-    sum += *it;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-  auto it = begin;
-  ++it;
-  EXPECT_TRUE(begin < it);
-  EXPECT_TRUE(begin <= it);
-  it = end;
-  EXPECT_TRUE(it == end);
-  EXPECT_TRUE(it > begin);
-  EXPECT_TRUE(it >= begin);
-  EXPECT_TRUE(it != begin);
-  // difference type
-  it = end;
-  --it;
-  --it;
-  EXPECT_EQ(end - it, 2);
-  it = begin;
-  EXPECT_EQ(it[0], 5);
-  EXPECT_EQ(it[1], 16);
-  EXPECT_EQ(it[2], 27);
-  // ValueProxy.
-  sum = 0;
-  for (::protos::RepeatedField<int32_t>::ValueCProxy c :
-       test_model.value_array()) {
-    sum += c;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-  sum = 0;
-  for (::protos::RepeatedField<int32_t>::ValueProxy c :
-       *test_model.mutable_value_array()) {
-    sum += c;
-  }
-  EXPECT_EQ(sum, 5 + 16 + 27);
-}
-
-TEST(CppGeneratedCode, RepeatedFieldProxyForStrings) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.repeated_string().size());
-  EXPECT_EQ(0, test_model.mutable_repeated_string()->size());
-
-  test_model.mutable_repeated_string()->push_back("a");
-  test_model.mutable_repeated_string()->push_back("b");
-  test_model.mutable_repeated_string()->push_back("c");
-
-  ASSERT_EQ(test_model.repeated_string().size(), 3);
-  EXPECT_EQ(test_model.repeated_string()[0], "a");
-  EXPECT_EQ(test_model.repeated_string()[1], "b");
-  EXPECT_EQ(test_model.repeated_string()[2], "c");
-
-  EXPECT_THAT(test_model.repeated_string(), ElementsAre("a", "b", "c"));
-  EXPECT_THAT(*test_model.mutable_repeated_string(),
-              ElementsAre("a", "b", "c"));
-
-  ASSERT_EQ(test_model.mutable_repeated_string()->size(), 3);
-  EXPECT_EQ((*test_model.mutable_repeated_string())[0], "a");
-  EXPECT_EQ((*test_model.mutable_repeated_string())[1], "b");
-  EXPECT_EQ((*test_model.mutable_repeated_string())[2], "c");
-
-  // The const accessor can't be used to modify the element
-  EXPECT_FALSE((std::is_assignable<decltype(test_model.repeated_string()[1]),
-                                   absl::string_view>::value));
-  // But the mutable one is fine.
-  (*test_model.mutable_repeated_string())[1] = "other";
-  EXPECT_THAT(test_model.repeated_string(), ElementsAre("a", "other", "c"));
-
-  test_model.mutable_repeated_string()->clear();
-  EXPECT_EQ(test_model.mutable_repeated_string()->size(), 0);
-}
-
-TEST(CppGeneratedCode, RepeatedFieldProxyForMessages) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.child_models().size());
-  ChildModel1 child1;
-  child1.set_child_str1(kTestStr1);
-  test_model.mutable_child_models()->push_back(child1);
-  ChildModel1 child2;
-  child2.set_child_str1(kTestStr2);
-  test_model.mutable_child_models()->push_back(std::move(child2));
-  EXPECT_EQ(test_model.child_models().size(), 2);
-  EXPECT_EQ(test_model.child_models()[0].child_str1(), kTestStr1);
-  EXPECT_EQ(test_model.child_models()[1].child_str1(), kTestStr2);
-  EXPECT_EQ((*test_model.mutable_child_models())[0].child_str1(), kTestStr1);
-  EXPECT_EQ((*test_model.mutable_child_models())[1].child_str1(), kTestStr2);
-  (*test_model.mutable_child_models())[0].set_child_str1("change1");
-  EXPECT_EQ((*test_model.mutable_child_models())[0].child_str1(), "change1");
-  test_model.mutable_child_models()->clear();
-  EXPECT_EQ(test_model.mutable_child_models()->size(), 0);
-}
-
-TEST(CppGeneratedCode, RepeatedFieldProxyForMessagesIndexOperator) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.child_models().size());
-  ChildModel1 child1;
-  child1.set_child_str1(kTestStr1);
-  test_model.mutable_child_models()->push_back(child1);
-  ChildModel1 child2;
-
-  child2.set_child_str1(kTestStr2);
-  test_model.mutable_child_models()->push_back(std::move(child2));
-  ASSERT_EQ(test_model.child_models().size(), 2);
-
-  // test_model.child_models()[0].set_child_str1("change1");
-  (*test_model.mutable_child_models())[0].set_child_str1("change1");
-  EXPECT_EQ((*test_model.mutable_child_models())[0].child_str1(), "change1");
-}
-
-TEST(CppGeneratedCode, RepeatedStrings) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.repeated_string_size());
-  // Should be able to clear repeated field when empty.
-  test_model.mutable_repeated_string()->clear();
-  EXPECT_EQ(0, test_model.repeated_string_size());
-  // Add 2 children.
-  EXPECT_EQ(true, test_model.add_repeated_string("Hello"));
-  EXPECT_EQ(true, test_model.add_repeated_string("World"));
-  EXPECT_EQ(2, test_model.repeated_string_size());
-  EXPECT_EQ("Hello", test_model.repeated_string(0));
-  EXPECT_EQ("World", test_model.repeated_string(1));
-  EXPECT_EQ(true, test_model.resize_repeated_string(3));
-  EXPECT_EQ(3, test_model.repeated_string_size());
-  test_model.set_repeated_string(2, "Test");
-  EXPECT_EQ("Hello", test_model.repeated_string(0));
-  EXPECT_EQ("World", test_model.repeated_string(1));
-  EXPECT_EQ("Test", test_model.repeated_string(2));
-}
-
-TEST(CppGeneratedCode, MessageMapInt32KeyMessageValue) {
-  const int key_test_value = 3;
-  ::protos::Arena arena;
-  ::protos::Arena child_arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.child_map_size());
-  test_model.clear_child_map();
-  EXPECT_EQ(0, test_model.child_map_size());
-  auto child_model1 = ::protos::CreateMessage<ChildModel1>(child_arena);
-  child_model1.set_child_str1("abc");
-  test_model.set_child_map(key_test_value, child_model1);
-  auto map_result = test_model.get_child_map(key_test_value);
-  EXPECT_EQ(true, map_result.ok());
-  EXPECT_EQ("abc", map_result.value()->child_str1());
-  // Now mutate original child model to verify that value semantics are
-  // preserved.
-  child_model1.set_child_str1("abc V2");
-  EXPECT_EQ("abc", map_result.value()->child_str1());
-  test_model.delete_child_map(key_test_value);
-  auto map_result_after_delete = test_model.get_child_map(key_test_value);
-  EXPECT_EQ(false, map_result_after_delete.ok());
-}
-
-TEST(CppGeneratedCode, MessageMapStringKeyAndStringValue) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.str_to_str_map_size());
-  test_model.clear_str_to_str_map();
-  EXPECT_EQ(0, test_model.str_to_str_map_size());
-  test_model.set_str_to_str_map("first", "abc");
-  test_model.set_str_to_str_map("second", "def");
-  auto result = test_model.get_str_to_str_map("second");
-  EXPECT_EQ(true, result.ok());
-  EXPECT_EQ("def", result.value());
-  test_model.delete_str_to_str_map("first");
-  auto result_after_delete = test_model.get_str_to_str_map("first");
-  EXPECT_EQ(false, result_after_delete.ok());
-}
-
-TEST(CppGeneratedCode, MessageMapStringKeyAndInt32Value) {
-  ::protos::Arena arena;
-  auto test_model = ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_EQ(0, test_model.str_to_int_map_size());
-  test_model.clear_str_to_int_map();
-  EXPECT_EQ(0, test_model.str_to_int_map_size());
-  test_model.set_str_to_int_map("first", 10);
-  EXPECT_EQ(1, test_model.str_to_int_map_size());
-  test_model.set_str_to_int_map("second", 20);
-  EXPECT_EQ(2, test_model.str_to_int_map_size());
-  auto result = test_model.get_str_to_int_map("second");
-  EXPECT_EQ(true, result.ok());
-  EXPECT_EQ(20, result.value());
-  test_model.delete_str_to_int_map("first");
-  auto result_after_delete = test_model.get_str_to_int_map("first");
-  EXPECT_EQ(false, result_after_delete.ok());
-}
-
-TEST(CppGeneratedCode, HasExtension) {
-  TestModel model;
-  EXPECT_EQ(false, ::protos::HasExtension(&model, theme));
-}
-
-TEST(CppGeneratedCode, HasExtensionPtr) {
-  TestModel model;
-  EXPECT_EQ(false, ::protos::HasExtension(model.recursive_child(), theme));
-}
-
-TEST(CppGeneratedCode, ClearExtensionWithEmptyExtension) {
-  TestModel model;
-  EXPECT_EQ(false, ::protos::HasExtension(&model, theme));
-  ::protos::ClearExtension(&model, theme);
-  EXPECT_EQ(false, ::protos::HasExtension(&model, theme));
-}
-
-TEST(CppGeneratedCode, ClearExtensionWithEmptyExtensionPtr) {
-  TestModel model;
-  ::protos::Ptr<TestModel> recursive_child = model.mutable_recursive_child();
-  ::protos::ClearExtension(recursive_child, theme);
-  EXPECT_EQ(false, ::protos::HasExtension(recursive_child, theme));
-}
-
-TEST(CppGeneratedCode, SetExtension) {
-  TestModel model;
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(false, ::protos::HasExtension(&model, theme));
-  EXPECT_EQ(true, ::protos::SetExtension(&model, theme, extension1).ok());
-  EXPECT_EQ(true, ::protos::HasExtension(&model, theme));
-}
-
-TEST(CppGeneratedCode, SetExtensionOnMutableChild) {
-  TestModel model;
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(false,
-            ::protos::HasExtension(model.mutable_recursive_child(), theme));
-  EXPECT_EQ(true, ::protos::SetExtension(model.mutable_recursive_child(), theme,
-                                         extension1)
-                      .ok());
-  EXPECT_EQ(true,
-            ::protos::HasExtension(model.mutable_recursive_child(), theme));
-}
-
-TEST(CppGeneratedCode, GetExtension) {
-  TestModel model;
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(false, ::protos::HasExtension(&model, theme));
-  EXPECT_EQ(true, ::protos::SetExtension(&model, theme, extension1).ok());
-  EXPECT_EQ("Hello World",
-            ::protos::GetExtension(&model, theme).value()->ext_name());
-}
-
-TEST(CppGeneratedCode, GetExtensionOnMutableChild) {
-  TestModel model;
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  ::protos::Ptr<TestModel> mutable_recursive_child =
-      model.mutable_recursive_child();
-  EXPECT_EQ(false, ::protos::HasExtension(mutable_recursive_child, theme));
-  EXPECT_EQ(
-      true,
-      ::protos::SetExtension(mutable_recursive_child, theme, extension1).ok());
-  EXPECT_EQ("Hello World",
-            ::protos::GetExtension(mutable_recursive_child, theme)
-                .value()
-                ->ext_name());
-}
-
-TEST(CppGeneratedCode, GetExtensionOnImmutableChild) {
-  TestModel model;
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  ::protos::Ptr<TestModel> mutable_recursive_child =
-      model.mutable_recursive_child();
-  EXPECT_EQ(false, ::protos::HasExtension(mutable_recursive_child, theme));
-  EXPECT_EQ(
-      true,
-      ::protos::SetExtension(mutable_recursive_child, theme, extension1).ok());
-  ::protos::Ptr<const TestModel> recursive_child = model.recursive_child();
-  EXPECT_EQ("Hello World",
-            ::protos::GetExtension(recursive_child, theme).value()->ext_name());
-}
-
-TEST(CppGeneratedCode, SerializeUsingArena) {
-  TestModel model;
-  model.set_str1("Hello World");
-  ::upb::Arena arena;
-  absl::StatusOr<absl::string_view> bytes = ::protos::Serialize(&model, arena);
-  EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
-  EXPECT_EQ("Hello World", parsed_model.str1());
-}
-
-TEST(CppGeneratedCode, SerializeProxyUsingArena) {
-  ::upb::Arena message_arena;
-  TestModel::Proxy model_proxy =
-      ::protos::CreateMessage<TestModel>(message_arena);
-  model_proxy.set_str1("Hello World");
-  ::upb::Arena arena;
-  absl::StatusOr<absl::string_view> bytes =
-      ::protos::Serialize(&model_proxy, arena);
-  EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
-  EXPECT_EQ("Hello World", parsed_model.str1());
-}
-
-TEST(CppGeneratedCode, SerializeNestedMessageUsingArena) {
-  TestModel model;
-  model.mutable_recursive_child()->set_str1("Hello World");
-  ::upb::Arena arena;
-  ::protos::Ptr<const TestModel> child = model.recursive_child();
-  absl::StatusOr<absl::string_view> bytes = ::protos::Serialize(child, arena);
-  EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
-  EXPECT_EQ("Hello World", parsed_model.str1());
-}
-
-TEST(CppGeneratedCode, Parse) {
-  TestModel model;
-  model.set_str1("Test123");
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(true, ::protos::SetExtension(&model, theme, extension1).ok());
-  ::upb::Arena arena;
-  auto bytes = ::protos::Serialize(&model, arena);
-  EXPECT_EQ(true, bytes.ok());
-  TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
-  EXPECT_EQ("Test123", parsed_model.str1());
-  EXPECT_EQ(true, ::protos::GetExtension(&parsed_model, theme).ok());
-}
-
-TEST(CppGeneratedCode, ParseIntoPtrToModel) {
-  TestModel model;
-  model.set_str1("Test123");
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(true, ::protos::SetExtension(&model, theme, extension1).ok());
-  ::upb::Arena arena;
-  auto bytes = ::protos::Serialize(&model, arena);
-  EXPECT_EQ(true, bytes.ok());
-  ::protos::Ptr<TestModel> parsed_model =
-      ::protos::CreateMessage<TestModel>(arena);
-  EXPECT_TRUE(::protos::Parse(parsed_model, bytes.value()));
-  EXPECT_EQ("Test123", parsed_model->str1());
-  // Should return an extension even if we don't pass ExtensionRegistry
-  // by promoting unknown.
-  EXPECT_EQ(true, ::protos::GetExtension(parsed_model, theme).ok());
-}
-
-TEST(CppGeneratedCode, ParseWithExtensionRegistry) {
-  TestModel model;
-  model.set_str1("Test123");
-  ThemeExtension extension1;
-  extension1.set_ext_name("Hello World");
-  EXPECT_EQ(true, ::protos::SetExtension(&model, theme, extension1).ok());
-  EXPECT_EQ(true, ::protos::SetExtension(
-                      &model, ThemeExtension::theme_extension, extension1)
-                      .ok());
-  ::upb::Arena arena;
-  auto bytes = ::protos::Serialize(&model, arena);
-  EXPECT_EQ(true, bytes.ok());
-  ::protos::ExtensionRegistry extensions(
-      {&theme, &other_ext, &ThemeExtension::theme_extension}, arena);
-  TestModel parsed_model =
-      ::protos::Parse<TestModel>(bytes.value(), extensions).value();
-  EXPECT_EQ("Test123", parsed_model.str1());
-  EXPECT_EQ(true, ::protos::GetExtension(&parsed_model, theme).ok());
-  EXPECT_EQ(true, ::protos::GetExtension(&parsed_model,
-                                         ThemeExtension::theme_extension)
-                      .ok());
-  EXPECT_EQ("Hello World", ::protos::GetExtension(
-                               &parsed_model, ThemeExtension::theme_extension)
-                               .value()
-                               ->ext_name());
-}
-
-TEST(CppGeneratedCode, NameCollisions) {
-  TestModel model;
-  model.set_template_("test");
-  EXPECT_EQ("test", model.template_());
-  model.set_arena__("test");
-  EXPECT_EQ("test", model.arena__());
-}
-
-TEST(CppGeneratedCode, SharedPointer) {
-  std::shared_ptr<TestModel> model = std::make_shared<TestModel>();
-  ::upb::Arena arena;
-  auto bytes = protos::Serialize(model.get(), arena);
-  EXPECT_TRUE(protos::Parse(model.get(), bytes.value()));
-}
-
-TEST(CppGeneratedCode, UniquePointer) {
-  auto model = std::make_unique<TestModel>();
-  ::upb::Arena arena;
-  auto bytes = protos::Serialize(model.get(), arena);
-  EXPECT_TRUE(protos::Parse(model.get(), bytes.value()));
-}
-
-TEST(CppGeneratedCode, Assignment) {
-  TestModel model;
-  model.set_category(5);
-  model.mutable_child_model_1()->set_child_str1("text in child");
-  TestModel model2 = model;
-  EXPECT_EQ(5, model2.category());
-  EXPECT_EQ(model2.child_model_1()->child_str1(), "text in child");
-}
-
-TEST(CppGeneratedCode, PtrAssignment) {
-  TestModel model;
-  model.mutable_child_model_1()->set_child_str1("text in child");
-  ChildModel1 child_from_const_ptr = *model.child_model_1();
-  EXPECT_EQ(child_from_const_ptr.child_str1(), "text in child");
-  ChildModel1 child_from_ptr = *model.mutable_child_model_1();
-  EXPECT_EQ(child_from_ptr.child_str1(), "text in child");
-}
-
-TEST(CppGeneratedCode, CopyConstructor) {
-  TestModel model;
-  model.set_category(6);
-  TestModel model2(model);
-  EXPECT_EQ(6, model2.category());
-}
-
-TEST(CppGeneratedCode, PtrConstructor) {
-  TestModel model;
-  model.mutable_child_model_1()->set_child_str1("text in child");
-  ChildModel1 child_from_ptr(*model.mutable_child_model_1());
-  EXPECT_EQ(child_from_ptr.child_str1(), "text in child");
-  ChildModel1 child_from_const_ptr(*model.child_model_1());
-  EXPECT_EQ(child_from_const_ptr.child_str1(), "text in child");
-}
-
-TEST(CppGeneratedCode, MutableToProxy) {
-  TestModel model;
-  ::protos::Ptr<ChildModel1> child = model.mutable_child_model_1();
-  (void)child;
-}
-
-TEST(CppGeneratedCode, ProxyToCProxy) {
-  TestModel model;
-  ::protos::Ptr<ChildModel1> child = model.mutable_child_model_1();
-  ::protos::Ptr<const ChildModel1> child2 = child;
-  (void)child2;
-}
-
-bool ProxyToCProxyMethod(::protos::Ptr<const ChildModel1> child) {
-  return child->child_str1() == "text in child";
-}
-
-TEST(CppGeneratedCode, PassProxyToCProxy) {
-  TestModel model;
-  model.mutable_child_model_1()->set_child_str1("text in child");
-  EXPECT_TRUE(ProxyToCProxyMethod(model.mutable_child_model_1()));
-}
-
-TEST(CppGeneratedCode, PtrImplicitConversion) {
-  TestModel model;
-  model.set_int64(5);
-  ::protos::Ptr<TestModel> model_ptr = &model;
-  EXPECT_EQ(model_ptr->int64(), 5);
-}
-
-TEST(CppGeneratedCode, ClearSubMessage) {
-  // Fill model.
-  TestModel model;
-  model.set_int64(5);
-  auto new_child = model.mutable_child_model_1();
-  new_child->set_child_str1("text in child");
-  ThemeExtension extension1;
-  extension1.set_ext_name("name in extension");
-  EXPECT_TRUE(::protos::SetExtension(&model, theme, extension1).ok());
-  EXPECT_TRUE(model.mutable_child_model_1()->has_child_str1());
-  // Clear using Ptr<T>
-  ::protos::ClearMessage(model.mutable_child_model_1());
-  EXPECT_FALSE(model.mutable_child_model_1()->has_child_str1());
-}
-
-TEST(CppGeneratedCode, ClearMessage) {
-  // Fill model.
-  TestModel model;
-  model.set_int64(5);
-  model.set_str2("Hello");
-  auto new_child = model.add_child_models();
-  ASSERT_TRUE(new_child.ok());
-  new_child.value()->set_child_str1("text in child");
-  ThemeExtension extension1;
-  extension1.set_ext_name("name in extension");
-  EXPECT_TRUE(::protos::SetExtension(&model, theme, extension1).ok());
-  // Clear using T*
-  ::protos::ClearMessage(&model);
-  // Verify that scalars, repeated fields and extensions are cleared.
-  EXPECT_FALSE(model.has_int64());
-  EXPECT_FALSE(model.has_str2());
-  EXPECT_TRUE(model.child_models().empty());
-  EXPECT_FALSE(::protos::HasExtension(&model, theme));
-}
-
-TEST(CppGeneratedCode, DeepCopy) {
-  // Fill model.
-  TestModel model;
-  model.set_int64(5);
-  model.set_str2("Hello");
-  auto new_child = model.add_child_models();
-  ASSERT_TRUE(new_child.ok());
-  new_child.value()->set_child_str1("text in child");
-  ThemeExtension extension1;
-  extension1.set_ext_name("name in extension");
-  EXPECT_TRUE(::protos::SetExtension(&model, theme, extension1).ok());
-  TestModel target;
-  target.set_b1(true);
-  ::protos::DeepCopy(&model, &target);
-  EXPECT_FALSE(target.b1()) << "Target was not cleared before copying content ";
-  EXPECT_EQ(target.str2(), "Hello");
-  EXPECT_TRUE(::protos::HasExtension(&target, theme));
-}
-
-TEST(CppGeneratedCode, HasExtensionAndRegistry) {
-  // Fill model.
-  TestModel source;
-  source.set_int64(5);
-  source.set_str2("Hello");
-  auto new_child = source.add_child_models();
-  ASSERT_TRUE(new_child.ok());
-  new_child.value()->set_child_str1("text in child");
-  ThemeExtension extension1;
-  extension1.set_ext_name("name in extension");
-  ASSERT_TRUE(::protos::SetExtension(&source, theme, extension1).ok());
-
-  // Now that we have a source model with extension data, serialize.
-  ::protos::Arena arena;
-  std::string data = std::string(::protos::Serialize(&source, arena).value());
-
-  // Test with ExtensionRegistry
-  ::protos::ExtensionRegistry extensions({&theme}, arena);
-  TestModel parsed_model = ::protos::Parse<TestModel>(data, extensions).value();
-  EXPECT_TRUE(::protos::HasExtension(&parsed_model, theme));
-}
-
-// TODO(b/288491350) : Add BUILD rule to test failures below.
-#ifdef TEST_CLEAR_MESSAGE_FAILURE
-TEST(CppGeneratedCode, ClearConstMessageShouldFail) {
-  // Fill model.
-  TestModel model;
-  model.set_int64(5);
-  model.set_str2("Hello");
-  // Only mutable_ can be cleared not Ptr<const T>.
-  ::protos::ClearMessage(model.child_model_1());
-}
-#endif
diff --git a/third_party/upb/protos_generator/tests/test_model.proto b/third_party/upb/protos_generator/tests/test_model.proto
deleted file mode 100644
index d372cc13e44b9..0000000000000
--- a/third_party/upb/protos_generator/tests/test_model.proto
+++ /dev/null
@@ -1,154 +0,0 @@
-syntax = "proto2";
-
-package protos_generator.test;
-
-import "protos_generator/tests/child_model.proto";
-
-message TestModelContainer {
-  repeated TestModel models = 1;
-  optional ChildModel3 proto_3_child = 2;
-}
-
-message TestModel {
-  optional int32 value = 1;
-  repeated int32 value_array = 2;  // _UPB_MODE_ARRAY
-  repeated int32 value_packed_array = 3
-      [packed = true];  // _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED
-  repeated int32 value_deprec = 4 [deprecated = true];
-  optional string str1 = 115;
-  optional bool b1 = 9;
-  optional bool b2 = 10;
-  optional string str2 = 50;
-  optional string str3 = 11;
-  optional float optional_float = 14;
-  optional double optional_double = 15;
-  optional int64 optional_int64 = 16;
-  optional uint32 optional_uint32 = 17;
-  optional uint64 optional_uint64 = 18;
-  optional sint32 optional_sint32 = 19;
-  optional sint64 optional_sint64 = 20;
-  optional fixed32 optional_fixed32 = 21;
-  optional fixed64 optional_fixed64 = 22;
-  optional sfixed32 optional_sfixed32 = 23;
-  optional sfixed64 optional_sfixed64 = 24;
-  repeated int64 repeated_int64 = 25;
-  repeated uint64 repeated_uint64 = 26;
-  repeated fixed64 repeated_fixed64 = 27;
-  repeated sfixed64 repeated_sfixed64 = 28;
-  repeated bool repeated_bool = 29;
-  repeated string repeated_string = 35;
-  optional bytes optional_bytes = 36;
-  message NestedChild {
-    optional string nested_child_name = 211;
-  }
-  optional NestedChild nested_child_1 = 212;
-  optional ChildModel1 child_model_1 = 222;
-  repeated ChildModel1 child_models = 223;
-  optional ChildModel1 bar = 224;
-  oneof child_oneof1 {
-    string oneof_member1 = 98;
-    bool oneof_member2 = 99;
-  }
-  optional int32 int_value_with_default = 31
-      [default = 65];  // Not supported yet
-  optional string string_value_with_default = 32
-      [default = "hello"];  // Not supported yet
-  optional float float_value_with_default = 33 [default = inf];
-  optional float double_value_with_default = 34 [default = -inf];
-
-  map<int32, ChildModel1> child_map = 225;
-  optional TestModel recursive_child = 226;
-  map<string, ChildModel1> child_str_map = 227;
-  map<string, int32> str_to_int_map = 228;
-  map<string, string> str_to_str_map = 229;
-
-  extend TestAnnotation {
-    optional OtherExtension in_message_ext = 15000;
-  }
-
-  enum Category {
-    IMAGES = 5;
-    NEWS = 6;
-    VIDEO = 7;
-    RADIO = 8 [deprecated = true];
-  }
-  optional Category category = 37;
-
-  // keyword collisions (double, template, ...)
-  oneof type {
-    string string = 230;
-    int64 int64 = 231;
-    double double = 232;
-  }
-  optional string template = 233;
-  optional string msg = 234;
-  optional string arena = 235;
-
-  // Tests publicly imported enum.
-  optional TestEnum imported_enum = 238;
-
-  optional string phase = 239;
-  optional bool clear_phase = 240;
-
-  optional string doc_id = 241;
-  optional bool set_doc_id = 242;
-
-  extensions 10000 to max;
-}
-
-// Old version with fewer fields to test backward/forward compatibility.
-message TestModelContainerV1 {
-  repeated TestModelV1 models = 1;
-}
-
-message TestModelV1 {
-  optional int32 value = 1;
-  repeated int32 value2 = 2;
-  repeated int32 value3 = 3 [packed = true];
-  repeated int32 value4 = 4 [deprecated = true];
-  optional bool b1 = 9;
-  optional bool b2 = 10;
-  optional string str2 = 50;
-}
-
-enum PrimaryColors {
-  RED = 1;
-  GREEN = 2;
-  BLUE = 3;
-}
-
-// TestModel extension.
-message ThemeExtension {
-  extend TestModel {
-    optional ThemeExtension theme_extension = 12003;
-  }
-  optional string ext_name = 1;
-  optional bool ext_bool = 2;
-}
-
-extend TestModel {
-  optional ThemeExtension theme = 12001;
-}
-
-message OtherExtension {
-  optional string ext2_name = 1;
-}
-
-extend TestModel {
-  optional OtherExtension other_ext = 12002;
-}
-
-message TestAnnotation {
-  extensions 10000 to max;
-}
-
-message TestMessageHasEnum {
-  optional EnumDeclaredAfterMessage enum_declared_after_message = 1;
-}
-
-enum EnumDeclaredAfterMessage {
-  ZERO = 0;
-  ONE = 1;
-  TWO = 2;
-  THREE = 3;
-}
diff --git a/third_party/upb/python/BUILD b/third_party/upb/python/BUILD
deleted file mode 100644
index cefe1859981d0..0000000000000
--- a/third_party/upb/python/BUILD
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# begin:github_only
-load("//python:py_extension.bzl", "py_extension")
-# end:github_only
-
-load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
-load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-
-# begin:github_only
-load("@rules_pkg//:mappings.bzl", "pkg_files")
-# end:github_only
-
-licenses(["notice"])
-
-package(
-    # begin:google_only
-#     default_applicable_licenses = ["//:license"],
-    # end:google_only
-    default_visibility = ["//python/dist:__pkg__"],
-)
-
-LIMITED_API_FLAG_SELECT = {
-    ":limited_api_3.7": ["-DPy_LIMITED_API=0x03070000"],
-    ":limited_api_3.10": ["-DPy_LIMITED_API=0x030a0000"],
-    "//conditions:default": [],
-}
-
-bool_flag(
-    name = "limited_api",
-    build_setting_default = True,
-)
-
-string_flag(
-    name = "python_version",
-    build_setting_default = "system",
-    values = [
-        "system",
-        "37",
-        "38",
-        "39",
-        "310",
-    ],
-)
-
-config_setting(
-    name = "limited_api_3.7",
-    flag_values = {
-        ":limited_api": "True",
-        ":python_version": "37",
-    },
-)
-
-config_setting(
-    name = "full_api_3.7_win32",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "37",
-    },
-    values = {"cpu": "win32"},
-)
-
-config_setting(
-    name = "full_api_3.7_win64",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "37",
-    },
-    values = {"cpu": "win64"},
-)
-
-selects.config_setting_group(
-    name = "full_api_3.7",
-    match_any = [
-        ":full_api_3.7_win32",
-        ":full_api_3.7_win64",
-    ],
-)
-
-config_setting(
-    name = "full_api_3.8_win32",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "38",
-    },
-    values = {"cpu": "win32"},
-)
-
-config_setting(
-    name = "full_api_3.8_win64",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "38",
-    },
-    values = {"cpu": "win64"},
-)
-
-selects.config_setting_group(
-    name = "full_api_3.8",
-    match_any = [
-        ":full_api_3.8_win32",
-        ":full_api_3.8_win64",
-    ],
-)
-
-config_setting(
-    name = "full_api_3.9_win32",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "39",
-    },
-    values = {"cpu": "win32"},
-)
-
-config_setting(
-    name = "full_api_3.9_win64",
-    flag_values = {
-        ":limited_api": "False",
-        ":python_version": "39",
-    },
-    values = {"cpu": "win64"},
-)
-
-selects.config_setting_group(
-    name = "full_api_3.9",
-    match_any = [
-        "full_api_3.9_win32",
-        ":full_api_3.9_win64",
-    ],
-)
-
-config_setting(
-    name = "limited_api_3.10_win32",
-    flag_values = {
-        ":limited_api": "True",
-        ":python_version": "310",
-    },
-    values = {"cpu": "win32"},
-)
-
-config_setting(
-    name = "limited_api_3.10_win64",
-    flag_values = {
-        ":limited_api": "True",
-        ":python_version": "310",
-    },
-    values = {"cpu": "win64"},
-)
-
-selects.config_setting_group(
-    name = "limited_api_3.10",
-    match_any = [
-        ":limited_api_3.10_win32",
-        ":limited_api_3.10_win64",
-    ],
-)
-
-# begin:github_only
-_message_target_compatible_with = {
-   "@platforms//os:windows": ["@platforms//:incompatible"],
-   "@system_python//:none": ["@platforms//:incompatible"],
-   "@system_python//:unsupported": ["@platforms//:incompatible"],
-   "//conditions:default": [],
-}
-
-pkg_files(
-   name = "message_extension",
-   srcs = [":message_srcs"],
-   prefix = "python/",
-)
-# end:github_only
-# begin:google_only
-# _message_target_compatible_with = {
-#     "@platforms//os:windows": ["@platforms//:incompatible"],
-#     "//conditions:default": [],
-# }
-# end:google_only
-
-filegroup(
-    name = "message_srcs",
-    srcs = [
-        "convert.c",
-        "convert.h",
-        "descriptor.c",
-        "descriptor.h",
-        "descriptor_containers.c",
-        "descriptor_containers.h",
-        "descriptor_pool.c",
-        "descriptor_pool.h",
-        "extension_dict.c",
-        "extension_dict.h",
-        "map.c",
-        "map.h",
-        "message.c",
-        "message.h",
-        "protobuf.c",
-        "protobuf.h",
-        "python_api.h",
-        "repeated.c",
-        "repeated.h",
-        "unknown_fields.c",
-        "unknown_fields.h",
-    ],
-    # begin:google_only
-#     compatible_with = ["//buildenv/target:non_prod"],
-    # end:google_only
-)
-
-py_extension(
-    name = "_message",
-    srcs = [":message_srcs"],
-    copts = UPB_DEFAULT_COPTS + select(LIMITED_API_FLAG_SELECT) + [
-        # The Python API requires patterns that are ISO C incompatible, like
-        # casts between function pointers and object pointers.
-        "-Wno-pedantic",
-    ],
-    target_compatible_with = select(_message_target_compatible_with),
-    deps = [
-        "//:collections",
-        "//:descriptor_upb_proto_reflection",
-        "//:eps_copy_input_stream",
-        "//:hash",
-        "//:message_copy",
-        "//:port",
-        "//:reflection",
-        "//:textformat",
-        "//:upb",
-        "//:wire",
-        "//:wire_reader",
-        "//:wire_types",
-        "//upb/util:compare",
-        "//upb/util:def_to_proto",
-        "//upb/util:required_fields",
-    ],
-)
diff --git a/third_party/upb/python/convert.c b/third_party/upb/python/convert.c
deleted file mode 100644
index 43e45138387a4..0000000000000
--- a/third_party/upb/python/convert.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/convert.h"
-
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/map.h"
-#include "upb/reflection/message.h"
-#include "upb/util/compare.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-PyObject* PyUpb_UpbToPy(upb_MessageValue val, const upb_FieldDef* f,
-                        PyObject* arena) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Enum:
-    case kUpb_CType_Int32:
-      return PyLong_FromLong(val.int32_val);
-    case kUpb_CType_Int64:
-      return PyLong_FromLongLong(val.int64_val);
-    case kUpb_CType_UInt32:
-      return PyLong_FromSize_t(val.uint32_val);
-    case kUpb_CType_UInt64:
-      return PyLong_FromUnsignedLongLong(val.uint64_val);
-    case kUpb_CType_Float:
-      return PyFloat_FromDouble(val.float_val);
-    case kUpb_CType_Double:
-      return PyFloat_FromDouble(val.double_val);
-    case kUpb_CType_Bool:
-      return PyBool_FromLong(val.bool_val);
-    case kUpb_CType_Bytes:
-      return PyBytes_FromStringAndSize(val.str_val.data, val.str_val.size);
-    case kUpb_CType_String: {
-      PyObject* ret =
-          PyUnicode_DecodeUTF8(val.str_val.data, val.str_val.size, NULL);
-      // If the string can't be decoded in UTF-8, just return a bytes object
-      // that contains the raw bytes. This can't happen if the value was
-      // assigned using the members of the Python message object, but can happen
-      // if the values were parsed from the wire (binary).
-      if (ret == NULL) {
-        PyErr_Clear();
-        ret = PyBytes_FromStringAndSize(val.str_val.data, val.str_val.size);
-      }
-      return ret;
-    }
-    case kUpb_CType_Message:
-      return PyUpb_Message_Get((upb_Message*)val.msg_val,
-                               upb_FieldDef_MessageSubDef(f), arena);
-    default:
-      PyErr_Format(PyExc_SystemError,
-                   "Getting a value from a field of unknown type %d",
-                   upb_FieldDef_CType(f));
-      return NULL;
-  }
-}
-
-static bool PyUpb_GetInt64(PyObject* obj, int64_t* val) {
-  // We require that the value is either an integer or has an __index__
-  // conversion.
-  obj = PyNumber_Index(obj);
-  if (!obj) return false;
-  // If the value is already a Python long, PyLong_AsLongLong() retrieves it.
-  // Otherwise is converts to integer using __int__.
-  *val = PyLong_AsLongLong(obj);
-  bool ok = true;
-  if (PyErr_Occurred()) {
-    assert(PyErr_ExceptionMatches(PyExc_OverflowError));
-    PyErr_Clear();
-    PyErr_Format(PyExc_ValueError, "Value out of range: %S", obj);
-    ok = false;
-  }
-  Py_DECREF(obj);
-  return ok;
-}
-
-static bool PyUpb_GetUint64(PyObject* obj, uint64_t* val) {
-  // We require that the value is either an integer or has an __index__
-  // conversion.
-  obj = PyNumber_Index(obj);
-  if (!obj) return false;
-  *val = PyLong_AsUnsignedLongLong(obj);
-  bool ok = true;
-  if (PyErr_Occurred()) {
-    assert(PyErr_ExceptionMatches(PyExc_OverflowError));
-    PyErr_Clear();
-    PyErr_Format(PyExc_ValueError, "Value out of range: %S", obj);
-    ok = false;
-  }
-  Py_DECREF(obj);
-  return ok;
-}
-
-static bool PyUpb_GetInt32(PyObject* obj, int32_t* val) {
-  int64_t i64;
-  if (!PyUpb_GetInt64(obj, &i64)) return false;
-  if (i64 < INT32_MIN || i64 > INT32_MAX) {
-    PyErr_Format(PyExc_ValueError, "Value out of range: %S", obj);
-    return false;
-  }
-  *val = i64;
-  return true;
-}
-
-static bool PyUpb_GetUint32(PyObject* obj, uint32_t* val) {
-  uint64_t u64;
-  if (!PyUpb_GetUint64(obj, &u64)) return false;
-  if (u64 > UINT32_MAX) {
-    PyErr_Format(PyExc_ValueError, "Value out of range: %S", obj);
-    return false;
-  }
-  *val = u64;
-  return true;
-}
-
-// If `arena` is specified, copies the string data into the given arena.
-// Otherwise aliases the given data.
-static upb_MessageValue PyUpb_MaybeCopyString(const char* ptr, size_t size,
-                                              upb_Arena* arena) {
-  upb_MessageValue ret;
-  ret.str_val.size = size;
-  if (arena) {
-    char* buf = upb_Arena_Malloc(arena, size);
-    memcpy(buf, ptr, size);
-    ret.str_val.data = buf;
-  } else {
-    ret.str_val.data = ptr;
-  }
-  return ret;
-}
-
-const char* upb_FieldDef_TypeString(const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Double:
-      return "double";
-    case kUpb_CType_Float:
-      return "float";
-    case kUpb_CType_Int64:
-      return "int64";
-    case kUpb_CType_Int32:
-      return "int32";
-    case kUpb_CType_UInt64:
-      return "uint64";
-    case kUpb_CType_UInt32:
-      return "uint32";
-    case kUpb_CType_Enum:
-      return "enum";
-    case kUpb_CType_Bool:
-      return "bool";
-    case kUpb_CType_String:
-      return "string";
-    case kUpb_CType_Bytes:
-      return "bytes";
-    case kUpb_CType_Message:
-      return "message";
-  }
-  UPB_UNREACHABLE();
-}
-
-static bool PyUpb_PyToUpbEnum(PyObject* obj, const upb_EnumDef* e,
-                              upb_MessageValue* val) {
-  if (PyUnicode_Check(obj)) {
-    Py_ssize_t size;
-    const char* name = PyUnicode_AsUTF8AndSize(obj, &size);
-    const upb_EnumValueDef* ev =
-        upb_EnumDef_FindValueByNameWithSize(e, name, size);
-    if (!ev) {
-      PyErr_Format(PyExc_ValueError, "unknown enum label \"%s\"", name);
-      return false;
-    }
-    val->int32_val = upb_EnumValueDef_Number(ev);
-    return true;
-  } else {
-    int32_t i32;
-    if (!PyUpb_GetInt32(obj, &i32)) return false;
-    if (upb_FileDef_Syntax(upb_EnumDef_File(e)) == kUpb_Syntax_Proto2 &&
-        !upb_EnumDef_CheckNumber(e, i32)) {
-      PyErr_Format(PyExc_ValueError, "invalid enumerator %d", (int)i32);
-      return false;
-    }
-    val->int32_val = i32;
-    return true;
-  }
-}
-
-bool PyUpb_IsNumpyNdarray(PyObject* obj, const upb_FieldDef* f) {
-  PyObject* type_name_obj =
-      PyObject_GetAttrString((PyObject*)Py_TYPE(obj), "__name__");
-  bool is_ndarray = false;
-  if (!strcmp(PyUpb_GetStrData(type_name_obj), "ndarray")) {
-    PyErr_Format(PyExc_TypeError,
-                 "%S has type ndarray, but expected one of: %s", obj,
-                 upb_FieldDef_TypeString(f));
-    is_ndarray = true;
-  }
-  Py_DECREF(type_name_obj);
-  return is_ndarray;
-}
-
-bool PyUpb_PyToUpb(PyObject* obj, const upb_FieldDef* f, upb_MessageValue* val,
-                   upb_Arena* arena) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Enum:
-      return PyUpb_PyToUpbEnum(obj, upb_FieldDef_EnumSubDef(f), val);
-    case kUpb_CType_Int32:
-      return PyUpb_GetInt32(obj, &val->int32_val);
-    case kUpb_CType_Int64:
-      return PyUpb_GetInt64(obj, &val->int64_val);
-    case kUpb_CType_UInt32:
-      return PyUpb_GetUint32(obj, &val->uint32_val);
-    case kUpb_CType_UInt64:
-      return PyUpb_GetUint64(obj, &val->uint64_val);
-    case kUpb_CType_Float:
-      if (PyUpb_IsNumpyNdarray(obj, f)) return false;
-      val->float_val = PyFloat_AsDouble(obj);
-      return !PyErr_Occurred();
-    case kUpb_CType_Double:
-      if (PyUpb_IsNumpyNdarray(obj, f)) return false;
-      val->double_val = PyFloat_AsDouble(obj);
-      return !PyErr_Occurred();
-    case kUpb_CType_Bool:
-      if (PyUpb_IsNumpyNdarray(obj, f)) return false;
-      val->bool_val = PyLong_AsLong(obj);
-      return !PyErr_Occurred();
-    case kUpb_CType_Bytes: {
-      char* ptr;
-      Py_ssize_t size;
-      if (PyBytes_AsStringAndSize(obj, &ptr, &size) < 0) return false;
-      *val = PyUpb_MaybeCopyString(ptr, size, arena);
-      return true;
-    }
-    case kUpb_CType_String: {
-      Py_ssize_t size;
-      const char* ptr;
-      PyObject* unicode = NULL;
-      if (PyBytes_Check(obj)) {
-        unicode = obj = PyUnicode_FromEncodedObject(obj, "utf-8", NULL);
-        if (!obj) return false;
-      }
-      ptr = PyUnicode_AsUTF8AndSize(obj, &size);
-      if (PyErr_Occurred()) {
-        Py_XDECREF(unicode);
-        return false;
-      }
-      *val = PyUpb_MaybeCopyString(ptr, size, arena);
-      Py_XDECREF(unicode);
-      return true;
-    }
-    case kUpb_CType_Message:
-      PyErr_Format(PyExc_ValueError, "Message objects may not be assigned");
-      return false;
-    default:
-      PyErr_Format(PyExc_SystemError,
-                   "Getting a value from a field of unknown type %d",
-                   upb_FieldDef_CType(f));
-      return false;
-  }
-}
-
-bool upb_Message_IsEqual(const upb_Message* msg1, const upb_Message* msg2,
-                         const upb_MessageDef* m);
-
-// -----------------------------------------------------------------------------
-// Equal
-// -----------------------------------------------------------------------------
-
-bool PyUpb_ValueEq(upb_MessageValue val1, upb_MessageValue val2,
-                   const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      return val1.bool_val == val2.bool_val;
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return val1.int32_val == val2.int32_val;
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return val1.int64_val == val2.int64_val;
-    case kUpb_CType_Float:
-      return val1.float_val == val2.float_val;
-    case kUpb_CType_Double:
-      return val1.double_val == val2.double_val;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return val1.str_val.size == val2.str_val.size &&
-             memcmp(val1.str_val.data, val2.str_val.data, val1.str_val.size) ==
-                 0;
-    case kUpb_CType_Message:
-      return upb_Message_IsEqual(val1.msg_val, val2.msg_val,
-                                 upb_FieldDef_MessageSubDef(f));
-    default:
-      return false;
-  }
-}
-
-bool PyUpb_Map_IsEqual(const upb_Map* map1, const upb_Map* map2,
-                       const upb_FieldDef* f) {
-  assert(upb_FieldDef_IsMap(f));
-  if (map1 == map2) return true;
-
-  size_t size1 = map1 ? upb_Map_Size(map1) : 0;
-  size_t size2 = map2 ? upb_Map_Size(map2) : 0;
-  if (size1 != size2) return false;
-  if (size1 == 0) return true;
-
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  size_t iter = kUpb_Map_Begin;
-
-  upb_MessageValue key, val1;
-  while (upb_Map_Next(map1, &key, &val1, &iter)) {
-    upb_MessageValue val2;
-    if (!upb_Map_Get(map2, key, &val2)) return false;
-    if (!PyUpb_ValueEq(val1, val2, val_f)) return false;
-  }
-
-  return true;
-}
-
-static bool PyUpb_ArrayElem_IsEqual(const upb_Array* arr1,
-                                    const upb_Array* arr2, size_t i,
-                                    const upb_FieldDef* f) {
-  assert(i < upb_Array_Size(arr1));
-  assert(i < upb_Array_Size(arr2));
-  upb_MessageValue val1 = upb_Array_Get(arr1, i);
-  upb_MessageValue val2 = upb_Array_Get(arr2, i);
-  return PyUpb_ValueEq(val1, val2, f);
-}
-
-bool PyUpb_Array_IsEqual(const upb_Array* arr1, const upb_Array* arr2,
-                         const upb_FieldDef* f) {
-  assert(upb_FieldDef_IsRepeated(f) && !upb_FieldDef_IsMap(f));
-  if (arr1 == arr2) return true;
-
-  size_t n1 = arr1 ? upb_Array_Size(arr1) : 0;
-  size_t n2 = arr2 ? upb_Array_Size(arr2) : 0;
-  if (n1 != n2) return false;
-
-  // Half the length rounded down.  Important: the empty list rounds to 0.
-  size_t half = n1 / 2;
-
-  // Search from the ends-in.  We expect differences to more quickly manifest
-  // at the ends than in the middle.  If the length is odd we will miss the
-  // middle element.
-  for (size_t i = 0; i < half; i++) {
-    if (!PyUpb_ArrayElem_IsEqual(arr1, arr2, i, f)) return false;
-    if (!PyUpb_ArrayElem_IsEqual(arr1, arr2, n1 - 1 - i, f)) return false;
-  }
-
-  // For an odd-lengthed list, pick up the middle element.
-  if (n1 & 1) {
-    if (!PyUpb_ArrayElem_IsEqual(arr1, arr2, half, f)) return false;
-  }
-
-  return true;
-}
-
-bool upb_Message_IsEqual(const upb_Message* msg1, const upb_Message* msg2,
-                         const upb_MessageDef* m) {
-  if (msg1 == msg2) return true;
-  if (upb_Message_ExtensionCount(msg1) != upb_Message_ExtensionCount(msg2))
-    return false;
-
-  // Compare messages field-by-field.  This is slightly tricky, because while
-  // we can iterate over normal fields in a predictable order, the extension
-  // order is unpredictable and may be different between msg1 and msg2.
-  // So we use the following strategy:
-  //   1. Iterate over all msg1 fields (including extensions).
-  //   2. For non-extension fields, we find the corresponding field by simply
-  //      using upb_Message_Next(msg2).  If the two messages have the same set
-  //      of fields, this will yield the same field.
-  //   3. For extension fields, we have to actually search for the corresponding
-  //      field, which we do with upb_Message_GetFieldByDef(msg2, ext_f1).
-  //   4. Once iteration over msg1 is complete, we call upb_Message_Next(msg2)
-  //   one
-  //      final time to verify that we have visited all of msg2's regular fields
-  //      (we pass NULL for ext_dict so that iteration will *not* return
-  //      extensions).
-  //
-  // We don't need to visit all of msg2's extensions, because we verified up
-  // front that both messages have the same number of extensions.
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m));
-  const upb_FieldDef *f1, *f2;
-  upb_MessageValue val1, val2;
-  size_t iter1 = kUpb_Message_Begin;
-  size_t iter2 = kUpb_Message_Begin;
-  while (upb_Message_Next(msg1, m, symtab, &f1, &val1, &iter1)) {
-    if (upb_FieldDef_IsExtension(f1)) {
-      val2 = upb_Message_GetFieldByDef(msg2, f1);
-    } else {
-      if (!upb_Message_Next(msg2, m, NULL, &f2, &val2, &iter2) || f1 != f2) {
-        return false;
-      }
-    }
-
-    if (upb_FieldDef_IsMap(f1)) {
-      if (!PyUpb_Map_IsEqual(val1.map_val, val2.map_val, f1)) return false;
-    } else if (upb_FieldDef_IsRepeated(f1)) {
-      if (!PyUpb_Array_IsEqual(val1.array_val, val2.array_val, f1)) {
-        return false;
-      }
-    } else {
-      if (!PyUpb_ValueEq(val1, val2, f1)) return false;
-    }
-  }
-
-  if (upb_Message_Next(msg2, m, NULL, &f2, &val2, &iter2)) return false;
-
-  size_t usize1, usize2;
-  const char* uf1 = upb_Message_GetUnknown(msg1, &usize1);
-  const char* uf2 = upb_Message_GetUnknown(msg2, &usize2);
-  // 100 is arbitrary, we're trying to prevent stack overflow but it's not
-  // obvious how deep we should allow here.
-  return upb_Message_UnknownFieldsAreEqual(uf1, usize1, uf2, usize2, 100) ==
-         kUpb_UnknownCompareResult_Equal;
-}
-
-#include "upb/port/undef.inc"
diff --git a/third_party/upb/python/convert.h b/third_party/upb/python/convert.h
deleted file mode 100644
index c02c1976a352f..0000000000000
--- a/third_party/upb/python/convert.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_CONVERT_H__
-#define PYUPB_CONVERT_H__
-
-#include "protobuf.h"
-#include "upb/reflection/def.h"
-#include "upb/reflection/message.h"
-
-// Converts `val` to a Python object according to the type information in `f`.
-// Any newly-created Python objects that reference non-primitive data from `val`
-// will take a reference on `arena`; the caller must ensure that `val` belongs
-// to `arena`. If the conversion cannot be performed, returns NULL and sets a
-// Python error.
-PyObject* PyUpb_UpbToPy(upb_MessageValue val, const upb_FieldDef* f,
-                        PyObject* arena);
-
-// Converts `obj` to a upb_MessageValue `*val` according to the type information
-// in `f`. If `arena` is provided, any string data will be copied into `arena`,
-// otherwise the returned value will alias the Python-owned data (this can be
-// useful for an ephemeral upb_MessageValue).  If the conversion cannot be
-// performed, returns false.
-bool PyUpb_PyToUpb(PyObject* obj, const upb_FieldDef* f, upb_MessageValue* val,
-                   upb_Arena* arena);
-
-// Returns true if the given values (of type `f`) are equal.
-bool PyUpb_ValueEq(upb_MessageValue val1, upb_MessageValue val2,
-                   const upb_FieldDef* f);
-
-// Returns true if the two arrays (with element type `f`) are equal.
-bool PyUpb_Array_IsEqual(const upb_Array* arr1, const upb_Array* arr2,
-                         const upb_FieldDef* f);
-
-// Returns true if the given messages (of type `m`) are equal.
-bool upb_Message_IsEqual(const upb_Message* msg1, const upb_Message* msg2,
-                         const upb_MessageDef* m);
-
-#endif  // PYUPB_CONVERT_H__
diff --git a/third_party/upb/python/descriptor.c b/third_party/upb/python/descriptor.c
deleted file mode 100644
index c8e72c8b12be8..0000000000000
--- a/third_party/upb/python/descriptor.c
+++ /dev/null
@@ -1,1698 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/descriptor.h"
-
-#include "python/convert.h"
-#include "python/descriptor_containers.h"
-#include "python/descriptor_pool.h"
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/reflection/def.h"
-#include "upb/util/def_to_proto.h"
-
-// -----------------------------------------------------------------------------
-// DescriptorBase
-// -----------------------------------------------------------------------------
-
-// This representation is used by all concrete descriptors.
-
-typedef struct {
-  PyObject_HEAD;
-  PyObject* pool;     // We own a ref.
-  const void* def;    // Type depends on the class. Kept alive by "pool".
-  PyObject* options;  // NULL if not present or not cached.
-} PyUpb_DescriptorBase;
-
-PyObject* PyUpb_AnyDescriptor_GetPool(PyObject* desc) {
-  PyUpb_DescriptorBase* base = (void*)desc;
-  return base->pool;
-}
-
-const void* PyUpb_AnyDescriptor_GetDef(PyObject* desc) {
-  PyUpb_DescriptorBase* base = (void*)desc;
-  return base->def;
-}
-
-static PyUpb_DescriptorBase* PyUpb_DescriptorBase_DoCreate(
-    PyUpb_DescriptorType type, const void* def, const upb_FileDef* file) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyTypeObject* type_obj = state->descriptor_types[type];
-  assert(def);
-
-  PyUpb_DescriptorBase* base = (void*)PyType_GenericAlloc(type_obj, 0);
-  base->pool = PyUpb_DescriptorPool_Get(upb_FileDef_Pool(file));
-  base->def = def;
-  base->options = NULL;
-
-  PyUpb_ObjCache_Add(def, &base->ob_base);
-  return base;
-}
-
-// Returns a Python object wrapping |def|, of descriptor type |type|.  If a
-// wrapper was previously created for this def, returns it, otherwise creates a
-// new wrapper.
-static PyObject* PyUpb_DescriptorBase_Get(PyUpb_DescriptorType type,
-                                          const void* def,
-                                          const upb_FileDef* file) {
-  PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)PyUpb_ObjCache_Get(def);
-
-  if (!base) {
-    base = PyUpb_DescriptorBase_DoCreate(type, def, file);
-  }
-
-  return &base->ob_base;
-}
-
-static PyUpb_DescriptorBase* PyUpb_DescriptorBase_Check(
-    PyObject* obj, PyUpb_DescriptorType type) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyTypeObject* type_obj = state->descriptor_types[type];
-  if (!PyObject_TypeCheck(obj, type_obj)) {
-    PyErr_Format(PyExc_TypeError, "Expected object of type %S, but got %R",
-                 type_obj, obj);
-    return NULL;
-  }
-  return (PyUpb_DescriptorBase*)obj;
-}
-
-static PyObject* PyUpb_DescriptorBase_GetOptions(PyUpb_DescriptorBase* self,
-                                                 const upb_Message* opts,
-                                                 const upb_MiniTable* layout,
-                                                 const char* msg_name) {
-  if (!self->options) {
-    // Load descriptors protos if they are not loaded already. We have to do
-    // this lazily, otherwise, it would lead to circular imports.
-    PyObject* mod = PyImport_ImportModule(PYUPB_DESCRIPTOR_MODULE);
-    Py_DECREF(mod);
-
-    // Find the correct options message.
-    PyObject* default_pool = PyUpb_DescriptorPool_GetDefaultPool();
-    const upb_DefPool* symtab = PyUpb_DescriptorPool_GetSymtab(default_pool);
-    const upb_MessageDef* m = upb_DefPool_FindMessageByName(symtab, msg_name);
-    assert(m);
-
-    // Copy the options message from C to Python using serialize+parse.
-    // We don't wrap the C object directly because there is no guarantee that
-    // the descriptor_pb2 that was loaded at runtime has the same members or
-    // layout as the C types that were compiled in.
-    size_t size;
-    PyObject* py_arena = PyUpb_Arena_New();
-    upb_Arena* arena = PyUpb_Arena_Get(py_arena);
-    char* pb;
-    // TODO(b/235839510): Need to correctly handle failed return codes.
-    (void)upb_Encode(opts, layout, 0, arena, &pb, &size);
-    const upb_MiniTable* opts2_layout = upb_MessageDef_MiniTable(m);
-    upb_Message* opts2 = upb_Message_New(opts2_layout, arena);
-    assert(opts2);
-    upb_DecodeStatus ds =
-        upb_Decode(pb, size, opts2, opts2_layout,
-                   upb_DefPool_ExtensionRegistry(symtab), 0, arena);
-    (void)ds;
-    assert(ds == kUpb_DecodeStatus_Ok);
-
-    self->options = PyUpb_Message_Get(opts2, m, py_arena);
-    Py_DECREF(py_arena);
-  }
-
-  Py_INCREF(self->options);
-  return self->options;
-}
-
-typedef void* PyUpb_ToProto_Func(const void* def, upb_Arena* arena);
-
-static PyObject* PyUpb_DescriptorBase_GetSerializedProto(
-    PyObject* _self, PyUpb_ToProto_Func* func, const upb_MiniTable* layout) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  upb_Arena* arena = upb_Arena_New();
-  if (!arena) PYUPB_RETURN_OOM;
-  upb_Message* proto = func(self->def, arena);
-  if (!proto) goto oom;
-  size_t size;
-  char* pb;
-  upb_EncodeStatus status = upb_Encode(proto, layout, 0, arena, &pb, &size);
-  if (status) goto oom;  // TODO(b/235839510) non-oom errors are possible here
-  PyObject* str = PyBytes_FromStringAndSize(pb, size);
-  upb_Arena_Free(arena);
-  return str;
-
-oom:
-  upb_Arena_Free(arena);
-  PyErr_SetNone(PyExc_MemoryError);
-  return NULL;
-}
-
-static PyObject* PyUpb_DescriptorBase_CopyToProto(PyObject* _self,
-                                                  PyUpb_ToProto_Func* func,
-                                                  const upb_MiniTable* layout,
-                                                  const char* expected_type,
-                                                  PyObject* py_proto) {
-  if (!PyUpb_Message_Verify(py_proto)) return NULL;
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(py_proto);
-  const char* type = upb_MessageDef_FullName(m);
-  if (strcmp(type, expected_type) != 0) {
-    PyErr_Format(
-        PyExc_TypeError,
-        "CopyToProto: message is of incorrect type '%s' (expected '%s'", type,
-        expected_type);
-    return NULL;
-  }
-  PyObject* serialized =
-      PyUpb_DescriptorBase_GetSerializedProto(_self, func, layout);
-  if (!serialized) return NULL;
-  PyObject* ret = PyUpb_Message_MergeFromString(py_proto, serialized);
-  Py_DECREF(serialized);
-  return ret;
-}
-
-static void PyUpb_DescriptorBase_Dealloc(PyUpb_DescriptorBase* base) {
-  PyUpb_ObjCache_Delete(base->def);
-  Py_DECREF(base->pool);
-  Py_XDECREF(base->options);
-  PyUpb_Dealloc(base);
-}
-
-#define DESCRIPTOR_BASE_SLOTS                           \
-  {Py_tp_new, (void*)&PyUpb_Forbidden_New}, {           \
-    Py_tp_dealloc, (void*)&PyUpb_DescriptorBase_Dealloc \
-  }
-
-// -----------------------------------------------------------------------------
-// Descriptor
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_Descriptor_Get(const upb_MessageDef* m) {
-  assert(m);
-  const upb_FileDef* file = upb_MessageDef_File(m);
-  return PyUpb_DescriptorBase_Get(kPyUpb_Descriptor, m, file);
-}
-
-PyObject* PyUpb_Descriptor_GetClass(const upb_MessageDef* m) {
-  PyObject* ret = PyUpb_ObjCache_Get(upb_MessageDef_MiniTable(m));
-  return ret;
-}
-
-// The LookupNested*() functions provide name lookup for entities nested inside
-// a message.  This uses the symtab's table, which requires that the symtab is
-// not being mutated concurrently.  We can guarantee this for Python-owned
-// symtabs, but upb cannot guarantee it in general for an arbitrary
-// `const upb_MessageDef*`.
-
-static const void* PyUpb_Descriptor_LookupNestedMessage(const upb_MessageDef* m,
-                                                        const char* name) {
-  const upb_FileDef* filedef = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(filedef);
-  PyObject* qname =
-      PyUnicode_FromFormat("%s.%s", upb_MessageDef_FullName(m), name);
-  const upb_MessageDef* ret = upb_DefPool_FindMessageByName(
-      symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
-  Py_DECREF(qname);
-  return ret;
-}
-
-static const void* PyUpb_Descriptor_LookupNestedEnum(const upb_MessageDef* m,
-                                                     const char* name) {
-  const upb_FileDef* filedef = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(filedef);
-  PyObject* qname =
-      PyUnicode_FromFormat("%s.%s", upb_MessageDef_FullName(m), name);
-  const upb_EnumDef* ret =
-      upb_DefPool_FindEnumByName(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
-  Py_DECREF(qname);
-  return ret;
-}
-
-static const void* PyUpb_Descriptor_LookupNestedExtension(
-    const upb_MessageDef* m, const char* name) {
-  const upb_FileDef* filedef = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(filedef);
-  PyObject* qname =
-      PyUnicode_FromFormat("%s.%s", upb_MessageDef_FullName(m), name);
-  const upb_FieldDef* ret = upb_DefPool_FindExtensionByName(
-      symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
-  Py_DECREF(qname);
-  return ret;
-}
-
-static PyObject* PyUpb_Descriptor_GetExtensionRanges(PyObject* _self,
-                                                     void* closure) {
-  PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
-  int n = upb_MessageDef_ExtensionRangeCount(self->def);
-  PyObject* range_list = PyList_New(n);
-
-  for (int i = 0; i < n; i++) {
-    const upb_ExtensionRange* range =
-        upb_MessageDef_ExtensionRange(self->def, i);
-    PyObject* start = PyLong_FromLong(upb_ExtensionRange_Start(range));
-    PyObject* end = PyLong_FromLong(upb_ExtensionRange_End(range));
-    PyList_SetItem(range_list, i, PyTuple_Pack(2, start, end));
-  }
-
-  return range_list;
-}
-
-static PyObject* PyUpb_Descriptor_GetExtensions(PyObject* _self,
-                                                void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_MessageDef_NestedExtensionCount,
-      (void*)&upb_MessageDef_NestedExtension,
-      (void*)&PyUpb_FieldDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetExtensionsByName(PyObject* _self,
-                                                      void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_NestedExtensionCount,
-          (void*)&upb_MessageDef_NestedExtension,
-          (void*)&PyUpb_FieldDescriptor_Get,
-      },
-      (void*)&PyUpb_Descriptor_LookupNestedExtension,
-      (void*)&upb_FieldDef_Name,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetEnumTypes(PyObject* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_MessageDef_NestedEnumCount,
-      (void*)&upb_MessageDef_NestedEnum,
-      (void*)&PyUpb_EnumDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetOneofs(PyObject* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_MessageDef_OneofCount,
-      (void*)&upb_MessageDef_Oneof,
-      (void*)&PyUpb_OneofDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetOptions(PyObject* _self, PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_MessageDef_Options(self->def), &google_protobuf_MessageOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".MessageOptions");
-}
-
-static PyObject* PyUpb_Descriptor_CopyToProto(PyObject* _self,
-                                              PyObject* py_proto) {
-  return PyUpb_DescriptorBase_CopyToProto(
-      _self, (PyUpb_ToProto_Func*)&upb_MessageDef_ToProto,
-      &google_protobuf_DescriptorProto_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".DescriptorProto", py_proto);
-}
-
-static PyObject* PyUpb_Descriptor_EnumValueName(PyObject* _self,
-                                                PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  const char* enum_name;
-  int number;
-  if (!PyArg_ParseTuple(args, "si", &enum_name, &number)) return NULL;
-  const upb_EnumDef* e =
-      PyUpb_Descriptor_LookupNestedEnum(self->def, enum_name);
-  if (!e) {
-    PyErr_SetString(PyExc_KeyError, enum_name);
-    return NULL;
-  }
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e, number);
-  if (!ev) {
-    PyErr_Format(PyExc_KeyError, "%d", number);
-    return NULL;
-  }
-  return PyUnicode_FromString(upb_EnumValueDef_Name(ev));
-}
-
-static PyObject* PyUpb_Descriptor_GetFieldsByName(PyObject* _self,
-                                                  void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_FieldCount,
-          (void*)&upb_MessageDef_Field,
-          (void*)&PyUpb_FieldDescriptor_Get,
-      },
-      (void*)&upb_MessageDef_FindFieldByName,
-      (void*)&upb_FieldDef_Name,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetFieldsByCamelCaseName(PyObject* _self,
-                                                           void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_FieldCount,
-          (void*)&upb_MessageDef_Field,
-          (void*)&PyUpb_FieldDescriptor_Get,
-      },
-      (void*)&upb_MessageDef_FindByJsonName,
-      (void*)&upb_FieldDef_JsonName,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetFieldsByNumber(PyObject* _self,
-                                                    void* closure) {
-  static PyUpb_ByNumberMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_FieldCount,
-          (void*)&upb_MessageDef_Field,
-          (void*)&PyUpb_FieldDescriptor_Get,
-      },
-      (void*)&upb_MessageDef_FindFieldByNumber,
-      (void*)&upb_FieldDef_Number,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNumberMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetNestedTypes(PyObject* _self,
-                                                 void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_MessageDef_NestedMessageCount,
-      (void*)&upb_MessageDef_NestedMessage,
-      (void*)&PyUpb_Descriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetNestedTypesByName(PyObject* _self,
-                                                       void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_NestedMessageCount,
-          (void*)&upb_MessageDef_NestedMessage,
-          (void*)&PyUpb_Descriptor_Get,
-      },
-      (void*)&PyUpb_Descriptor_LookupNestedMessage,
-      (void*)&upb_MessageDef_Name,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetContainingType(PyObject* _self,
-                                                    void* closure) {
-  // upb does not natively store the lexical parent of a message type, but we
-  // can derive it with some string manipulation and a lookup.
-  PyUpb_DescriptorBase* self = (void*)_self;
-  const upb_MessageDef* m = self->def;
-  const upb_FileDef* file = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(file);
-  const char* full_name = upb_MessageDef_FullName(m);
-  const char* last_dot = strrchr(full_name, '.');
-  if (!last_dot) Py_RETURN_NONE;
-  const upb_MessageDef* parent = upb_DefPool_FindMessageByNameWithSize(
-      symtab, full_name, last_dot - full_name);
-  if (!parent) Py_RETURN_NONE;
-  return PyUpb_Descriptor_Get(parent);
-}
-
-static PyObject* PyUpb_Descriptor_GetEnumTypesByName(PyObject* _self,
-                                                     void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_NestedEnumCount,
-          (void*)&upb_MessageDef_NestedEnum,
-          (void*)&PyUpb_EnumDescriptor_Get,
-      },
-      (void*)&PyUpb_Descriptor_LookupNestedEnum,
-      (void*)&upb_EnumDef_Name,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetIsExtendable(PyObject* _self,
-                                                  void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  if (upb_MessageDef_ExtensionRangeCount(self->def) > 0) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static PyObject* PyUpb_Descriptor_GetFullName(PyObject* self, void* closure) {
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(self);
-  return PyUnicode_FromString(upb_MessageDef_FullName(msgdef));
-}
-
-static PyObject* PyUpb_Descriptor_GetConcreteClass(PyObject* self,
-                                                   void* closure) {
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(self);
-  return PyUpb_Descriptor_GetClass(msgdef);
-}
-
-static PyObject* PyUpb_Descriptor_GetFile(PyObject* self, void* closure) {
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(self);
-  return PyUpb_FileDescriptor_Get(upb_MessageDef_File(msgdef));
-}
-
-static PyObject* PyUpb_Descriptor_GetFields(PyObject* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_MessageDef_FieldCount,
-      (void*)&upb_MessageDef_Field,
-      (void*)&PyUpb_FieldDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetHasOptions(PyObject* _self,
-                                                void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_MessageDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_Descriptor_GetName(PyObject* self, void* closure) {
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(self);
-  return PyUnicode_FromString(upb_MessageDef_Name(msgdef));
-}
-
-static PyObject* PyUpb_Descriptor_GetEnumValuesByName(PyObject* _self,
-                                                      void* closure) {
-  // upb does not natively store any table containing all nested values.
-  // Consider:
-  //     message M {
-  //       enum E1 {
-  //         A = 0;
-  //         B = 1;
-  //       }
-  //       enum E2 {
-  //         C = 0;
-  //         D = 1;
-  //       }
-  //     }
-  //
-  // In this case, upb stores tables for E1 and E2, but it does not store a
-  // table for M that combines them (it is rarely needed and costs precious
-  // space and time to build).
-  //
-  // To work around this, we build an actual Python dict whenever a user
-  // actually asks for this.
-  PyUpb_DescriptorBase* self = (void*)_self;
-  PyObject* ret = PyDict_New();
-  if (!ret) return NULL;
-  int enum_count = upb_MessageDef_NestedEnumCount(self->def);
-  for (int i = 0; i < enum_count; i++) {
-    const upb_EnumDef* e = upb_MessageDef_NestedEnum(self->def, i);
-    int value_count = upb_EnumDef_ValueCount(e);
-    for (int j = 0; j < value_count; j++) {
-      // Collisions should be impossible here, as uniqueness is checked by
-      // protoc (this is an invariant of the protobuf language).  However this
-      // uniqueness constraint is not currently checked by upb/def.c at load
-      // time, so if the user supplies a manually-constructed descriptor that
-      // does not respect this constraint, a collision could be possible and the
-      // last-defined enumerator would win.  This could be seen as an argument
-      // for having upb actually build the table at load time, thus checking the
-      // constraint proactively, but upb is always checking a subset of the full
-      // validation performed by C++, and we have to pick and choose the biggest
-      // bang for the buck.
-      const upb_EnumValueDef* ev = upb_EnumDef_Value(e, j);
-      const char* name = upb_EnumValueDef_Name(ev);
-      PyObject* val = PyUpb_EnumValueDescriptor_Get(ev);
-      if (!val || PyDict_SetItemString(ret, name, val) < 0) {
-        Py_XDECREF(val);
-        Py_DECREF(ret);
-        return NULL;
-      }
-      Py_DECREF(val);
-    }
-  }
-  return ret;
-}
-
-static PyObject* PyUpb_Descriptor_GetOneofsByName(PyObject* _self,
-                                                  void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_MessageDef_OneofCount,
-          (void*)&upb_MessageDef_Oneof,
-          (void*)&PyUpb_OneofDescriptor_Get,
-      },
-      (void*)&upb_MessageDef_FindOneofByName,
-      (void*)&upb_OneofDef_Name,
-  };
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_Descriptor_GetSyntax(PyObject* self, void* closure) {
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(self);
-  const char* syntax =
-      upb_MessageDef_Syntax(msgdef) == kUpb_Syntax_Proto2 ? "proto2" : "proto3";
-  return PyUnicode_InternFromString(syntax);
-}
-
-static PyGetSetDef PyUpb_Descriptor_Getters[] = {
-    {"name", PyUpb_Descriptor_GetName, NULL, "Last name"},
-    {"full_name", PyUpb_Descriptor_GetFullName, NULL, "Full name"},
-    {"_concrete_class", PyUpb_Descriptor_GetConcreteClass, NULL,
-     "concrete class"},
-    {"file", PyUpb_Descriptor_GetFile, NULL, "File descriptor"},
-    {"fields", PyUpb_Descriptor_GetFields, NULL, "Fields sequence"},
-    {"fields_by_name", PyUpb_Descriptor_GetFieldsByName, NULL,
-     "Fields by name"},
-    {"fields_by_camelcase_name", PyUpb_Descriptor_GetFieldsByCamelCaseName,
-     NULL, "Fields by camelCase name"},
-    {"fields_by_number", PyUpb_Descriptor_GetFieldsByNumber, NULL,
-     "Fields by number"},
-    {"nested_types", PyUpb_Descriptor_GetNestedTypes, NULL,
-     "Nested types sequence"},
-    {"nested_types_by_name", PyUpb_Descriptor_GetNestedTypesByName, NULL,
-     "Nested types by name"},
-    {"extensions", PyUpb_Descriptor_GetExtensions, NULL, "Extensions Sequence"},
-    {"extensions_by_name", PyUpb_Descriptor_GetExtensionsByName, NULL,
-     "Extensions by name"},
-    {"extension_ranges", PyUpb_Descriptor_GetExtensionRanges, NULL,
-     "Extension ranges"},
-    {"enum_types", PyUpb_Descriptor_GetEnumTypes, NULL, "Enum sequence"},
-    {"enum_types_by_name", PyUpb_Descriptor_GetEnumTypesByName, NULL,
-     "Enum types by name"},
-    {"enum_values_by_name", PyUpb_Descriptor_GetEnumValuesByName, NULL,
-     "Enum values by name"},
-    {"oneofs_by_name", PyUpb_Descriptor_GetOneofsByName, NULL,
-     "Oneofs by name"},
-    {"oneofs", PyUpb_Descriptor_GetOneofs, NULL, "Oneofs Sequence"},
-    {"containing_type", PyUpb_Descriptor_GetContainingType, NULL,
-     "Containing type"},
-    {"is_extendable", PyUpb_Descriptor_GetIsExtendable, NULL},
-    {"has_options", PyUpb_Descriptor_GetHasOptions, NULL, "Has Options"},
-    {"syntax", &PyUpb_Descriptor_GetSyntax, NULL, "Syntax"},
-    {NULL}};
-
-static PyMethodDef PyUpb_Descriptor_Methods[] = {
-    {"GetOptions", PyUpb_Descriptor_GetOptions, METH_NOARGS},
-    {"CopyToProto", PyUpb_Descriptor_CopyToProto, METH_O},
-    {"EnumValueName", PyUpb_Descriptor_EnumValueName, METH_VARARGS},
-    {NULL}};
-
-static PyType_Slot PyUpb_Descriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_Descriptor_Methods},
-    {Py_tp_getset, PyUpb_Descriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_Descriptor_Spec = {
-    PYUPB_MODULE_NAME ".Descriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),     // tp_basicsize
-    0,                                // tp_itemsize
-    Py_TPFLAGS_DEFAULT,               // tp_flags
-    PyUpb_Descriptor_Slots,
-};
-
-const upb_MessageDef* PyUpb_Descriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_Descriptor);
-  return self ? self->def : NULL;
-}
-
-// -----------------------------------------------------------------------------
-// EnumDescriptor
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_EnumDescriptor_Get(const upb_EnumDef* enumdef) {
-  const upb_FileDef* file = upb_EnumDef_File(enumdef);
-  return PyUpb_DescriptorBase_Get(kPyUpb_EnumDescriptor, enumdef, file);
-}
-
-const upb_EnumDef* PyUpb_EnumDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_EnumDescriptor);
-  return self ? self->def : NULL;
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetFullName(PyObject* self,
-                                                  void* closure) {
-  const upb_EnumDef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_EnumDef_FullName(enumdef));
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetName(PyObject* self, void* closure) {
-  const upb_EnumDef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_EnumDef_Name(enumdef));
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetFile(PyObject* self, void* closure) {
-  const upb_EnumDef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
-  return PyUpb_FileDescriptor_Get(upb_EnumDef_File(enumdef));
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetValues(PyObject* _self,
-                                                void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_EnumDef_ValueCount,
-      (void*)&upb_EnumDef_Value,
-      (void*)&PyUpb_EnumValueDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetValuesByName(PyObject* _self,
-                                                      void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_EnumDef_ValueCount,
-          (void*)&upb_EnumDef_Value,
-          (void*)&PyUpb_EnumValueDescriptor_Get,
-      },
-      (void*)&upb_EnumDef_FindValueByName,
-      (void*)&upb_EnumValueDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetValuesByNumber(PyObject* _self,
-                                                        void* closure) {
-  static PyUpb_ByNumberMap_Funcs funcs = {
-      {
-          (void*)&upb_EnumDef_ValueCount,
-          (void*)&upb_EnumDef_Value,
-          (void*)&PyUpb_EnumValueDescriptor_Get,
-      },
-      (void*)&upb_EnumDef_FindValueByNumber,
-      (void*)&upb_EnumValueDef_Number,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNumberMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetContainingType(PyObject* _self,
-                                                        void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  const upb_MessageDef* m = upb_EnumDef_ContainingType(self->def);
-  if (!m) Py_RETURN_NONE;
-  return PyUpb_Descriptor_Get(m);
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetHasOptions(PyObject* _self,
-                                                    void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_EnumDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetIsClosed(PyObject* _self,
-                                                  void* closure) {
-  const upb_EnumDef* enumdef = PyUpb_EnumDescriptor_GetDef(_self);
-  return PyBool_FromLong(upb_EnumDef_IsClosed(enumdef));
-}
-
-static PyObject* PyUpb_EnumDescriptor_GetOptions(PyObject* _self,
-                                                 PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_EnumDef_Options(self->def), &google_protobuf_EnumOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".EnumOptions");
-}
-
-static PyObject* PyUpb_EnumDescriptor_CopyToProto(PyObject* _self,
-                                                  PyObject* py_proto) {
-  return PyUpb_DescriptorBase_CopyToProto(
-      _self, (PyUpb_ToProto_Func*)&upb_EnumDef_ToProto,
-      &google_protobuf_EnumDescriptorProto_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".EnumDescriptorProto", py_proto);
-}
-
-static PyGetSetDef PyUpb_EnumDescriptor_Getters[] = {
-    {"full_name", PyUpb_EnumDescriptor_GetFullName, NULL, "Full name"},
-    {"name", PyUpb_EnumDescriptor_GetName, NULL, "last name"},
-    {"file", PyUpb_EnumDescriptor_GetFile, NULL, "File descriptor"},
-    {"values", PyUpb_EnumDescriptor_GetValues, NULL, "values"},
-    {"values_by_name", PyUpb_EnumDescriptor_GetValuesByName, NULL,
-     "Enum values by name"},
-    {"values_by_number", PyUpb_EnumDescriptor_GetValuesByNumber, NULL,
-     "Enum values by number"},
-    {"containing_type", PyUpb_EnumDescriptor_GetContainingType, NULL,
-     "Containing type"},
-    {"has_options", PyUpb_EnumDescriptor_GetHasOptions, NULL, "Has Options"},
-    {"is_closed", PyUpb_EnumDescriptor_GetIsClosed, NULL,
-     "Checks if the enum is closed"},
-    {NULL}};
-
-static PyMethodDef PyUpb_EnumDescriptor_Methods[] = {
-    {"GetOptions", PyUpb_EnumDescriptor_GetOptions, METH_NOARGS},
-    {"CopyToProto", PyUpb_EnumDescriptor_CopyToProto, METH_O},
-    {NULL}};
-
-static PyType_Slot PyUpb_EnumDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_EnumDescriptor_Methods},
-    {Py_tp_getset, PyUpb_EnumDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_EnumDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".EnumDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),         // tp_basicsize
-    0,                                    // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                   // tp_flags
-    PyUpb_EnumDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// EnumValueDescriptor
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_EnumValueDescriptor_Get(const upb_EnumValueDef* ev) {
-  const upb_FileDef* file = upb_EnumDef_File(upb_EnumValueDef_Enum(ev));
-  return PyUpb_DescriptorBase_Get(kPyUpb_EnumValueDescriptor, ev, file);
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetName(PyObject* self,
-                                                   void* closure) {
-  PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
-  return PyUnicode_FromString(upb_EnumValueDef_Name(base->def));
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetNumber(PyObject* self,
-                                                     void* closure) {
-  PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
-  return PyLong_FromLong(upb_EnumValueDef_Number(base->def));
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetIndex(PyObject* self,
-                                                    void* closure) {
-  PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
-  return PyLong_FromLong(upb_EnumValueDef_Index(base->def));
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetType(PyObject* self,
-                                                   void* closure) {
-  PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
-  return PyUpb_EnumDescriptor_Get(upb_EnumValueDef_Enum(base->def));
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetHasOptions(PyObject* _self,
-                                                         void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_EnumValueDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_EnumValueDescriptor_GetOptions(PyObject* _self,
-                                                      PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_EnumValueDef_Options(self->def),
-      &google_protobuf_EnumValueOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".EnumValueOptions");
-}
-
-static PyGetSetDef PyUpb_EnumValueDescriptor_Getters[] = {
-    {"name", PyUpb_EnumValueDescriptor_GetName, NULL, "name"},
-    {"number", PyUpb_EnumValueDescriptor_GetNumber, NULL, "number"},
-    {"index", PyUpb_EnumValueDescriptor_GetIndex, NULL, "index"},
-    {"type", PyUpb_EnumValueDescriptor_GetType, NULL, "index"},
-    {"has_options", PyUpb_EnumValueDescriptor_GetHasOptions, NULL,
-     "Has Options"},
-    {NULL}};
-
-static PyMethodDef PyUpb_EnumValueDescriptor_Methods[] = {
-    {
-        "GetOptions",
-        PyUpb_EnumValueDescriptor_GetOptions,
-        METH_NOARGS,
-    },
-    {NULL}};
-
-static PyType_Slot PyUpb_EnumValueDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_EnumValueDescriptor_Methods},
-    {Py_tp_getset, PyUpb_EnumValueDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_EnumValueDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".EnumValueDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),              // tp_basicsize
-    0,                                         // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                        // tp_flags
-    PyUpb_EnumValueDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// FieldDescriptor
-// -----------------------------------------------------------------------------
-
-const upb_FieldDef* PyUpb_FieldDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_FieldDescriptor);
-  return self ? self->def : NULL;
-}
-
-PyObject* PyUpb_FieldDescriptor_Get(const upb_FieldDef* field) {
-  const upb_FileDef* file = upb_FieldDef_File(field);
-  return PyUpb_DescriptorBase_Get(kPyUpb_FieldDescriptor, field, file);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetFullName(PyUpb_DescriptorBase* self,
-                                                   void* closure) {
-  return PyUnicode_FromString(upb_FieldDef_FullName(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetName(PyUpb_DescriptorBase* self,
-                                               void* closure) {
-  return PyUnicode_FromString(upb_FieldDef_Name(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetCamelCaseName(
-    PyUpb_DescriptorBase* self, void* closure) {
-  // TODO: Ok to use jsonname here?
-  return PyUnicode_FromString(upb_FieldDef_JsonName(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetJsonName(PyUpb_DescriptorBase* self,
-                                                   void* closure) {
-  return PyUnicode_FromString(upb_FieldDef_JsonName(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetFile(PyUpb_DescriptorBase* self,
-                                               void* closure) {
-  const upb_FileDef* file = upb_FieldDef_File(self->def);
-  if (!file) Py_RETURN_NONE;
-  return PyUpb_FileDescriptor_Get(file);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetType(PyUpb_DescriptorBase* self,
-                                               void* closure) {
-  return PyLong_FromLong(upb_FieldDef_Type(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetCppType(PyUpb_DescriptorBase* self,
-                                                  void* closure) {
-  // Enum values copied from descriptor.h in C++.
-  enum CppType {
-    CPPTYPE_INT32 = 1,     // TYPE_INT32, TYPE_SINT32, TYPE_SFIXED32
-    CPPTYPE_INT64 = 2,     // TYPE_INT64, TYPE_SINT64, TYPE_SFIXED64
-    CPPTYPE_UINT32 = 3,    // TYPE_UINT32, TYPE_FIXED32
-    CPPTYPE_UINT64 = 4,    // TYPE_UINT64, TYPE_FIXED64
-    CPPTYPE_DOUBLE = 5,    // TYPE_DOUBLE
-    CPPTYPE_FLOAT = 6,     // TYPE_FLOAT
-    CPPTYPE_BOOL = 7,      // TYPE_BOOL
-    CPPTYPE_ENUM = 8,      // TYPE_ENUM
-    CPPTYPE_STRING = 9,    // TYPE_STRING, TYPE_BYTES
-    CPPTYPE_MESSAGE = 10,  // TYPE_MESSAGE, TYPE_GROUP
-  };
-  static const uint8_t cpp_types[] = {
-      -1,
-      [kUpb_CType_Int32] = CPPTYPE_INT32,
-      [kUpb_CType_Int64] = CPPTYPE_INT64,
-      [kUpb_CType_UInt32] = CPPTYPE_UINT32,
-      [kUpb_CType_UInt64] = CPPTYPE_UINT64,
-      [kUpb_CType_Double] = CPPTYPE_DOUBLE,
-      [kUpb_CType_Float] = CPPTYPE_FLOAT,
-      [kUpb_CType_Bool] = CPPTYPE_BOOL,
-      [kUpb_CType_Enum] = CPPTYPE_ENUM,
-      [kUpb_CType_String] = CPPTYPE_STRING,
-      [kUpb_CType_Bytes] = CPPTYPE_STRING,
-      [kUpb_CType_Message] = CPPTYPE_MESSAGE,
-  };
-  return PyLong_FromLong(cpp_types[upb_FieldDef_CType(self->def)]);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetLabel(PyUpb_DescriptorBase* self,
-                                                void* closure) {
-  return PyLong_FromLong(upb_FieldDef_Label(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetIsExtension(
-    PyUpb_DescriptorBase* self, void* closure) {
-  return PyBool_FromLong(upb_FieldDef_IsExtension(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetNumber(PyUpb_DescriptorBase* self,
-                                                 void* closure) {
-  return PyLong_FromLong(upb_FieldDef_Number(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetIndex(PyUpb_DescriptorBase* self,
-                                                void* closure) {
-  return PyLong_FromLong(upb_FieldDef_Index(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetMessageType(
-    PyUpb_DescriptorBase* self, void* closure) {
-  const upb_MessageDef* subdef = upb_FieldDef_MessageSubDef(self->def);
-  if (!subdef) Py_RETURN_NONE;
-  return PyUpb_Descriptor_Get(subdef);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetEnumType(PyUpb_DescriptorBase* self,
-                                                   void* closure) {
-  const upb_EnumDef* enumdef = upb_FieldDef_EnumSubDef(self->def);
-  if (!enumdef) Py_RETURN_NONE;
-  return PyUpb_EnumDescriptor_Get(enumdef);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetContainingType(
-    PyUpb_DescriptorBase* self, void* closure) {
-  const upb_MessageDef* m = upb_FieldDef_ContainingType(self->def);
-  if (!m) Py_RETURN_NONE;
-  return PyUpb_Descriptor_Get(m);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetExtensionScope(
-    PyUpb_DescriptorBase* self, void* closure) {
-  const upb_MessageDef* m = upb_FieldDef_ExtensionScope(self->def);
-  if (!m) Py_RETURN_NONE;
-  return PyUpb_Descriptor_Get(m);
-}
-
-static PyObject* PyUpb_FieldDescriptor_HasDefaultValue(
-    PyUpb_DescriptorBase* self, void* closure) {
-  return PyBool_FromLong(upb_FieldDef_HasDefault(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetDefaultValue(
-    PyUpb_DescriptorBase* self, void* closure) {
-  const upb_FieldDef* f = self->def;
-  if (upb_FieldDef_IsRepeated(f)) return PyList_New(0);
-  if (upb_FieldDef_IsSubMessage(f)) Py_RETURN_NONE;
-  return PyUpb_UpbToPy(upb_FieldDef_Default(self->def), self->def, NULL);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetContainingOneof(
-    PyUpb_DescriptorBase* self, void* closure) {
-  const upb_OneofDef* oneof = upb_FieldDef_ContainingOneof(self->def);
-  if (!oneof) Py_RETURN_NONE;
-  return PyUpb_OneofDescriptor_Get(oneof);
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetHasOptions(
-    PyUpb_DescriptorBase* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_FieldDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetHasPresence(
-    PyUpb_DescriptorBase* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_FieldDef_HasPresence(self->def));
-}
-
-static PyObject* PyUpb_FieldDescriptor_GetOptions(PyObject* _self,
-                                                  PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_FieldDef_Options(self->def), &google_protobuf_FieldOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FieldOptions");
-}
-
-static PyGetSetDef PyUpb_FieldDescriptor_Getters[] = {
-    {"full_name", (getter)PyUpb_FieldDescriptor_GetFullName, NULL, "Full name"},
-    {"name", (getter)PyUpb_FieldDescriptor_GetName, NULL, "Unqualified name"},
-    {"camelcase_name", (getter)PyUpb_FieldDescriptor_GetCamelCaseName, NULL,
-     "CamelCase name"},
-    {"json_name", (getter)PyUpb_FieldDescriptor_GetJsonName, NULL, "Json name"},
-    {"file", (getter)PyUpb_FieldDescriptor_GetFile, NULL, "File Descriptor"},
-    {"type", (getter)PyUpb_FieldDescriptor_GetType, NULL, "Type"},
-    {"cpp_type", (getter)PyUpb_FieldDescriptor_GetCppType, NULL, "C++ Type"},
-    {"label", (getter)PyUpb_FieldDescriptor_GetLabel, NULL, "Label"},
-    {"number", (getter)PyUpb_FieldDescriptor_GetNumber, NULL, "Number"},
-    {"index", (getter)PyUpb_FieldDescriptor_GetIndex, NULL, "Index"},
-    {"default_value", (getter)PyUpb_FieldDescriptor_GetDefaultValue, NULL,
-     "Default Value"},
-    {"has_default_value", (getter)PyUpb_FieldDescriptor_HasDefaultValue},
-    {"is_extension", (getter)PyUpb_FieldDescriptor_GetIsExtension, NULL, "ID"},
-    // TODO(https://github.com/protocolbuffers/upb/issues/459)
-    //{ "id", (getter)GetID, NULL, "ID"},
-    {"message_type", (getter)PyUpb_FieldDescriptor_GetMessageType, NULL,
-     "Message type"},
-    {"enum_type", (getter)PyUpb_FieldDescriptor_GetEnumType, NULL, "Enum type"},
-    {"containing_type", (getter)PyUpb_FieldDescriptor_GetContainingType, NULL,
-     "Containing type"},
-    {"extension_scope", (getter)PyUpb_FieldDescriptor_GetExtensionScope, NULL,
-     "Extension scope"},
-    {"containing_oneof", (getter)PyUpb_FieldDescriptor_GetContainingOneof, NULL,
-     "Containing oneof"},
-    {"has_options", (getter)PyUpb_FieldDescriptor_GetHasOptions, NULL,
-     "Has Options"},
-    {"has_presence", (getter)PyUpb_FieldDescriptor_GetHasPresence, NULL,
-     "Has Presence"},
-    // TODO(https://github.com/protocolbuffers/upb/issues/459)
-    //{ "_options",
-    //(getter)NULL, (setter)SetOptions, "Options"}, { "_serialized_options",
-    //(getter)NULL, (setter)SetSerializedOptions, "Serialized Options"},
-    {NULL}};
-
-static PyMethodDef PyUpb_FieldDescriptor_Methods[] = {
-    {
-        "GetOptions",
-        PyUpb_FieldDescriptor_GetOptions,
-        METH_NOARGS,
-    },
-    {NULL}};
-
-static PyType_Slot PyUpb_FieldDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_FieldDescriptor_Methods},
-    {Py_tp_getset, PyUpb_FieldDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_FieldDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".FieldDescriptor",
-    sizeof(PyUpb_DescriptorBase),
-    0,  // tp_itemsize
-    Py_TPFLAGS_DEFAULT,
-    PyUpb_FieldDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// FileDescriptor
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_FileDescriptor_Get(const upb_FileDef* file) {
-  return PyUpb_DescriptorBase_Get(kPyUpb_FileDescriptor, file, file);
-}
-
-// These are not provided on upb_FileDef because they use the underlying
-// symtab's hash table. This works for Python because everything happens under
-// the GIL, but in general the caller has to guarantee that the symtab is not
-// being mutated concurrently.
-typedef const void* PyUpb_FileDescriptor_LookupFunc(const upb_DefPool*,
-                                                    const char*);
-
-static const void* PyUpb_FileDescriptor_NestedLookup(
-    const upb_FileDef* filedef, const char* name,
-    PyUpb_FileDescriptor_LookupFunc* func) {
-  const upb_DefPool* symtab = upb_FileDef_Pool(filedef);
-  const char* package = upb_FileDef_Package(filedef);
-  if (strlen(package)) {
-    PyObject* qname = PyUnicode_FromFormat("%s.%s", package, name);
-    const void* ret = func(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
-    Py_DECREF(qname);
-    return ret;
-  } else {
-    return func(symtab, name);
-  }
-}
-
-static const void* PyUpb_FileDescriptor_LookupMessage(
-    const upb_FileDef* filedef, const char* name) {
-  return PyUpb_FileDescriptor_NestedLookup(
-      filedef, name, (void*)&upb_DefPool_FindMessageByName);
-}
-
-static const void* PyUpb_FileDescriptor_LookupEnum(const upb_FileDef* filedef,
-                                                   const char* name) {
-  return PyUpb_FileDescriptor_NestedLookup(filedef, name,
-                                           (void*)&upb_DefPool_FindEnumByName);
-}
-
-static const void* PyUpb_FileDescriptor_LookupExtension(
-    const upb_FileDef* filedef, const char* name) {
-  return PyUpb_FileDescriptor_NestedLookup(
-      filedef, name, (void*)&upb_DefPool_FindExtensionByName);
-}
-
-static const void* PyUpb_FileDescriptor_LookupService(
-    const upb_FileDef* filedef, const char* name) {
-  return PyUpb_FileDescriptor_NestedLookup(
-      filedef, name, (void*)&upb_DefPool_FindServiceByName);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetName(PyUpb_DescriptorBase* self,
-                                              void* closure) {
-  return PyUnicode_FromString(upb_FileDef_Name(self->def));
-}
-
-static PyObject* PyUpb_FileDescriptor_GetPool(PyObject* _self, void* closure) {
-  PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
-  Py_INCREF(self->pool);
-  return self->pool;
-}
-
-static PyObject* PyUpb_FileDescriptor_GetPackage(PyObject* _self,
-                                                 void* closure) {
-  PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
-  return PyUnicode_FromString(upb_FileDef_Package(self->def));
-}
-
-static PyObject* PyUpb_FileDescriptor_GetSerializedPb(PyObject* self,
-                                                      void* closure) {
-  return PyUpb_DescriptorBase_GetSerializedProto(
-      self, (PyUpb_ToProto_Func*)&upb_FileDef_ToProto,
-      &google_protobuf_FileDescriptorProto_msg_init);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetMessageTypesByName(PyObject* _self,
-                                                            void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_FileDef_TopLevelMessageCount,
-          (void*)&upb_FileDef_TopLevelMessage,
-          (void*)&PyUpb_Descriptor_Get,
-      },
-      (void*)&PyUpb_FileDescriptor_LookupMessage,
-      (void*)&upb_MessageDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetEnumTypesByName(PyObject* _self,
-                                                         void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_FileDef_TopLevelEnumCount,
-          (void*)&upb_FileDef_TopLevelEnum,
-          (void*)&PyUpb_EnumDescriptor_Get,
-      },
-      (void*)&PyUpb_FileDescriptor_LookupEnum,
-      (void*)&upb_EnumDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetExtensionsByName(PyObject* _self,
-                                                          void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_FileDef_TopLevelExtensionCount,
-          (void*)&upb_FileDef_TopLevelExtension,
-          (void*)&PyUpb_FieldDescriptor_Get,
-      },
-      (void*)&PyUpb_FileDescriptor_LookupExtension,
-      (void*)&upb_FieldDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetServicesByName(PyObject* _self,
-                                                        void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_FileDef_ServiceCount,
-          (void*)&upb_FileDef_Service,
-          (void*)&PyUpb_ServiceDescriptor_Get,
-      },
-      (void*)&PyUpb_FileDescriptor_LookupService,
-      (void*)&upb_ServiceDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetDependencies(PyObject* _self,
-                                                      void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_FileDef_DependencyCount,
-      (void*)&upb_FileDef_Dependency,
-      (void*)&PyUpb_FileDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetPublicDependencies(PyObject* _self,
-                                                            void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_FileDef_PublicDependencyCount,
-      (void*)&upb_FileDef_PublicDependency,
-      (void*)&PyUpb_FileDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetSyntax(PyObject* _self,
-                                                void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  const char* syntax =
-      upb_FileDef_Syntax(self->def) == kUpb_Syntax_Proto2 ? "proto2" : "proto3";
-  return PyUnicode_FromString(syntax);
-}
-
-static PyObject* PyUpb_FileDescriptor_GetHasOptions(PyObject* _self,
-                                                    void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_FileDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_FileDescriptor_GetOptions(PyObject* _self,
-                                                 PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_FileDef_Options(self->def), &google_protobuf_FileOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FileOptions");
-}
-
-static PyObject* PyUpb_FileDescriptor_CopyToProto(PyObject* _self,
-                                                  PyObject* py_proto) {
-  return PyUpb_DescriptorBase_CopyToProto(
-      _self, (PyUpb_ToProto_Func*)&upb_FileDef_ToProto,
-      &google_protobuf_FileDescriptorProto_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FileDescriptorProto", py_proto);
-}
-
-static PyGetSetDef PyUpb_FileDescriptor_Getters[] = {
-    {"pool", PyUpb_FileDescriptor_GetPool, NULL, "pool"},
-    {"name", (getter)PyUpb_FileDescriptor_GetName, NULL, "name"},
-    {"package", PyUpb_FileDescriptor_GetPackage, NULL, "package"},
-    {"serialized_pb", PyUpb_FileDescriptor_GetSerializedPb},
-    {"message_types_by_name", PyUpb_FileDescriptor_GetMessageTypesByName, NULL,
-     "Messages by name"},
-    {"enum_types_by_name", PyUpb_FileDescriptor_GetEnumTypesByName, NULL,
-     "Enums by name"},
-    {"extensions_by_name", PyUpb_FileDescriptor_GetExtensionsByName, NULL,
-     "Extensions by name"},
-    {"services_by_name", PyUpb_FileDescriptor_GetServicesByName, NULL,
-     "Services by name"},
-    {"dependencies", PyUpb_FileDescriptor_GetDependencies, NULL,
-     "Dependencies"},
-    {"public_dependencies", PyUpb_FileDescriptor_GetPublicDependencies, NULL,
-     "Dependencies"},
-    {"has_options", PyUpb_FileDescriptor_GetHasOptions, NULL, "Has Options"},
-    {"syntax", PyUpb_FileDescriptor_GetSyntax, (setter)NULL, "Syntax"},
-    {NULL},
-};
-
-static PyMethodDef PyUpb_FileDescriptor_Methods[] = {
-    {"GetOptions", PyUpb_FileDescriptor_GetOptions, METH_NOARGS},
-    {"CopyToProto", PyUpb_FileDescriptor_CopyToProto, METH_O},
-    {NULL}};
-
-static PyType_Slot PyUpb_FileDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_FileDescriptor_Methods},
-    {Py_tp_getset, PyUpb_FileDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_FileDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".FileDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),         // tp_basicsize
-    0,                                    // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                   // tp_flags
-    PyUpb_FileDescriptor_Slots,
-};
-
-const upb_FileDef* PyUpb_FileDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_FileDescriptor);
-  return self ? self->def : NULL;
-}
-
-// -----------------------------------------------------------------------------
-// MethodDescriptor
-// -----------------------------------------------------------------------------
-
-const upb_MethodDef* PyUpb_MethodDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_MethodDescriptor);
-  return self ? self->def : NULL;
-}
-
-PyObject* PyUpb_MethodDescriptor_Get(const upb_MethodDef* m) {
-  const upb_FileDef* file = upb_ServiceDef_File(upb_MethodDef_Service(m));
-  return PyUpb_DescriptorBase_Get(kPyUpb_MethodDescriptor, m, file);
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetName(PyObject* self, void* closure) {
-  const upb_MethodDef* m = PyUpb_MethodDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_MethodDef_Name(m));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetFullName(PyObject* self,
-                                                    void* closure) {
-  const upb_MethodDef* m = PyUpb_MethodDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_MethodDef_FullName(m));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetIndex(PyObject* self,
-                                                 void* closure) {
-  const upb_MethodDef* oneof = PyUpb_MethodDescriptor_GetDef(self);
-  return PyLong_FromLong(upb_MethodDef_Index(oneof));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetContainingService(PyObject* self,
-                                                             void* closure) {
-  const upb_MethodDef* m = PyUpb_MethodDescriptor_GetDef(self);
-  return PyUpb_ServiceDescriptor_Get(upb_MethodDef_Service(m));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetInputType(PyObject* self,
-                                                     void* closure) {
-  const upb_MethodDef* m = PyUpb_MethodDescriptor_GetDef(self);
-  return PyUpb_Descriptor_Get(upb_MethodDef_InputType(m));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetOutputType(PyObject* self,
-                                                      void* closure) {
-  const upb_MethodDef* m = PyUpb_MethodDescriptor_GetDef(self);
-  return PyUpb_Descriptor_Get(upb_MethodDef_OutputType(m));
-}
-
-static PyObject* PyUpb_MethodDescriptor_GetOptions(PyObject* _self,
-                                                   PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_MethodDef_Options(self->def), &google_protobuf_MethodOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".MethodOptions");
-}
-
-static PyObject* PyUpb_MethodDescriptor_CopyToProto(PyObject* _self,
-                                                    PyObject* py_proto) {
-  return PyUpb_DescriptorBase_CopyToProto(
-      _self, (PyUpb_ToProto_Func*)&upb_MethodDef_ToProto,
-      &google_protobuf_MethodDescriptorProto_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".MethodDescriptorProto", py_proto);
-}
-
-static PyGetSetDef PyUpb_MethodDescriptor_Getters[] = {
-    {"name", PyUpb_MethodDescriptor_GetName, NULL, "Name", NULL},
-    {"full_name", PyUpb_MethodDescriptor_GetFullName, NULL, "Full name", NULL},
-    {"index", PyUpb_MethodDescriptor_GetIndex, NULL, "Index", NULL},
-    {"containing_service", PyUpb_MethodDescriptor_GetContainingService, NULL,
-     "Containing service", NULL},
-    {"input_type", PyUpb_MethodDescriptor_GetInputType, NULL, "Input type",
-     NULL},
-    {"output_type", PyUpb_MethodDescriptor_GetOutputType, NULL, "Output type",
-     NULL},
-    {NULL}};
-
-static PyMethodDef PyUpb_MethodDescriptor_Methods[] = {
-    {"GetOptions", PyUpb_MethodDescriptor_GetOptions, METH_NOARGS},
-    {"CopyToProto", PyUpb_MethodDescriptor_CopyToProto, METH_O},
-    {NULL}};
-
-static PyType_Slot PyUpb_MethodDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_MethodDescriptor_Methods},
-    {Py_tp_getset, PyUpb_MethodDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_MethodDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".MethodDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),           // tp_basicsize
-    0,                                      // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                     // tp_flags
-    PyUpb_MethodDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// OneofDescriptor
-// -----------------------------------------------------------------------------
-
-const upb_OneofDef* PyUpb_OneofDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_OneofDescriptor);
-  return self ? self->def : NULL;
-}
-
-PyObject* PyUpb_OneofDescriptor_Get(const upb_OneofDef* oneof) {
-  const upb_FileDef* file =
-      upb_MessageDef_File(upb_OneofDef_ContainingType(oneof));
-  return PyUpb_DescriptorBase_Get(kPyUpb_OneofDescriptor, oneof, file);
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetName(PyObject* self, void* closure) {
-  const upb_OneofDef* oneof = PyUpb_OneofDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_OneofDef_Name(oneof));
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetFullName(PyObject* self,
-                                                   void* closure) {
-  const upb_OneofDef* oneof = PyUpb_OneofDescriptor_GetDef(self);
-  return PyUnicode_FromFormat(
-      "%s.%s", upb_MessageDef_FullName(upb_OneofDef_ContainingType(oneof)),
-      upb_OneofDef_Name(oneof));
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetIndex(PyObject* self, void* closure) {
-  const upb_OneofDef* oneof = PyUpb_OneofDescriptor_GetDef(self);
-  return PyLong_FromLong(upb_OneofDef_Index(oneof));
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetContainingType(PyObject* self,
-                                                         void* closure) {
-  const upb_OneofDef* oneof = PyUpb_OneofDescriptor_GetDef(self);
-  return PyUpb_Descriptor_Get(upb_OneofDef_ContainingType(oneof));
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetHasOptions(PyObject* _self,
-                                                     void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyBool_FromLong(upb_OneofDef_HasOptions(self->def));
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetFields(PyObject* _self,
-                                                 void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_OneofDef_FieldCount,
-      (void*)&upb_OneofDef_Field,
-      (void*)&PyUpb_FieldDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_OneofDescriptor_GetOptions(PyObject* _self,
-                                                  PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_OneofDef_Options(self->def), &google_protobuf_OneofOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".OneofOptions");
-}
-
-static PyGetSetDef PyUpb_OneofDescriptor_Getters[] = {
-    {"name", PyUpb_OneofDescriptor_GetName, NULL, "Name"},
-    {"full_name", PyUpb_OneofDescriptor_GetFullName, NULL, "Full name"},
-    {"index", PyUpb_OneofDescriptor_GetIndex, NULL, "Index"},
-    {"containing_type", PyUpb_OneofDescriptor_GetContainingType, NULL,
-     "Containing type"},
-    {"has_options", PyUpb_OneofDescriptor_GetHasOptions, NULL, "Has Options"},
-    {"fields", PyUpb_OneofDescriptor_GetFields, NULL, "Fields"},
-    {NULL}};
-
-static PyMethodDef PyUpb_OneofDescriptor_Methods[] = {
-    {"GetOptions", PyUpb_OneofDescriptor_GetOptions, METH_NOARGS}, {NULL}};
-
-static PyType_Slot PyUpb_OneofDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_OneofDescriptor_Methods},
-    {Py_tp_getset, PyUpb_OneofDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_OneofDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".OneofDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),          // tp_basicsize
-    0,                                     // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                    // tp_flags
-    PyUpb_OneofDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// ServiceDescriptor
-// -----------------------------------------------------------------------------
-
-const upb_ServiceDef* PyUpb_ServiceDescriptor_GetDef(PyObject* _self) {
-  PyUpb_DescriptorBase* self =
-      PyUpb_DescriptorBase_Check(_self, kPyUpb_ServiceDescriptor);
-  return self ? self->def : NULL;
-}
-
-PyObject* PyUpb_ServiceDescriptor_Get(const upb_ServiceDef* s) {
-  const upb_FileDef* file = upb_ServiceDef_File(s);
-  return PyUpb_DescriptorBase_Get(kPyUpb_ServiceDescriptor, s, file);
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetFullName(PyObject* self,
-                                                     void* closure) {
-  const upb_ServiceDef* s = PyUpb_ServiceDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_ServiceDef_FullName(s));
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetName(PyObject* self,
-                                                 void* closure) {
-  const upb_ServiceDef* s = PyUpb_ServiceDescriptor_GetDef(self);
-  return PyUnicode_FromString(upb_ServiceDef_Name(s));
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetFile(PyObject* self,
-                                                 void* closure) {
-  const upb_ServiceDef* s = PyUpb_ServiceDescriptor_GetDef(self);
-  return PyUpb_FileDescriptor_Get(upb_ServiceDef_File(s));
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetIndex(PyObject* self,
-                                                  void* closure) {
-  const upb_ServiceDef* s = PyUpb_ServiceDescriptor_GetDef(self);
-  return PyLong_FromLong(upb_ServiceDef_Index(s));
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetMethods(PyObject* _self,
-                                                    void* closure) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  static PyUpb_GenericSequence_Funcs funcs = {
-      (void*)&upb_ServiceDef_MethodCount,
-      (void*)&upb_ServiceDef_Method,
-      (void*)&PyUpb_MethodDescriptor_Get,
-  };
-  return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetMethodsByName(PyObject* _self,
-                                                          void* closure) {
-  static PyUpb_ByNameMap_Funcs funcs = {
-      {
-          (void*)&upb_ServiceDef_MethodCount,
-          (void*)&upb_ServiceDef_Method,
-          (void*)&PyUpb_MethodDescriptor_Get,
-      },
-      (void*)&upb_ServiceDef_FindMethodByName,
-      (void*)&upb_MethodDef_Name,
-  };
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-
-static PyObject* PyUpb_ServiceDescriptor_GetOptions(PyObject* _self,
-                                                    PyObject* args) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  return PyUpb_DescriptorBase_GetOptions(
-      self, upb_ServiceDef_Options(self->def), &google_protobuf_ServiceOptions_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".ServiceOptions");
-}
-
-static PyObject* PyUpb_ServiceDescriptor_CopyToProto(PyObject* _self,
-                                                     PyObject* py_proto) {
-  return PyUpb_DescriptorBase_CopyToProto(
-      _self, (PyUpb_ToProto_Func*)&upb_ServiceDef_ToProto,
-      &google_protobuf_ServiceDescriptorProto_msg_init,
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".ServiceDescriptorProto", py_proto);
-}
-
-static PyObject* PyUpb_ServiceDescriptor_FindMethodByName(PyObject* _self,
-                                                          PyObject* py_name) {
-  PyUpb_DescriptorBase* self = (void*)_self;
-  const char* name = PyUnicode_AsUTF8AndSize(py_name, NULL);
-  if (!name) return NULL;
-  const upb_MethodDef* method =
-      upb_ServiceDef_FindMethodByName(self->def, name);
-  if (method == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
-  }
-  return PyUpb_MethodDescriptor_Get(method);
-}
-
-static PyGetSetDef PyUpb_ServiceDescriptor_Getters[] = {
-    {"name", PyUpb_ServiceDescriptor_GetName, NULL, "Name", NULL},
-    {"full_name", PyUpb_ServiceDescriptor_GetFullName, NULL, "Full name", NULL},
-    {"file", PyUpb_ServiceDescriptor_GetFile, NULL, "File descriptor"},
-    {"index", PyUpb_ServiceDescriptor_GetIndex, NULL, "Index", NULL},
-    {"methods", PyUpb_ServiceDescriptor_GetMethods, NULL, "Methods", NULL},
-    {"methods_by_name", PyUpb_ServiceDescriptor_GetMethodsByName, NULL,
-     "Methods by name", NULL},
-    {NULL}};
-
-static PyMethodDef PyUpb_ServiceDescriptor_Methods[] = {
-    {"GetOptions", PyUpb_ServiceDescriptor_GetOptions, METH_NOARGS},
-    {"CopyToProto", PyUpb_ServiceDescriptor_CopyToProto, METH_O},
-    {"FindMethodByName", PyUpb_ServiceDescriptor_FindMethodByName, METH_O},
-    {NULL}};
-
-static PyType_Slot PyUpb_ServiceDescriptor_Slots[] = {
-    DESCRIPTOR_BASE_SLOTS,
-    {Py_tp_methods, PyUpb_ServiceDescriptor_Methods},
-    {Py_tp_getset, PyUpb_ServiceDescriptor_Getters},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_ServiceDescriptor_Spec = {
-    PYUPB_MODULE_NAME ".ServiceDescriptor",  // tp_name
-    sizeof(PyUpb_DescriptorBase),            // tp_basicsize
-    0,                                       // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                      // tp_flags
-    PyUpb_ServiceDescriptor_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-static bool PyUpb_SetIntAttr(PyObject* obj, const char* name, int val) {
-  PyObject* num = PyLong_FromLong(val);
-  if (!num) return false;
-  int status = PyObject_SetAttrString(obj, name, num);
-  Py_DECREF(num);
-  return status >= 0;
-}
-
-// These must be in the same order as PyUpb_DescriptorType in the header.
-static PyType_Spec* desc_specs[] = {
-    &PyUpb_Descriptor_Spec,          &PyUpb_EnumDescriptor_Spec,
-    &PyUpb_EnumValueDescriptor_Spec, &PyUpb_FieldDescriptor_Spec,
-    &PyUpb_FileDescriptor_Spec,      &PyUpb_MethodDescriptor_Spec,
-    &PyUpb_OneofDescriptor_Spec,     &PyUpb_ServiceDescriptor_Spec,
-};
-
-bool PyUpb_InitDescriptor(PyObject* m) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_GetFromModule(m);
-
-  for (size_t i = 0; i < kPyUpb_Descriptor_Count; i++) {
-    s->descriptor_types[i] = PyUpb_AddClass(m, desc_specs[i]);
-    if (!s->descriptor_types[i]) {
-      return false;
-    }
-  }
-
-  PyObject* fd = (PyObject*)s->descriptor_types[kPyUpb_FieldDescriptor];
-  return PyUpb_SetIntAttr(fd, "LABEL_OPTIONAL", kUpb_Label_Optional) &&
-         PyUpb_SetIntAttr(fd, "LABEL_REPEATED", kUpb_Label_Repeated) &&
-         PyUpb_SetIntAttr(fd, "LABEL_REQUIRED", kUpb_Label_Required) &&
-         PyUpb_SetIntAttr(fd, "TYPE_BOOL", kUpb_FieldType_Bool) &&
-         PyUpb_SetIntAttr(fd, "TYPE_BYTES", kUpb_FieldType_Bytes) &&
-         PyUpb_SetIntAttr(fd, "TYPE_DOUBLE", kUpb_FieldType_Double) &&
-         PyUpb_SetIntAttr(fd, "TYPE_ENUM", kUpb_FieldType_Enum) &&
-         PyUpb_SetIntAttr(fd, "TYPE_FIXED32", kUpb_FieldType_Fixed32) &&
-         PyUpb_SetIntAttr(fd, "TYPE_FIXED64", kUpb_FieldType_Fixed64) &&
-         PyUpb_SetIntAttr(fd, "TYPE_FLOAT", kUpb_FieldType_Float) &&
-         PyUpb_SetIntAttr(fd, "TYPE_GROUP", kUpb_FieldType_Group) &&
-         PyUpb_SetIntAttr(fd, "TYPE_INT32", kUpb_FieldType_Int32) &&
-         PyUpb_SetIntAttr(fd, "TYPE_INT64", kUpb_FieldType_Int64) &&
-         PyUpb_SetIntAttr(fd, "TYPE_MESSAGE", kUpb_FieldType_Message) &&
-         PyUpb_SetIntAttr(fd, "TYPE_SFIXED32", kUpb_FieldType_SFixed32) &&
-         PyUpb_SetIntAttr(fd, "TYPE_SFIXED64", kUpb_FieldType_SFixed64) &&
-         PyUpb_SetIntAttr(fd, "TYPE_SINT32", kUpb_FieldType_SInt32) &&
-         PyUpb_SetIntAttr(fd, "TYPE_SINT64", kUpb_FieldType_SInt64) &&
-         PyUpb_SetIntAttr(fd, "TYPE_STRING", kUpb_FieldType_String) &&
-         PyUpb_SetIntAttr(fd, "TYPE_UINT32", kUpb_FieldType_UInt32) &&
-         PyUpb_SetIntAttr(fd, "TYPE_UINT64", kUpb_FieldType_UInt64);
-}
diff --git a/third_party/upb/python/descriptor.h b/third_party/upb/python/descriptor.h
deleted file mode 100644
index 9bf6b4258d9de..0000000000000
--- a/third_party/upb/python/descriptor.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_DESCRIPTOR_H__
-#define PYUPB_DESCRIPTOR_H__
-
-#include <stdbool.h>
-
-#include "python/python_api.h"
-#include "upb/reflection/def.h"
-
-typedef enum {
-  kPyUpb_Descriptor = 0,
-  kPyUpb_EnumDescriptor = 1,
-  kPyUpb_EnumValueDescriptor = 2,
-  kPyUpb_FieldDescriptor = 3,
-  kPyUpb_FileDescriptor = 4,
-  kPyUpb_MethodDescriptor = 5,
-  kPyUpb_OneofDescriptor = 6,
-  kPyUpb_ServiceDescriptor = 7,
-  kPyUpb_Descriptor_Count = 8,
-} PyUpb_DescriptorType;
-
-// Given a descriptor object |desc|, returns a Python message class object for
-// the msgdef |m|, which must be from the same pool.
-PyObject* PyUpb_Descriptor_GetClass(const upb_MessageDef* m);
-
-// Returns a Python wrapper object for the given def. This will return an
-// existing object if one already exists, otherwise a new object will be
-// created.  The caller always owns a ref on the returned object.
-PyObject* PyUpb_Descriptor_Get(const upb_MessageDef* msgdef);
-PyObject* PyUpb_EnumDescriptor_Get(const upb_EnumDef* enumdef);
-PyObject* PyUpb_FieldDescriptor_Get(const upb_FieldDef* field);
-PyObject* PyUpb_FileDescriptor_Get(const upb_FileDef* file);
-PyObject* PyUpb_OneofDescriptor_Get(const upb_OneofDef* oneof);
-PyObject* PyUpb_EnumValueDescriptor_Get(const upb_EnumValueDef* enumval);
-PyObject* PyUpb_Descriptor_GetOrCreateWrapper(const upb_MessageDef* msg);
-PyObject* PyUpb_ServiceDescriptor_Get(const upb_ServiceDef* s);
-PyObject* PyUpb_MethodDescriptor_Get(const upb_MethodDef* s);
-
-// Returns the underlying |def| for a given wrapper object. The caller must
-// have already verified that the given Python object is of the expected type.
-const upb_FileDef* PyUpb_FileDescriptor_GetDef(PyObject* file);
-const upb_FieldDef* PyUpb_FieldDescriptor_GetDef(PyObject* file);
-const upb_MessageDef* PyUpb_Descriptor_GetDef(PyObject* _self);
-const void* PyUpb_AnyDescriptor_GetDef(PyObject* _self);
-
-// Returns the underlying |def| for a given wrapper object. The caller must
-// have already verified that the given Python object is of the expected type.
-const upb_FileDef* PyUpb_FileDescriptor_GetDef(PyObject* file);
-
-// Module-level init.
-bool PyUpb_InitDescriptor(PyObject* m);
-
-#endif  // PYUPB_DESCRIPTOR_H__
diff --git a/third_party/upb/python/descriptor_containers.c b/third_party/upb/python/descriptor_containers.c
deleted file mode 100644
index c750a4a04fbbb..0000000000000
--- a/third_party/upb/python/descriptor_containers.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/descriptor_containers.h"
-
-#include "python/descriptor.h"
-#include "python/protobuf.h"
-#include "upb/reflection/def.h"
-
-// Implements __repr__ as str(dict(self)).
-static PyObject* PyUpb_DescriptorMap_Repr(PyObject* _self) {
-  PyObject* dict = PyDict_New();
-  PyObject* ret = NULL;
-  if (!dict) goto err;
-  if (PyDict_Merge(dict, _self, 1) != 0) goto err;
-  ret = PyObject_Str(dict);
-
-err:
-  Py_XDECREF(dict);
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-// ByNameIterator
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  const PyUpb_ByNameMap_Funcs* funcs;
-  const void* parent;    // upb_MessageDef*, upb_DefPool*, etc.
-  PyObject* parent_obj;  // Python object that keeps parent alive, we own a ref.
-  int index;             // Current iterator index.
-} PyUpb_ByNameIterator;
-
-static PyUpb_ByNameIterator* PyUpb_ByNameIterator_Self(PyObject* obj) {
-  assert(Py_TYPE(obj) == PyUpb_ModuleState_Get()->by_name_iterator_type);
-  return (PyUpb_ByNameIterator*)obj;
-}
-
-static void PyUpb_ByNameIterator_Dealloc(PyObject* _self) {
-  PyUpb_ByNameIterator* self = PyUpb_ByNameIterator_Self(_self);
-  Py_DECREF(self->parent_obj);
-  PyUpb_Dealloc(self);
-}
-
-static PyObject* PyUpb_ByNameIterator_New(const PyUpb_ByNameMap_Funcs* funcs,
-                                          const void* parent,
-                                          PyObject* parent_obj) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_ByNameIterator* iter =
-      (void*)PyType_GenericAlloc(s->by_name_iterator_type, 0);
-  iter->funcs = funcs;
-  iter->parent = parent;
-  iter->parent_obj = parent_obj;
-  iter->index = 0;
-  Py_INCREF(iter->parent_obj);
-  return &iter->ob_base;
-}
-
-static PyObject* PyUpb_ByNameIterator_IterNext(PyObject* _self) {
-  PyUpb_ByNameIterator* self = PyUpb_ByNameIterator_Self(_self);
-  int size = self->funcs->base.get_elem_count(self->parent);
-  if (self->index >= size) return NULL;
-  const void* elem = self->funcs->base.index(self->parent, self->index);
-  self->index++;
-  return PyUnicode_FromString(self->funcs->get_elem_name(elem));
-}
-
-static PyType_Slot PyUpb_ByNameIterator_Slots[] = {
-    {Py_tp_dealloc, PyUpb_ByNameIterator_Dealloc},
-    {Py_tp_iter, PyObject_SelfIter},
-    {Py_tp_iternext, PyUpb_ByNameIterator_IterNext},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_ByNameIterator_Spec = {
-    PYUPB_MODULE_NAME "._ByNameIterator",  // tp_name
-    sizeof(PyUpb_ByNameIterator),          // tp_basicsize
-    0,                                     // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                    // tp_flags
-    PyUpb_ByNameIterator_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// ByNumberIterator
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  const PyUpb_ByNumberMap_Funcs* funcs;
-  const void* parent;    // upb_MessageDef*, upb_DefPool*, etc.
-  PyObject* parent_obj;  // Python object that keeps parent alive, we own a ref.
-  int index;             // Current iterator index.
-} PyUpb_ByNumberIterator;
-
-static PyUpb_ByNumberIterator* PyUpb_ByNumberIterator_Self(PyObject* obj) {
-  assert(Py_TYPE(obj) == PyUpb_ModuleState_Get()->by_number_iterator_type);
-  return (PyUpb_ByNumberIterator*)obj;
-}
-
-static void PyUpb_ByNumberIterator_Dealloc(PyObject* _self) {
-  PyUpb_ByNumberIterator* self = PyUpb_ByNumberIterator_Self(_self);
-  Py_DECREF(self->parent_obj);
-  PyUpb_Dealloc(self);
-}
-
-static PyObject* PyUpb_ByNumberIterator_New(
-    const PyUpb_ByNumberMap_Funcs* funcs, const void* parent,
-    PyObject* parent_obj) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_ByNumberIterator* iter =
-      (void*)PyType_GenericAlloc(s->by_number_iterator_type, 0);
-  iter->funcs = funcs;
-  iter->parent = parent;
-  iter->parent_obj = parent_obj;
-  iter->index = 0;
-  Py_INCREF(iter->parent_obj);
-  return &iter->ob_base;
-}
-
-static PyObject* PyUpb_ByNumberIterator_IterNext(PyObject* _self) {
-  PyUpb_ByNumberIterator* self = PyUpb_ByNumberIterator_Self(_self);
-  int size = self->funcs->base.get_elem_count(self->parent);
-  if (self->index >= size) return NULL;
-  const void* elem = self->funcs->base.index(self->parent, self->index);
-  self->index++;
-  return PyLong_FromLong(self->funcs->get_elem_num(elem));
-}
-
-static PyType_Slot PyUpb_ByNumberIterator_Slots[] = {
-    {Py_tp_dealloc, PyUpb_ByNumberIterator_Dealloc},
-    {Py_tp_iter, PyObject_SelfIter},
-    {Py_tp_iternext, PyUpb_ByNumberIterator_IterNext},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_ByNumberIterator_Spec = {
-    PYUPB_MODULE_NAME "._ByNumberIterator",  // tp_name
-    sizeof(PyUpb_ByNumberIterator),          // tp_basicsize
-    0,                                       // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                      // tp_flags
-    PyUpb_ByNumberIterator_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// GenericSequence
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  const PyUpb_GenericSequence_Funcs* funcs;
-  const void* parent;    // upb_MessageDef*, upb_DefPool*, etc.
-  PyObject* parent_obj;  // Python object that keeps parent alive, we own a ref.
-} PyUpb_GenericSequence;
-
-PyUpb_GenericSequence* PyUpb_GenericSequence_Self(PyObject* obj) {
-  assert(Py_TYPE(obj) == PyUpb_ModuleState_Get()->generic_sequence_type);
-  return (PyUpb_GenericSequence*)obj;
-}
-
-static void PyUpb_GenericSequence_Dealloc(PyObject* _self) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  Py_CLEAR(self->parent_obj);
-  PyUpb_Dealloc(self);
-}
-
-PyObject* PyUpb_GenericSequence_New(const PyUpb_GenericSequence_Funcs* funcs,
-                                    const void* parent, PyObject* parent_obj) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_GenericSequence* seq =
-      (PyUpb_GenericSequence*)PyType_GenericAlloc(s->generic_sequence_type, 0);
-  seq->funcs = funcs;
-  seq->parent = parent;
-  seq->parent_obj = parent_obj;
-  Py_INCREF(parent_obj);
-  return &seq->ob_base;
-}
-
-static Py_ssize_t PyUpb_GenericSequence_Length(PyObject* _self) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  return self->funcs->get_elem_count(self->parent);
-}
-
-static PyObject* PyUpb_GenericSequence_GetItem(PyObject* _self,
-                                               Py_ssize_t index) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  Py_ssize_t size = self->funcs->get_elem_count(self->parent);
-  if (index < 0 || index >= size) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return NULL;
-  }
-  const void* elem = self->funcs->index(self->parent, index);
-  return self->funcs->get_elem_wrapper(elem);
-}
-
-// A sequence container can only be equal to another sequence container, or (for
-// backward compatibility) to a list containing the same items.
-// Returns 1 if equal, 0 if unequal, -1 on error.
-static int PyUpb_GenericSequence_IsEqual(PyUpb_GenericSequence* self,
-                                         PyObject* other) {
-  // Check the identity of C++ pointers.
-  if (PyObject_TypeCheck(other, Py_TYPE(self))) {
-    PyUpb_GenericSequence* other_seq = (void*)other;
-    return self->parent == other_seq->parent && self->funcs == other_seq->funcs;
-  }
-
-  if (!PyList_Check(other)) return 0;
-
-  // return list(self) == other
-  // We can clamp `i` to int because GenericSequence uses int for size (this
-  // is useful when we do int iteration below).
-  int n = PyUpb_GenericSequence_Length((PyObject*)self);
-  if ((Py_ssize_t)n != PyList_Size(other)) {
-    return false;
-  }
-
-  PyObject* item1;
-  for (int i = 0; i < n; i++) {
-    item1 = PyUpb_GenericSequence_GetItem((PyObject*)self, i);
-    PyObject* item2 = PyList_GetItem(other, i);
-    if (!item1 || !item2) goto error;
-    int cmp = PyObject_RichCompareBool(item1, item2, Py_EQ);
-    Py_DECREF(item1);
-    if (cmp != 1) return cmp;
-  }
-  // All items were found and equal
-  return 1;
-
-error:
-  Py_XDECREF(item1);
-  return -1;
-}
-
-static PyObject* PyUpb_GenericSequence_RichCompare(PyObject* _self,
-                                                   PyObject* other, int opid) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_RETURN_NOTIMPLEMENTED;
-  }
-  bool ret = PyUpb_GenericSequence_IsEqual(self, other);
-  if (opid == Py_NE) ret = !ret;
-  return PyBool_FromLong(ret);
-}
-
-// Linear search.  Could optimize this in some cases (defs that have index),
-// but not all (FileDescriptor.dependencies).
-static int PyUpb_GenericSequence_Find(PyObject* _self, PyObject* item) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  const void* item_ptr = PyUpb_AnyDescriptor_GetDef(item);
-  int count = self->funcs->get_elem_count(self->parent);
-  for (int i = 0; i < count; i++) {
-    if (self->funcs->index(self->parent, i) == item_ptr) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-static PyObject* PyUpb_GenericSequence_Index(PyObject* self, PyObject* item) {
-  int position = PyUpb_GenericSequence_Find(self, item);
-  if (position < 0) {
-    PyErr_SetNone(PyExc_ValueError);
-    return NULL;
-  } else {
-    return PyLong_FromLong(position);
-  }
-}
-
-static PyObject* PyUpb_GenericSequence_Count(PyObject* _self, PyObject* item) {
-  PyUpb_GenericSequence* self = PyUpb_GenericSequence_Self(_self);
-  const void* item_ptr = PyUpb_AnyDescriptor_GetDef(item);
-  int n = self->funcs->get_elem_count(self->parent);
-  int count = 0;
-  for (int i = 0; i < n; i++) {
-    if (self->funcs->index(self->parent, i) == item_ptr) {
-      count++;
-    }
-  }
-  return PyLong_FromLong(count);
-}
-
-static PyObject* PyUpb_GenericSequence_Append(PyObject* self, PyObject* args) {
-  PyErr_Format(PyExc_TypeError, "'%R' is not a mutable sequence", self);
-  return NULL;
-}
-
-static PyMethodDef PyUpb_GenericSequence_Methods[] = {
-    {"index", PyUpb_GenericSequence_Index, METH_O},
-    {"count", PyUpb_GenericSequence_Count, METH_O},
-    {"append", PyUpb_GenericSequence_Append, METH_O},
-    // This was implemented for Python/C++ but so far has not been required.
-    //{ "__reversed__", (PyCFunction)Reversed, METH_NOARGS, },
-    {NULL}};
-
-static PyType_Slot PyUpb_GenericSequence_Slots[] = {
-    {Py_tp_dealloc, &PyUpb_GenericSequence_Dealloc},
-    {Py_tp_methods, &PyUpb_GenericSequence_Methods},
-    {Py_sq_length, PyUpb_GenericSequence_Length},
-    {Py_sq_item, PyUpb_GenericSequence_GetItem},
-    {Py_tp_richcompare, &PyUpb_GenericSequence_RichCompare},
-    // These were implemented for Python/C++ but so far have not been required.
-    // {Py_tp_repr, &PyUpb_GenericSequence_Repr},
-    // {Py_sq_contains, PyUpb_GenericSequence_Contains},
-    // {Py_mp_subscript, PyUpb_GenericSequence_Subscript},
-    // {Py_mp_ass_subscript, PyUpb_GenericSequence_AssignSubscript},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_GenericSequence_Spec = {
-    PYUPB_MODULE_NAME "._GenericSequence",  // tp_name
-    sizeof(PyUpb_GenericSequence),          // tp_basicsize
-    0,                                      // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                     // tp_flags
-    PyUpb_GenericSequence_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// ByNameMap
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  const PyUpb_ByNameMap_Funcs* funcs;
-  const void* parent;    // upb_MessageDef*, upb_DefPool*, etc.
-  PyObject* parent_obj;  // Python object that keeps parent alive, we own a ref.
-} PyUpb_ByNameMap;
-
-PyUpb_ByNameMap* PyUpb_ByNameMap_Self(PyObject* obj) {
-  assert(Py_TYPE(obj) == PyUpb_ModuleState_Get()->by_name_map_type);
-  return (PyUpb_ByNameMap*)obj;
-}
-
-static void PyUpb_ByNameMap_Dealloc(PyObject* _self) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  Py_DECREF(self->parent_obj);
-  PyUpb_Dealloc(self);
-}
-
-PyObject* PyUpb_ByNameMap_New(const PyUpb_ByNameMap_Funcs* funcs,
-                              const void* parent, PyObject* parent_obj) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_ByNameMap* map = (void*)PyType_GenericAlloc(s->by_name_map_type, 0);
-  map->funcs = funcs;
-  map->parent = parent;
-  map->parent_obj = parent_obj;
-  Py_INCREF(parent_obj);
-  return &map->ob_base;
-}
-
-static Py_ssize_t PyUpb_ByNameMap_Length(PyObject* _self) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  return self->funcs->base.get_elem_count(self->parent);
-}
-
-static PyObject* PyUpb_ByNameMap_Subscript(PyObject* _self, PyObject* key) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  const char* name = PyUpb_GetStrData(key);
-  const void* elem = name ? self->funcs->lookup(self->parent, name) : NULL;
-
-  if (!name && PyObject_Hash(key) == -1) return NULL;
-
-  if (elem) {
-    return self->funcs->base.get_elem_wrapper(elem);
-  } else {
-    PyErr_SetObject(PyExc_KeyError, key);
-    return NULL;
-  }
-}
-
-static int PyUpb_ByNameMap_AssignSubscript(PyObject* self, PyObject* key,
-                                           PyObject* value) {
-  PyErr_Format(PyExc_TypeError, PYUPB_MODULE_NAME
-               ".ByNameMap' object does not support item assignment");
-  return -1;
-}
-
-static int PyUpb_ByNameMap_Contains(PyObject* _self, PyObject* key) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  const char* name = PyUpb_GetStrData(key);
-  const void* elem = name ? self->funcs->lookup(self->parent, name) : NULL;
-  if (!name && PyObject_Hash(key) == -1) return -1;
-  return elem ? 1 : 0;
-}
-
-static PyObject* PyUpb_ByNameMap_Get(PyObject* _self, PyObject* args) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  PyObject* key;
-  PyObject* default_value = Py_None;
-  if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &default_value)) {
-    return NULL;
-  }
-
-  const char* name = PyUpb_GetStrData(key);
-  const void* elem = name ? self->funcs->lookup(self->parent, name) : NULL;
-
-  if (!name && PyObject_Hash(key) == -1) return NULL;
-
-  if (elem) {
-    return self->funcs->base.get_elem_wrapper(elem);
-  } else {
-    Py_INCREF(default_value);
-    return default_value;
-  }
-}
-
-static PyObject* PyUpb_ByNameMap_GetIter(PyObject* _self) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  return PyUpb_ByNameIterator_New(self->funcs, self->parent, self->parent_obj);
-}
-
-static PyObject* PyUpb_ByNameMap_Keys(PyObject* _self, PyObject* args) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    PyObject* key = PyUnicode_FromString(self->funcs->get_elem_name(elem));
-    if (!key) goto error;
-    PyList_SetItem(ret, i, key);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-static PyObject* PyUpb_ByNameMap_Values(PyObject* _self, PyObject* args) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    PyObject* py_elem = self->funcs->base.get_elem_wrapper(elem);
-    if (!py_elem) goto error;
-    PyList_SetItem(ret, i, py_elem);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-static PyObject* PyUpb_ByNameMap_Items(PyObject* _self, PyObject* args) {
-  PyUpb_ByNameMap* self = (PyUpb_ByNameMap*)_self;
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  PyObject* item;
-  PyObject* py_elem;
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    item = PyTuple_New(2);
-    py_elem = self->funcs->base.get_elem_wrapper(elem);
-    if (!item || !py_elem) goto error;
-    PyTuple_SetItem(item, 0,
-                    PyUnicode_FromString(self->funcs->get_elem_name(elem)));
-    PyTuple_SetItem(item, 1, py_elem);
-    PyList_SetItem(ret, i, item);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(py_elem);
-  Py_XDECREF(item);
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-// A mapping container can only be equal to another mapping container, or (for
-// backward compatibility) to a dict containing the same items.
-// Returns 1 if equal, 0 if unequal, -1 on error.
-static int PyUpb_ByNameMap_IsEqual(PyUpb_ByNameMap* self, PyObject* other) {
-  // Check the identity of C++ pointers.
-  if (PyObject_TypeCheck(other, Py_TYPE(self))) {
-    PyUpb_ByNameMap* other_map = (void*)other;
-    return self->parent == other_map->parent && self->funcs == other_map->funcs;
-  }
-
-  if (!PyDict_Check(other)) return 0;
-
-  PyObject* self_dict = PyDict_New();
-  PyDict_Merge(self_dict, (PyObject*)self, 0);
-  int eq = PyObject_RichCompareBool(self_dict, other, Py_EQ);
-  Py_DECREF(self_dict);
-  return eq;
-}
-
-static PyObject* PyUpb_ByNameMap_RichCompare(PyObject* _self, PyObject* other,
-                                             int opid) {
-  PyUpb_ByNameMap* self = PyUpb_ByNameMap_Self(_self);
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_RETURN_NOTIMPLEMENTED;
-  }
-  bool ret = PyUpb_ByNameMap_IsEqual(self, other);
-  if (opid == Py_NE) ret = !ret;
-  return PyBool_FromLong(ret);
-}
-
-static PyMethodDef PyUpb_ByNameMap_Methods[] = {
-    {"get", (PyCFunction)&PyUpb_ByNameMap_Get, METH_VARARGS},
-    {"keys", PyUpb_ByNameMap_Keys, METH_NOARGS},
-    {"values", PyUpb_ByNameMap_Values, METH_NOARGS},
-    {"items", PyUpb_ByNameMap_Items, METH_NOARGS},
-    {NULL}};
-
-static PyType_Slot PyUpb_ByNameMap_Slots[] = {
-    {Py_mp_ass_subscript, PyUpb_ByNameMap_AssignSubscript},
-    {Py_mp_length, PyUpb_ByNameMap_Length},
-    {Py_mp_subscript, PyUpb_ByNameMap_Subscript},
-    {Py_sq_contains, &PyUpb_ByNameMap_Contains},
-    {Py_tp_dealloc, &PyUpb_ByNameMap_Dealloc},
-    {Py_tp_iter, PyUpb_ByNameMap_GetIter},
-    {Py_tp_methods, &PyUpb_ByNameMap_Methods},
-    {Py_tp_repr, &PyUpb_DescriptorMap_Repr},
-    {Py_tp_richcompare, &PyUpb_ByNameMap_RichCompare},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_ByNameMap_Spec = {
-    PYUPB_MODULE_NAME "._ByNameMap",  // tp_name
-    sizeof(PyUpb_ByNameMap),          // tp_basicsize
-    0,                                // tp_itemsize
-    Py_TPFLAGS_DEFAULT,               // tp_flags
-    PyUpb_ByNameMap_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// ByNumberMap
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  const PyUpb_ByNumberMap_Funcs* funcs;
-  const void* parent;    // upb_MessageDef*, upb_DefPool*, etc.
-  PyObject* parent_obj;  // Python object that keeps parent alive, we own a ref.
-} PyUpb_ByNumberMap;
-
-PyUpb_ByNumberMap* PyUpb_ByNumberMap_Self(PyObject* obj) {
-  assert(Py_TYPE(obj) == PyUpb_ModuleState_Get()->by_number_map_type);
-  return (PyUpb_ByNumberMap*)obj;
-}
-
-PyObject* PyUpb_ByNumberMap_New(const PyUpb_ByNumberMap_Funcs* funcs,
-                                const void* parent, PyObject* parent_obj) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_ByNumberMap* map = (void*)PyType_GenericAlloc(s->by_number_map_type, 0);
-  map->funcs = funcs;
-  map->parent = parent;
-  map->parent_obj = parent_obj;
-  Py_INCREF(parent_obj);
-  return &map->ob_base;
-}
-
-static void PyUpb_ByNumberMap_Dealloc(PyObject* _self) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  Py_DECREF(self->parent_obj);
-  PyUpb_Dealloc(self);
-}
-
-static Py_ssize_t PyUpb_ByNumberMap_Length(PyObject* _self) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  return self->funcs->base.get_elem_count(self->parent);
-}
-
-static const void* PyUpb_ByNumberMap_LookupHelper(PyUpb_ByNumberMap* self,
-                                                  PyObject* key) {
-  long num = PyLong_AsLong(key);
-  if (num == -1 && PyErr_Occurred()) {
-    PyErr_Clear();
-    // Ensure that the key is hashable (this will raise an error if not).
-    PyObject_Hash(key);
-    return NULL;
-  } else {
-    return self->funcs->lookup(self->parent, num);
-  }
-}
-
-static PyObject* PyUpb_ByNumberMap_Subscript(PyObject* _self, PyObject* key) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  const void* elem = PyUpb_ByNumberMap_LookupHelper(self, key);
-  if (elem) {
-    return self->funcs->base.get_elem_wrapper(elem);
-  } else {
-    if (!PyErr_Occurred()) {
-      PyErr_SetObject(PyExc_KeyError, key);
-    }
-    return NULL;
-  }
-}
-
-static int PyUpb_ByNumberMap_AssignSubscript(PyObject* self, PyObject* key,
-                                             PyObject* value) {
-  PyErr_Format(PyExc_TypeError, PYUPB_MODULE_NAME
-               ".ByNumberMap' object does not support item assignment");
-  return -1;
-}
-
-static PyObject* PyUpb_ByNumberMap_Get(PyObject* _self, PyObject* args) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  PyObject* key;
-  PyObject* default_value = Py_None;
-  if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &default_value)) {
-    return NULL;
-  }
-
-  const void* elem = PyUpb_ByNumberMap_LookupHelper(self, key);
-  if (elem) {
-    return self->funcs->base.get_elem_wrapper(elem);
-  } else if (PyErr_Occurred()) {
-    return NULL;
-  } else {
-    return PyUpb_NewRef(default_value);
-  }
-}
-
-static PyObject* PyUpb_ByNumberMap_GetIter(PyObject* _self) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  return PyUpb_ByNumberIterator_New(self->funcs, self->parent,
-                                    self->parent_obj);
-}
-
-static PyObject* PyUpb_ByNumberMap_Keys(PyObject* _self, PyObject* args) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    PyObject* key = PyLong_FromLong(self->funcs->get_elem_num(elem));
-    if (!key) goto error;
-    PyList_SetItem(ret, i, key);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-static PyObject* PyUpb_ByNumberMap_Values(PyObject* _self, PyObject* args) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    PyObject* py_elem = self->funcs->base.get_elem_wrapper(elem);
-    if (!py_elem) goto error;
-    PyList_SetItem(ret, i, py_elem);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-static PyObject* PyUpb_ByNumberMap_Items(PyObject* _self, PyObject* args) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  int n = self->funcs->base.get_elem_count(self->parent);
-  PyObject* ret = PyList_New(n);
-  PyObject* item;
-  PyObject* py_elem;
-  if (!ret) return NULL;
-  for (int i = 0; i < n; i++) {
-    const void* elem = self->funcs->base.index(self->parent, i);
-    int number = self->funcs->get_elem_num(elem);
-    item = PyTuple_New(2);
-    py_elem = self->funcs->base.get_elem_wrapper(elem);
-    if (!item || !py_elem) goto error;
-    PyTuple_SetItem(item, 0, PyLong_FromLong(number));
-    PyTuple_SetItem(item, 1, py_elem);
-    PyList_SetItem(ret, i, item);
-  }
-  return ret;
-
-error:
-  Py_XDECREF(py_elem);
-  Py_XDECREF(item);
-  Py_XDECREF(ret);
-  return NULL;
-}
-
-static int PyUpb_ByNumberMap_Contains(PyObject* _self, PyObject* key) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  const void* elem = PyUpb_ByNumberMap_LookupHelper(self, key);
-  if (elem) return 1;
-  if (PyErr_Occurred()) return -1;
-  return 0;
-}
-
-// A mapping container can only be equal to another mapping container, or (for
-// backward compatibility) to a dict containing the same items.
-// Returns 1 if equal, 0 if unequal, -1 on error.
-static int PyUpb_ByNumberMap_IsEqual(PyUpb_ByNumberMap* self, PyObject* other) {
-  // Check the identity of C++ pointers.
-  if (PyObject_TypeCheck(other, Py_TYPE(self))) {
-    PyUpb_ByNumberMap* other_map = (void*)other;
-    return self->parent == other_map->parent && self->funcs == other_map->funcs;
-  }
-
-  if (!PyDict_Check(other)) return 0;
-
-  PyObject* self_dict = PyDict_New();
-  PyDict_Merge(self_dict, (PyObject*)self, 0);
-  int eq = PyObject_RichCompareBool(self_dict, other, Py_EQ);
-  Py_DECREF(self_dict);
-  return eq;
-}
-
-static PyObject* PyUpb_ByNumberMap_RichCompare(PyObject* _self, PyObject* other,
-                                               int opid) {
-  PyUpb_ByNumberMap* self = PyUpb_ByNumberMap_Self(_self);
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_RETURN_NOTIMPLEMENTED;
-  }
-  bool ret = PyUpb_ByNumberMap_IsEqual(self, other);
-  if (opid == Py_NE) ret = !ret;
-  return PyBool_FromLong(ret);
-}
-
-static PyMethodDef PyUpb_ByNumberMap_Methods[] = {
-    {"get", (PyCFunction)&PyUpb_ByNumberMap_Get, METH_VARARGS},
-    {"keys", PyUpb_ByNumberMap_Keys, METH_NOARGS},
-    {"values", PyUpb_ByNumberMap_Values, METH_NOARGS},
-    {"items", PyUpb_ByNumberMap_Items, METH_NOARGS},
-    {NULL}};
-
-static PyType_Slot PyUpb_ByNumberMap_Slots[] = {
-    {Py_mp_ass_subscript, PyUpb_ByNumberMap_AssignSubscript},
-    {Py_mp_length, PyUpb_ByNumberMap_Length},
-    {Py_mp_subscript, PyUpb_ByNumberMap_Subscript},
-    {Py_sq_contains, &PyUpb_ByNumberMap_Contains},
-    {Py_tp_dealloc, &PyUpb_ByNumberMap_Dealloc},
-    {Py_tp_iter, PyUpb_ByNumberMap_GetIter},
-    {Py_tp_methods, &PyUpb_ByNumberMap_Methods},
-    {Py_tp_repr, &PyUpb_DescriptorMap_Repr},
-    {Py_tp_richcompare, &PyUpb_ByNumberMap_RichCompare},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_ByNumberMap_Spec = {
-    PYUPB_MODULE_NAME "._ByNumberMap",  // tp_name
-    sizeof(PyUpb_ByNumberMap),          // tp_basicsize
-    0,                                  // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                 // tp_flags
-    PyUpb_ByNumberMap_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-bool PyUpb_InitDescriptorContainers(PyObject* m) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_GetFromModule(m);
-
-  s->by_name_map_type = PyUpb_AddClass(m, &PyUpb_ByNameMap_Spec);
-  s->by_number_map_type = PyUpb_AddClass(m, &PyUpb_ByNumberMap_Spec);
-  s->by_name_iterator_type = PyUpb_AddClass(m, &PyUpb_ByNameIterator_Spec);
-  s->by_number_iterator_type = PyUpb_AddClass(m, &PyUpb_ByNumberIterator_Spec);
-  s->generic_sequence_type = PyUpb_AddClass(m, &PyUpb_GenericSequence_Spec);
-
-  return s->by_name_map_type && s->by_number_map_type &&
-         s->by_name_iterator_type && s->by_number_iterator_type &&
-         s->generic_sequence_type;
-}
diff --git a/third_party/upb/python/descriptor_containers.h b/third_party/upb/python/descriptor_containers.h
deleted file mode 100644
index 276aea558a2ed..0000000000000
--- a/third_party/upb/python/descriptor_containers.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_DESCRIPTOR_CONTAINERS_H__
-#define PYUPB_DESCRIPTOR_CONTAINERS_H__
-
-// This file defines immutable Python containiner types whose data comes from
-// an underlying descriptor (def).
-//
-// Because there are many instances of these types that vend different kinds of
-// data (fields, oneofs, enums, etc) these types accept a "vtable" of function
-// pointers. This saves us from having to define numerous distinct Python types
-// for each kind of data we want to vend.
-//
-// The underlying upb APIs follow a consistent pattern that allows us to use
-// those functions directly inside these vtables, greatly reducing the amount of
-// "adaptor" code we need to write.
-
-#include <stdbool.h>
-
-#include "protobuf.h"
-#include "upb/reflection/def.h"
-
-// -----------------------------------------------------------------------------
-// PyUpb_GenericSequence
-// -----------------------------------------------------------------------------
-
-// A Python object that vends a sequence of descriptors.
-
-typedef struct {
-  // Returns the number of elements in the map.
-  int (*get_elem_count)(const void* parent);
-  // Returns an element by index.
-  const void* (*index)(const void* parent, int idx);
-  // Returns a Python object wrapping this element, caller owns a ref.
-  PyObject* (*get_elem_wrapper)(const void* elem);
-} PyUpb_GenericSequence_Funcs;
-
-// Returns a new GenericSequence.  The vtable `funcs` must outlive this object
-// (generally it should be static).  The GenericSequence will take a ref on
-// `parent_obj`, which must be sufficient to keep `parent` alive.  The object
-// `parent` will be passed as an argument to the functions in `funcs`.
-PyObject* PyUpb_GenericSequence_New(const PyUpb_GenericSequence_Funcs* funcs,
-                                    const void* parent, PyObject* parent_obj);
-
-// -----------------------------------------------------------------------------
-// PyUpb_ByNameMap
-// -----------------------------------------------------------------------------
-
-// A Python object that vends a name->descriptor map.
-
-typedef struct {
-  PyUpb_GenericSequence_Funcs base;
-  // Looks up by name and returns either a pointer to the element or NULL.
-  const void* (*lookup)(const void* parent, const char* key);
-  // Returns the name associated with this element.
-  const char* (*get_elem_name)(const void* elem);
-} PyUpb_ByNameMap_Funcs;
-
-// Returns a new ByNameMap.  The vtable `funcs` must outlive this object
-// (generally it should be static).  The ByNameMap will take a ref on
-// `parent_obj`, which must be sufficient to keep `parent` alive.  The object
-// `parent` will be passed as an argument to the functions in `funcs`.
-PyObject* PyUpb_ByNameMap_New(const PyUpb_ByNameMap_Funcs* funcs,
-                              const void* parent, PyObject* parent_obj);
-
-// -----------------------------------------------------------------------------
-// PyUpb_ByNumberMap
-// -----------------------------------------------------------------------------
-
-// A Python object that vends a number->descriptor map.
-
-typedef struct {
-  PyUpb_GenericSequence_Funcs base;
-  // Looks up by name and returns either a pointer to the element or NULL.
-  const void* (*lookup)(const void* parent, int num);
-  // Returns the name associated with this element.
-  int (*get_elem_num)(const void* elem);
-} PyUpb_ByNumberMap_Funcs;
-
-// Returns a new ByNumberMap.  The vtable `funcs` must outlive this object
-// (generally it should be static).  The ByNumberMap will take a ref on
-// `parent_obj`, which must be sufficient to keep `parent` alive.  The object
-// `parent` will be passed as an argument to the functions in `funcs`.
-PyObject* PyUpb_ByNumberMap_New(const PyUpb_ByNumberMap_Funcs* funcs,
-                                const void* parent, PyObject* parent_obj);
-
-bool PyUpb_InitDescriptorContainers(PyObject* m);
-
-#endif  // PYUPB_DESCRIPTOR_CONTAINERS_H__
diff --git a/third_party/upb/python/descriptor_pool.c b/third_party/upb/python/descriptor_pool.c
deleted file mode 100644
index f6083f7d6bb4f..0000000000000
--- a/third_party/upb/python/descriptor_pool.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/descriptor_pool.h"
-
-#include "google/protobuf/descriptor.upbdefs.h"
-#include "python/convert.h"
-#include "python/descriptor.h"
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/reflection/def.h"
-#include "upb/util/def_to_proto.h"
-
-// -----------------------------------------------------------------------------
-// DescriptorPool
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  upb_DefPool* symtab;
-  PyObject* db;  // The DescriptorDatabase underlying this pool.  May be NULL.
-} PyUpb_DescriptorPool;
-
-PyObject* PyUpb_DescriptorPool_GetDefaultPool(void) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  return s->default_pool;
-}
-
-const upb_MessageDef* PyUpb_DescriptorPool_GetFileProtoDef(void) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  if (!s->c_descriptor_symtab) {
-    s->c_descriptor_symtab = upb_DefPool_New();
-  }
-  return google_protobuf_FileDescriptorProto_getmsgdef(s->c_descriptor_symtab);
-}
-
-static PyObject* PyUpb_DescriptorPool_DoCreateWithCache(
-    PyTypeObject* type, PyObject* db, PyUpb_WeakMap* obj_cache) {
-  PyUpb_DescriptorPool* pool = (void*)PyType_GenericAlloc(type, 0);
-  pool->symtab = upb_DefPool_New();
-  pool->db = db;
-  Py_XINCREF(pool->db);
-  PyUpb_WeakMap_Add(obj_cache, pool->symtab, &pool->ob_base);
-  return &pool->ob_base;
-}
-
-static PyObject* PyUpb_DescriptorPool_DoCreate(PyTypeObject* type,
-                                               PyObject* db) {
-  return PyUpb_DescriptorPool_DoCreateWithCache(type, db,
-                                                PyUpb_ObjCache_Instance());
-}
-
-upb_DefPool* PyUpb_DescriptorPool_GetSymtab(PyObject* pool) {
-  return ((PyUpb_DescriptorPool*)pool)->symtab;
-}
-
-static int PyUpb_DescriptorPool_Traverse(PyUpb_DescriptorPool* self,
-                                         visitproc visit, void* arg) {
-  Py_VISIT(self->db);
-  return 0;
-}
-
-static int PyUpb_DescriptorPool_Clear(PyUpb_DescriptorPool* self) {
-  Py_CLEAR(self->db);
-  return 0;
-}
-
-PyObject* PyUpb_DescriptorPool_Get(const upb_DefPool* symtab) {
-  PyObject* pool = PyUpb_ObjCache_Get(symtab);
-  assert(pool);
-  return pool;
-}
-
-static void PyUpb_DescriptorPool_Dealloc(PyUpb_DescriptorPool* self) {
-  PyUpb_DescriptorPool_Clear(self);
-  upb_DefPool_Free(self->symtab);
-  PyUpb_ObjCache_Delete(self->symtab);
-  PyUpb_Dealloc(self);
-}
-
-/*
- * DescriptorPool.__new__()
- *
- * Implements:
- *   DescriptorPool(descriptor_db=None)
- */
-static PyObject* PyUpb_DescriptorPool_New(PyTypeObject* type, PyObject* args,
-                                          PyObject* kwargs) {
-  char* kwlist[] = {"descriptor_db", 0};
-  PyObject* db = NULL;
-
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwlist, &db)) {
-    return NULL;
-  }
-
-  if (db == Py_None) db = NULL;
-  return PyUpb_DescriptorPool_DoCreate(type, db);
-}
-
-static PyObject* PyUpb_DescriptorPool_DoAdd(PyObject* _self,
-                                            PyObject* file_desc);
-
-static bool PyUpb_DescriptorPool_TryLoadFileProto(PyUpb_DescriptorPool* self,
-                                                  PyObject* proto) {
-  if (proto == NULL) {
-    if (PyErr_ExceptionMatches(PyExc_KeyError)) {
-      // Expected error: item was simply not found.
-      PyErr_Clear();
-      return true;  // We didn't accomplish our goal, but we didn't error out.
-    }
-    return false;
-  }
-  if (proto == Py_None) return true;
-  PyObject* ret = PyUpb_DescriptorPool_DoAdd((PyObject*)self, proto);
-  bool ok = ret != NULL;
-  Py_XDECREF(ret);
-  return ok;
-}
-
-static bool PyUpb_DescriptorPool_TryLoadSymbol(PyUpb_DescriptorPool* self,
-                                               PyObject* sym) {
-  if (!self->db) return false;
-  PyObject* file_proto =
-      PyObject_CallMethod(self->db, "FindFileContainingSymbol", "O", sym);
-  bool ret = PyUpb_DescriptorPool_TryLoadFileProto(self, file_proto);
-  Py_XDECREF(file_proto);
-  return ret;
-}
-
-static bool PyUpb_DescriptorPool_TryLoadFilename(PyUpb_DescriptorPool* self,
-                                                 PyObject* filename) {
-  if (!self->db) return false;
-  PyObject* file_proto =
-      PyObject_CallMethod(self->db, "FindFileByName", "O", filename);
-  bool ret = PyUpb_DescriptorPool_TryLoadFileProto(self, file_proto);
-  Py_XDECREF(file_proto);
-  return ret;
-}
-
-bool PyUpb_DescriptorPool_CheckNoDatabase(PyObject* _self) { return true; }
-
-static bool PyUpb_DescriptorPool_LoadDependentFiles(
-    PyUpb_DescriptorPool* self, google_protobuf_FileDescriptorProto* proto) {
-  size_t n;
-  const upb_StringView* deps =
-      google_protobuf_FileDescriptorProto_dependency(proto, &n);
-  for (size_t i = 0; i < n; i++) {
-    const upb_FileDef* dep = upb_DefPool_FindFileByNameWithSize(
-        self->symtab, deps[i].data, deps[i].size);
-    if (!dep) {
-      PyObject* filename =
-          PyUnicode_FromStringAndSize(deps[i].data, deps[i].size);
-      if (!filename) return false;
-      bool ok = PyUpb_DescriptorPool_TryLoadFilename(self, filename);
-      Py_DECREF(filename);
-      if (!ok) return false;
-    }
-  }
-  return true;
-}
-
-static PyObject* PyUpb_DescriptorPool_DoAddSerializedFile(
-    PyObject* _self, PyObject* serialized_pb) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-  upb_Arena* arena = upb_Arena_New();
-  if (!arena) PYUPB_RETURN_OOM;
-  PyObject* result = NULL;
-
-  char* buf;
-  Py_ssize_t size;
-  if (PyBytes_AsStringAndSize(serialized_pb, &buf, &size) < 0) {
-    goto done;
-  }
-
-  google_protobuf_FileDescriptorProto* proto =
-      google_protobuf_FileDescriptorProto_parse(buf, size, arena);
-  if (!proto) {
-    PyErr_SetString(PyExc_TypeError, "Couldn't parse file content!");
-    goto done;
-  }
-
-  upb_StringView name = google_protobuf_FileDescriptorProto_name(proto);
-  const upb_FileDef* file =
-      upb_DefPool_FindFileByNameWithSize(self->symtab, name.data, name.size);
-
-  if (file) {
-    // If the existing file is equal to the new file, then silently ignore the
-    // duplicate add.
-    google_protobuf_FileDescriptorProto* existing =
-        upb_FileDef_ToProto(file, arena);
-    if (!existing) {
-      PyErr_SetNone(PyExc_MemoryError);
-      goto done;
-    }
-    const upb_MessageDef* m = PyUpb_DescriptorPool_GetFileProtoDef();
-    if (upb_Message_IsEqual(proto, existing, m)) {
-      result = PyUpb_FileDescriptor_Get(file);
-      goto done;
-    }
-  }
-
-  if (self->db) {
-    if (!PyUpb_DescriptorPool_LoadDependentFiles(self, proto)) goto done;
-  }
-
-  upb_Status status;
-  upb_Status_Clear(&status);
-
-  const upb_FileDef* filedef =
-      upb_DefPool_AddFile(self->symtab, proto, &status);
-  if (!filedef) {
-    PyErr_Format(PyExc_TypeError,
-                 "Couldn't build proto file into descriptor pool: %s",
-                 upb_Status_ErrorMessage(&status));
-    goto done;
-  }
-
-  result = PyUpb_FileDescriptor_Get(filedef);
-
-done:
-  upb_Arena_Free(arena);
-  return result;
-}
-
-static PyObject* PyUpb_DescriptorPool_DoAdd(PyObject* _self,
-                                            PyObject* file_desc) {
-  if (!PyUpb_Message_Verify(file_desc)) return NULL;
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(file_desc);
-  const char* file_proto_name =
-      PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FileDescriptorProto";
-  if (strcmp(upb_MessageDef_FullName(m), file_proto_name) != 0) {
-    return PyErr_Format(PyExc_TypeError, "Can only add FileDescriptorProto");
-  }
-  PyObject* subargs = PyTuple_New(0);
-  if (!subargs) return NULL;
-  PyObject* serialized =
-      PyUpb_Message_SerializeToString(file_desc, subargs, NULL);
-  Py_DECREF(subargs);
-  if (!serialized) return NULL;
-  PyObject* ret = PyUpb_DescriptorPool_DoAddSerializedFile(_self, serialized);
-  Py_DECREF(serialized);
-  return ret;
-}
-
-/*
- * PyUpb_DescriptorPool_AddSerializedFile()
- *
- * Implements:
- *   DescriptorPool.AddSerializedFile(self, serialized_file_descriptor)
- *
- * Adds the given serialized FileDescriptorProto to the pool.
- */
-static PyObject* PyUpb_DescriptorPool_AddSerializedFile(
-    PyObject* _self, PyObject* serialized_pb) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-  if (self->db) {
-    PyErr_SetString(
-        PyExc_ValueError,
-        "Cannot call AddSerializedFile on a DescriptorPool that uses a "
-        "DescriptorDatabase. Add your file to the underlying database.");
-    return false;
-  }
-  return PyUpb_DescriptorPool_DoAddSerializedFile(_self, serialized_pb);
-}
-
-static PyObject* PyUpb_DescriptorPool_Add(PyObject* _self,
-                                          PyObject* file_desc) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-  if (self->db) {
-    PyErr_SetString(
-        PyExc_ValueError,
-        "Cannot call Add on a DescriptorPool that uses a DescriptorDatabase. "
-        "Add your file to the underlying database.");
-    return false;
-  }
-  return PyUpb_DescriptorPool_DoAdd(_self, file_desc);
-}
-
-/*
- * PyUpb_DescriptorPool_FindFileByName()
- *
- * Implements:
- *   DescriptorPool.FindFileByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindFileByName(PyObject* _self,
-                                                     PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_FileDef* file = upb_DefPool_FindFileByName(self->symtab, name);
-  if (file == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadFilename(self, arg)) return NULL;
-    file = upb_DefPool_FindFileByName(self->symtab, name);
-  }
-  if (file == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find file %.200s", name);
-  }
-
-  return PyUpb_FileDescriptor_Get(file);
-}
-
-/*
- * PyUpb_DescriptorPool_FindExtensionByName()
- *
- * Implements:
- *   DescriptorPool.FindExtensionByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindExtensionByName(PyObject* _self,
-                                                          PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_FieldDef* field =
-      upb_DefPool_FindExtensionByName(self->symtab, name);
-  if (field == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    field = upb_DefPool_FindExtensionByName(self->symtab, name);
-  }
-  if (field == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find extension %.200s", name);
-  }
-
-  return PyUpb_FieldDescriptor_Get(field);
-}
-
-/*
- * PyUpb_DescriptorPool_FindMessageTypeByName()
- *
- * Implements:
- *   DescriptorPool.FindMessageTypeByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindMessageTypeByName(PyObject* _self,
-                                                            PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_MessageDef* m = upb_DefPool_FindMessageByName(self->symtab, name);
-  if (m == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    m = upb_DefPool_FindMessageByName(self->symtab, name);
-  }
-  if (m == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find message %.200s", name);
-  }
-
-  return PyUpb_Descriptor_Get(m);
-}
-
-// Splits a dotted symbol like foo.bar.baz on the last dot.  Returns the portion
-// after the last dot (baz) and updates `*parent_size` to the length of the
-// parent (foo.bar).  Returns NULL if no dots were present.
-static const char* PyUpb_DescriptorPool_SplitSymbolName(const char* sym,
-                                                        size_t* parent_size) {
-  const char* last_dot = strrchr(sym, '.');
-  if (!last_dot) return NULL;
-  *parent_size = last_dot - sym;
-  return last_dot + 1;
-}
-
-/*
- * PyUpb_DescriptorPool_FindFieldByName()
- *
- * Implements:
- *   DescriptorPool.FindFieldByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindFieldByName(PyObject* _self,
-                                                      PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  size_t parent_size;
-  const char* child = PyUpb_DescriptorPool_SplitSymbolName(name, &parent_size);
-  const upb_FieldDef* f = NULL;
-  if (child) {
-    const upb_MessageDef* parent =
-        upb_DefPool_FindMessageByNameWithSize(self->symtab, name, parent_size);
-    if (parent == NULL && self->db) {
-      if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-      parent = upb_DefPool_FindMessageByNameWithSize(self->symtab, name,
-                                                     parent_size);
-    }
-    if (parent) {
-      f = upb_MessageDef_FindFieldByName(parent, child);
-    }
-  }
-
-  if (!f) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find message %.200s", name);
-  }
-
-  return PyUpb_FieldDescriptor_Get(f);
-}
-
-/*
- * PyUpb_DescriptorPool_FindEnumTypeByName()
- *
- * Implements:
- *   DescriptorPool.FindEnumTypeByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindEnumTypeByName(PyObject* _self,
-                                                         PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_EnumDef* e = upb_DefPool_FindEnumByName(self->symtab, name);
-  if (e == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    e = upb_DefPool_FindEnumByName(self->symtab, name);
-  }
-  if (e == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find enum %.200s", name);
-  }
-
-  return PyUpb_EnumDescriptor_Get(e);
-}
-
-/*
- * PyUpb_DescriptorPool_FindOneofByName()
- *
- * Implements:
- *   DescriptorPool.FindOneofByName(self, name)
- */
-static PyObject* PyUpb_DescriptorPool_FindOneofByName(PyObject* _self,
-                                                      PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  size_t parent_size;
-  const char* child = PyUpb_DescriptorPool_SplitSymbolName(name, &parent_size);
-
-  if (child) {
-    const upb_MessageDef* parent =
-        upb_DefPool_FindMessageByNameWithSize(self->symtab, name, parent_size);
-    if (parent == NULL && self->db) {
-      if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-      parent = upb_DefPool_FindMessageByNameWithSize(self->symtab, name,
-                                                     parent_size);
-    }
-    if (parent) {
-      const upb_OneofDef* o = upb_MessageDef_FindOneofByName(parent, child);
-      return PyUpb_OneofDescriptor_Get(o);
-    }
-  }
-
-  return PyErr_Format(PyExc_KeyError, "Couldn't find oneof %.200s", name);
-}
-
-static PyObject* PyUpb_DescriptorPool_FindServiceByName(PyObject* _self,
-                                                        PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_ServiceDef* s = upb_DefPool_FindServiceByName(self->symtab, name);
-  if (s == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    s = upb_DefPool_FindServiceByName(self->symtab, name);
-  }
-  if (s == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find service %.200s", name);
-  }
-
-  return PyUpb_ServiceDescriptor_Get(s);
-}
-
-static PyObject* PyUpb_DescriptorPool_FindMethodByName(PyObject* _self,
-                                                       PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-  size_t parent_size;
-  const char* child = PyUpb_DescriptorPool_SplitSymbolName(name, &parent_size);
-
-  if (!child) goto err;
-  const upb_ServiceDef* parent =
-      upb_DefPool_FindServiceByNameWithSize(self->symtab, name, parent_size);
-  if (parent == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    parent =
-        upb_DefPool_FindServiceByNameWithSize(self->symtab, name, parent_size);
-  }
-  if (!parent) goto err;
-  const upb_MethodDef* m = upb_ServiceDef_FindMethodByName(parent, child);
-  if (!m) goto err;
-  return PyUpb_MethodDescriptor_Get(m);
-
-err:
-  return PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
-}
-
-static PyObject* PyUpb_DescriptorPool_FindFileContainingSymbol(PyObject* _self,
-                                                               PyObject* arg) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-
-  const char* name = PyUpb_VerifyStrData(arg);
-  if (!name) return NULL;
-
-  const upb_FileDef* f =
-      upb_DefPool_FindFileContainingSymbol(self->symtab, name);
-  if (f == NULL && self->db) {
-    if (!PyUpb_DescriptorPool_TryLoadSymbol(self, arg)) return NULL;
-    f = upb_DefPool_FindFileContainingSymbol(self->symtab, name);
-  }
-  if (f == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find symbol %.200s", name);
-  }
-
-  return PyUpb_FileDescriptor_Get(f);
-}
-
-static PyObject* PyUpb_DescriptorPool_FindExtensionByNumber(PyObject* _self,
-                                                            PyObject* args) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-  PyObject* message_descriptor;
-  int number;
-  if (!PyArg_ParseTuple(args, "Oi", &message_descriptor, &number)) {
-    return NULL;
-  }
-
-  const upb_FieldDef* f = upb_DefPool_FindExtensionByNumber(
-      self->symtab, PyUpb_Descriptor_GetDef(message_descriptor), number);
-  if (f == NULL) {
-    return PyErr_Format(PyExc_KeyError, "Couldn't find Extension %d", number);
-  }
-
-  return PyUpb_FieldDescriptor_Get(f);
-}
-
-static PyObject* PyUpb_DescriptorPool_FindAllExtensions(PyObject* _self,
-                                                        PyObject* msg_desc) {
-  PyUpb_DescriptorPool* self = (PyUpb_DescriptorPool*)_self;
-  const upb_MessageDef* m = PyUpb_Descriptor_GetDef(msg_desc);
-  size_t n;
-  const upb_FieldDef** ext = upb_DefPool_GetAllExtensions(self->symtab, m, &n);
-  PyObject* ret = PyList_New(n);
-  if (!ret) goto done;
-  for (size_t i = 0; i < n; i++) {
-    PyObject* field = PyUpb_FieldDescriptor_Get(ext[i]);
-    if (!field) {
-      Py_DECREF(ret);
-      ret = NULL;
-      goto done;
-    }
-    PyList_SetItem(ret, i, field);
-  }
-done:
-  free(ext);
-  return ret;
-}
-
-static PyMethodDef PyUpb_DescriptorPool_Methods[] = {
-    {"Add", PyUpb_DescriptorPool_Add, METH_O,
-     "Adds the FileDescriptorProto and its types to this pool."},
-    {"AddSerializedFile", PyUpb_DescriptorPool_AddSerializedFile, METH_O,
-     "Adds a serialized FileDescriptorProto to this pool."},
-    {"FindFileByName", PyUpb_DescriptorPool_FindFileByName, METH_O,
-     "Searches for a file descriptor by its .proto name."},
-    {"FindMessageTypeByName", PyUpb_DescriptorPool_FindMessageTypeByName,
-     METH_O, "Searches for a message descriptor by full name."},
-    {"FindFieldByName", PyUpb_DescriptorPool_FindFieldByName, METH_O,
-     "Searches for a field descriptor by full name."},
-    {"FindExtensionByName", PyUpb_DescriptorPool_FindExtensionByName, METH_O,
-     "Searches for extension descriptor by full name."},
-    {"FindEnumTypeByName", PyUpb_DescriptorPool_FindEnumTypeByName, METH_O,
-     "Searches for enum type descriptor by full name."},
-    {"FindOneofByName", PyUpb_DescriptorPool_FindOneofByName, METH_O,
-     "Searches for oneof descriptor by full name."},
-    {"FindServiceByName", PyUpb_DescriptorPool_FindServiceByName, METH_O,
-     "Searches for service descriptor by full name."},
-    {"FindMethodByName", PyUpb_DescriptorPool_FindMethodByName, METH_O,
-     "Searches for method descriptor by full name."},
-    {"FindFileContainingSymbol", PyUpb_DescriptorPool_FindFileContainingSymbol,
-     METH_O, "Gets the FileDescriptor containing the specified symbol."},
-    {"FindExtensionByNumber", PyUpb_DescriptorPool_FindExtensionByNumber,
-     METH_VARARGS, "Gets the extension descriptor for the given number."},
-    {"FindAllExtensions", PyUpb_DescriptorPool_FindAllExtensions, METH_O,
-     "Gets all known extensions of the given message descriptor."},
-    {NULL}};
-
-static PyType_Slot PyUpb_DescriptorPool_Slots[] = {
-    {Py_tp_clear, PyUpb_DescriptorPool_Clear},
-    {Py_tp_dealloc, PyUpb_DescriptorPool_Dealloc},
-    {Py_tp_methods, PyUpb_DescriptorPool_Methods},
-    {Py_tp_new, PyUpb_DescriptorPool_New},
-    {Py_tp_traverse, PyUpb_DescriptorPool_Traverse},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_DescriptorPool_Spec = {
-    PYUPB_MODULE_NAME ".DescriptorPool",
-    sizeof(PyUpb_DescriptorPool),
-    0,  // tp_itemsize
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
-    PyUpb_DescriptorPool_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-bool PyUpb_InitDescriptorPool(PyObject* m) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-  PyTypeObject* descriptor_pool_type =
-      PyUpb_AddClass(m, &PyUpb_DescriptorPool_Spec);
-
-  if (!descriptor_pool_type) return false;
-
-  state->default_pool = PyUpb_DescriptorPool_DoCreateWithCache(
-      descriptor_pool_type, NULL, state->obj_cache);
-  return state->default_pool &&
-         PyModule_AddObject(m, "default_pool", state->default_pool) == 0;
-}
diff --git a/third_party/upb/python/descriptor_pool.h b/third_party/upb/python/descriptor_pool.h
deleted file mode 100644
index 41b7c3e5cf177..0000000000000
--- a/third_party/upb/python/descriptor_pool.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_DESCRIPTOR_POOL_H__
-#define PYUPB_DESCRIPTOR_POOL_H__
-
-#include <stdbool.h>
-
-#include "protobuf.h"
-
-// Returns a Python wrapper object for the given symtab. The symtab must have
-// been created from a Python DescriptorPool originally.
-PyObject* PyUpb_DescriptorPool_Get(const upb_DefPool* symtab);
-
-// Given a Python DescriptorPool, returns the underlying symtab.
-upb_DefPool* PyUpb_DescriptorPool_GetSymtab(PyObject* pool);
-
-// Returns the default DescriptorPool (a global singleton).
-PyObject* PyUpb_DescriptorPool_GetDefaultPool(void);
-
-// Module-level init.
-bool PyUpb_InitDescriptorPool(PyObject* m);
-
-#endif  // PYUPB_DESCRIPTOR_POOL_H__
diff --git a/third_party/upb/python/extension_dict.c b/third_party/upb/python/extension_dict.c
deleted file mode 100644
index 48bb2de799861..0000000000000
--- a/third_party/upb/python/extension_dict.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/extension_dict.h"
-
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/reflection/def.h"
-
-// -----------------------------------------------------------------------------
-// ExtensionDict
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  PyObject* msg;  // Owning ref to our parent pessage.
-} PyUpb_ExtensionDict;
-
-PyObject* PyUpb_ExtensionDict_New(PyObject* msg) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyUpb_ExtensionDict* ext_dict =
-      (void*)PyType_GenericAlloc(state->extension_dict_type, 0);
-  ext_dict->msg = msg;
-  Py_INCREF(ext_dict->msg);
-  return &ext_dict->ob_base;
-}
-
-static PyObject* PyUpb_ExtensionDict_FindExtensionByName(PyObject* _self,
-                                                         PyObject* key) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  const char* name = PyUpb_GetStrData(key);
-  if (!name) {
-    PyErr_Format(PyExc_TypeError, "_FindExtensionByName expect a str");
-    return NULL;
-  }
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(self->msg);
-  const upb_FileDef* file = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(file);
-  const upb_FieldDef* ext = upb_DefPool_FindExtensionByName(symtab, name);
-  if (ext) {
-    return PyUpb_FieldDescriptor_Get(ext);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static PyObject* PyUpb_ExtensionDict_FindExtensionByNumber(PyObject* _self,
-                                                           PyObject* arg) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(self->msg);
-  const upb_MiniTable* l = upb_MessageDef_MiniTable(m);
-  const upb_FileDef* file = upb_MessageDef_File(m);
-  const upb_DefPool* symtab = upb_FileDef_Pool(file);
-  const upb_ExtensionRegistry* reg = upb_DefPool_ExtensionRegistry(symtab);
-  int64_t number = PyLong_AsLong(arg);
-  if (number == -1 && PyErr_Occurred()) return NULL;
-  const upb_MiniTableExtension* ext =
-      (upb_MiniTableExtension*)upb_ExtensionRegistry_Lookup(reg, l, number);
-  if (ext) {
-    const upb_FieldDef* f = upb_DefPool_FindExtensionByMiniTable(symtab, ext);
-    return PyUpb_FieldDescriptor_Get(f);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static void PyUpb_ExtensionDict_Dealloc(PyUpb_ExtensionDict* self) {
-  PyUpb_Message_ClearExtensionDict(self->msg);
-  Py_DECREF(self->msg);
-  PyUpb_Dealloc(self);
-}
-
-static PyObject* PyUpb_ExtensionDict_RichCompare(PyObject* _self,
-                                                 PyObject* _other, int opid) {
-  // Only equality comparisons are implemented.
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  bool equals = false;
-  if (PyObject_TypeCheck(_other, Py_TYPE(_self))) {
-    PyUpb_ExtensionDict* other = (PyUpb_ExtensionDict*)_other;
-    equals = self->msg == other->msg;
-  }
-  bool ret = opid == Py_EQ ? equals : !equals;
-  return PyBool_FromLong(ret);
-}
-
-static int PyUpb_ExtensionDict_Contains(PyObject* _self, PyObject* key) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  const upb_FieldDef* f = PyUpb_Message_GetExtensionDef(self->msg, key);
-  if (!f) return -1;
-  upb_Message* msg = PyUpb_Message_GetIfReified(self->msg);
-  if (!msg) return 0;
-  if (upb_FieldDef_IsRepeated(f)) {
-    upb_MessageValue val = upb_Message_GetFieldByDef(msg, f);
-    return upb_Array_Size(val.array_val) > 0;
-  } else {
-    return upb_Message_HasFieldByDef(msg, f);
-  }
-}
-
-static Py_ssize_t PyUpb_ExtensionDict_Length(PyObject* _self) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  upb_Message* msg = PyUpb_Message_GetIfReified(self->msg);
-  return msg ? upb_Message_ExtensionCount(msg) : 0;
-}
-
-static PyObject* PyUpb_ExtensionDict_Subscript(PyObject* _self, PyObject* key) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  const upb_FieldDef* f = PyUpb_Message_GetExtensionDef(self->msg, key);
-  if (!f) return NULL;
-  return PyUpb_Message_GetFieldValue(self->msg, f);
-}
-
-static int PyUpb_ExtensionDict_AssignSubscript(PyObject* _self, PyObject* key,
-                                               PyObject* val) {
-  PyUpb_ExtensionDict* self = (PyUpb_ExtensionDict*)_self;
-  const upb_FieldDef* f = PyUpb_Message_GetExtensionDef(self->msg, key);
-  if (!f) return -1;
-  if (val) {
-    return PyUpb_Message_SetFieldValue(self->msg, f, val, PyExc_TypeError);
-  } else {
-    PyUpb_Message_DoClearField(self->msg, f);
-    return 0;
-  }
-}
-
-static PyObject* PyUpb_ExtensionIterator_New(PyObject* _ext_dict);
-
-static PyMethodDef PyUpb_ExtensionDict_Methods[] = {
-    {"_FindExtensionByName", PyUpb_ExtensionDict_FindExtensionByName, METH_O,
-     "Finds an extension by name."},
-    {"_FindExtensionByNumber", PyUpb_ExtensionDict_FindExtensionByNumber,
-     METH_O, "Finds an extension by number."},
-    {NULL, NULL},
-};
-
-static PyType_Slot PyUpb_ExtensionDict_Slots[] = {
-    {Py_tp_dealloc, PyUpb_ExtensionDict_Dealloc},
-    {Py_tp_methods, PyUpb_ExtensionDict_Methods},
-    //{Py_tp_getset, PyUpb_ExtensionDict_Getters},
-    //{Py_tp_hash, PyObject_HashNotImplemented},
-    {Py_tp_richcompare, PyUpb_ExtensionDict_RichCompare},
-    {Py_tp_iter, PyUpb_ExtensionIterator_New},
-    {Py_sq_contains, PyUpb_ExtensionDict_Contains},
-    {Py_sq_length, PyUpb_ExtensionDict_Length},
-    {Py_mp_length, PyUpb_ExtensionDict_Length},
-    {Py_mp_subscript, PyUpb_ExtensionDict_Subscript},
-    {Py_mp_ass_subscript, PyUpb_ExtensionDict_AssignSubscript},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_ExtensionDict_Spec = {
-    PYUPB_MODULE_NAME ".ExtensionDict",  // tp_name
-    sizeof(PyUpb_ExtensionDict),         // tp_basicsize
-    0,                                   // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    PyUpb_ExtensionDict_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// ExtensionIterator
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  PyObject* msg;
-  size_t iter;
-} PyUpb_ExtensionIterator;
-
-static PyObject* PyUpb_ExtensionIterator_New(PyObject* _ext_dict) {
-  PyUpb_ExtensionDict* ext_dict = (PyUpb_ExtensionDict*)_ext_dict;
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyUpb_ExtensionIterator* iter =
-      (void*)PyType_GenericAlloc(state->extension_iterator_type, 0);
-  if (!iter) return NULL;
-  iter->msg = ext_dict->msg;
-  iter->iter = kUpb_Message_Begin;
-  Py_INCREF(iter->msg);
-  return &iter->ob_base;
-}
-
-static void PyUpb_ExtensionIterator_Dealloc(void* _self) {
-  PyUpb_ExtensionIterator* self = (PyUpb_ExtensionIterator*)_self;
-  Py_DECREF(self->msg);
-  PyUpb_Dealloc(_self);
-}
-
-PyObject* PyUpb_ExtensionIterator_IterNext(PyObject* _self) {
-  PyUpb_ExtensionIterator* self = (PyUpb_ExtensionIterator*)_self;
-  upb_Message* msg = PyUpb_Message_GetIfReified(self->msg);
-  if (!msg) return NULL;
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(self->msg);
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m));
-  while (true) {
-    const upb_FieldDef* f;
-    upb_MessageValue val;
-    if (!upb_Message_Next(msg, m, symtab, &f, &val, &self->iter)) return NULL;
-    if (upb_FieldDef_IsExtension(f)) return PyUpb_FieldDescriptor_Get(f);
-  }
-}
-
-static PyType_Slot PyUpb_ExtensionIterator_Slots[] = {
-    {Py_tp_dealloc, PyUpb_ExtensionIterator_Dealloc},
-    {Py_tp_iter, PyObject_SelfIter},
-    {Py_tp_iternext, PyUpb_ExtensionIterator_IterNext},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_ExtensionIterator_Spec = {
-    PYUPB_MODULE_NAME ".ExtensionIterator",  // tp_name
-    sizeof(PyUpb_ExtensionIterator),         // tp_basicsize
-    0,                                       // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                      // tp_flags
-    PyUpb_ExtensionIterator_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-bool PyUpb_InitExtensionDict(PyObject* m) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_GetFromModule(m);
-
-  s->extension_dict_type = PyUpb_AddClass(m, &PyUpb_ExtensionDict_Spec);
-  s->extension_iterator_type = PyUpb_AddClass(m, &PyUpb_ExtensionIterator_Spec);
-
-  return s->extension_dict_type && s->extension_iterator_type;
-}
diff --git a/third_party/upb/python/extension_dict.h b/third_party/upb/python/extension_dict.h
deleted file mode 100644
index a21822c0ee482..0000000000000
--- a/third_party/upb/python/extension_dict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_EXTENSION_DICT_H__
-#define PYUPB_EXTENSION_DICT_H__
-
-#include <stdbool.h>
-
-#include "python/python_api.h"
-
-PyObject* PyUpb_ExtensionDict_New(PyObject* msg);
-
-bool PyUpb_InitExtensionDict(PyObject* m);
-
-#endif  // PYUPB_EXTENSION_DICT_H__
diff --git a/third_party/upb/python/map.c b/third_party/upb/python/map.c
deleted file mode 100644
index eea57e63d4536..0000000000000
--- a/third_party/upb/python/map.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/map.h"
-
-#include "python/convert.h"
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/map.h"
-#include "upb/reflection/def.h"
-
-// -----------------------------------------------------------------------------
-// MapContainer
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  PyObject* arena;
-  // The field descriptor (upb_FieldDef*).
-  // The low bit indicates whether the container is reified (see ptr below).
-  //   - low bit set: repeated field is a stub (empty map, no underlying data).
-  //   - low bit clear: repeated field is reified (points to upb_Array).
-  uintptr_t field;
-  union {
-    PyObject* parent;  // stub: owning pointer to parent message.
-    upb_Map* map;      // reified: the data for this array.
-  } ptr;
-  int version;
-} PyUpb_MapContainer;
-
-static PyObject* PyUpb_MapIterator_New(PyUpb_MapContainer* map);
-
-static bool PyUpb_MapContainer_IsStub(PyUpb_MapContainer* self) {
-  return self->field & 1;
-}
-
-// If the map is reified, returns it.  Otherwise, returns NULL.
-// If NULL is returned, the object is empty and has no underlying data.
-static upb_Map* PyUpb_MapContainer_GetIfReified(PyUpb_MapContainer* self) {
-  return PyUpb_MapContainer_IsStub(self) ? NULL : self->ptr.map;
-}
-
-static const upb_FieldDef* PyUpb_MapContainer_GetField(
-    PyUpb_MapContainer* self) {
-  return (const upb_FieldDef*)(self->field & ~(uintptr_t)1);
-}
-
-static void PyUpb_MapContainer_Dealloc(void* _self) {
-  PyUpb_MapContainer* self = _self;
-  Py_DECREF(self->arena);
-  if (PyUpb_MapContainer_IsStub(self)) {
-    PyUpb_Message_CacheDelete(self->ptr.parent,
-                              PyUpb_MapContainer_GetField(self));
-    Py_DECREF(self->ptr.parent);
-  } else {
-    PyUpb_ObjCache_Delete(self->ptr.map);
-  }
-  PyUpb_Dealloc(_self);
-}
-
-PyTypeObject* PyUpb_MapContainer_GetClass(const upb_FieldDef* f) {
-  assert(upb_FieldDef_IsMap(f));
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  const upb_FieldDef* val =
-      upb_MessageDef_Field(upb_FieldDef_MessageSubDef(f), 1);
-  assert(upb_FieldDef_Number(val) == 2);
-  return upb_FieldDef_IsSubMessage(val) ? state->message_map_container_type
-                                        : state->scalar_map_container_type;
-}
-
-PyObject* PyUpb_MapContainer_NewStub(PyObject* parent, const upb_FieldDef* f,
-                                     PyObject* arena) {
-  // We only create stubs when the parent is reified, by convention.  However
-  // this is not an invariant: the parent could become reified at any time.
-  assert(PyUpb_Message_GetIfReified(parent) == NULL);
-  PyTypeObject* cls = PyUpb_MapContainer_GetClass(f);
-  PyUpb_MapContainer* map = (void*)PyType_GenericAlloc(cls, 0);
-  map->arena = arena;
-  map->field = (uintptr_t)f | 1;
-  map->ptr.parent = parent;
-  map->version = 0;
-  Py_INCREF(arena);
-  Py_INCREF(parent);
-  return &map->ob_base;
-}
-
-void PyUpb_MapContainer_Reify(PyObject* _self, upb_Map* map) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  if (!map) {
-    const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-    upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-    const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-    const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-    map = upb_Map_New(arena, upb_FieldDef_CType(key_f),
-                      upb_FieldDef_CType(val_f));
-  }
-  PyUpb_ObjCache_Add(map, &self->ob_base);
-  Py_DECREF(self->ptr.parent);
-  self->ptr.map = map;  // Overwrites self->ptr.parent.
-  self->field &= ~(uintptr_t)1;
-  assert(!PyUpb_MapContainer_IsStub(self));
-}
-
-void PyUpb_MapContainer_Invalidate(PyObject* obj) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)obj;
-  self->version++;
-}
-
-upb_Map* PyUpb_MapContainer_EnsureReified(PyObject* _self) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  self->version++;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  if (map) return map;  // Already writable.
-
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  map =
-      upb_Map_New(arena, upb_FieldDef_CType(key_f), upb_FieldDef_CType(val_f));
-  upb_MessageValue msgval = {.map_val = map};
-  PyUpb_Message_SetConcreteSubobj(self->ptr.parent, f, msgval);
-  PyUpb_MapContainer_Reify((PyObject*)self, map);
-  return map;
-}
-
-bool PyUpb_MapContainer_Set(PyUpb_MapContainer* self, upb_Map* map,
-                            upb_MessageValue key, upb_MessageValue val,
-                            upb_Arena* arena) {
-  switch (upb_Map_Insert(map, key, val, arena)) {
-    case kUpb_MapInsertStatus_Inserted:
-      return true;
-    case kUpb_MapInsertStatus_Replaced:
-      // We did not insert a new key, undo the previous invalidate.
-      self->version--;
-      return true;
-    case kUpb_MapInsertStatus_OutOfMemory:
-      return false;
-  }
-  return false;  // Unreachable, silence compiler warning.
-}
-
-int PyUpb_MapContainer_AssignSubscript(PyObject* _self, PyObject* key,
-                                       PyObject* val) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  upb_Map* map = PyUpb_MapContainer_EnsureReified(_self);
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  upb_MessageValue u_key, u_val;
-  if (!PyUpb_PyToUpb(key, key_f, &u_key, arena)) return -1;
-
-  if (val) {
-    if (!PyUpb_PyToUpb(val, val_f, &u_val, arena)) return -1;
-    if (!PyUpb_MapContainer_Set(self, map, u_key, u_val, arena)) return -1;
-  } else {
-    if (!upb_Map_Delete(map, u_key, NULL)) {
-      PyErr_Format(PyExc_KeyError, "Key not present in map");
-      return -1;
-    }
-  }
-  return 0;
-}
-
-PyObject* PyUpb_MapContainer_Subscript(PyObject* _self, PyObject* key) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  upb_MessageValue u_key, u_val;
-  if (!PyUpb_PyToUpb(key, key_f, &u_key, arena)) return NULL;
-  if (!map || !upb_Map_Get(map, u_key, &u_val)) {
-    map = PyUpb_MapContainer_EnsureReified(_self);
-    upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-    if (upb_FieldDef_IsSubMessage(val_f)) {
-      const upb_Message* m = upb_FieldDef_MessageSubDef(val_f);
-      const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-      u_val.msg_val = upb_Message_New(layout, arena);
-    } else {
-      memset(&u_val, 0, sizeof(u_val));
-    }
-    if (!PyUpb_MapContainer_Set(self, map, u_key, u_val, arena)) return false;
-  }
-  return PyUpb_UpbToPy(u_val, val_f, self->arena);
-}
-
-PyObject* PyUpb_MapContainer_Contains(PyObject* _self, PyObject* key) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  if (!map) Py_RETURN_FALSE;
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  upb_MessageValue u_key;
-  if (!PyUpb_PyToUpb(key, key_f, &u_key, NULL)) return NULL;
-  if (upb_Map_Get(map, u_key, NULL)) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-PyObject* PyUpb_MapContainer_Clear(PyObject* _self, PyObject* key) {
-  upb_Map* map = PyUpb_MapContainer_EnsureReified(_self);
-  upb_Map_Clear(map);
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_MapContainer_Get(PyObject* _self, PyObject* args,
-                                        PyObject* kwargs) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  static const char* kwlist[] = {"key", "default", NULL};
-  PyObject* key;
-  PyObject* default_value = NULL;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O", (char**)kwlist, &key,
-                                   &default_value)) {
-    return NULL;
-  }
-
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  upb_MessageValue u_key, u_val;
-  if (!PyUpb_PyToUpb(key, key_f, &u_key, arena)) return NULL;
-  if (map && upb_Map_Get(map, u_key, &u_val)) {
-    return PyUpb_UpbToPy(u_val, val_f, self->arena);
-  }
-  if (default_value) {
-    Py_INCREF(default_value);
-    return default_value;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_MapContainer_GetEntryClass(PyObject* _self,
-                                                  PyObject* arg) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  return PyUpb_Descriptor_GetClass(entry_m);
-}
-
-Py_ssize_t PyUpb_MapContainer_Length(PyObject* _self) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  return map ? upb_Map_Size(map) : 0;
-}
-
-PyUpb_MapContainer* PyUpb_MapContainer_Check(PyObject* _self) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  if (!PyObject_TypeCheck(_self, state->message_map_container_type) &&
-      !PyObject_TypeCheck(_self, state->scalar_map_container_type)) {
-    PyErr_Format(PyExc_TypeError, "Expected protobuf map, but got %R", _self);
-    return NULL;
-  }
-  return (PyUpb_MapContainer*)_self;
-}
-
-int PyUpb_Message_InitMapAttributes(PyObject* map, PyObject* value,
-                                    const upb_FieldDef* f);
-
-static PyObject* PyUpb_MapContainer_MergeFrom(PyObject* _self, PyObject* _arg) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-
-  if (PyDict_Check(_arg)) {
-    return PyErr_Format(PyExc_AttributeError, "Merging of dict is not allowed");
-  }
-
-  if (PyUpb_Message_InitMapAttributes(_self, _arg, f) < 0) {
-    return NULL;
-  }
-
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_MapContainer_Repr(PyObject* _self) {
-  PyUpb_MapContainer* self = (PyUpb_MapContainer*)_self;
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self);
-  PyObject* dict = PyDict_New();
-  if (map) {
-    const upb_FieldDef* f = PyUpb_MapContainer_GetField(self);
-    const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-    const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-    size_t iter = kUpb_Map_Begin;
-    upb_MessageValue map_key, map_val;
-    while (upb_Map_Next(map, &map_key, &map_val, &iter)) {
-      PyObject* key = PyUpb_UpbToPy(map_key, key_f, self->arena);
-      PyObject* val = PyUpb_UpbToPy(map_val, val_f, self->arena);
-      if (!key || !val) {
-        Py_XDECREF(key);
-        Py_XDECREF(val);
-        Py_DECREF(dict);
-        return NULL;
-      }
-      PyDict_SetItem(dict, key, val);
-      Py_DECREF(key);
-      Py_DECREF(val);
-    }
-  }
-  PyObject* repr = PyObject_Repr(dict);
-  Py_DECREF(dict);
-  return repr;
-}
-
-PyObject* PyUpb_MapContainer_GetOrCreateWrapper(upb_Map* map,
-                                                const upb_FieldDef* f,
-                                                PyObject* arena) {
-  PyUpb_MapContainer* ret = (void*)PyUpb_ObjCache_Get(map);
-  if (ret) return &ret->ob_base;
-
-  PyTypeObject* cls = PyUpb_MapContainer_GetClass(f);
-  ret = (void*)PyType_GenericAlloc(cls, 0);
-  ret->arena = arena;
-  ret->field = (uintptr_t)f;
-  ret->ptr.map = map;
-  ret->version = 0;
-  Py_INCREF(arena);
-  PyUpb_ObjCache_Add(map, &ret->ob_base);
-  return &ret->ob_base;
-}
-
-// -----------------------------------------------------------------------------
-// ScalarMapContainer
-// -----------------------------------------------------------------------------
-
-static PyMethodDef PyUpb_ScalarMapContainer_Methods[] = {
-    {"__contains__", PyUpb_MapContainer_Contains, METH_O,
-     "Tests whether a key is a member of the map."},
-    {"clear", PyUpb_MapContainer_Clear, METH_NOARGS,
-     "Removes all elements from the map."},
-    {"get", (PyCFunction)PyUpb_MapContainer_Get, METH_VARARGS | METH_KEYWORDS,
-     "Gets the value for the given key if present, or otherwise a default"},
-    {"GetEntryClass", PyUpb_MapContainer_GetEntryClass, METH_NOARGS,
-     "Return the class used to build Entries of (key, value) pairs."},
-    {"MergeFrom", PyUpb_MapContainer_MergeFrom, METH_O,
-     "Merges a map into the current map."},
-    /*
-   { "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class." },
-   { "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
-     "Outputs picklable representation of the repeated field." },
-   */
-    {NULL, NULL},
-};
-
-static PyType_Slot PyUpb_ScalarMapContainer_Slots[] = {
-    {Py_tp_dealloc, PyUpb_MapContainer_Dealloc},
-    {Py_mp_length, PyUpb_MapContainer_Length},
-    {Py_mp_subscript, PyUpb_MapContainer_Subscript},
-    {Py_mp_ass_subscript, PyUpb_MapContainer_AssignSubscript},
-    {Py_tp_methods, PyUpb_ScalarMapContainer_Methods},
-    {Py_tp_iter, PyUpb_MapIterator_New},
-    {Py_tp_repr, PyUpb_MapContainer_Repr},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_ScalarMapContainer_Spec = {
-    PYUPB_MODULE_NAME ".ScalarMapContainer",
-    sizeof(PyUpb_MapContainer),
-    0,
-    Py_TPFLAGS_DEFAULT,
-    PyUpb_ScalarMapContainer_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// MessageMapContainer
-// -----------------------------------------------------------------------------
-
-static PyMethodDef PyUpb_MessageMapContainer_Methods[] = {
-    {"__contains__", PyUpb_MapContainer_Contains, METH_O,
-     "Tests whether the map contains this element."},
-    {"clear", PyUpb_MapContainer_Clear, METH_NOARGS,
-     "Removes all elements from the map."},
-    {"get", (PyCFunction)PyUpb_MapContainer_Get, METH_VARARGS | METH_KEYWORDS,
-     "Gets the value for the given key if present, or otherwise a default"},
-    {"get_or_create", PyUpb_MapContainer_Subscript, METH_O,
-     "Alias for getitem, useful to make explicit that the map is mutated."},
-    {"GetEntryClass", PyUpb_MapContainer_GetEntryClass, METH_NOARGS,
-     "Return the class used to build Entries of (key, value) pairs."},
-    {"MergeFrom", PyUpb_MapContainer_MergeFrom, METH_O,
-     "Merges a map into the current map."},
-    /*
-   { "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class." },
-   { "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
-     "Outputs picklable representation of the repeated field." },
-   */
-    {NULL, NULL},
-};
-
-static PyType_Slot PyUpb_MessageMapContainer_Slots[] = {
-    {Py_tp_dealloc, PyUpb_MapContainer_Dealloc},
-    {Py_mp_length, PyUpb_MapContainer_Length},
-    {Py_mp_subscript, PyUpb_MapContainer_Subscript},
-    {Py_mp_ass_subscript, PyUpb_MapContainer_AssignSubscript},
-    {Py_tp_methods, PyUpb_MessageMapContainer_Methods},
-    {Py_tp_iter, PyUpb_MapIterator_New},
-    {Py_tp_repr, PyUpb_MapContainer_Repr},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_MessageMapContainer_Spec = {
-    PYUPB_MODULE_NAME ".MessageMapContainer", sizeof(PyUpb_MapContainer), 0,
-    Py_TPFLAGS_DEFAULT, PyUpb_MessageMapContainer_Slots};
-
-// -----------------------------------------------------------------------------
-// MapIterator
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  PyUpb_MapContainer* map;  // We own a reference.
-  size_t iter;
-  int version;
-} PyUpb_MapIterator;
-
-static PyObject* PyUpb_MapIterator_New(PyUpb_MapContainer* map) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyUpb_MapIterator* iter =
-      (void*)PyType_GenericAlloc(state->map_iterator_type, 0);
-  iter->map = map;
-  iter->iter = kUpb_Map_Begin;
-  iter->version = map->version;
-  Py_INCREF(map);
-  return &iter->ob_base;
-}
-
-static void PyUpb_MapIterator_Dealloc(void* _self) {
-  PyUpb_MapIterator* self = (PyUpb_MapIterator*)_self;
-  Py_DECREF(&self->map->ob_base);
-  PyUpb_Dealloc(_self);
-}
-
-PyObject* PyUpb_MapIterator_IterNext(PyObject* _self) {
-  PyUpb_MapIterator* self = (PyUpb_MapIterator*)_self;
-  if (self->version != self->map->version) {
-    return PyErr_Format(PyExc_RuntimeError, "Map modified during iteration.");
-  }
-  upb_Map* map = PyUpb_MapContainer_GetIfReified(self->map);
-  if (!map) return NULL;
-  upb_MessageValue key, val;
-  if (!upb_Map_Next(map, &key, &val, &self->iter)) return NULL;
-  const upb_FieldDef* f = PyUpb_MapContainer_GetField(self->map);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
-  return PyUpb_UpbToPy(key, key_f, self->map->arena);
-}
-
-static PyType_Slot PyUpb_MapIterator_Slots[] = {
-    {Py_tp_dealloc, PyUpb_MapIterator_Dealloc},
-    {Py_tp_iter, PyObject_SelfIter},
-    {Py_tp_iternext, PyUpb_MapIterator_IterNext},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_MapIterator_Spec = {
-    PYUPB_MODULE_NAME ".MapIterator", sizeof(PyUpb_MapIterator), 0,
-    Py_TPFLAGS_DEFAULT, PyUpb_MapIterator_Slots};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-static PyObject* GetMutableMappingBase(void) {
-  PyObject* collections = NULL;
-  PyObject* mapping = NULL;
-  PyObject* bases = NULL;
-  if ((collections = PyImport_ImportModule("collections.abc")) &&
-      (mapping = PyObject_GetAttrString(collections, "MutableMapping"))) {
-    bases = Py_BuildValue("(O)", mapping);
-  }
-  Py_XDECREF(collections);
-  Py_XDECREF(mapping);
-  return bases;
-}
-
-bool PyUpb_Map_Init(PyObject* m) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-  PyObject* bases = GetMutableMappingBase();
-  if (!bases) return false;
-
-  state->message_map_container_type =
-      PyUpb_AddClassWithBases(m, &PyUpb_MessageMapContainer_Spec, bases);
-  state->scalar_map_container_type =
-      PyUpb_AddClassWithBases(m, &PyUpb_ScalarMapContainer_Spec, bases);
-  state->map_iterator_type = PyUpb_AddClass(m, &PyUpb_MapIterator_Spec);
-
-  Py_DECREF(bases);
-
-  return state->message_map_container_type &&
-         state->scalar_map_container_type && state->map_iterator_type;
-}
diff --git a/third_party/upb/python/map.h b/third_party/upb/python/map.h
deleted file mode 100644
index e69ff9fe2831c..0000000000000
--- a/third_party/upb/python/map.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_MAP_H__
-#define PYUPB_MAP_H__
-
-#include <stdbool.h>
-
-#include "python/python_api.h"
-#include "upb/reflection/def.h"
-
-// Creates a new repeated field stub for field `f` of message object `parent`.
-// Precondition: `parent` must be a stub.
-PyObject* PyUpb_MapContainer_NewStub(PyObject* parent, const upb_FieldDef* f,
-                                     PyObject* arena);
-
-// Returns a map object wrapping `map`, of field type `f`, which must be on
-// `arena`.  If an existing wrapper object exists, it will be returned,
-// otherwise a new object will be created.  The caller always owns a ref on the
-// returned value.
-PyObject* PyUpb_MapContainer_GetOrCreateWrapper(upb_Map* map,
-                                                const upb_FieldDef* f,
-                                                PyObject* arena);
-
-// Reifies a map stub to point to the concrete data in `map`.
-// If `map` is NULL, an appropriate empty map will be constructed.
-void PyUpb_MapContainer_Reify(PyObject* self, upb_Map* map);
-
-// Reifies this map object if it is not already reified.
-upb_Map* PyUpb_MapContainer_EnsureReified(PyObject* self);
-
-// Assigns `self[key] = val` for the map `self`.
-int PyUpb_MapContainer_AssignSubscript(PyObject* self, PyObject* key,
-                                       PyObject* val);
-
-// Invalidates any existing iterators for the map `obj`.
-void PyUpb_MapContainer_Invalidate(PyObject* obj);
-
-// Module-level init.
-bool PyUpb_Map_Init(PyObject* m);
-
-#endif  // PYUPB_MAP_H__
diff --git a/third_party/upb/python/message.c b/third_party/upb/python/message.c
deleted file mode 100644
index 66c26f4147eff..0000000000000
--- a/third_party/upb/python/message.c
+++ /dev/null
@@ -1,2002 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/message.h"
-
-#include "python/convert.h"
-#include "python/descriptor.h"
-#include "python/extension_dict.h"
-#include "python/map.h"
-#include "python/repeated.h"
-#include "upb/message/copy.h"
-#include "upb/reflection/def.h"
-#include "upb/reflection/message.h"
-#include "upb/text/encode.h"
-#include "upb/util/required_fields.h"
-#include "upb/wire/common.h"
-
-static const upb_MessageDef* PyUpb_MessageMeta_GetMsgdef(PyObject* cls);
-static PyObject* PyUpb_MessageMeta_GetAttr(PyObject* self, PyObject* name);
-
-// -----------------------------------------------------------------------------
-// CPythonBits
-// -----------------------------------------------------------------------------
-
-// This struct contains a few things that are not exposed directly through the
-// limited API, but that we can get at in somewhat more roundabout ways. The
-// roundabout ways are slower, so we cache the values here.
-//
-// These values are valid to cache in a global, even across sub-interpreters,
-// because they are not pointers to interpreter state.  They are process
-// globals that will be the same for any interpreter in this process.
-typedef struct {
-  // For each member, we note the equivalent expression that we could use in the
-  // full (non-limited) API.
-  newfunc type_new;            // PyTypeObject.tp_new
-  destructor type_dealloc;     // PyTypeObject.tp_dealloc
-  getattrofunc type_getattro;  // PyTypeObject.tp_getattro
-  setattrofunc type_setattro;  // PyTypeObject.tp_setattro
-  size_t type_basicsize;       // sizeof(PyHeapTypeObject)
-
-  // While we can refer to PY_VERSION_HEX in the limited API, this will give us
-  // the version of Python we were compiled against, which may be different
-  // than the version we are dynamically linked against.  Here we want the
-  // version that is actually running in this process.
-  long python_version_hex;  // PY_VERSION_HEX
-} PyUpb_CPythonBits;
-
-// A global containing the values for this process.
-PyUpb_CPythonBits cpython_bits;
-
-destructor upb_Pre310_PyType_GetDeallocSlot(PyTypeObject* type_subclass) {
-  // This is a bit desperate.  We need type_dealloc(), but PyType_GetSlot(type,
-  // Py_tp_dealloc) will return subtype_dealloc().  There appears to be no way
-  // whatsoever to fetch type_dealloc() through the limited API until Python
-  // 3.10.
-  //
-  // To work around this so we attempt to find it by looking for the offset of
-  // tp_dealloc in PyTypeObject, then memcpy() it directly.  This should always
-  // work in practice.
-  //
-  // Starting with Python 3.10 on you can call PyType_GetSlot() on non-heap
-  // types.  We will be able to replace all this hack with just:
-  //
-  //   PyType_GetSlot(&PyType_Type, Py_tp_dealloc)
-  //
-  destructor subtype_dealloc = PyType_GetSlot(type_subclass, Py_tp_dealloc);
-  for (size_t i = 0; i < 2000; i += sizeof(uintptr_t)) {
-    destructor maybe_subtype_dealloc;
-    memcpy(&maybe_subtype_dealloc, (char*)type_subclass + i,
-           sizeof(destructor));
-    if (maybe_subtype_dealloc == subtype_dealloc) {
-      destructor type_dealloc;
-      memcpy(&type_dealloc, (char*)&PyType_Type + i, sizeof(destructor));
-      return type_dealloc;
-    }
-  }
-  assert(false);
-  return NULL;
-}
-
-static bool PyUpb_CPythonBits_Init(PyUpb_CPythonBits* bits) {
-  PyObject* bases = NULL;
-  PyTypeObject* type = NULL;
-  PyObject* size = NULL;
-  PyObject* sys = NULL;
-  PyObject* hex_version = NULL;
-  bool ret = false;
-
-  // PyType_GetSlot() only works on heap types, so we cannot use it on
-  // &PyType_Type directly. Instead we create our own (temporary) type derived
-  // from PyType_Type: this will inherit all of the slots from PyType_Type, but
-  // as a heap type it can be queried with PyType_GetSlot().
-  static PyType_Slot dummy_slots[] = {{0, NULL}};
-
-  static PyType_Spec dummy_spec = {
-      "module.DummyClass",  // tp_name
-      0,  // To be filled in by size of base     // tp_basicsize
-      0,  // tp_itemsize
-      Py_TPFLAGS_DEFAULT,  // tp_flags
-      dummy_slots,
-  };
-
-  bases = Py_BuildValue("(O)", &PyType_Type);
-  if (!bases) goto err;
-  type = (PyTypeObject*)PyType_FromSpecWithBases(&dummy_spec, bases);
-  if (!type) goto err;
-
-  bits->type_new = PyType_GetSlot(type, Py_tp_new);
-  bits->type_dealloc = upb_Pre310_PyType_GetDeallocSlot(type);
-  bits->type_getattro = PyType_GetSlot(type, Py_tp_getattro);
-  bits->type_setattro = PyType_GetSlot(type, Py_tp_setattro);
-
-  size = PyObject_GetAttrString((PyObject*)&PyType_Type, "__basicsize__");
-  if (!size) goto err;
-  bits->type_basicsize = PyLong_AsLong(size);
-  if (bits->type_basicsize == -1) goto err;
-
-  assert(bits->type_new);
-  assert(bits->type_dealloc);
-  assert(bits->type_getattro);
-  assert(bits->type_setattro);
-
-#ifndef Py_LIMITED_API
-  assert(bits->type_new == PyType_Type.tp_new);
-  assert(bits->type_dealloc == PyType_Type.tp_dealloc);
-  assert(bits->type_getattro == PyType_Type.tp_getattro);
-  assert(bits->type_setattro == PyType_Type.tp_setattro);
-  assert(bits->type_basicsize == sizeof(PyHeapTypeObject));
-#endif
-
-  sys = PyImport_ImportModule("sys");
-  hex_version = PyObject_GetAttrString(sys, "hexversion");
-  bits->python_version_hex = PyLong_AsLong(hex_version);
-  ret = true;
-
-err:
-  Py_XDECREF(bases);
-  Py_XDECREF(type);
-  Py_XDECREF(size);
-  Py_XDECREF(sys);
-  Py_XDECREF(hex_version);
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-// Message
-// -----------------------------------------------------------------------------
-
-// The main message object.  The type of the object (PyUpb_Message.ob_type)
-// will be an instance of the PyUpb_MessageMeta type (defined below).  So the
-// chain is:
-//   FooMessage = MessageMeta(...)
-//   foo = FooMessage()
-//
-// Which becomes:
-//   Object             C Struct Type        Python type (ob_type)
-//   -----------------  -----------------    ---------------------
-//   foo                PyUpb_Message        FooMessage
-//   FooMessage         PyUpb_MessageMeta    message_meta_type
-//   message_meta_type  PyTypeObject         'type' in Python
-//
-// A message object can be in one of two states: present or non-present.  When
-// a message is non-present, it stores a reference to its parent, and a write
-// to any attribute will trigger the message to become present in its parent.
-// The parent may also be non-present, in which case a mutation will trigger a
-// chain reaction.
-typedef struct PyUpb_Message {
-  PyObject_HEAD;
-  PyObject* arena;
-  uintptr_t def;  // Tagged, low bit 1 == upb_FieldDef*, else upb_MessageDef*
-  union {
-    // when def is msgdef, the data for this msg.
-    upb_Message* msg;
-    // when def is fielddef, owning pointer to parent
-    struct PyUpb_Message* parent;
-  } ptr;
-  PyObject* ext_dict;  // Weak pointer to extension dict, if any.
-  // name->obj dict for non-present msg/map/repeated, NULL if none.
-  PyUpb_WeakMap* unset_subobj_map;
-  int version;
-} PyUpb_Message;
-
-static PyObject* PyUpb_Message_GetAttr(PyObject* _self, PyObject* attr);
-
-bool PyUpb_Message_IsStub(PyUpb_Message* msg) { return msg->def & 1; }
-
-const upb_FieldDef* PyUpb_Message_GetFieldDef(PyUpb_Message* msg) {
-  assert(PyUpb_Message_IsStub(msg));
-  return (void*)(msg->def & ~(uintptr_t)1);
-}
-
-static const upb_MessageDef* _PyUpb_Message_GetMsgdef(PyUpb_Message* msg) {
-  return PyUpb_Message_IsStub(msg)
-             ? upb_FieldDef_MessageSubDef(PyUpb_Message_GetFieldDef(msg))
-             : (void*)msg->def;
-}
-
-const upb_MessageDef* PyUpb_Message_GetMsgdef(PyObject* self) {
-  return _PyUpb_Message_GetMsgdef((PyUpb_Message*)self);
-}
-
-static upb_Message* PyUpb_Message_GetMsg(PyUpb_Message* self) {
-  assert(!PyUpb_Message_IsStub(self));
-  return self->ptr.msg;
-}
-
-bool PyUpb_Message_TryCheck(PyObject* self) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyObject* type = (PyObject*)Py_TYPE(self);
-  return Py_TYPE(type) == state->message_meta_type;
-}
-
-bool PyUpb_Message_Verify(PyObject* self) {
-  if (!PyUpb_Message_TryCheck(self)) {
-    PyErr_Format(PyExc_TypeError, "Expected a message object, but got %R.",
-                 self);
-    return false;
-  }
-  return true;
-}
-
-// If the message is reified, returns it.  Otherwise, returns NULL.
-// If NULL is returned, the object is empty and has no underlying data.
-upb_Message* PyUpb_Message_GetIfReified(PyObject* _self) {
-  PyUpb_Message* self = (void*)_self;
-  return PyUpb_Message_IsStub(self) ? NULL : self->ptr.msg;
-}
-
-static PyObject* PyUpb_Message_New(PyObject* cls, PyObject* unused_args,
-                                   PyObject* unused_kwargs) {
-  const upb_MessageDef* msgdef = PyUpb_MessageMeta_GetMsgdef(cls);
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(msgdef);
-  PyUpb_Message* msg = (void*)PyType_GenericAlloc((PyTypeObject*)cls, 0);
-  msg->def = (uintptr_t)msgdef;
-  msg->arena = PyUpb_Arena_New();
-  msg->ptr.msg = upb_Message_New(layout, PyUpb_Arena_Get(msg->arena));
-  msg->unset_subobj_map = NULL;
-  msg->ext_dict = NULL;
-  msg->version = 0;
-
-  PyObject* ret = &msg->ob_base;
-  PyUpb_ObjCache_Add(msg->ptr.msg, ret);
-  return ret;
-}
-
-/*
- * PyUpb_Message_LookupName()
- *
- * Tries to find a field or oneof named `py_name` in the message object `self`.
- * The user must pass `f` and/or `o` to indicate whether a field or a oneof name
- * is expected.  If the name is found and it has an expected type, the function
- * sets `*f` or `*o` respectively and returns true.  Otherwise returns false
- * and sets an exception of type `exc_type` if provided.
- */
-static bool PyUpb_Message_LookupName(PyUpb_Message* self, PyObject* py_name,
-                                     const upb_FieldDef** f,
-                                     const upb_OneofDef** o,
-                                     PyObject* exc_type) {
-  assert(f || o);
-  Py_ssize_t size;
-  const char* name = NULL;
-  if (PyUnicode_Check(py_name)) {
-    name = PyUnicode_AsUTF8AndSize(py_name, &size);
-  } else if (PyBytes_Check(py_name)) {
-    PyBytes_AsStringAndSize(py_name, (char**)&name, &size);
-  }
-  if (!name) {
-    PyErr_Format(exc_type,
-                 "Expected a field name, but got non-string argument %S.",
-                 py_name);
-    return false;
-  }
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-
-  if (!upb_MessageDef_FindByNameWithSize(msgdef, name, size, f, o)) {
-    if (exc_type) {
-      PyErr_Format(exc_type, "Protocol message %s has no \"%s\" field.",
-                   upb_MessageDef_Name(msgdef), name);
-    }
-    return false;
-  }
-
-  if (!o && !*f) {
-    if (exc_type) {
-      PyErr_Format(exc_type, "Expected a field name, but got oneof name %s.",
-                   name);
-    }
-    return false;
-  }
-
-  if (!f && !*o) {
-    if (exc_type) {
-      PyErr_Format(exc_type, "Expected a oneof name, but got field name %s.",
-                   name);
-    }
-    return false;
-  }
-
-  return true;
-}
-
-static bool PyUpb_Message_InitMessageMapEntry(PyObject* dst, PyObject* src) {
-  if (!src || !dst) return false;
-
-  PyObject* ok = PyObject_CallMethod(dst, "CopyFrom", "O", src);
-  if (!ok) return false;
-  Py_DECREF(ok);
-
-  return true;
-}
-
-int PyUpb_Message_InitMapAttributes(PyObject* map, PyObject* value,
-                                    const upb_FieldDef* f) {
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* val_f = upb_MessageDef_Field(entry_m, 1);
-  PyObject* it = NULL;
-  PyObject* tmp = NULL;
-  int ret = -1;
-  if (upb_FieldDef_IsSubMessage(val_f)) {
-    it = PyObject_GetIter(value);
-    if (it == NULL) {
-      PyErr_Format(PyExc_TypeError, "Argument for field %s is not iterable",
-                   upb_FieldDef_FullName(f));
-      goto err;
-    }
-    PyObject* e;
-    while ((e = PyIter_Next(it)) != NULL) {
-      PyObject* src = PyObject_GetItem(value, e);
-      PyObject* dst = PyObject_GetItem(map, e);
-      Py_DECREF(e);
-      bool ok = PyUpb_Message_InitMessageMapEntry(dst, src);
-      Py_XDECREF(src);
-      Py_XDECREF(dst);
-      if (!ok) goto err;
-    }
-  } else {
-    tmp = PyObject_CallMethod(map, "update", "O", value);
-    if (!tmp) goto err;
-  }
-  ret = 0;
-
-err:
-  Py_XDECREF(it);
-  Py_XDECREF(tmp);
-  return ret;
-}
-
-void PyUpb_Message_EnsureReified(PyUpb_Message* self);
-
-static bool PyUpb_Message_InitMapAttribute(PyObject* _self, PyObject* name,
-                                           const upb_FieldDef* f,
-                                           PyObject* value) {
-  PyObject* map = PyUpb_Message_GetAttr(_self, name);
-  int ok = PyUpb_Message_InitMapAttributes(map, value, f);
-  Py_DECREF(map);
-  return ok >= 0;
-}
-
-static bool PyUpb_Message_InitRepeatedMessageAttribute(PyObject* _self,
-                                                       PyObject* repeated,
-                                                       PyObject* value,
-                                                       const upb_FieldDef* f) {
-  PyObject* it = PyObject_GetIter(value);
-  if (!it) {
-    PyErr_Format(PyExc_TypeError, "Argument for field %s is not iterable",
-                 upb_FieldDef_FullName(f));
-    return false;
-  }
-  PyObject* e = NULL;
-  PyObject* m = NULL;
-  while ((e = PyIter_Next(it)) != NULL) {
-    if (PyDict_Check(e)) {
-      m = PyUpb_RepeatedCompositeContainer_Add(repeated, NULL, e);
-      if (!m) goto err;
-    } else {
-      m = PyUpb_RepeatedCompositeContainer_Add(repeated, NULL, NULL);
-      if (!m) goto err;
-      PyObject* merged = PyUpb_Message_MergeFrom(m, e);
-      if (!merged) goto err;
-      Py_DECREF(merged);
-    }
-    Py_DECREF(e);
-    Py_DECREF(m);
-    m = NULL;
-  }
-
-err:
-  Py_XDECREF(it);
-  Py_XDECREF(e);
-  Py_XDECREF(m);
-  return !PyErr_Occurred();  // Check PyIter_Next() exit.
-}
-
-static bool PyUpb_Message_InitRepeatedAttribute(PyObject* _self, PyObject* name,
-                                                PyObject* value) {
-  PyUpb_Message* self = (void*)_self;
-  const upb_FieldDef* field;
-  if (!PyUpb_Message_LookupName(self, name, &field, NULL,
-                                PyExc_AttributeError)) {
-    return false;
-  }
-  bool ok = false;
-  PyObject* repeated = PyUpb_Message_GetFieldValue(_self, field);
-  PyObject* tmp = NULL;
-  if (!repeated) goto err;
-  if (upb_FieldDef_IsSubMessage(field)) {
-    if (!PyUpb_Message_InitRepeatedMessageAttribute(_self, repeated, value,
-                                                    field)) {
-      goto err;
-    }
-  } else {
-    tmp = PyUpb_RepeatedContainer_Extend(repeated, value);
-    if (!tmp) goto err;
-  }
-  ok = true;
-
-err:
-  Py_XDECREF(repeated);
-  Py_XDECREF(tmp);
-  return ok;
-}
-
-static PyObject* PyUpb_Message_MergePartialFrom(PyObject*, PyObject*);
-
-static bool PyUpb_Message_InitMessageAttribute(PyObject* _self, PyObject* name,
-                                               PyObject* value) {
-  PyObject* submsg = PyUpb_Message_GetAttr(_self, name);
-  if (!submsg) return -1;
-  assert(!PyErr_Occurred());
-  bool ok;
-  if (PyUpb_Message_TryCheck(value)) {
-    PyObject* tmp = PyUpb_Message_MergePartialFrom(submsg, value);
-    ok = tmp != NULL;
-    Py_XDECREF(tmp);
-  } else if (PyDict_Check(value)) {
-    assert(!PyErr_Occurred());
-    ok = PyUpb_Message_InitAttributes(submsg, NULL, value) >= 0;
-  } else {
-    const upb_MessageDef* m = PyUpb_Message_GetMsgdef(_self);
-    PyErr_Format(PyExc_TypeError, "Message must be initialized with a dict: %s",
-                 upb_MessageDef_FullName(m));
-    ok = false;
-  }
-  Py_DECREF(submsg);
-  return ok;
-}
-
-static bool PyUpb_Message_InitScalarAttribute(upb_Message* msg,
-                                              const upb_FieldDef* f,
-                                              PyObject* value,
-                                              upb_Arena* arena) {
-  upb_MessageValue msgval;
-  assert(!PyErr_Occurred());
-  if (!PyUpb_PyToUpb(value, f, &msgval, arena)) return false;
-  upb_Message_SetFieldByDef(msg, f, msgval, arena);
-  return true;
-}
-
-int PyUpb_Message_InitAttributes(PyObject* _self, PyObject* args,
-                                 PyObject* kwargs) {
-  assert(!PyErr_Occurred());
-
-  if (args != NULL && PyTuple_Size(args) != 0) {
-    PyErr_SetString(PyExc_TypeError, "No positional arguments allowed");
-    return -1;
-  }
-
-  if (kwargs == NULL) return 0;
-
-  PyUpb_Message* self = (void*)_self;
-  Py_ssize_t pos = 0;
-  PyObject* name;
-  PyObject* value;
-  PyUpb_Message_EnsureReified(self);
-  upb_Message* msg = PyUpb_Message_GetMsg(self);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-
-  while (PyDict_Next(kwargs, &pos, &name, &value)) {
-    assert(!PyErr_Occurred());
-    const upb_FieldDef* f;
-    assert(!PyErr_Occurred());
-    if (!PyUpb_Message_LookupName(self, name, &f, NULL, PyExc_ValueError)) {
-      return -1;
-    }
-
-    if (value == Py_None) continue;  // Ignored.
-
-    assert(!PyErr_Occurred());
-
-    if (upb_FieldDef_IsMap(f)) {
-      if (!PyUpb_Message_InitMapAttribute(_self, name, f, value)) return -1;
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      if (!PyUpb_Message_InitRepeatedAttribute(_self, name, value)) return -1;
-    } else if (upb_FieldDef_IsSubMessage(f)) {
-      if (!PyUpb_Message_InitMessageAttribute(_self, name, value)) return -1;
-    } else {
-      if (!PyUpb_Message_InitScalarAttribute(msg, f, value, arena)) return -1;
-    }
-    if (PyErr_Occurred()) return -1;
-  }
-
-  if (PyErr_Occurred()) return -1;
-  return 0;
-}
-
-static int PyUpb_Message_Init(PyObject* _self, PyObject* args,
-                              PyObject* kwargs) {
-  if (args != NULL && PyTuple_Size(args) != 0) {
-    PyErr_SetString(PyExc_TypeError, "No positional arguments allowed");
-    return -1;
-  }
-
-  return PyUpb_Message_InitAttributes(_self, args, kwargs);
-}
-
-static PyObject* PyUpb_Message_NewStub(PyObject* parent, const upb_FieldDef* f,
-                                       PyObject* arena) {
-  const upb_MessageDef* sub_m = upb_FieldDef_MessageSubDef(f);
-  PyObject* cls = PyUpb_Descriptor_GetClass(sub_m);
-
-  PyUpb_Message* msg = (void*)PyType_GenericAlloc((PyTypeObject*)cls, 0);
-  msg->def = (uintptr_t)f | 1;
-  msg->arena = arena;
-  msg->ptr.parent = (PyUpb_Message*)parent;
-  msg->unset_subobj_map = NULL;
-  msg->ext_dict = NULL;
-  msg->version = 0;
-
-  Py_DECREF(cls);
-  Py_INCREF(parent);
-  Py_INCREF(arena);
-  return &msg->ob_base;
-}
-
-static bool PyUpb_Message_IsEmpty(const upb_Message* msg,
-                                  const upb_MessageDef* m,
-                                  const upb_DefPool* ext_pool) {
-  if (!msg) return true;
-
-  size_t iter = kUpb_Message_Begin;
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-  if (upb_Message_Next(msg, m, ext_pool, &f, &val, &iter)) return false;
-
-  size_t len;
-  (void)upb_Message_GetUnknown(msg, &len);
-  return len == 0;
-}
-
-static bool PyUpb_Message_IsEqual(PyUpb_Message* m1, PyObject* _m2) {
-  PyUpb_Message* m2 = (void*)_m2;
-  if (m1 == m2) return true;
-  if (!PyObject_TypeCheck(_m2, m1->ob_base.ob_type)) {
-    return false;
-  }
-  const upb_MessageDef* m1_msgdef = _PyUpb_Message_GetMsgdef(m1);
-#ifndef NDEBUG
-  const upb_MessageDef* m2_msgdef = _PyUpb_Message_GetMsgdef(m2);
-  assert(m1_msgdef == m2_msgdef);
-#endif
-  const upb_Message* m1_msg = PyUpb_Message_GetIfReified((PyObject*)m1);
-  const upb_Message* m2_msg = PyUpb_Message_GetIfReified(_m2);
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m1_msgdef));
-
-  const bool e1 = PyUpb_Message_IsEmpty(m1_msg, m1_msgdef, symtab);
-  const bool e2 = PyUpb_Message_IsEmpty(m2_msg, m1_msgdef, symtab);
-  if (e1 || e2) return e1 && e2;
-
-  return upb_Message_IsEqual(m1_msg, m2_msg, m1_msgdef);
-}
-
-static const upb_FieldDef* PyUpb_Message_InitAsMsg(PyUpb_Message* m,
-                                                   upb_Arena* arena) {
-  const upb_FieldDef* f = PyUpb_Message_GetFieldDef(m);
-  const upb_MessageDef* m2 = upb_FieldDef_MessageSubDef(f);
-  m->ptr.msg = upb_Message_New(upb_MessageDef_MiniTable(m2), arena);
-  m->def = (uintptr_t)m2;
-  PyUpb_ObjCache_Add(m->ptr.msg, &m->ob_base);
-  return f;
-}
-
-static void PyUpb_Message_SetField(PyUpb_Message* parent, const upb_FieldDef* f,
-                                   PyUpb_Message* child, upb_Arena* arena) {
-  upb_MessageValue msgval = {.msg_val = PyUpb_Message_GetMsg(child)};
-  upb_Message_SetFieldByDef(PyUpb_Message_GetMsg(parent), f, msgval, arena);
-  PyUpb_WeakMap_Delete(parent->unset_subobj_map, f);
-  // Releases a ref previously owned by child->ptr.parent of our child.
-  Py_DECREF(child);
-}
-
-/*
- * PyUpb_Message_EnsureReified()
- *
- * This implements the "expando" behavior of Python protos:
- *   foo = FooProto()
- *
- *   # The intermediate messages don't really exist, and won't be serialized.
- *   x = foo.bar.bar.bar.bar.bar.baz
- *
- *   # Now all the intermediate objects are created.
- *   foo.bar.bar.bar.bar.bar.baz = 5
- *
- * This function should be called before performing any mutation of a protobuf
- * object.
- *
- * Post-condition:
- *   PyUpb_Message_IsStub(self) is false
- */
-void PyUpb_Message_EnsureReified(PyUpb_Message* self) {
-  if (!PyUpb_Message_IsStub(self)) return;
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-
-  // This is a non-present message. We need to create a real upb_Message for
-  // this object and every parent until we reach a present message.
-  PyUpb_Message* child = self;
-  PyUpb_Message* parent = self->ptr.parent;
-  const upb_FieldDef* child_f = PyUpb_Message_InitAsMsg(child, arena);
-  Py_INCREF(child);  // To avoid a special-case in PyUpb_Message_SetField().
-
-  do {
-    PyUpb_Message* next_parent = parent->ptr.parent;
-    const upb_FieldDef* parent_f = NULL;
-    if (PyUpb_Message_IsStub(parent)) {
-      parent_f = PyUpb_Message_InitAsMsg(parent, arena);
-    }
-    PyUpb_Message_SetField(parent, child_f, child, arena);
-    child = parent;
-    child_f = parent_f;
-    parent = next_parent;
-  } while (child_f);
-
-  // Releases ref previously owned by child->ptr.parent of our child.
-  Py_DECREF(child);
-  self->version++;
-}
-
-static void PyUpb_Message_SyncSubobjs(PyUpb_Message* self);
-
-/*
- * PyUpb_Message_Reify()
- *
- * The message equivalent of PyUpb_*Container_Reify(), this transitions
- * the wrapper from the unset state (owning a reference on self->ptr.parent) to
- * the set state (having a non-owning pointer to self->ptr.msg).
- */
-static void PyUpb_Message_Reify(PyUpb_Message* self, const upb_FieldDef* f,
-                                upb_Message* msg) {
-  assert(f == PyUpb_Message_GetFieldDef(self));
-  if (!msg) {
-    const upb_MessageDef* msgdef = PyUpb_Message_GetMsgdef((PyObject*)self);
-    const upb_MiniTable* layout = upb_MessageDef_MiniTable(msgdef);
-    msg = upb_Message_New(layout, PyUpb_Arena_Get(self->arena));
-  }
-  PyUpb_ObjCache_Add(msg, &self->ob_base);
-  Py_DECREF(&self->ptr.parent->ob_base);
-  self->ptr.msg = msg;  // Overwrites self->ptr.parent
-  self->def = (uintptr_t)upb_FieldDef_MessageSubDef(f);
-  PyUpb_Message_SyncSubobjs(self);
-}
-
-/*
- * PyUpb_Message_SyncSubobjs()
- *
- * This operation must be invoked whenever the underlying upb_Message has been
- * mutated directly in C.  This will attach any newly-present field data
- * to previously returned stub wrapper objects.
- *
- * For example:
- *   foo = FooMessage()
- *   sub = foo.submsg  # Empty, unset sub-message
- *
- *   # SyncSubobjs() is required to connect our existing 'sub' wrapper to the
- *   # newly created foo.submsg data in C.
- *   foo.MergeFrom(FooMessage(submsg={}))
- *
- * This requires that all of the new sub-objects that have appeared are owned
- * by `self`'s arena.
- */
-static void PyUpb_Message_SyncSubobjs(PyUpb_Message* self) {
-  PyUpb_WeakMap* subobj_map = self->unset_subobj_map;
-  if (!subobj_map) return;
-
-  upb_Message* msg = PyUpb_Message_GetMsg(self);
-  intptr_t iter = PYUPB_WEAKMAP_BEGIN;
-  const void* key;
-  PyObject* obj;
-
-  // The last ref to this message could disappear during iteration.
-  // When we call PyUpb_*Container_Reify() below, the container will drop
-  // its ref on `self`.  If that was the last ref on self, the object will be
-  // deleted, and `subobj_map` along with it.  We need it to live until we are
-  // done iterating.
-  Py_INCREF(&self->ob_base);
-
-  while (PyUpb_WeakMap_Next(subobj_map, &key, &obj, &iter)) {
-    const upb_FieldDef* f = key;
-    if (upb_FieldDef_HasPresence(f) && !upb_Message_HasFieldByDef(msg, f))
-      continue;
-    upb_MessageValue msgval = upb_Message_GetFieldByDef(msg, f);
-    PyUpb_WeakMap_DeleteIter(subobj_map, &iter);
-    if (upb_FieldDef_IsMap(f)) {
-      if (!msgval.map_val) continue;
-      PyUpb_MapContainer_Reify(obj, (upb_Map*)msgval.map_val);
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      if (!msgval.array_val) continue;
-      PyUpb_RepeatedContainer_Reify(obj, (upb_Array*)msgval.array_val);
-    } else {
-      PyUpb_Message* sub = (void*)obj;
-      assert(self == sub->ptr.parent);
-      PyUpb_Message_Reify(sub, f, (upb_Message*)msgval.msg_val);
-    }
-  }
-
-  Py_DECREF(&self->ob_base);
-
-  // TODO(haberman): present fields need to be iterated too if they can reach
-  // a WeakMap.
-}
-
-static PyObject* PyUpb_Message_ToString(PyUpb_Message* self) {
-  if (PyUpb_Message_IsStub(self)) {
-    return PyUnicode_FromStringAndSize(NULL, 0);
-  }
-  upb_Message* msg = PyUpb_Message_GetMsg(self);
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(msgdef));
-  char buf[1024];
-  int options = UPB_TXTENC_SKIPUNKNOWN;
-  size_t size = upb_TextEncode(msg, msgdef, symtab, options, buf, sizeof(buf));
-  if (size < sizeof(buf)) {
-    return PyUnicode_FromStringAndSize(buf, size);
-  } else {
-    char* buf2 = malloc(size + 1);
-    size_t size2 = upb_TextEncode(msg, msgdef, symtab, options, buf2, size + 1);
-    assert(size == size2);
-    PyObject* ret = PyUnicode_FromStringAndSize(buf2, size2);
-    free(buf2);
-    return ret;
-  }
-}
-
-static PyObject* PyUpb_Message_RichCompare(PyObject* _self, PyObject* other,
-                                           int opid) {
-  PyUpb_Message* self = (void*)_self;
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  bool ret = PyUpb_Message_IsEqual(self, other);
-  if (opid == Py_NE) ret = !ret;
-  return PyBool_FromLong(ret);
-}
-
-void PyUpb_Message_CacheDelete(PyObject* _self, const upb_FieldDef* f) {
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_WeakMap_Delete(self->unset_subobj_map, f);
-}
-
-void PyUpb_Message_SetConcreteSubobj(PyObject* _self, const upb_FieldDef* f,
-                                     upb_MessageValue subobj) {
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_Message_EnsureReified(self);
-  PyUpb_Message_CacheDelete(_self, f);
-  upb_Message_SetFieldByDef(self->ptr.msg, f, subobj,
-                            PyUpb_Arena_Get(self->arena));
-}
-
-static void PyUpb_Message_Dealloc(PyObject* _self) {
-  PyUpb_Message* self = (void*)_self;
-
-  if (PyUpb_Message_IsStub(self)) {
-    PyUpb_Message_CacheDelete((PyObject*)self->ptr.parent,
-                              PyUpb_Message_GetFieldDef(self));
-    Py_DECREF(self->ptr.parent);
-  } else {
-    PyUpb_ObjCache_Delete(self->ptr.msg);
-  }
-
-  if (self->unset_subobj_map) {
-    PyUpb_WeakMap_Free(self->unset_subobj_map);
-  }
-
-  Py_DECREF(self->arena);
-
-  // We do not use PyUpb_Dealloc() here because Message is a base type and for
-  // base types there is a bug we have to work around in this case (see below).
-  PyTypeObject* tp = Py_TYPE(self);
-  freefunc tp_free = PyType_GetSlot(tp, Py_tp_free);
-  tp_free(self);
-
-  if (cpython_bits.python_version_hex >= 0x03080000) {
-    // Prior to Python 3.8 there is a bug where deallocating the type here would
-    // lead to a double-decref: https://bugs.python.org/issue37879
-    Py_DECREF(tp);
-  }
-}
-
-PyObject* PyUpb_Message_Get(upb_Message* u_msg, const upb_MessageDef* m,
-                            PyObject* arena) {
-  PyObject* ret = PyUpb_ObjCache_Get(u_msg);
-  if (ret) return ret;
-
-  PyObject* cls = PyUpb_Descriptor_GetClass(m);
-  // It is not safe to use PyObject_{,GC}_New() due to:
-  //    https://bugs.python.org/issue35810
-  PyUpb_Message* py_msg = (void*)PyType_GenericAlloc((PyTypeObject*)cls, 0);
-  py_msg->arena = arena;
-  py_msg->def = (uintptr_t)m;
-  py_msg->ptr.msg = u_msg;
-  py_msg->unset_subobj_map = NULL;
-  py_msg->ext_dict = NULL;
-  py_msg->version = 0;
-  ret = &py_msg->ob_base;
-  Py_DECREF(cls);
-  Py_INCREF(arena);
-  PyUpb_ObjCache_Add(u_msg, ret);
-  return ret;
-}
-
-/* PyUpb_Message_GetStub()
- *
- * Non-present messages return "stub" objects that point to their parent, but
- * will materialize into real upb objects if they are mutated.
- *
- * Note: we do *not* create stubs for repeated/map fields unless the parent
- * is a stub:
- *
- *    msg = TestMessage()
- *    msg.submessage                # (A) Creates a stub
- *    msg.repeated_foo              # (B) Does *not* create a stub
- *    msg.submessage.repeated_bar   # (C) Creates a stub
- *
- * In case (B) we have some freedom: we could either create a stub, or create
- * a reified object with underlying data.  It appears that either could work
- * equally well, with no observable change to users.  There isn't a clear
- * advantage to either choice.  We choose to follow the behavior of the
- * pre-existing C++ behavior for consistency, but if it becomes apparent that
- * there would be some benefit to reversing this decision, it should be totally
- * within the realm of possibility.
- */
-PyObject* PyUpb_Message_GetStub(PyUpb_Message* self,
-                                const upb_FieldDef* field) {
-  PyObject* _self = (void*)self;
-  if (!self->unset_subobj_map) {
-    self->unset_subobj_map = PyUpb_WeakMap_New();
-  }
-  PyObject* subobj = PyUpb_WeakMap_Get(self->unset_subobj_map, field);
-
-  if (subobj) return subobj;
-
-  if (upb_FieldDef_IsMap(field)) {
-    subobj = PyUpb_MapContainer_NewStub(_self, field, self->arena);
-  } else if (upb_FieldDef_IsRepeated(field)) {
-    subobj = PyUpb_RepeatedContainer_NewStub(_self, field, self->arena);
-  } else {
-    subobj = PyUpb_Message_NewStub(&self->ob_base, field, self->arena);
-  }
-  PyUpb_WeakMap_Add(self->unset_subobj_map, field, subobj);
-
-  assert(!PyErr_Occurred());
-  return subobj;
-}
-
-PyObject* PyUpb_Message_GetPresentWrapper(PyUpb_Message* self,
-                                          const upb_FieldDef* field) {
-  assert(!PyUpb_Message_IsStub(self));
-  upb_MutableMessageValue mutval =
-      upb_Message_Mutable(self->ptr.msg, field, PyUpb_Arena_Get(self->arena));
-  if (upb_FieldDef_IsMap(field)) {
-    return PyUpb_MapContainer_GetOrCreateWrapper(mutval.map, field,
-                                                 self->arena);
-  } else {
-    return PyUpb_RepeatedContainer_GetOrCreateWrapper(mutval.array, field,
-                                                      self->arena);
-  }
-}
-
-PyObject* PyUpb_Message_GetScalarValue(PyUpb_Message* self,
-                                       const upb_FieldDef* field) {
-  upb_MessageValue val;
-  if (PyUpb_Message_IsStub(self)) {
-    // Unset message always returns default values.
-    val = upb_FieldDef_Default(field);
-  } else {
-    val = upb_Message_GetFieldByDef(self->ptr.msg, field);
-  }
-  return PyUpb_UpbToPy(val, field, self->arena);
-}
-
-/*
- * PyUpb_Message_GetFieldValue()
- *
- * Implements the equivalent of getattr(msg, field), once `field` has
- * already been resolved to a `upb_FieldDef*`.
- *
- * This may involve constructing a wrapper object for the given field, or
- * returning one that was previously constructed.  If the field is not actually
- * set, the wrapper object will be an "unset" object that is not actually
- * connected to any C data.
- */
-PyObject* PyUpb_Message_GetFieldValue(PyObject* _self,
-                                      const upb_FieldDef* field) {
-  PyUpb_Message* self = (void*)_self;
-  assert(upb_FieldDef_ContainingType(field) == PyUpb_Message_GetMsgdef(_self));
-  bool submsg = upb_FieldDef_IsSubMessage(field);
-  bool seq = upb_FieldDef_IsRepeated(field);
-
-  if ((PyUpb_Message_IsStub(self) && (submsg || seq)) ||
-      (submsg && !seq && !upb_Message_HasFieldByDef(self->ptr.msg, field))) {
-    return PyUpb_Message_GetStub(self, field);
-  } else if (seq) {
-    return PyUpb_Message_GetPresentWrapper(self, field);
-  } else {
-    return PyUpb_Message_GetScalarValue(self, field);
-  }
-}
-
-int PyUpb_Message_SetFieldValue(PyObject* _self, const upb_FieldDef* field,
-                                PyObject* value, PyObject* exc) {
-  PyUpb_Message* self = (void*)_self;
-  assert(value);
-
-  if (upb_FieldDef_IsSubMessage(field) || upb_FieldDef_IsRepeated(field)) {
-    PyErr_Format(exc,
-                 "Assignment not allowed to message, map, or repeated "
-                 "field \"%s\" in protocol message object.",
-                 upb_FieldDef_Name(field));
-    return -1;
-  }
-
-  PyUpb_Message_EnsureReified(self);
-
-  upb_MessageValue val;
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  if (!PyUpb_PyToUpb(value, field, &val, arena)) {
-    return -1;
-  }
-
-  upb_Message_SetFieldByDef(self->ptr.msg, field, val, arena);
-  return 0;
-}
-
-int PyUpb_Message_GetVersion(PyObject* _self) {
-  PyUpb_Message* self = (void*)_self;
-  return self->version;
-}
-
-/*
- * PyUpb_Message_GetAttr()
- *
- * Implements:
- *   foo = msg.foo
- *
- * Attribute lookup must find both message fields and base class methods like
- * msg.SerializeToString().
- */
-__attribute__((flatten)) static PyObject* PyUpb_Message_GetAttr(
-    PyObject* _self, PyObject* attr) {
-  PyUpb_Message* self = (void*)_self;
-
-  // Lookup field by name.
-  const upb_FieldDef* field;
-  if (PyUpb_Message_LookupName(self, attr, &field, NULL, NULL)) {
-    return PyUpb_Message_GetFieldValue(_self, field);
-  }
-
-  // Check base class attributes.
-  assert(!PyErr_Occurred());
-  PyObject* ret = PyObject_GenericGetAttr(_self, attr);
-  if (ret) return ret;
-
-  // Swallow AttributeError if it occurred and try again on the metaclass
-  // to pick up class attributes.  But we have to special-case "Extensions"
-  // which affirmatively returns AttributeError when a message is not
-  // extendable.
-  const char* name;
-  if (PyErr_ExceptionMatches(PyExc_AttributeError) &&
-      (name = PyUpb_GetStrData(attr)) && strcmp(name, "Extensions") != 0) {
-    PyErr_Clear();
-    return PyUpb_MessageMeta_GetAttr((PyObject*)Py_TYPE(_self), attr);
-  }
-
-  return NULL;
-}
-
-/*
- * PyUpb_Message_SetAttr()
- *
- * Implements:
- *   msg.foo = foo
- */
-static int PyUpb_Message_SetAttr(PyObject* _self, PyObject* attr,
-                                 PyObject* value) {
-  PyUpb_Message* self = (void*)_self;
-  const upb_FieldDef* field;
-  if (!PyUpb_Message_LookupName(self, attr, &field, NULL,
-                                PyExc_AttributeError)) {
-    return -1;
-  }
-
-  return PyUpb_Message_SetFieldValue(_self, field, value, PyExc_AttributeError);
-}
-
-static PyObject* PyUpb_Message_HasField(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-  const upb_FieldDef* field;
-  const upb_OneofDef* oneof;
-
-  if (!PyUpb_Message_LookupName(self, arg, &field, &oneof, PyExc_ValueError)) {
-    return NULL;
-  }
-
-  if (field && !upb_FieldDef_HasPresence(field)) {
-    PyErr_Format(PyExc_ValueError, "Field %s does not have presence.",
-                 upb_FieldDef_FullName(field));
-    return NULL;
-  }
-
-  if (PyUpb_Message_IsStub(self)) Py_RETURN_FALSE;
-
-  return PyBool_FromLong(field ? upb_Message_HasFieldByDef(self->ptr.msg, field)
-                               : upb_Message_WhichOneof(self->ptr.msg, oneof) !=
-                                     NULL);
-}
-
-static PyObject* PyUpb_Message_FindInitializationErrors(PyObject* _self,
-                                                        PyObject* arg);
-
-static PyObject* PyUpb_Message_IsInitializedAppendErrors(PyObject* _self,
-                                                         PyObject* errors) {
-  PyObject* list = PyUpb_Message_FindInitializationErrors(_self, NULL);
-  if (!list) return NULL;
-  bool ok = PyList_Size(list) == 0;
-  PyObject* ret = NULL;
-  PyObject* extend_result = NULL;
-  if (!ok) {
-    extend_result = PyObject_CallMethod(errors, "extend", "O", list);
-    if (!extend_result) goto done;
-  }
-  ret = PyBool_FromLong(ok);
-
-done:
-  Py_XDECREF(list);
-  Py_XDECREF(extend_result);
-  return ret;
-}
-
-static PyObject* PyUpb_Message_IsInitialized(PyObject* _self, PyObject* args) {
-  PyObject* errors = NULL;
-  if (!PyArg_ParseTuple(args, "|O", &errors)) {
-    return NULL;
-  }
-  if (errors) {
-    // We need to collect a list of unset required fields and append it to
-    // `errors`.
-    return PyUpb_Message_IsInitializedAppendErrors(_self, errors);
-  } else {
-    // We just need to return a boolean "true" or "false" for whether all
-    // required fields are set.
-    upb_Message* msg = PyUpb_Message_GetIfReified(_self);
-    const upb_MessageDef* m = PyUpb_Message_GetMsgdef(_self);
-    const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m));
-    bool initialized = !upb_util_HasUnsetRequired(msg, m, symtab, NULL);
-    return PyBool_FromLong(initialized);
-  }
-}
-
-static PyObject* PyUpb_Message_ListFieldsItemKey(PyObject* self,
-                                                 PyObject* val) {
-  assert(PyTuple_Check(val));
-  PyObject* field = PyTuple_GetItem(val, 0);
-  const upb_FieldDef* f = PyUpb_FieldDescriptor_GetDef(field);
-  return PyLong_FromLong(upb_FieldDef_Number(f));
-}
-
-static PyObject* PyUpb_Message_CheckCalledFromGeneratedFile(
-    PyObject* unused, PyObject* unused_arg) {
-  PyErr_SetString(
-      PyExc_TypeError,
-      "Descriptors cannot not be created directly.\n"
-      "If this call came from a _pb2.py file, your generated code is out of "
-      "date and must be regenerated with protoc >= 3.19.0.\n"
-      "If you cannot immediately regenerate your protos, some other possible "
-      "workarounds are:\n"
-      " 1. Downgrade the protobuf package to 3.20.x or lower.\n"
-      " 2. Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python (but this will "
-      "use pure-Python parsing and will be much slower).\n"
-      "\n"
-      "More information: "
-      "https://developers.google.com/protocol-buffers/docs/news/"
-      "2022-05-06#python-updates");
-  return NULL;
-}
-
-static bool PyUpb_Message_SortFieldList(PyObject* list) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  bool ok = false;
-  PyObject* args = PyTuple_New(0);
-  PyObject* kwargs = PyDict_New();
-  PyObject* method = PyObject_GetAttrString(list, "sort");
-  PyObject* call_result = NULL;
-  if (!args || !kwargs || !method) goto err;
-  if (PyDict_SetItemString(kwargs, "key", state->listfields_item_key) < 0) {
-    goto err;
-  }
-  call_result = PyObject_Call(method, args, kwargs);
-  if (!call_result) goto err;
-  ok = true;
-
-err:
-  Py_XDECREF(method);
-  Py_XDECREF(args);
-  Py_XDECREF(kwargs);
-  Py_XDECREF(call_result);
-  return ok;
-}
-
-static PyObject* PyUpb_Message_ListFields(PyObject* _self, PyObject* arg) {
-  PyObject* list = PyList_New(0);
-  upb_Message* msg = PyUpb_Message_GetIfReified(_self);
-  if (!msg) return list;
-
-  size_t iter1 = kUpb_Message_Begin;
-  const upb_MessageDef* m = PyUpb_Message_GetMsgdef(_self);
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m));
-  const upb_FieldDef* f;
-  PyObject* field_desc = NULL;
-  PyObject* py_val = NULL;
-  PyObject* tuple = NULL;
-  upb_MessageValue val;
-  uint32_t last_field = 0;
-  bool in_order = true;
-  while (upb_Message_Next(msg, m, symtab, &f, &val, &iter1)) {
-    const uint32_t field_number = upb_FieldDef_Number(f);
-    if (field_number < last_field) in_order = false;
-    last_field = field_number;
-    PyObject* field_desc = PyUpb_FieldDescriptor_Get(f);
-    PyObject* py_val = PyUpb_Message_GetFieldValue(_self, f);
-    if (!field_desc || !py_val) goto err;
-    PyObject* tuple = Py_BuildValue("(NN)", field_desc, py_val);
-    field_desc = NULL;
-    py_val = NULL;
-    if (!tuple) goto err;
-    if (PyList_Append(list, tuple)) goto err;
-    Py_DECREF(tuple);
-    tuple = NULL;
-  }
-
-  // Users rely on fields being returned in field number order.
-  if (!in_order && !PyUpb_Message_SortFieldList(list)) goto err;
-
-  return list;
-
-err:
-  Py_XDECREF(field_desc);
-  Py_XDECREF(py_val);
-  Py_XDECREF(tuple);
-  Py_DECREF(list);
-  return NULL;
-}
-
-static PyObject* PyUpb_Message_MergeInternal(PyObject* self, PyObject* arg,
-                                             bool check_required) {
-  if (self->ob_type != arg->ob_type) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to MergeFrom() must be instance of same class: "
-                 "expected %S got %S.",
-                 Py_TYPE(self), Py_TYPE(arg));
-    return NULL;
-  }
-  // OPT: exit if src is empty.
-  PyObject* subargs = PyTuple_New(0);
-  PyObject* serialized =
-      check_required
-          ? PyUpb_Message_SerializeToString(arg, subargs, NULL)
-          : PyUpb_Message_SerializePartialToString(arg, subargs, NULL);
-  Py_DECREF(subargs);
-  if (!serialized) return NULL;
-  PyObject* ret = PyUpb_Message_MergeFromString(self, serialized);
-  Py_DECREF(serialized);
-  Py_DECREF(ret);
-  Py_RETURN_NONE;
-}
-
-PyObject* PyUpb_Message_MergeFrom(PyObject* self, PyObject* arg) {
-  return PyUpb_Message_MergeInternal(self, arg, true);
-}
-
-static PyObject* PyUpb_Message_MergePartialFrom(PyObject* self, PyObject* arg) {
-  return PyUpb_Message_MergeInternal(self, arg, false);
-}
-
-static PyObject* PyUpb_Message_Clear(PyUpb_Message* self);
-
-static PyObject* PyUpb_Message_CopyFrom(PyObject* _self, PyObject* arg) {
-  if (_self->ob_type != arg->ob_type) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to CopyFrom() must be instance of same class: "
-                 "expected %S got %S.",
-                 Py_TYPE(_self), Py_TYPE(arg));
-    return NULL;
-  }
-  if (_self == arg) {
-    Py_RETURN_NONE;
-  }
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_Message* other = (void*)arg;
-  PyUpb_Message_EnsureReified(self);
-
-  PyObject* tmp = PyUpb_Message_Clear(self);
-  Py_DECREF(tmp);
-
-  upb_Message_DeepCopy(self->ptr.msg, other->ptr.msg,
-                       upb_MessageDef_MiniTable(other->def),
-                       PyUpb_Arena_Get(self->arena));
-  PyUpb_Message_SyncSubobjs(self);
-
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_Message_SetInParent(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_Message_EnsureReified(self);
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_Message_UnknownFields(PyObject* _self, PyObject* arg) {
-  // TODO(haberman): re-enable when unknown fields are added.
-  // return PyUpb_UnknownFields_New(_self);
-  PyErr_SetString(PyExc_NotImplementedError, "unknown field accessor");
-  return NULL;
-}
-
-PyObject* PyUpb_Message_MergeFromString(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-  char* buf;
-  Py_ssize_t size;
-  PyObject* bytes = NULL;
-
-  if (PyMemoryView_Check(arg)) {
-    bytes = PyBytes_FromObject(arg);
-    // Cannot fail when passed something of the correct type.
-    int err = PyBytes_AsStringAndSize(bytes, &buf, &size);
-    (void)err;
-    assert(err >= 0);
-  } else if (PyBytes_AsStringAndSize(arg, &buf, &size) < 0) {
-    return NULL;
-  }
-
-  PyUpb_Message_EnsureReified(self);
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  const upb_FileDef* file = upb_MessageDef_File(msgdef);
-  const upb_ExtensionRegistry* extreg =
-      upb_DefPool_ExtensionRegistry(upb_FileDef_Pool(file));
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(msgdef);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  int options = upb_DecodeOptions_MaxDepth(
-      state->allow_oversize_protos ? UINT16_MAX
-                                   : kUpb_WireFormat_DefaultDepthLimit);
-  upb_DecodeStatus status =
-      upb_Decode(buf, size, self->ptr.msg, layout, extreg, options, arena);
-  Py_XDECREF(bytes);
-  if (status != kUpb_DecodeStatus_Ok) {
-    PyErr_Format(state->decode_error_class, "Error parsing message");
-    return NULL;
-  }
-  PyUpb_Message_SyncSubobjs(self);
-  return PyLong_FromSsize_t(size);
-}
-
-static PyObject* PyUpb_Message_ParseFromString(PyObject* self, PyObject* arg) {
-  PyObject* tmp = PyUpb_Message_Clear((PyUpb_Message*)self);
-  Py_DECREF(tmp);
-  return PyUpb_Message_MergeFromString(self, arg);
-}
-
-static PyObject* PyUpb_Message_ByteSize(PyObject* self, PyObject* args) {
-  // TODO(https://github.com/protocolbuffers/upb/issues/462): At the moment upb
-  // does not have a "byte size" function, so we just serialize to string and
-  // get the size of the string.
-  PyObject* subargs = PyTuple_New(0);
-  PyObject* serialized = PyUpb_Message_SerializeToString(self, subargs, NULL);
-  Py_DECREF(subargs);
-  if (!serialized) return NULL;
-  size_t size = PyBytes_Size(serialized);
-  Py_DECREF(serialized);
-  return PyLong_FromSize_t(size);
-}
-
-static PyObject* PyUpb_Message_Clear(PyUpb_Message* self) {
-  PyUpb_Message_EnsureReified(self);
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  PyUpb_WeakMap* subobj_map = self->unset_subobj_map;
-
-  if (subobj_map) {
-    upb_Message* msg = PyUpb_Message_GetMsg(self);
-    (void)msg;  // Suppress unused warning when asserts are disabled.
-    intptr_t iter = PYUPB_WEAKMAP_BEGIN;
-    const void* key;
-    PyObject* obj;
-
-    while (PyUpb_WeakMap_Next(subobj_map, &key, &obj, &iter)) {
-      const upb_FieldDef* f = key;
-      PyUpb_WeakMap_DeleteIter(subobj_map, &iter);
-      if (upb_FieldDef_IsMap(f)) {
-        assert(upb_Message_GetFieldByDef(msg, f).map_val == NULL);
-        PyUpb_MapContainer_Reify(obj, NULL);
-      } else if (upb_FieldDef_IsRepeated(f)) {
-        assert(upb_Message_GetFieldByDef(msg, f).array_val == NULL);
-        PyUpb_RepeatedContainer_Reify(obj, NULL);
-      } else {
-        assert(!upb_Message_HasFieldByDef(msg, f));
-        PyUpb_Message* sub = (void*)obj;
-        assert(self == sub->ptr.parent);
-        PyUpb_Message_Reify(sub, f, NULL);
-      }
-    }
-  }
-
-  upb_Message_ClearByDef(self->ptr.msg, msgdef);
-  Py_RETURN_NONE;
-}
-
-void PyUpb_Message_DoClearField(PyObject* _self, const upb_FieldDef* f) {
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_Message_EnsureReified((PyUpb_Message*)self);
-
-  // We must ensure that any stub object is reified so its parent no longer
-  // points to us.
-  PyObject* sub = self->unset_subobj_map
-                      ? PyUpb_WeakMap_Get(self->unset_subobj_map, f)
-                      : NULL;
-
-  if (upb_FieldDef_IsMap(f)) {
-    // For maps we additionally have to invalidate any iterators.  So we need
-    // to get an object even if it's reified.
-    if (!sub) {
-      sub = PyUpb_Message_GetFieldValue(_self, f);
-    }
-    PyUpb_MapContainer_EnsureReified(sub);
-    PyUpb_MapContainer_Invalidate(sub);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    if (sub) {
-      PyUpb_RepeatedContainer_EnsureReified(sub);
-    }
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    if (sub) {
-      PyUpb_Message_EnsureReified((PyUpb_Message*)sub);
-    }
-  }
-
-  Py_XDECREF(sub);
-  upb_Message_ClearFieldByDef(self->ptr.msg, f);
-}
-
-static PyObject* PyUpb_Message_ClearExtension(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-  PyUpb_Message_EnsureReified(self);
-  const upb_FieldDef* f = PyUpb_Message_GetExtensionDef(_self, arg);
-  if (!f) return NULL;
-  PyUpb_Message_DoClearField(_self, f);
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_Message_ClearField(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-
-  // We always need EnsureReified() here (even for an unset message) to
-  // preserve behavior like:
-  //   msg = FooMessage()
-  //   msg.foo.Clear()
-  //   assert msg.HasField("foo")
-  PyUpb_Message_EnsureReified(self);
-
-  const upb_FieldDef* f;
-  const upb_OneofDef* o;
-  if (!PyUpb_Message_LookupName(self, arg, &f, &o, PyExc_ValueError)) {
-    return NULL;
-  }
-
-  if (o) f = upb_Message_WhichOneof(self->ptr.msg, o);
-  if (f) PyUpb_Message_DoClearField(_self, f);
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_Message_DiscardUnknownFields(PyUpb_Message* self,
-                                                    PyObject* arg) {
-  PyUpb_Message_EnsureReified(self);
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  upb_Message_DiscardUnknown(self->ptr.msg, msgdef, 64);
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_Message_FindInitializationErrors(PyObject* _self,
-                                                        PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-  upb_Message* msg = PyUpb_Message_GetIfReified(_self);
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  const upb_DefPool* ext_pool = upb_FileDef_Pool(upb_MessageDef_File(msgdef));
-  upb_FieldPathEntry* fields_base;
-  PyObject* ret = PyList_New(0);
-  if (upb_util_HasUnsetRequired(msg, msgdef, ext_pool, &fields_base)) {
-    upb_FieldPathEntry* fields = fields_base;
-    char* buf = NULL;
-    size_t size = 0;
-    assert(fields->field);
-    while (fields->field) {
-      upb_FieldPathEntry* field = fields;
-      size_t need = upb_FieldPath_ToText(&fields, buf, size);
-      if (need >= size) {
-        fields = field;
-        size = size ? size * 2 : 16;
-        while (size <= need) size *= 2;
-        buf = realloc(buf, size);
-        need = upb_FieldPath_ToText(&fields, buf, size);
-        assert(size > need);
-      }
-      PyObject* str = PyUnicode_FromString(buf);
-      PyList_Append(ret, str);
-      Py_DECREF(str);
-    }
-    free(buf);
-    free(fields_base);
-  }
-  return ret;
-}
-
-static PyObject* PyUpb_Message_FromString(PyObject* cls, PyObject* serialized) {
-  PyObject* ret = NULL;
-  PyObject* length = NULL;
-
-  ret = PyObject_CallObject(cls, NULL);
-  if (ret == NULL) goto err;
-  length = PyUpb_Message_MergeFromString(ret, serialized);
-  if (length == NULL) goto err;
-
-done:
-  Py_XDECREF(length);
-  return ret;
-
-err:
-  Py_XDECREF(ret);
-  ret = NULL;
-  goto done;
-}
-
-const upb_FieldDef* PyUpb_Message_GetExtensionDef(PyObject* _self,
-                                                  PyObject* key) {
-  const upb_FieldDef* f = PyUpb_FieldDescriptor_GetDef(key);
-  if (!f) {
-    PyErr_Clear();
-    PyErr_Format(PyExc_KeyError, "Object %R is not a field descriptor\n", key);
-    return NULL;
-  }
-  if (!upb_FieldDef_IsExtension(f)) {
-    PyErr_Format(PyExc_KeyError, "Field %s is not an extension\n",
-                 upb_FieldDef_FullName(f));
-    return NULL;
-  }
-  const upb_MessageDef* msgdef = PyUpb_Message_GetMsgdef(_self);
-  if (upb_FieldDef_ContainingType(f) != msgdef) {
-    PyErr_Format(PyExc_KeyError, "Extension doesn't match (%s vs %s)",
-                 upb_MessageDef_FullName(msgdef), upb_FieldDef_FullName(f));
-    return NULL;
-  }
-  return f;
-}
-
-static PyObject* PyUpb_Message_HasExtension(PyObject* _self,
-                                            PyObject* ext_desc) {
-  upb_Message* msg = PyUpb_Message_GetIfReified(_self);
-  const upb_FieldDef* f = PyUpb_Message_GetExtensionDef(_self, ext_desc);
-  if (!f) return NULL;
-  if (upb_FieldDef_IsRepeated(f)) {
-    PyErr_SetString(PyExc_KeyError,
-                    "Field is repeated. A singular method is required.");
-    return NULL;
-  }
-  if (!msg) Py_RETURN_FALSE;
-  return PyBool_FromLong(upb_Message_HasFieldByDef(msg, f));
-}
-
-void PyUpb_Message_ReportInitializationErrors(const upb_MessageDef* msgdef,
-                                              PyObject* errors, PyObject* exc) {
-  PyObject* comma = PyUnicode_FromString(",");
-  PyObject* missing_fields = NULL;
-  if (!comma) goto done;
-  missing_fields = PyUnicode_Join(comma, errors);
-  if (!missing_fields) goto done;
-  PyErr_Format(exc, "Message %s is missing required fields: %U",
-               upb_MessageDef_FullName(msgdef), missing_fields);
-done:
-  Py_XDECREF(comma);
-  Py_XDECREF(missing_fields);
-  Py_DECREF(errors);
-}
-
-PyObject* PyUpb_Message_SerializeInternal(PyObject* _self, PyObject* args,
-                                          PyObject* kwargs,
-                                          bool check_required) {
-  PyUpb_Message* self = (void*)_self;
-  if (!PyUpb_Message_Verify((PyObject*)self)) return NULL;
-  static const char* kwlist[] = {"deterministic", NULL};
-  int deterministic = 0;
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|p", (char**)(kwlist),
-                                   &deterministic)) {
-    return NULL;
-  }
-
-  const upb_MessageDef* msgdef = _PyUpb_Message_GetMsgdef(self);
-  if (PyUpb_Message_IsStub(self)) {
-    // Nothing to serialize, but we do have to check whether the message is
-    // initialized.
-    PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-    PyObject* errors = PyUpb_Message_FindInitializationErrors(_self, NULL);
-    if (!errors) return NULL;
-    if (PyList_Size(errors) == 0) {
-      Py_DECREF(errors);
-      return PyBytes_FromStringAndSize(NULL, 0);
-    }
-    PyUpb_Message_ReportInitializationErrors(msgdef, errors,
-                                             state->encode_error_class);
-    return NULL;
-  }
-
-  upb_Arena* arena = upb_Arena_New();
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(msgdef);
-  size_t size = 0;
-  // Python does not currently have any effective limit on serialization depth.
-  int options = upb_EncodeOptions_MaxDepth(UINT16_MAX);
-  if (check_required) options |= kUpb_EncodeOption_CheckRequired;
-  if (deterministic) options |= kUpb_EncodeOption_Deterministic;
-  char* pb;
-  upb_EncodeStatus status =
-      upb_Encode(self->ptr.msg, layout, options, arena, &pb, &size);
-  PyObject* ret = NULL;
-
-  if (status != kUpb_EncodeStatus_Ok) {
-    PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-    PyObject* errors = PyUpb_Message_FindInitializationErrors(_self, NULL);
-    if (PyList_Size(errors) != 0) {
-      PyUpb_Message_ReportInitializationErrors(msgdef, errors,
-                                               state->encode_error_class);
-    } else {
-      PyErr_Format(state->encode_error_class, "Failed to serialize proto");
-    }
-    goto done;
-  }
-
-  ret = PyBytes_FromStringAndSize(pb, size);
-
-done:
-  upb_Arena_Free(arena);
-  return ret;
-}
-
-PyObject* PyUpb_Message_SerializeToString(PyObject* _self, PyObject* args,
-                                          PyObject* kwargs) {
-  return PyUpb_Message_SerializeInternal(_self, args, kwargs, true);
-}
-
-PyObject* PyUpb_Message_SerializePartialToString(PyObject* _self,
-                                                 PyObject* args,
-                                                 PyObject* kwargs) {
-  return PyUpb_Message_SerializeInternal(_self, args, kwargs, false);
-}
-
-static PyObject* PyUpb_Message_WhichOneof(PyObject* _self, PyObject* name) {
-  PyUpb_Message* self = (void*)_self;
-  const upb_OneofDef* o;
-  if (!PyUpb_Message_LookupName(self, name, NULL, &o, PyExc_ValueError)) {
-    return NULL;
-  }
-  upb_Message* msg = PyUpb_Message_GetIfReified(_self);
-  if (!msg) Py_RETURN_NONE;
-  const upb_FieldDef* f = upb_Message_WhichOneof(msg, o);
-  if (!f) Py_RETURN_NONE;
-  return PyUnicode_FromString(upb_FieldDef_Name(f));
-}
-
-PyObject* DeepCopy(PyObject* _self, PyObject* arg) {
-  PyUpb_Message* self = (void*)_self;
-
-  PyObject* arena = PyUpb_Arena_New();
-  upb_Message* clone =
-      upb_Message_DeepClone(self->ptr.msg, upb_MessageDef_MiniTable(self->def),
-                            PyUpb_Arena_Get(arena));
-  PyObject* ret = PyUpb_Message_Get(clone, self->def, arena);
-  Py_DECREF(arena);
-
-  return ret;
-}
-
-void PyUpb_Message_ClearExtensionDict(PyObject* _self) {
-  PyUpb_Message* self = (void*)_self;
-  assert(self->ext_dict);
-  self->ext_dict = NULL;
-}
-
-static PyObject* PyUpb_Message_GetExtensionDict(PyObject* _self,
-                                                void* closure) {
-  PyUpb_Message* self = (void*)_self;
-  if (self->ext_dict) {
-    Py_INCREF(self->ext_dict);
-    return self->ext_dict;
-  }
-
-  const upb_MessageDef* m = _PyUpb_Message_GetMsgdef(self);
-  if (upb_MessageDef_ExtensionRangeCount(m) == 0) {
-    PyErr_SetNone(PyExc_AttributeError);
-    return NULL;
-  }
-
-  self->ext_dict = PyUpb_ExtensionDict_New(_self);
-  return self->ext_dict;
-}
-
-static PyGetSetDef PyUpb_Message_Getters[] = {
-    {"Extensions", PyUpb_Message_GetExtensionDict, NULL, "Extension dict"},
-    {NULL}};
-
-static PyMethodDef PyUpb_Message_Methods[] = {
-    {"__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class."},
-    // TODO(https://github.com/protocolbuffers/upb/issues/459)
-    //{ "__unicode__", (PyCFunction)ToUnicode, METH_NOARGS,
-    //  "Outputs a unicode representation of the message." },
-    {"ByteSize", (PyCFunction)PyUpb_Message_ByteSize, METH_NOARGS,
-     "Returns the size of the message in bytes."},
-    {"Clear", (PyCFunction)PyUpb_Message_Clear, METH_NOARGS,
-     "Clears the message."},
-    {"ClearExtension", PyUpb_Message_ClearExtension, METH_O,
-     "Clears a message field."},
-    {"ClearField", PyUpb_Message_ClearField, METH_O, "Clears a message field."},
-    // TODO(b/296078718): add the CopyFrom back in 25.0 fro OSS
-    // {"CopyFrom", PyUpb_Message_CopyFrom, METH_O,
-    //  "Copies a protocol message into the current message."},
-    {"DiscardUnknownFields", (PyCFunction)PyUpb_Message_DiscardUnknownFields,
-     METH_NOARGS, "Discards the unknown fields."},
-    {"FindInitializationErrors", PyUpb_Message_FindInitializationErrors,
-     METH_NOARGS, "Finds unset required fields."},
-    {"FromString", PyUpb_Message_FromString, METH_O | METH_CLASS,
-     "Creates new method instance from given serialized data."},
-    {"HasExtension", PyUpb_Message_HasExtension, METH_O,
-     "Checks if a message field is set."},
-    {"HasField", PyUpb_Message_HasField, METH_O,
-     "Checks if a message field is set."},
-    {"IsInitialized", PyUpb_Message_IsInitialized, METH_VARARGS,
-     "Checks if all required fields of a protocol message are set."},
-    {"ListFields", PyUpb_Message_ListFields, METH_NOARGS,
-     "Lists all set fields of a message."},
-    {"MergeFrom", PyUpb_Message_MergeFrom, METH_O,
-     "Merges a protocol message into the current message."},
-    {"MergeFromString", PyUpb_Message_MergeFromString, METH_O,
-     "Merges a serialized message into the current message."},
-    {"ParseFromString", PyUpb_Message_ParseFromString, METH_O,
-     "Parses a serialized message into the current message."},
-    {"SerializePartialToString",
-     (PyCFunction)PyUpb_Message_SerializePartialToString,
-     METH_VARARGS | METH_KEYWORDS,
-     "Serializes the message to a string, even if it isn't initialized."},
-    {"SerializeToString", (PyCFunction)PyUpb_Message_SerializeToString,
-     METH_VARARGS | METH_KEYWORDS,
-     "Serializes the message to a string, only for initialized messages."},
-    {"SetInParent", (PyCFunction)PyUpb_Message_SetInParent, METH_NOARGS,
-     "Sets the has bit of the given field in its parent message."},
-    {"UnknownFields", (PyCFunction)PyUpb_Message_UnknownFields, METH_NOARGS,
-     "Parse unknown field set"},
-    {"WhichOneof", PyUpb_Message_WhichOneof, METH_O,
-     "Returns the name of the field set inside a oneof, "
-     "or None if no field is set."},
-    {"_ListFieldsItemKey", PyUpb_Message_ListFieldsItemKey,
-     METH_O | METH_STATIC,
-     "Compares ListFields() list entries by field number"},
-    {"_CheckCalledFromGeneratedFile",
-     PyUpb_Message_CheckCalledFromGeneratedFile, METH_NOARGS | METH_STATIC,
-     "Raises TypeError if the caller is not in a _pb2.py file."},
-    {NULL, NULL}};
-
-static PyType_Slot PyUpb_Message_Slots[] = {
-    {Py_tp_dealloc, PyUpb_Message_Dealloc},
-    {Py_tp_doc, "A ProtocolMessage"},
-    {Py_tp_getattro, PyUpb_Message_GetAttr},
-    {Py_tp_getset, PyUpb_Message_Getters},
-    {Py_tp_hash, PyObject_HashNotImplemented},
-    {Py_tp_methods, PyUpb_Message_Methods},
-    {Py_tp_new, PyUpb_Message_New},
-    {Py_tp_str, PyUpb_Message_ToString},
-    {Py_tp_repr, PyUpb_Message_ToString},
-    {Py_tp_richcompare, PyUpb_Message_RichCompare},
-    {Py_tp_setattro, PyUpb_Message_SetAttr},
-    {Py_tp_init, PyUpb_Message_Init},
-    {0, NULL}};
-
-PyType_Spec PyUpb_Message_Spec = {
-    PYUPB_MODULE_NAME ".Message",              // tp_name
-    sizeof(PyUpb_Message),                     // tp_basicsize
-    0,                                         // tp_itemsize
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,  // tp_flags
-    PyUpb_Message_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// MessageMeta
-// -----------------------------------------------------------------------------
-
-// MessageMeta is the metaclass for message objects.  The generated code uses it
-// to construct message classes, ie.
-//
-// FooMessage = _message.MessageMeta('FooMessage', (_message.Message), {...})
-//
-// (This is not quite true: at the moment the Python library subclasses
-// MessageMeta, and uses that subclass as the metaclass.  There is a TODO below
-// to simplify this, so that the illustration above is indeed accurate).
-
-typedef struct {
-  const upb_MiniTable* layout;
-  PyObject* py_message_descriptor;
-} PyUpb_MessageMeta;
-
-// The PyUpb_MessageMeta struct is trailing data tacked onto the end of
-// MessageMeta instances.  This means that we get our instances of this struct
-// by adding the appropriate number of bytes.
-static PyUpb_MessageMeta* PyUpb_GetMessageMeta(PyObject* cls) {
-#ifndef NDEBUG
-  PyUpb_ModuleState* state = PyUpb_ModuleState_MaybeGet();
-  assert(!state || cls->ob_type == state->message_meta_type);
-#endif
-  return (PyUpb_MessageMeta*)((char*)cls + cpython_bits.type_basicsize);
-}
-
-static const upb_MessageDef* PyUpb_MessageMeta_GetMsgdef(PyObject* cls) {
-  PyUpb_MessageMeta* self = PyUpb_GetMessageMeta(cls);
-  return PyUpb_Descriptor_GetDef(self->py_message_descriptor);
-}
-
-PyObject* PyUpb_MessageMeta_DoCreateClass(PyObject* py_descriptor,
-                                          const char* name, PyObject* dict) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyTypeObject* descriptor_type = state->descriptor_types[kPyUpb_Descriptor];
-  if (!PyObject_TypeCheck(py_descriptor, descriptor_type)) {
-    return PyErr_Format(PyExc_TypeError, "Expected a message Descriptor");
-  }
-
-  const upb_MessageDef* msgdef = PyUpb_Descriptor_GetDef(py_descriptor);
-  assert(msgdef);
-  assert(!PyUpb_ObjCache_Get(upb_MessageDef_MiniTable(msgdef)));
-
-  PyObject* slots = PyTuple_New(0);
-  if (!slots) return NULL;
-  int status = PyDict_SetItemString(dict, "__slots__", slots);
-  Py_DECREF(slots);
-  if (status < 0) return NULL;
-
-  // Bases are either:
-  //    (Message, Message)            # for regular messages
-  //    (Message, Message, WktBase)   # For well-known types
-  PyObject* wkt_bases = PyUpb_GetWktBases(state);
-  PyObject* wkt_base =
-      PyDict_GetItemString(wkt_bases, upb_MessageDef_FullName(msgdef));
-  PyObject* args;
-  if (wkt_base == NULL) {
-    args = Py_BuildValue("s(OO)O", name, state->cmessage_type,
-                         state->message_class, dict);
-  } else {
-    args = Py_BuildValue("s(OOO)O", name, state->cmessage_type,
-                         state->message_class, wkt_base, dict);
-  }
-
-  PyObject* ret = cpython_bits.type_new(state->message_meta_type, args, NULL);
-  Py_DECREF(args);
-  if (!ret) return NULL;
-
-  PyUpb_MessageMeta* meta = PyUpb_GetMessageMeta(ret);
-  meta->py_message_descriptor = py_descriptor;
-  meta->layout = upb_MessageDef_MiniTable(msgdef);
-  Py_INCREF(meta->py_message_descriptor);
-
-  PyUpb_ObjCache_Add(meta->layout, ret);
-
-  return ret;
-}
-
-static PyObject* PyUpb_MessageMeta_New(PyTypeObject* type, PyObject* args,
-                                       PyObject* kwargs) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  static const char* kwlist[] = {"name", "bases", "dict", 0};
-  PyObject *bases, *dict;
-  const char* name;
-
-  // Check arguments: (name, bases, dict)
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO!O!:type", (char**)kwlist,
-                                   &name, &PyTuple_Type, &bases, &PyDict_Type,
-                                   &dict)) {
-    return NULL;
-  }
-
-  // Check bases: only (), or (message.Message,) are allowed
-  Py_ssize_t size = PyTuple_Size(bases);
-  if (!(size == 0 ||
-        (size == 1 && PyTuple_GetItem(bases, 0) == state->message_class))) {
-    PyErr_Format(PyExc_TypeError,
-                 "A Message class can only inherit from Message, not %S",
-                 bases);
-    return NULL;
-  }
-
-  // Check dict['DESCRIPTOR']
-  PyObject* py_descriptor = PyDict_GetItemString(dict, "DESCRIPTOR");
-  if (py_descriptor == NULL) {
-    PyErr_SetString(PyExc_TypeError, "Message class has no DESCRIPTOR");
-    return NULL;
-  }
-
-  const upb_MessageDef* m = PyUpb_Descriptor_GetDef(py_descriptor);
-  PyObject* ret = PyUpb_ObjCache_Get(upb_MessageDef_MiniTable(m));
-  if (ret) return ret;
-  return PyUpb_MessageMeta_DoCreateClass(py_descriptor, name, dict);
-}
-
-static void PyUpb_MessageMeta_Dealloc(PyObject* self) {
-  PyUpb_MessageMeta* meta = PyUpb_GetMessageMeta(self);
-  PyUpb_ObjCache_Delete(meta->layout);
-  Py_DECREF(meta->py_message_descriptor);
-  PyTypeObject* tp = Py_TYPE(self);
-  cpython_bits.type_dealloc(self);
-  Py_DECREF(tp);
-}
-
-void PyUpb_MessageMeta_AddFieldNumber(PyObject* self, const upb_FieldDef* f) {
-  PyObject* name =
-      PyUnicode_FromFormat("%s_FIELD_NUMBER", upb_FieldDef_Name(f));
-  PyObject* upper = PyObject_CallMethod(name, "upper", "");
-  PyObject_SetAttr(self, upper, PyLong_FromLong(upb_FieldDef_Number(f)));
-  Py_DECREF(name);
-  Py_DECREF(upper);
-}
-
-static PyObject* PyUpb_MessageMeta_GetDynamicAttr(PyObject* self,
-                                                  PyObject* name) {
-  const char* name_buf = PyUpb_GetStrData(name);
-  if (!name_buf) return NULL;
-  const upb_MessageDef* msgdef = PyUpb_MessageMeta_GetMsgdef(self);
-  const upb_FileDef* filedef = upb_MessageDef_File(msgdef);
-  const upb_DefPool* symtab = upb_FileDef_Pool(filedef);
-
-  PyObject* py_key =
-      PyBytes_FromFormat("%s.%s", upb_MessageDef_FullName(msgdef), name_buf);
-  const char* key = PyUpb_GetStrData(py_key);
-  PyObject* ret = NULL;
-  const upb_MessageDef* nested = upb_DefPool_FindMessageByName(symtab, key);
-  const upb_EnumDef* enumdef;
-  const upb_EnumValueDef* enumval;
-  const upb_FieldDef* ext;
-
-  if (nested) {
-    ret = PyUpb_Descriptor_GetClass(nested);
-  } else if ((enumdef = upb_DefPool_FindEnumByName(symtab, key))) {
-    PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-    PyObject* klass = state->enum_type_wrapper_class;
-    ret = PyUpb_EnumDescriptor_Get(enumdef);
-    ret = PyObject_CallFunctionObjArgs(klass, ret, NULL);
-  } else if ((enumval = upb_DefPool_FindEnumByNameval(symtab, key))) {
-    ret = PyLong_FromLong(upb_EnumValueDef_Number(enumval));
-  } else if ((ext = upb_DefPool_FindExtensionByName(symtab, key))) {
-    ret = PyUpb_FieldDescriptor_Get(ext);
-  }
-
-  Py_DECREF(py_key);
-
-  const char* suffix = "_FIELD_NUMBER";
-  size_t n = strlen(name_buf);
-  size_t suffix_n = strlen(suffix);
-  if (n > suffix_n && memcmp(suffix, name_buf + n - suffix_n, suffix_n) == 0) {
-    // We can't look up field names dynamically, because the <NAME>_FIELD_NUMBER
-    // naming scheme upper-cases the field name and is therefore non-reversible.
-    // So we just add all field numbers.
-    int n = upb_MessageDef_FieldCount(msgdef);
-    for (int i = 0; i < n; i++) {
-      PyUpb_MessageMeta_AddFieldNumber(self, upb_MessageDef_Field(msgdef, i));
-    }
-    n = upb_MessageDef_NestedExtensionCount(msgdef);
-    for (int i = 0; i < n; i++) {
-      PyUpb_MessageMeta_AddFieldNumber(
-          self, upb_MessageDef_NestedExtension(msgdef, i));
-    }
-    ret = PyObject_GenericGetAttr(self, name);
-  }
-
-  return ret;
-}
-
-static PyObject* PyUpb_MessageMeta_GetAttr(PyObject* self, PyObject* name) {
-  // We want to first delegate to the type's tp_dict to retrieve any attributes
-  // that were previously calculated and cached in the type's dict.
-  PyObject* ret = cpython_bits.type_getattro(self, name);
-  if (ret) return ret;
-
-  // We did not find a cached attribute. Try to calculate the attribute
-  // dynamically, using the descriptor as an argument.
-  PyErr_Clear();
-  ret = PyUpb_MessageMeta_GetDynamicAttr(self, name);
-
-  if (ret) {
-    PyObject_SetAttr(self, name, ret);
-    PyErr_Clear();
-    return ret;
-  }
-
-  PyErr_SetObject(PyExc_AttributeError, name);
-  return NULL;
-}
-
-static PyType_Slot PyUpb_MessageMeta_Slots[] = {
-    {Py_tp_new, PyUpb_MessageMeta_New},
-    {Py_tp_dealloc, PyUpb_MessageMeta_Dealloc},
-    {Py_tp_getattro, PyUpb_MessageMeta_GetAttr},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_MessageMeta_Spec = {
-    PYUPB_MODULE_NAME ".MessageMeta",  // tp_name
-    0,  // To be filled in by size of base     // tp_basicsize
-    0,  // tp_itemsize
-    // TODO(haberman): remove BASETYPE, Python should just use MessageMeta
-    // directly instead of subclassing it.
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,  // tp_flags
-    PyUpb_MessageMeta_Slots,
-};
-
-static PyObject* PyUpb_MessageMeta_CreateType(void) {
-  PyObject* bases = Py_BuildValue("(O)", &PyType_Type);
-  if (!bases) return NULL;
-  PyUpb_MessageMeta_Spec.basicsize =
-      cpython_bits.type_basicsize + sizeof(PyUpb_MessageMeta);
-  PyObject* type = PyType_FromSpecWithBases(&PyUpb_MessageMeta_Spec, bases);
-  Py_DECREF(bases);
-  return type;
-}
-
-bool PyUpb_InitMessage(PyObject* m) {
-  if (!PyUpb_CPythonBits_Init(&cpython_bits)) return false;
-  PyObject* message_meta_type = PyUpb_MessageMeta_CreateType();
-
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-  state->cmessage_type = PyUpb_AddClass(m, &PyUpb_Message_Spec);
-  state->message_meta_type = (PyTypeObject*)message_meta_type;
-
-  if (!state->cmessage_type || !state->message_meta_type) return false;
-  if (PyModule_AddObject(m, "MessageMeta", message_meta_type)) return false;
-  state->listfields_item_key = PyObject_GetAttrString(
-      (PyObject*)state->cmessage_type, "_ListFieldsItemKey");
-
-  PyObject* mod =
-      PyImport_ImportModule(PYUPB_PROTOBUF_PUBLIC_PACKAGE ".message");
-  if (mod == NULL) return false;
-
-  state->encode_error_class = PyObject_GetAttrString(mod, "EncodeError");
-  state->decode_error_class = PyObject_GetAttrString(mod, "DecodeError");
-  state->message_class = PyObject_GetAttrString(mod, "Message");
-  Py_DECREF(mod);
-
-  PyObject* enum_type_wrapper = PyImport_ImportModule(
-      PYUPB_PROTOBUF_INTERNAL_PACKAGE ".enum_type_wrapper");
-  if (enum_type_wrapper == NULL) return false;
-
-  state->enum_type_wrapper_class =
-      PyObject_GetAttrString(enum_type_wrapper, "EnumTypeWrapper");
-  Py_DECREF(enum_type_wrapper);
-
-  if (!state->encode_error_class || !state->decode_error_class ||
-      !state->message_class || !state->listfields_item_key ||
-      !state->enum_type_wrapper_class) {
-    return false;
-  }
-
-  return true;
-}
diff --git a/third_party/upb/python/message.h b/third_party/upb/python/message.h
deleted file mode 100644
index 2bb075ba305bd..0000000000000
--- a/third_party/upb/python/message.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYPB_MESSAGE_H__
-#define PYPB_MESSAGE_H__
-
-#include <stdbool.h>
-
-#include "python/protobuf.h"
-#include "upb/reflection/message.h"
-
-// Removes the wrapper object for this field from the unset subobject cache.
-void PyUpb_Message_CacheDelete(PyObject* _self, const upb_FieldDef* f);
-
-// Sets the field value for `f` to `subobj`, evicting the wrapper object from
-// the "unset subobject" cache now that real data exists for it.  The caller
-// must also update the wrapper associated with `f` to point to `subobj` also.
-void PyUpb_Message_SetConcreteSubobj(PyObject* _self, const upb_FieldDef* f,
-                                     upb_MessageValue subobj);
-
-// Gets a Python wrapper object for message `u_msg` of type `m`, returning a
-// cached wrapper if one was previously created.  If a new object is created,
-// it will reference `arena`, which must own `u_msg`.
-PyObject* PyUpb_Message_Get(upb_Message* u_msg, const upb_MessageDef* m,
-                            PyObject* arena);
-
-// Verifies that a Python object is a message.  Sets a TypeError exception and
-// returns false on failure.
-bool PyUpb_Message_Verify(PyObject* self);
-
-// Gets the upb_Message* for this message object if the message is reified.
-// Otherwise returns NULL.
-upb_Message* PyUpb_Message_GetIfReified(PyObject* _self);
-
-// Returns the `upb_MessageDef` for a given Message.
-const upb_MessageDef* PyUpb_Message_GetMsgdef(PyObject* self);
-
-// Functions that match the corresponding methods on the message object.
-PyObject* PyUpb_Message_MergeFrom(PyObject* self, PyObject* arg);
-PyObject* PyUpb_Message_MergeFromString(PyObject* self, PyObject* arg);
-PyObject* PyUpb_Message_SerializeToString(PyObject* self, PyObject* args,
-                                          PyObject* kwargs);
-PyObject* PyUpb_Message_SerializePartialToString(PyObject* self, PyObject* args,
-                                                 PyObject* kwargs);
-
-// Sets fields of the message according to the attribuges in `kwargs`.
-int PyUpb_Message_InitAttributes(PyObject* _self, PyObject* args,
-                                 PyObject* kwargs);
-
-// Checks that `key` is a field descriptor for an extension type, and that the
-// extendee is this message.  Otherwise returns NULL and sets a KeyError.
-const upb_FieldDef* PyUpb_Message_GetExtensionDef(PyObject* _self,
-                                                  PyObject* key);
-
-// Clears the given field in this message.
-void PyUpb_Message_DoClearField(PyObject* _self, const upb_FieldDef* f);
-
-// Clears the ExtensionDict from the message.  The message must have an
-// ExtensionDict set.
-void PyUpb_Message_ClearExtensionDict(PyObject* _self);
-
-// Implements the equivalent of getattr(msg, field), once `field` has
-// already been resolved to a `upb_FieldDef*`.
-PyObject* PyUpb_Message_GetFieldValue(PyObject* _self,
-                                      const upb_FieldDef* field);
-
-// Implements the equivalent of setattr(msg, field, value), once `field` has
-// already been resolved to a `upb_FieldDef*`.
-int PyUpb_Message_SetFieldValue(PyObject* _self, const upb_FieldDef* field,
-                                PyObject* value, PyObject* exc);
-
-// Returns the version associated with this message.  The version will be
-// incremented when the message changes.
-int PyUpb_Message_GetVersion(PyObject* _self);
-
-// Module-level init.
-bool PyUpb_InitMessage(PyObject* m);
-
-#endif  // PYPB_MESSAGE_H__
diff --git a/third_party/upb/python/minimal_test.py b/third_party/upb/python/minimal_test.py
deleted file mode 100644
index 3c0df48f3c240..0000000000000
--- a/third_party/upb/python/minimal_test.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""A bare-bones unit test that doesn't load any generated code."""
-
-
-import unittest
-from google.protobuf.pyext import _message
-from google3.net.proto2.python.internal import api_implementation
-from google.protobuf import unittest_pb2
-from google.protobuf import map_unittest_pb2
-from google.protobuf import descriptor_pool
-from google.protobuf import text_format
-from google.protobuf import message_factory
-from google.protobuf import message
-from google3.net.proto2.python.internal import factory_test1_pb2
-from google3.net.proto2.python.internal import factory_test2_pb2
-from google3.net.proto2.python.internal import more_extensions_pb2
-from google.protobuf import descriptor_pb2
-
-class TestMessageExtension(unittest.TestCase):
-
-    def test_descriptor_pool(self):
-        serialized_desc = b'\n\ntest.proto\"\x0e\n\x02M1*\x08\x08\x01\x10\x80\x80\x80\x80\x02:\x15\n\x08test_ext\x12\x03.M1\x18\x01 \x01(\x05'
-        pool = _message.DescriptorPool()
-        file_desc = pool.AddSerializedFile(serialized_desc)
-        self.assertEqual("test.proto", file_desc.name)
-        ext_desc = pool.FindExtensionByName("test_ext")
-        self.assertEqual(1, ext_desc.number)
-
-        # Test object cache: repeatedly retrieving the same descriptor
-        # should result in the same object
-        self.assertIs(ext_desc, pool.FindExtensionByName("test_ext"))
-
-
-    def test_lib_is_upb(self):
-        # Ensure we are not pulling in a different protobuf library on the
-        # system.
-        print(_message._IS_UPB)
-        self.assertTrue(_message._IS_UPB)
-        self.assertEqual(api_implementation.Type(), "cpp")
-
-    def test_repeated_field_slice_delete(self):
-        def test_slice(start, end, step):
-            vals = list(range(20))
-            message = unittest_pb2.TestAllTypes(repeated_int32=vals)
-            del vals[start:end:step]
-            del message.repeated_int32[start:end:step]
-            self.assertEqual(vals, list(message.repeated_int32))
-        test_slice(3, 11, 1)
-        test_slice(3, 11, 2)
-        test_slice(3, 11, 3)
-        test_slice(11, 3, -1)
-        test_slice(11, 3, -2)
-        test_slice(11, 3, -3)
-        test_slice(10, 25, 4)
-    
-    def testExtensionsErrors(self):
-        msg = unittest_pb2.TestAllTypes()
-        self.assertRaises(AttributeError, getattr, msg, 'Extensions')
-    
-    def testClearStubMapField(self):
-        msg = map_unittest_pb2.TestMapSubmessage()
-        int32_map = msg.test_map.map_int32_int32
-        msg.test_map.ClearField("map_int32_int32")
-        int32_map[123] = 456
-        self.assertEqual(0, msg.test_map.ByteSize())
-
-    def testClearReifiedMapField(self):
-        msg = map_unittest_pb2.TestMap()
-        int32_map = msg.map_int32_int32
-        int32_map[123] = 456
-        msg.ClearField("map_int32_int32")
-        int32_map[111] = 222
-        self.assertEqual(0, msg.ByteSize())
-
-    def testClearStubRepeatedField(self):
-        msg = unittest_pb2.NestedTestAllTypes()
-        int32_array = msg.payload.repeated_int32
-        msg.payload.ClearField("repeated_int32")
-        int32_array.append(123)
-        self.assertEqual(0, msg.payload.ByteSize())
-
-    def testClearReifiedRepeatdField(self):
-        msg = unittest_pb2.TestAllTypes()
-        int32_array = msg.repeated_int32
-        int32_array.append(123)
-        self.assertNotEqual(0, msg.ByteSize())
-        msg.ClearField("repeated_int32")
-        int32_array.append(123)
-        self.assertEqual(0, msg.ByteSize())
-
-    def testFloatPrinting(self):
-        message = unittest_pb2.TestAllTypes()
-        message.optional_float = -0.0
-        self.assertEqual(str(message), 'optional_float: -0\n')
-
-class OversizeProtosTest(unittest.TestCase):
-  def setUp(self):
-    msg = unittest_pb2.NestedTestAllTypes()
-    m = msg
-    for i in range(101):
-      m = m.child
-    m.Clear()
-    self.p_serialized = msg.SerializeToString()
-    
-  def testAssertOversizeProto(self):
-    from google.protobuf.pyext._message import SetAllowOversizeProtos
-    SetAllowOversizeProtos(False)
-    q = unittest_pb2.NestedTestAllTypes()
-    with self.assertRaises(message.DecodeError):
-      q.ParseFromString(self.p_serialized)
-      print(q)
-  
-  def testSucceedOversizeProto(self):
-    from google.protobuf.pyext._message import SetAllowOversizeProtos
-    SetAllowOversizeProtos(True)
-    q = unittest_pb2.NestedTestAllTypes()
-    q.ParseFromString(self.p_serialized)
-
-  def testExtensionIter(self):
-    extendee_proto = more_extensions_pb2.ExtendedMessage()
-
-    extension_int32 = more_extensions_pb2.optional_int_extension
-    extendee_proto.Extensions[extension_int32] = 23
-
-    extension_repeated = more_extensions_pb2.repeated_int_extension
-    extendee_proto.Extensions[extension_repeated].append(11)
-
-    extension_msg = more_extensions_pb2.optional_message_extension
-    extendee_proto.Extensions[extension_msg].foreign_message_int = 56
-
-    # Set some normal fields.
-    extendee_proto.optional_int32 = 1
-    extendee_proto.repeated_string.append('hi')
-
-    expected = {
-        extension_int32: True,
-        extension_msg: True,
-        extension_repeated: True
-    }
-    count = 0
-    for item in extendee_proto.Extensions:
-      del expected[item]
-      self.assertIn(item, extendee_proto.Extensions)
-      count += 1
-    self.assertEqual(count, 3)
-    self.assertEqual(len(expected), 0)
-  
-  def testIsInitializedStub(self):
-    proto = unittest_pb2.TestRequiredForeign()
-    self.assertTrue(proto.IsInitialized())
-    self.assertFalse(proto.optional_message.IsInitialized())
-    errors = []
-    self.assertFalse(proto.optional_message.IsInitialized(errors))
-    self.assertEqual(['a', 'b', 'c'], errors)
-    self.assertRaises(message.EncodeError, proto.optional_message.SerializeToString)
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/BUILD b/third_party/upb/python/pb_unit_tests/BUILD
deleted file mode 100644
index d63a081417a9e..0000000000000
--- a/third_party/upb/python/pb_unit_tests/BUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(":pyproto_test_wrapper.bzl", "pyproto_test_wrapper")
-# begin:github_only
-load("@pip_deps//:requirements.bzl", "requirement")
-# end:github_only
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-pyproto_test_wrapper(name = "descriptor_database_test")
-
-pyproto_test_wrapper(name = "descriptor_pool_test")
-
-pyproto_test_wrapper(name = "descriptor_test")
-
-# begin:github_only
-pyproto_test_wrapper(name = "generator_test")
-# end:github_only
-
-pyproto_test_wrapper(name = "json_format_test")
-
-pyproto_test_wrapper(name = "keywords_test")
-
-pyproto_test_wrapper(name = "message_factory_test")
-
-# begin:github_only
-# This target has different dependencies and fails when using the wrapper
-# TODO: Move this to using pyproto_test_wrapper
-py_test(
-    name = "numpy_test",
-    srcs = ["numpy_test_wrapper.py"],
-    main = "numpy_test_wrapper.py",
-    deps = [
-      requirement("numpy"),
-      "@com_google_protobuf//python/google/protobuf/internal/numpy:numpy_test",
-      "//python:_message",
-    ],
-    target_compatible_with = select({
-      "@system_python//:supported": [],
-      "//conditions:default": ["@platforms//:incompatible"],
-    }),
-)
-# end:github_only
-
-# begin:google_only
-# pyproto_test_wrapper(name = "numpy_test")
-# end:google_only
-
-pyproto_test_wrapper(name = "proto_builder_test")
-
-pyproto_test_wrapper(name = "service_reflection_test")
-
-pyproto_test_wrapper(name = "symbol_database_test")
-
-pyproto_test_wrapper(name = "text_encoding_test")
-
-pyproto_test_wrapper(name = "message_test")
-
-pyproto_test_wrapper(name = "reflection_test")
-
-pyproto_test_wrapper(name = "text_format_test")
-
-pyproto_test_wrapper(name = "unknown_fields_test")
-
-pyproto_test_wrapper(name = "well_known_types_test")
-
-pyproto_test_wrapper(name = "wire_format_test")
-
-filegroup(
-    name = "test_files",
-    srcs = glob(["*.py"]),
-    visibility = [
-        "//python/dist:__pkg__",  # Scheuklappen: keep
-    ],
-)
diff --git a/third_party/upb/python/pb_unit_tests/README.md b/third_party/upb/python/pb_unit_tests/README.md
deleted file mode 100644
index 669f0674da88d..0000000000000
--- a/third_party/upb/python/pb_unit_tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# Protobuf Unit Tests
-
-This directory contains wrappers around the Python unit tests defined in
-the protobuf repo.  Python+upb is intended to be a drop-in replacement for
-protobuf Python, so we should be able to pass the same set of unit tests.
-
-Our wrappers contain exclusion lists for tests we know we are not currently
-passing.  Ideally these exclusion lists will become empty once Python+upb is
-fully implemented.  However there may be a few edge cases that we decide
-are not worth matching with perfect parity.
diff --git a/third_party/upb/python/pb_unit_tests/descriptor_database_test_wrapper.py b/third_party/upb/python/pb_unit_tests/descriptor_database_test_wrapper.py
deleted file mode 100644
index 8cabf0f065ea2..0000000000000
--- a/third_party/upb/python/pb_unit_tests/descriptor_database_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.descriptor_database_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/descriptor_pool_test_wrapper.py b/third_party/upb/python/pb_unit_tests/descriptor_pool_test_wrapper.py
deleted file mode 100644
index 24620c3680d17..0000000000000
--- a/third_party/upb/python/pb_unit_tests/descriptor_pool_test_wrapper.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
-from google.protobuf.internal.descriptor_pool_test import *
-
-SecondaryDescriptorFromDescriptorDB.testErrorCollector.__unittest_expecting_failure__ = True
-
-# begin:github_only
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
-# end:github_only
-
-# begin:google_only
-# from absl import app
-# if __name__ == '__main__':
-#   app.run(lambda argv: unittest.main(verbosity=2))
-# end:google_only
diff --git a/third_party/upb/python/pb_unit_tests/descriptor_test_wrapper.py b/third_party/upb/python/pb_unit_tests/descriptor_test_wrapper.py
deleted file mode 100644
index 8b33899b70e1b..0000000000000
--- a/third_party/upb/python/pb_unit_tests/descriptor_test_wrapper.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.descriptor_test import *
-import unittest
-
-# These fail because they attempt to add fields with conflicting JSON names.
-# We don't want to support this going forward.
-MakeDescriptorTest.testCamelcaseName.__unittest_expecting_failure__ = True
-MakeDescriptorTest.testJsonName.__unittest_expecting_failure__ = True
-
-# We pass this test, but the error message is slightly different.
-# Our error message is better.
-NewDescriptorTest.testImmutableCppDescriptor.__unittest_expecting_failure__ = True
-
-DescriptorTest.testGetDebugString.__unittest_expecting_failure__ = True
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/generator_test_wrapper.py b/third_party/upb/python/pb_unit_tests/generator_test_wrapper.py
deleted file mode 100644
index 8eed1654df679..0000000000000
--- a/third_party/upb/python/pb_unit_tests/generator_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.generator_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/json_format_test_wrapper.py b/third_party/upb/python/pb_unit_tests/json_format_test_wrapper.py
deleted file mode 100644
index 876e44d525716..0000000000000
--- a/third_party/upb/python/pb_unit_tests/json_format_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.json_format_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/keywords_test_wrapper.py b/third_party/upb/python/pb_unit_tests/keywords_test_wrapper.py
deleted file mode 100644
index 54034feb98d06..0000000000000
--- a/third_party/upb/python/pb_unit_tests/keywords_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.keywords_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/message_factory_test_wrapper.py b/third_party/upb/python/pb_unit_tests/message_factory_test_wrapper.py
deleted file mode 100644
index 6bf14c5508084..0000000000000
--- a/third_party/upb/python/pb_unit_tests/message_factory_test_wrapper.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.message_factory_test import *
-import unittest
-
-MessageFactoryTest.testDuplicateExtensionNumber.__unittest_expecting_failure__ = True
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/message_test_wrapper.py b/third_party/upb/python/pb_unit_tests/message_test_wrapper.py
deleted file mode 100644
index 08cd363051a13..0000000000000
--- a/third_party/upb/python/pb_unit_tests/message_test_wrapper.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.message_test import *
-import unittest
-
-MessageTest.testExtendFloatWithNothing_proto2.__unittest_skip__ = True
-MessageTest.testExtendFloatWithNothing_proto3.__unittest_skip__ = True
-MessageTest.testExtendInt32WithNothing_proto2.__unittest_skip__ = True
-MessageTest.testExtendInt32WithNothing_proto3.__unittest_skip__ = True
-MessageTest.testExtendStringWithNothing_proto2.__unittest_skip__ = True
-MessageTest.testExtendStringWithNothing_proto3.__unittest_skip__ = True
-
-# Python/C++ customizes the C++ TextFormat to always print trailing ".0" for
-# floats. upb doesn't do this, it matches C++ TextFormat.
-MessageTest.testFloatPrinting_proto2.__unittest_expecting_failure__ = True
-MessageTest.testFloatPrinting_proto3.__unittest_expecting_failure__ = True
-
-# For these tests we are throwing the correct error, only the text of the error
-# message is a mismatch.  For technical reasons around the limited API, matching
-# the existing error message exactly is not feasible.
-Proto3Test.testCopyFromBadType.__unittest_expecting_failure__ = True
-Proto3Test.testMergeFromBadType.__unittest_expecting_failure__ = True
-
-Proto2Test.test_documentation.__unittest_expecting_failure__ = True
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/numpy_test_wrapper.py b/third_party/upb/python/pb_unit_tests/numpy_test_wrapper.py
deleted file mode 100644
index ef0998ff187c8..0000000000000
--- a/third_party/upb/python/pb_unit_tests/numpy_test_wrapper.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
-
-from google.protobuf.internal.numpy.numpy_test import *
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/proto_builder_test_wrapper.py b/third_party/upb/python/pb_unit_tests/proto_builder_test_wrapper.py
deleted file mode 100644
index 0b6a25a158a25..0000000000000
--- a/third_party/upb/python/pb_unit_tests/proto_builder_test_wrapper.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.proto_builder_test import *
-import unittest
-
-ProtoBuilderTest.testMakeLargeProtoClass.__unittest_expecting_failure__ = True
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/pyproto_test_wrapper.bzl b/third_party/upb/python/pb_unit_tests/pyproto_test_wrapper.bzl
deleted file mode 100644
index e3a2e232cb7b7..0000000000000
--- a/third_party/upb/python/pb_unit_tests/pyproto_test_wrapper.bzl
+++ /dev/null
@@ -1,44 +0,0 @@
-# begin:github_only
-
-def pyproto_test_wrapper(name, deps = []):
-    src = name + "_wrapper.py"
-    native.py_test(
-        name = name,
-        srcs = [src],
-        legacy_create_init = False,
-        main = src,
-        data = ["@com_google_protobuf//src/google/protobuf:testdata"],
-        deps = [
-            "//python:_message",
-            "@com_google_protobuf//:python_common_test_protos",
-            "@com_google_protobuf//:python_specific_test_protos",
-            "@com_google_protobuf//:python_test_srcs",
-            "@com_google_protobuf//:python_srcs",
-        ] + deps,
-        target_compatible_with = select({
-            "@system_python//:supported": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
-    )
-
-# end:github_only
-
-# begin:google_only
-#
-# def pyproto_test_wrapper(name):
-#     src = name + "_wrapper.py"
-#     native.py_test(
-#         name = name,
-#         srcs = [src],
-#         main = src,
-#         deps = [
-#             "//third_party/py/google/protobuf/internal:" + name + "_for_deps",
-#             "//net/proto2/python/public:use_upb_protos",
-#         ],
-#         target_compatible_with = select({
-#             "@platforms//os:windows": ["@platforms//:incompatible"],
-#             "//conditions:default": [],
-#         }),
-#     )
-#
-# end:google_only
diff --git a/third_party/upb/python/pb_unit_tests/reflection_test_wrapper.py b/third_party/upb/python/pb_unit_tests/reflection_test_wrapper.py
deleted file mode 100644
index a1f458f4375fa..0000000000000
--- a/third_party/upb/python/pb_unit_tests/reflection_test_wrapper.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.reflection_test import *
-import unittest
-
-# These tests depend on a specific iteration order for extensions, which is not
-# reasonable to guarantee.
-Proto2ReflectionTest.testExtensionIter.__unittest_expecting_failure__ = True
-
-# These tests depend on a specific serialization order for extensions, which is
-# not reasonable to guarantee.
-SerializationTest.testCanonicalSerializationOrder.__unittest_expecting_failure__ = True
-SerializationTest.testCanonicalSerializationOrderSameAsCpp.__unittest_expecting_failure__ = True
-
-# This test relies on the internal implementation using Python descriptors.
-# This is an implementation detail that users should not depend on.
-SerializationTest.testFieldDataDescriptor.__unittest_expecting_failure__ = True
-
-SerializationTest.testFieldProperties.__unittest_expecting_failure__ = True
-
-# TODO(259423340) Python Docker image on MacOS failing.
-ClassAPITest.testParsingNestedClass.__unittest_skip__ = True
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/service_reflection_test_wrapper.py b/third_party/upb/python/pb_unit_tests/service_reflection_test_wrapper.py
deleted file mode 100644
index 00069238de2b9..0000000000000
--- a/third_party/upb/python/pb_unit_tests/service_reflection_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.service_reflection_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/symbol_database_test_wrapper.py b/third_party/upb/python/pb_unit_tests/symbol_database_test_wrapper.py
deleted file mode 100644
index 760548bd8b69c..0000000000000
--- a/third_party/upb/python/pb_unit_tests/symbol_database_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.symbol_database_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/text_encoding_test_wrapper.py b/third_party/upb/python/pb_unit_tests/text_encoding_test_wrapper.py
deleted file mode 100644
index 1354274135bad..0000000000000
--- a/third_party/upb/python/pb_unit_tests/text_encoding_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.text_encoding_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/text_format_test_wrapper.py b/third_party/upb/python/pb_unit_tests/text_format_test_wrapper.py
deleted file mode 100644
index 71b3d4e23a33b..0000000000000
--- a/third_party/upb/python/pb_unit_tests/text_format_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.text_format_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/unknown_fields_test_wrapper.py b/third_party/upb/python/pb_unit_tests/unknown_fields_test_wrapper.py
deleted file mode 100644
index 902394fdd04b1..0000000000000
--- a/third_party/upb/python/pb_unit_tests/unknown_fields_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.unknown_fields_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/well_known_types_test_wrapper.py b/third_party/upb/python/pb_unit_tests/well_known_types_test_wrapper.py
deleted file mode 100644
index ef3692505f7ab..0000000000000
--- a/third_party/upb/python/pb_unit_tests/well_known_types_test_wrapper.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.well_known_types_test import *
-import os
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/pb_unit_tests/wire_format_test_wrapper.py b/third_party/upb/python/pb_unit_tests/wire_format_test_wrapper.py
deleted file mode 100644
index f56474bc9c8d3..0000000000000
--- a/third_party/upb/python/pb_unit_tests/wire_format_test_wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from google.protobuf.internal.wire_format_test import *
-import unittest
-
-if __name__ == '__main__':
-  unittest.main(verbosity=2)
diff --git a/third_party/upb/python/protobuf.c b/third_party/upb/python/protobuf.c
deleted file mode 100644
index ca06c660b4715..0000000000000
--- a/third_party/upb/python/protobuf.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/protobuf.h"
-
-#include "python/descriptor.h"
-#include "python/descriptor_containers.h"
-#include "python/descriptor_pool.h"
-#include "python/extension_dict.h"
-#include "python/map.h"
-#include "python/message.h"
-#include "python/repeated.h"
-#include "python/unknown_fields.h"
-
-static upb_Arena* PyUpb_NewArena(void);
-
-static void PyUpb_ModuleDealloc(void* module) {
-  PyUpb_ModuleState* s = PyModule_GetState(module);
-  PyUpb_WeakMap_Free(s->obj_cache);
-  if (s->c_descriptor_symtab) {
-    upb_DefPool_Free(s->c_descriptor_symtab);
-  }
-}
-
-PyObject* PyUpb_SetAllowOversizeProtos(PyObject* m, PyObject* arg) {
-  if (!arg || !PyBool_Check(arg)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Argument to SetAllowOversizeProtos must be boolean");
-    return NULL;
-  }
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  state->allow_oversize_protos = PyObject_IsTrue(arg);
-  Py_INCREF(arg);
-  return arg;
-}
-
-static PyMethodDef PyUpb_ModuleMethods[] = {
-    {"SetAllowOversizeProtos", PyUpb_SetAllowOversizeProtos, METH_O,
-     "Enable/disable oversize proto parsing."},
-    {NULL, NULL}};
-
-static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
-                                        PYUPB_MODULE_NAME,
-                                        "Protobuf Module",
-                                        sizeof(PyUpb_ModuleState),
-                                        PyUpb_ModuleMethods,  // m_methods
-                                        NULL,                 // m_slots
-                                        NULL,                 // m_traverse
-                                        NULL,                 // m_clear
-                                        PyUpb_ModuleDealloc};
-
-// -----------------------------------------------------------------------------
-// ModuleState
-// -----------------------------------------------------------------------------
-
-PyUpb_ModuleState* PyUpb_ModuleState_MaybeGet(void) {
-  PyObject* module = PyState_FindModule(&module_def);
-  return module ? PyModule_GetState(module) : NULL;
-}
-
-PyUpb_ModuleState* PyUpb_ModuleState_GetFromModule(PyObject* module) {
-  PyUpb_ModuleState* state = PyModule_GetState(module);
-  assert(state);
-  assert(PyModule_GetDef(module) == &module_def);
-  return state;
-}
-
-PyUpb_ModuleState* PyUpb_ModuleState_Get(void) {
-  PyObject* module = PyState_FindModule(&module_def);
-  assert(module);
-  return PyUpb_ModuleState_GetFromModule(module);
-}
-
-PyObject* PyUpb_GetWktBases(PyUpb_ModuleState* state) {
-  if (!state->wkt_bases) {
-    PyObject* wkt_module = PyImport_ImportModule(PYUPB_PROTOBUF_INTERNAL_PACKAGE
-                                                 ".well_known_types");
-
-    if (wkt_module == NULL) {
-      return false;
-    }
-
-    state->wkt_bases = PyObject_GetAttrString(wkt_module, "WKTBASES");
-    PyObject* m = PyState_FindModule(&module_def);
-    // Reparent ownership to m.
-    PyModule_AddObject(m, "__internal_wktbases", state->wkt_bases);
-    Py_DECREF(wkt_module);
-  }
-
-  return state->wkt_bases;
-}
-
-// -----------------------------------------------------------------------------
-// WeakMap
-// -----------------------------------------------------------------------------
-
-struct PyUpb_WeakMap {
-  upb_inttable table;
-  upb_Arena* arena;
-};
-
-PyUpb_WeakMap* PyUpb_WeakMap_New(void) {
-  upb_Arena* arena = PyUpb_NewArena();
-  PyUpb_WeakMap* map = upb_Arena_Malloc(arena, sizeof(*map));
-  map->arena = arena;
-  upb_inttable_init(&map->table, map->arena);
-  return map;
-}
-
-void PyUpb_WeakMap_Free(PyUpb_WeakMap* map) { upb_Arena_Free(map->arena); }
-
-// To give better entropy in the table key, we shift away low bits that are
-// always zero.
-static const int PyUpb_PtrShift = (sizeof(void*) == 4) ? 2 : 3;
-
-uintptr_t PyUpb_WeakMap_GetKey(const void* key) {
-  uintptr_t n = (uintptr_t)key;
-  assert((n & ((1 << PyUpb_PtrShift) - 1)) == 0);
-  return n >> PyUpb_PtrShift;
-}
-
-void PyUpb_WeakMap_Add(PyUpb_WeakMap* map, const void* key, PyObject* py_obj) {
-  upb_inttable_insert(&map->table, PyUpb_WeakMap_GetKey(key),
-                      upb_value_ptr(py_obj), map->arena);
-}
-
-void PyUpb_WeakMap_Delete(PyUpb_WeakMap* map, const void* key) {
-  upb_value val;
-  bool removed =
-      upb_inttable_remove(&map->table, PyUpb_WeakMap_GetKey(key), &val);
-  (void)removed;
-  assert(removed);
-}
-
-void PyUpb_WeakMap_TryDelete(PyUpb_WeakMap* map, const void* key) {
-  upb_inttable_remove(&map->table, PyUpb_WeakMap_GetKey(key), NULL);
-}
-
-PyObject* PyUpb_WeakMap_Get(PyUpb_WeakMap* map, const void* key) {
-  upb_value val;
-  if (upb_inttable_lookup(&map->table, PyUpb_WeakMap_GetKey(key), &val)) {
-    PyObject* ret = upb_value_getptr(val);
-    Py_INCREF(ret);
-    return ret;
-  } else {
-    return NULL;
-  }
-}
-
-bool PyUpb_WeakMap_Next(PyUpb_WeakMap* map, const void** key, PyObject** obj,
-                        intptr_t* iter) {
-  uintptr_t u_key;
-  upb_value val;
-  if (!upb_inttable_next(&map->table, &u_key, &val, iter)) return false;
-  *key = (void*)(u_key << PyUpb_PtrShift);
-  *obj = upb_value_getptr(val);
-  return true;
-}
-
-void PyUpb_WeakMap_DeleteIter(PyUpb_WeakMap* map, intptr_t* iter) {
-  upb_inttable_removeiter(&map->table, iter);
-}
-
-// -----------------------------------------------------------------------------
-// ObjCache
-// -----------------------------------------------------------------------------
-
-PyUpb_WeakMap* PyUpb_ObjCache_Instance(void) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  return state->obj_cache;
-}
-
-void PyUpb_ObjCache_Add(const void* key, PyObject* py_obj) {
-  PyUpb_WeakMap_Add(PyUpb_ObjCache_Instance(), key, py_obj);
-}
-
-void PyUpb_ObjCache_Delete(const void* key) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_MaybeGet();
-  if (!state) {
-    // During the shutdown sequence, our object's Dealloc() methods can be
-    // called *after* our module Dealloc() method has been called.  At that
-    // point our state will be NULL and there is nothing to delete out of the
-    // map.
-    return;
-  }
-  PyUpb_WeakMap_Delete(state->obj_cache, key);
-}
-
-PyObject* PyUpb_ObjCache_Get(const void* key) {
-  return PyUpb_WeakMap_Get(PyUpb_ObjCache_Instance(), key);
-}
-
-// -----------------------------------------------------------------------------
-// Arena
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  upb_Arena* arena;
-} PyUpb_Arena;
-
-// begin:google_only
-// static upb_alloc* global_alloc = &upb_alloc_global;
-// end:google_only
-
-// begin:github_only
-#ifdef __GLIBC__
-#include <malloc.h>  // malloc_trim()
-#endif
-
-// A special allocator that calls malloc_trim() periodically to release
-// memory to the OS.  Without this call, we appear to leak memory, at least
-// as measured in RSS.
-//
-// We opt not to use this instead of PyMalloc (which would also solve the
-// problem) because the latter requires the GIL to be held.  This would make
-// our messages unsafe to share with other languages that could free at
-// unpredictable
-// times.
-static void* upb_trim_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                                size_t size) {
-  (void)alloc;
-  (void)oldsize;
-  if (size == 0) {
-    free(ptr);
-#ifdef __GLIBC__
-    static int count = 0;
-    if (++count == 10000) {
-      malloc_trim(0);
-      count = 0;
-    }
-#endif
-    return NULL;
-  } else {
-    return realloc(ptr, size);
-  }
-}
-static upb_alloc trim_alloc = {&upb_trim_allocfunc};
-static const upb_alloc* global_alloc = &trim_alloc;
-// end:github_only
-
-static upb_Arena* PyUpb_NewArena(void) {
-  return upb_Arena_Init(NULL, 0, global_alloc);
-}
-
-PyObject* PyUpb_Arena_New(void) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  PyUpb_Arena* arena = (void*)PyType_GenericAlloc(state->arena_type, 0);
-  arena->arena = PyUpb_NewArena();
-  return &arena->ob_base;
-}
-
-static void PyUpb_Arena_Dealloc(PyObject* self) {
-  upb_Arena_Free(PyUpb_Arena_Get(self));
-  PyUpb_Dealloc(self);
-}
-
-upb_Arena* PyUpb_Arena_Get(PyObject* arena) {
-  return ((PyUpb_Arena*)arena)->arena;
-}
-
-static PyType_Slot PyUpb_Arena_Slots[] = {
-    {Py_tp_dealloc, PyUpb_Arena_Dealloc},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_Arena_Spec = {
-    PYUPB_MODULE_NAME ".Arena",
-    sizeof(PyUpb_Arena),
-    0,  // itemsize
-    Py_TPFLAGS_DEFAULT,
-    PyUpb_Arena_Slots,
-};
-
-static bool PyUpb_InitArena(PyObject* m) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-  state->arena_type = PyUpb_AddClass(m, &PyUpb_Arena_Spec);
-  return state->arena_type;
-}
-
-// -----------------------------------------------------------------------------
-// Utilities
-// -----------------------------------------------------------------------------
-
-PyTypeObject* AddObject(PyObject* m, const char* name, PyType_Spec* spec) {
-  PyObject* type = PyType_FromSpec(spec);
-  return type && PyModule_AddObject(m, name, type) == 0 ? (PyTypeObject*)type
-                                                        : NULL;
-}
-
-static const char* PyUpb_GetClassName(PyType_Spec* spec) {
-  // spec->name contains a fully-qualified name, like:
-  //   google.protobuf.pyext._message.FooBar
-  //
-  // Find the rightmost '.' to get "FooBar".
-  const char* name = strrchr(spec->name, '.');
-  assert(name);
-  return name + 1;
-}
-
-PyTypeObject* PyUpb_AddClass(PyObject* m, PyType_Spec* spec) {
-  PyObject* type = PyType_FromSpec(spec);
-  const char* name = PyUpb_GetClassName(spec);
-  if (PyModule_AddObject(m, name, type) < 0) {
-    Py_XDECREF(type);
-    return NULL;
-  }
-  return (PyTypeObject*)type;
-}
-
-PyTypeObject* PyUpb_AddClassWithBases(PyObject* m, PyType_Spec* spec,
-                                      PyObject* bases) {
-  PyObject* type = PyType_FromSpecWithBases(spec, bases);
-  const char* name = PyUpb_GetClassName(spec);
-  if (PyModule_AddObject(m, name, type) < 0) {
-    Py_XDECREF(type);
-    return NULL;
-  }
-  return (PyTypeObject*)type;
-}
-
-const char* PyUpb_GetStrData(PyObject* obj) {
-  if (PyUnicode_Check(obj)) {
-    return PyUnicode_AsUTF8AndSize(obj, NULL);
-  } else if (PyBytes_Check(obj)) {
-    return PyBytes_AsString(obj);
-  } else {
-    return NULL;
-  }
-}
-
-const char* PyUpb_VerifyStrData(PyObject* obj) {
-  const char* ret = PyUpb_GetStrData(obj);
-  if (ret) return ret;
-  PyErr_Format(PyExc_TypeError, "Expected string: %S", obj);
-  return NULL;
-}
-
-PyObject* PyUpb_Forbidden_New(PyObject* cls, PyObject* args, PyObject* kwds) {
-  PyObject* name = PyObject_GetAttrString(cls, "__name__");
-  PyErr_Format(PyExc_RuntimeError,
-               "Objects of type %U may not be created directly.", name);
-  Py_XDECREF(name);
-  return NULL;
-}
-
-// -----------------------------------------------------------------------------
-// Module Entry Point
-// -----------------------------------------------------------------------------
-
-__attribute__((visibility("default"))) PyMODINIT_FUNC PyInit__message(void) {
-  PyObject* m = PyModule_Create(&module_def);
-  if (!m) return NULL;
-
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-
-  state->allow_oversize_protos = false;
-  state->wkt_bases = NULL;
-  state->obj_cache = PyUpb_WeakMap_New();
-  state->c_descriptor_symtab = NULL;
-
-  if (!PyUpb_InitDescriptorContainers(m) || !PyUpb_InitDescriptorPool(m) ||
-      !PyUpb_InitDescriptor(m) || !PyUpb_InitArena(m) ||
-      !PyUpb_InitExtensionDict(m) || !PyUpb_Map_Init(m) ||
-      !PyUpb_InitMessage(m) || !PyUpb_Repeated_Init(m) ||
-      !PyUpb_UnknownFields_Init(m)) {
-    Py_DECREF(m);
-    return NULL;
-  }
-
-  // Temporary: an cookie we can use in the tests to ensure we are testing upb
-  // and not another protobuf library on the system.
-  PyModule_AddIntConstant(m, "_IS_UPB", 1);
-
-  return m;
-}
diff --git a/third_party/upb/python/protobuf.h b/third_party/upb/python/protobuf.h
deleted file mode 100644
index 66fe1f06f7810..0000000000000
--- a/third_party/upb/python/protobuf.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_PROTOBUF_H__
-#define PYUPB_PROTOBUF_H__
-
-#include <stdbool.h>
-
-#include "python/descriptor.h"
-#include "python/python_api.h"
-#include "upb/hash/int_table.h"
-
-// begin:github_only
-#define PYUPB_PROTOBUF_PUBLIC_PACKAGE "google.protobuf"
-#define PYUPB_PROTOBUF_INTERNAL_PACKAGE "google.protobuf.internal"
-#define PYUPB_DESCRIPTOR_PROTO_PACKAGE "google.protobuf"
-#define PYUPB_DESCRIPTOR_MODULE "google.protobuf.descriptor_pb2"
-#define PYUPB_MODULE_NAME "google._upb._message"
-// end:github_only
-
-// begin:google_only
-// #define PYUPB_PROTOBUF_PUBLIC_PACKAGE "google3.net.proto2.python.public"
-// #define PYUPB_PROTOBUF_INTERNAL_PACKAGE "google3.net.proto2.python.internal"
-// #define PYUPB_DESCRIPTOR_PROTO_PACKAGE "proto2"
-// #define PYUPB_DESCRIPTOR_MODULE "google3.net.proto2.proto.descriptor_pb2"
-// #define PYUPB_MODULE_NAME "google3.third_party.upb.python._message"
-// end:google_only
-
-#define PYUPB_RETURN_OOM return PyErr_SetNone(PyExc_MemoryError), NULL
-
-struct PyUpb_WeakMap;
-typedef struct PyUpb_WeakMap PyUpb_WeakMap;
-
-// -----------------------------------------------------------------------------
-// ModuleState
-// -----------------------------------------------------------------------------
-
-// We store all "global" state in this struct instead of using (C) global
-// variables. This makes this extension compatible with sub-interpreters.
-
-typedef struct {
-  // From descriptor.c
-  PyTypeObject* descriptor_types[kPyUpb_Descriptor_Count];
-
-  // From descriptor_containers.c
-  PyTypeObject* by_name_map_type;
-  PyTypeObject* by_name_iterator_type;
-  PyTypeObject* by_number_map_type;
-  PyTypeObject* by_number_iterator_type;
-  PyTypeObject* generic_sequence_type;
-
-  // From descriptor_pool.c
-  PyObject* default_pool;
-
-  // From descriptor_pool.c
-  PyTypeObject* descriptor_pool_type;
-  upb_DefPool* c_descriptor_symtab;
-
-  // From extension_dict.c
-  PyTypeObject* extension_dict_type;
-  PyTypeObject* extension_iterator_type;
-
-  // From map.c
-  PyTypeObject* map_iterator_type;
-  PyTypeObject* message_map_container_type;
-  PyTypeObject* scalar_map_container_type;
-
-  // From message.c
-  PyObject* decode_error_class;
-  PyObject* descriptor_string;
-  PyObject* encode_error_class;
-  PyObject* enum_type_wrapper_class;
-  PyObject* message_class;
-  PyTypeObject* cmessage_type;
-  PyTypeObject* message_meta_type;
-  PyObject* listfields_item_key;
-
-  // From protobuf.c
-  bool allow_oversize_protos;
-  PyObject* wkt_bases;
-  PyTypeObject* arena_type;
-  PyUpb_WeakMap* obj_cache;
-
-  // From repeated.c
-  PyTypeObject* repeated_composite_container_type;
-  PyTypeObject* repeated_scalar_container_type;
-
-  // From unknown_fields.c
-  PyTypeObject* unknown_fields_type;
-  PyObject* unknown_field_type;
-} PyUpb_ModuleState;
-
-// Returns the global state object from the current interpreter. The current
-// interpreter is looked up from thread-local state.
-PyUpb_ModuleState* PyUpb_ModuleState_Get(void);
-PyUpb_ModuleState* PyUpb_ModuleState_GetFromModule(PyObject* module);
-
-// Returns NULL if module state is not yet available (during startup).
-// Any use of the module state during startup needs to be passed explicitly.
-PyUpb_ModuleState* PyUpb_ModuleState_MaybeGet(void);
-
-// Returns:
-//   from google.protobuf.internal.well_known_types import WKTBASES
-//
-// This has to be imported lazily rather than at module load time, because
-// otherwise it would cause a circular import.
-PyObject* PyUpb_GetWktBases(PyUpb_ModuleState* state);
-
-// -----------------------------------------------------------------------------
-// WeakMap
-// -----------------------------------------------------------------------------
-
-// A WeakMap maps C pointers to the corresponding Python wrapper object. We
-// want a consistent Python wrapper object for each C object, both to save
-// memory and to provide object stability (ie. x is x).
-//
-// Each wrapped object should add itself to the map when it is constructed and
-// remove itself from the map when it is destroyed. The map is weak so it does
-// not take references to the cached objects.
-
-PyUpb_WeakMap* PyUpb_WeakMap_New(void);
-void PyUpb_WeakMap_Free(PyUpb_WeakMap* map);
-
-// Adds the given object to the map, indexed by the given key.
-void PyUpb_WeakMap_Add(PyUpb_WeakMap* map, const void* key, PyObject* py_obj);
-
-// Removes the given key from the cache. It must exist in the cache currently.
-void PyUpb_WeakMap_Delete(PyUpb_WeakMap* map, const void* key);
-void PyUpb_WeakMap_TryDelete(PyUpb_WeakMap* map, const void* key);
-
-// Returns a new reference to an object if it exists, otherwise returns NULL.
-PyObject* PyUpb_WeakMap_Get(PyUpb_WeakMap* map, const void* key);
-
-#define PYUPB_WEAKMAP_BEGIN UPB_INTTABLE_BEGIN
-
-// Iteration over the weak map, eg.
-//
-// intptr_t it = PYUPB_WEAKMAP_BEGIN;
-// while (PyUpb_WeakMap_Next(map, &key, &obj, &it)) {
-//   // ...
-// }
-//
-// Note that the callee does not own a ref on the returned `obj`.
-bool PyUpb_WeakMap_Next(PyUpb_WeakMap* map, const void** key, PyObject** obj,
-                        intptr_t* iter);
-void PyUpb_WeakMap_DeleteIter(PyUpb_WeakMap* map, intptr_t* iter);
-
-// -----------------------------------------------------------------------------
-// ObjCache
-// -----------------------------------------------------------------------------
-
-// The object cache is a global WeakMap for mapping upb objects to the
-// corresponding wrapper.
-void PyUpb_ObjCache_Add(const void* key, PyObject* py_obj);
-void PyUpb_ObjCache_Delete(const void* key);
-PyObject* PyUpb_ObjCache_Get(const void* key);  // returns NULL if not present.
-PyUpb_WeakMap* PyUpb_ObjCache_Instance(void);
-
-// -----------------------------------------------------------------------------
-// Arena
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_Arena_New(void);
-upb_Arena* PyUpb_Arena_Get(PyObject* arena);
-
-// -----------------------------------------------------------------------------
-// Utilities
-// -----------------------------------------------------------------------------
-
-PyTypeObject* AddObject(PyObject* m, const char* name, PyType_Spec* spec);
-
-// Creates a Python type from `spec` and adds it to the given module `m`.
-PyTypeObject* PyUpb_AddClass(PyObject* m, PyType_Spec* spec);
-
-// Like PyUpb_AddClass(), but allows you to specify a tuple of base classes
-// in `bases`.
-PyTypeObject* PyUpb_AddClassWithBases(PyObject* m, PyType_Spec* spec,
-                                      PyObject* bases);
-
-// A function that implements the tp_new slot for types that we do not allow
-// users to create directly. This will immediately fail with an error message.
-PyObject* PyUpb_Forbidden_New(PyObject* cls, PyObject* args, PyObject* kwds);
-
-// Our standard dealloc func. It follows the guidance defined in:
-//   https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_dealloc
-// However it tests Py_TPFLAGS_HEAPTYPE dynamically so that a single dealloc
-// function can work for any type.
-static inline void PyUpb_Dealloc(void* self) {
-  PyTypeObject* tp = Py_TYPE(self);
-  assert(PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE);
-  freefunc tp_free = (freefunc)PyType_GetSlot(tp, Py_tp_free);
-  tp_free(self);
-  Py_DECREF(tp);
-}
-
-// Equivalent to the Py_NewRef() function introduced in Python 3.10.  If/when we
-// drop support for Python <3.10, we can remove this function and replace all
-// callers with Py_NewRef().
-static inline PyObject* PyUpb_NewRef(PyObject* obj) {
-  Py_INCREF(obj);
-  return obj;
-}
-
-const char* PyUpb_GetStrData(PyObject* obj);
-const char* PyUpb_VerifyStrData(PyObject* obj);
-
-#endif  // PYUPB_PROTOBUF_H__
diff --git a/third_party/upb/python/py_extension.bzl b/third_party/upb/python/py_extension.bzl
deleted file mode 100644
index 7b918bc78e49f..0000000000000
--- a/third_party/upb/python/py_extension.bzl
+++ /dev/null
@@ -1,60 +0,0 @@
-"""Macro to support py_extension """
-
-load("@bazel_skylib//lib:selects.bzl", "selects")
-
-def py_extension(name, srcs, copts, deps = [], **kwargs):
-    """Creates a C++ library to extend python
-
-    Args:
-      name: Name of the target
-      srcs: List of source files to create the target
-      copts: List of C++ compile options to use
-      deps: Libraries that the target depends on
-    """
-
-    native.cc_binary(
-        name = name + "_binary",
-        srcs = srcs,
-        copts = copts + ["-fvisibility=hidden"],
-        linkopts = selects.with_or({
-            (
-                "//python/dist:osx_x86_64",
-                "//python/dist:osx_aarch64",
-            ): ["-undefined", "dynamic_lookup"],
-            "//python/dist:windows_x86_32": ["-static-libgcc"],
-            "//conditions:default": [],
-        }),
-        linkshared = True,
-        linkstatic = True,
-        deps = deps + select({
-            "//python:limited_api_3.7": ["@python-3.7.0//:python_headers"],
-            "//python:full_api_3.7_win32": ["@nuget_python_i686_3.7.0//:python_full_api"],
-            "//python:full_api_3.7_win64": ["@nuget_python_x86-64_3.7.0//:python_full_api"],
-            "//python:full_api_3.8_win32": ["@nuget_python_i686_3.8.0//:python_full_api"],
-            "//python:full_api_3.8_win64": ["@nuget_python_x86-64_3.8.0//:python_full_api"],
-            "//python:full_api_3.9_win32": ["@nuget_python_i686_3.9.0//:python_full_api"],
-            "//python:full_api_3.9_win64": ["@nuget_python_x86-64_3.9.0//:python_full_api"],
-            "//python:limited_api_3.10_win32": ["@nuget_python_i686_3.10.0//:python_limited_api"],
-            "//python:limited_api_3.10_win64": ["@nuget_python_x86-64_3.10.0//:python_limited_api"],
-            "//conditions:default": ["@system_python//:python_headers"],
-        }),
-        **kwargs
-    )
-
-    EXT_SUFFIX = ".abi3.so"
-    output_file = "google/_upb/" + name + EXT_SUFFIX
-
-    native.genrule(
-        name = "copy" + name,
-        srcs = [":" + name + "_binary"],
-        outs = [output_file],
-        cmd = "cp $< $@",
-        visibility = ["//python:__subpackages__"],
-    )
-
-    native.py_library(
-        name = name,
-        data = [output_file],
-        imports = ["."],
-        visibility = ["//python:__subpackages__"],
-    )
diff --git a/third_party/upb/python/python_api.h b/third_party/upb/python/python_api.h
deleted file mode 100644
index 80496cb4ee04f..0000000000000
--- a/third_party/upb/python/python_api.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_PYTHON_H__
-#define PYUPB_PYTHON_H__
-
-// We restrict ourselves to the limited API, so that a single build can be
-// ABI-compatible with a wide range of Python versions.
-//
-// The build system will define Py_LIMITED_API as appropriate (see BUILD). We
-// only want to define it for our distribution packages, since we can do some
-// extra assertions when Py_LIMITED_API is not defined.  Also Py_LIMITED_API is
-// incompatible with Py_DEBUG.
-
-// #define Py_LIMITED_API <val>  // Defined by build system when appropriate.
-
-#include "Python.h"
-
-// Ideally we could restrict ourselves to the limited API of 3.7, but this is
-// a very important function that was not officially added to the limited API
-// until 3.10.  Without this function, there is no way of getting data from a
-// Python `str` object without a copy.
-//
-// While this function was not *officially* added to the limited API until
-// Python 3.10, In practice it has been stable since Python 3.1.
-//   https://bugs.python.org/issue41784
-//
-// On Linux/ELF and macOS/Mach-O, we can get away with using this function with
-// the limited API prior to 3.10.
-
-#if (defined(__linux__) || defined(__APPLE__)) && defined(Py_LIMITED_API) && \
-    Py_LIMITED_API < 0x03100000
-PyAPI_FUNC(const char*)
-    PyUnicode_AsUTF8AndSize(PyObject* unicode, Py_ssize_t* size);
-#endif
-
-#endif  // PYUPB_PYTHON_H__
diff --git a/third_party/upb/python/repeated.c b/third_party/upb/python/repeated.c
deleted file mode 100644
index 2c09f7c33b12e..0000000000000
--- a/third_party/upb/python/repeated.c
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/repeated.h"
-
-#include "python/convert.h"
-#include "python/message.h"
-#include "python/protobuf.h"
-
-static PyObject* PyUpb_RepeatedCompositeContainer_Append(PyObject* _self,
-                                                         PyObject* value);
-static PyObject* PyUpb_RepeatedScalarContainer_Append(PyObject* _self,
-                                                      PyObject* value);
-
-// For an expression like:
-//    foo[index]
-//
-// Converts `index` to an effective i/count/step, for a repeated field
-// field of size `size`.
-static bool IndexToRange(PyObject* index, Py_ssize_t size, Py_ssize_t* i,
-                         Py_ssize_t* count, Py_ssize_t* step) {
-  assert(i && count && step);
-  if (PySlice_Check(index)) {
-    Py_ssize_t start, stop;
-    if (PySlice_Unpack(index, &start, &stop, step) < 0) return false;
-    *count = PySlice_AdjustIndices(size, &start, &stop, *step);
-    *i = start;
-  } else {
-    *i = PyNumber_AsSsize_t(index, PyExc_IndexError);
-
-    if (*i == -1 && PyErr_Occurred()) {
-      PyErr_SetString(PyExc_TypeError, "list indices must be integers");
-      return false;
-    }
-
-    if (*i < 0) *i += size;
-    *step = 0;
-    *count = 1;
-
-    if (*i < 0 || size <= *i) {
-      PyErr_Format(PyExc_IndexError, "list index out of range");
-      return false;
-    }
-  }
-  return true;
-}
-
-// Wrapper for a repeated field.
-typedef struct {
-  PyObject_HEAD;
-  PyObject* arena;
-  // The field descriptor (PyObject*).
-  // The low bit indicates whether the container is reified (see ptr below).
-  //   - low bit set: repeated field is a stub (no underlying data).
-  //   - low bit clear: repeated field is reified (points to upb_Array).
-  uintptr_t field;
-  union {
-    PyObject* parent;  // stub: owning pointer to parent message.
-    upb_Array* arr;    // reified: the data for this array.
-  } ptr;
-} PyUpb_RepeatedContainer;
-
-static bool PyUpb_RepeatedContainer_IsStub(PyUpb_RepeatedContainer* self) {
-  return self->field & 1;
-}
-
-static PyObject* PyUpb_RepeatedContainer_GetFieldDescriptor(
-    PyUpb_RepeatedContainer* self) {
-  return (PyObject*)(self->field & ~(uintptr_t)1);
-}
-
-static const upb_FieldDef* PyUpb_RepeatedContainer_GetField(
-    PyUpb_RepeatedContainer* self) {
-  return PyUpb_FieldDescriptor_GetDef(
-      PyUpb_RepeatedContainer_GetFieldDescriptor(self));
-}
-
-// If the repeated field is reified, returns it.  Otherwise, returns NULL.
-// If NULL is returned, the object is empty and has no underlying data.
-static upb_Array* PyUpb_RepeatedContainer_GetIfReified(
-    PyUpb_RepeatedContainer* self) {
-  return PyUpb_RepeatedContainer_IsStub(self) ? NULL : self->ptr.arr;
-}
-
-void PyUpb_RepeatedContainer_Reify(PyObject* _self, upb_Array* arr) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  assert(PyUpb_RepeatedContainer_IsStub(self));
-  if (!arr) {
-    const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-    upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-    arr = upb_Array_New(arena, upb_FieldDef_CType(f));
-  }
-  PyUpb_ObjCache_Add(arr, &self->ob_base);
-  Py_DECREF(self->ptr.parent);
-  self->ptr.arr = arr;  // Overwrites self->ptr.parent.
-  self->field &= ~(uintptr_t)1;
-  assert(!PyUpb_RepeatedContainer_IsStub(self));
-}
-
-upb_Array* PyUpb_RepeatedContainer_EnsureReified(PyObject* _self) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_GetIfReified(self);
-  if (arr) return arr;  // Already writable.
-
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  arr = upb_Array_New(arena, upb_FieldDef_CType(f));
-  PyUpb_Message_SetConcreteSubobj(self->ptr.parent, f,
-                                  (upb_MessageValue){.array_val = arr});
-  PyUpb_RepeatedContainer_Reify((PyObject*)self, arr);
-  return arr;
-}
-
-static void PyUpb_RepeatedContainer_Dealloc(PyObject* _self) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  Py_DECREF(self->arena);
-  if (PyUpb_RepeatedContainer_IsStub(self)) {
-    PyUpb_Message_CacheDelete(self->ptr.parent,
-                              PyUpb_RepeatedContainer_GetField(self));
-    Py_DECREF(self->ptr.parent);
-  } else {
-    PyUpb_ObjCache_Delete(self->ptr.arr);
-  }
-  Py_DECREF(PyUpb_RepeatedContainer_GetFieldDescriptor(self));
-  PyUpb_Dealloc(self);
-}
-
-static PyTypeObject* PyUpb_RepeatedContainer_GetClass(const upb_FieldDef* f) {
-  assert(upb_FieldDef_IsRepeated(f) && !upb_FieldDef_IsMap(f));
-  PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
-  return upb_FieldDef_IsSubMessage(f) ? state->repeated_composite_container_type
-                                      : state->repeated_scalar_container_type;
-}
-
-static Py_ssize_t PyUpb_RepeatedContainer_Length(PyObject* self) {
-  upb_Array* arr =
-      PyUpb_RepeatedContainer_GetIfReified((PyUpb_RepeatedContainer*)self);
-  return arr ? upb_Array_Size(arr) : 0;
-}
-
-PyObject* PyUpb_RepeatedContainer_NewStub(PyObject* parent,
-                                          const upb_FieldDef* f,
-                                          PyObject* arena) {
-  // We only create stubs when the parent is reified, by convention.  However
-  // this is not an invariant: the parent could become reified at any time.
-  assert(PyUpb_Message_GetIfReified(parent) == NULL);
-  PyTypeObject* cls = PyUpb_RepeatedContainer_GetClass(f);
-  PyUpb_RepeatedContainer* repeated = (void*)PyType_GenericAlloc(cls, 0);
-  repeated->arena = arena;
-  repeated->field = (uintptr_t)PyUpb_FieldDescriptor_Get(f) | 1;
-  repeated->ptr.parent = parent;
-  Py_INCREF(arena);
-  Py_INCREF(parent);
-  return &repeated->ob_base;
-}
-
-PyObject* PyUpb_RepeatedContainer_GetOrCreateWrapper(upb_Array* arr,
-                                                     const upb_FieldDef* f,
-                                                     PyObject* arena) {
-  PyObject* ret = PyUpb_ObjCache_Get(arr);
-  if (ret) return ret;
-
-  PyTypeObject* cls = PyUpb_RepeatedContainer_GetClass(f);
-  PyUpb_RepeatedContainer* repeated = (void*)PyType_GenericAlloc(cls, 0);
-  repeated->arena = arena;
-  repeated->field = (uintptr_t)PyUpb_FieldDescriptor_Get(f);
-  repeated->ptr.arr = arr;
-  ret = &repeated->ob_base;
-  Py_INCREF(arena);
-  PyUpb_ObjCache_Add(arr, ret);
-  return ret;
-}
-
-static PyObject* PyUpb_RepeatedContainer_MergeFrom(PyObject* _self,
-                                                   PyObject* args);
-
-PyObject* PyUpb_RepeatedContainer_DeepCopy(PyObject* _self, PyObject* value) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  PyUpb_RepeatedContainer* clone =
-      (void*)PyType_GenericAlloc(Py_TYPE(_self), 0);
-  if (clone == NULL) return NULL;
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  clone->arena = PyUpb_Arena_New();
-  clone->field = (uintptr_t)PyUpb_FieldDescriptor_Get(f);
-  clone->ptr.arr =
-      upb_Array_New(PyUpb_Arena_Get(clone->arena), upb_FieldDef_CType(f));
-  PyUpb_ObjCache_Add(clone->ptr.arr, (PyObject*)clone);
-  PyObject* result = PyUpb_RepeatedContainer_MergeFrom((PyObject*)clone, _self);
-  if (!result) {
-    Py_DECREF(clone);
-    return NULL;
-  }
-  Py_DECREF(result);
-  return (PyObject*)clone;
-}
-
-PyObject* PyUpb_RepeatedContainer_Extend(PyObject* _self, PyObject* value) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  size_t start_size = upb_Array_Size(arr);
-  PyObject* it = PyObject_GetIter(value);
-  if (!it) {
-    PyErr_SetString(PyExc_TypeError, "Value must be iterable");
-    return NULL;
-  }
-
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  bool submsg = upb_FieldDef_IsSubMessage(f);
-  PyObject* e;
-
-  while ((e = PyIter_Next(it))) {
-    PyObject* ret;
-    if (submsg) {
-      ret = PyUpb_RepeatedCompositeContainer_Append(_self, e);
-    } else {
-      ret = PyUpb_RepeatedScalarContainer_Append(_self, e);
-    }
-    Py_XDECREF(ret);
-    Py_DECREF(e);
-  }
-
-  Py_DECREF(it);
-
-  if (PyErr_Occurred()) {
-    upb_Array_Resize(arr, start_size, NULL);
-    return NULL;
-  }
-
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Item(PyObject* _self,
-                                              Py_ssize_t index) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_GetIfReified(self);
-  Py_ssize_t size = arr ? upb_Array_Size(arr) : 0;
-  if (index < 0 || index >= size) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return NULL;
-  }
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  return PyUpb_UpbToPy(upb_Array_Get(arr, index), f, self->arena);
-}
-
-PyObject* PyUpb_RepeatedContainer_ToList(PyObject* _self) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_GetIfReified(self);
-  if (!arr) return PyList_New(0);
-
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  size_t n = upb_Array_Size(arr);
-  PyObject* list = PyList_New(n);
-  for (size_t i = 0; i < n; i++) {
-    PyObject* val = PyUpb_UpbToPy(upb_Array_Get(arr, i), f, self->arena);
-    if (!val) {
-      Py_DECREF(list);
-      return NULL;
-    }
-    PyList_SetItem(list, i, val);
-  }
-  return list;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Repr(PyObject* _self) {
-  PyObject* list = PyUpb_RepeatedContainer_ToList(_self);
-  if (!list) return NULL;
-  assert(!PyErr_Occurred());
-  PyObject* repr = PyObject_Repr(list);
-  Py_DECREF(list);
-  return repr;
-}
-
-static PyObject* PyUpb_RepeatedContainer_RichCompare(PyObject* _self,
-                                                     PyObject* _other,
-                                                     int opid) {
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  PyObject* list1 = PyUpb_RepeatedContainer_ToList(_self);
-  PyObject* list2 = _other;
-  PyObject* del = NULL;
-  if (PyObject_TypeCheck(_other, _self->ob_type)) {
-    del = list2 = PyUpb_RepeatedContainer_ToList(_other);
-  }
-  PyObject* ret = PyObject_RichCompare(list1, list2, opid);
-  Py_DECREF(list1);
-  Py_XDECREF(del);
-  return ret;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Subscript(PyObject* _self,
-                                                   PyObject* key) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_GetIfReified(self);
-  Py_ssize_t size = arr ? upb_Array_Size(arr) : 0;
-  Py_ssize_t idx, count, step;
-  if (!IndexToRange(key, size, &idx, &count, &step)) return NULL;
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  if (step == 0) {
-    return PyUpb_UpbToPy(upb_Array_Get(arr, idx), f, self->arena);
-  } else {
-    PyObject* list = PyList_New(count);
-    for (Py_ssize_t i = 0; i < count; i++, idx += step) {
-      upb_MessageValue msgval = upb_Array_Get(self->ptr.arr, idx);
-      PyObject* item = PyUpb_UpbToPy(msgval, f, self->arena);
-      if (!item) {
-        Py_DECREF(list);
-        return NULL;
-      }
-      PyList_SetItem(list, i, item);
-    }
-    return list;
-  }
-}
-
-static int PyUpb_RepeatedContainer_SetSubscript(
-    PyUpb_RepeatedContainer* self, upb_Array* arr, const upb_FieldDef* f,
-    Py_ssize_t idx, Py_ssize_t count, Py_ssize_t step, PyObject* value) {
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  if (upb_FieldDef_IsSubMessage(f)) {
-    PyErr_SetString(PyExc_TypeError, "does not support assignment");
-    return -1;
-  }
-
-  if (step == 0) {
-    // Set single value.
-    upb_MessageValue msgval;
-    if (!PyUpb_PyToUpb(value, f, &msgval, arena)) return -1;
-    upb_Array_Set(arr, idx, msgval);
-    return 0;
-  }
-
-  // Set range.
-  PyObject* seq =
-      PySequence_Fast(value, "must assign iterable to extended slice");
-  PyObject* item = NULL;
-  int ret = -1;
-  if (!seq) goto err;
-  Py_ssize_t seq_size = PySequence_Size(seq);
-  if (seq_size != count) {
-    if (step == 1) {
-      // We must shift the tail elements (either right or left).
-      size_t tail = upb_Array_Size(arr) - (idx + count);
-      upb_Array_Resize(arr, idx + seq_size + tail, arena);
-      upb_Array_Move(arr, idx + seq_size, idx + count, tail);
-      count = seq_size;
-    } else {
-      PyErr_Format(PyExc_ValueError,
-                   "attempt to assign sequence of  %zd to extended slice "
-                   "of size %zd",
-                   seq_size, count);
-      goto err;
-    }
-  }
-  for (Py_ssize_t i = 0; i < count; i++, idx += step) {
-    upb_MessageValue msgval;
-    item = PySequence_GetItem(seq, i);
-    if (!item) goto err;
-    // XXX: if this fails we can leave the list partially mutated.
-    if (!PyUpb_PyToUpb(item, f, &msgval, arena)) goto err;
-    Py_DECREF(item);
-    item = NULL;
-    upb_Array_Set(arr, idx, msgval);
-  }
-  ret = 0;
-
-err:
-  Py_XDECREF(seq);
-  Py_XDECREF(item);
-  return ret;
-}
-
-static int PyUpb_RepeatedContainer_DeleteSubscript(upb_Array* arr,
-                                                   Py_ssize_t idx,
-                                                   Py_ssize_t count,
-                                                   Py_ssize_t step) {
-  // Normalize direction: deletion is order-independent.
-  Py_ssize_t start = idx;
-  if (step < 0) {
-    Py_ssize_t end = start + step * (count - 1);
-    start = end;
-    step = -step;
-  }
-
-  size_t dst = start;
-  size_t src;
-  if (step > 1) {
-    // Move elements between steps:
-    //
-    //        src
-    //         |
-    // |------X---X---X---X------------------------------|
-    //        |
-    //       dst           <-------- tail -------------->
-    src = start + 1;
-    for (Py_ssize_t i = 1; i < count; i++, dst += step - 1, src += step) {
-      upb_Array_Move(arr, dst, src, step);
-    }
-  } else {
-    src = start + count;
-  }
-
-  // Move tail.
-  size_t tail = upb_Array_Size(arr) - src;
-  size_t new_size = dst + tail;
-  assert(new_size == upb_Array_Size(arr) - count);
-  upb_Array_Move(arr, dst, src, tail);
-  upb_Array_Resize(arr, new_size, NULL);
-  return 0;
-}
-
-static int PyUpb_RepeatedContainer_AssignSubscript(PyObject* _self,
-                                                   PyObject* key,
-                                                   PyObject* value) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  Py_ssize_t size = arr ? upb_Array_Size(arr) : 0;
-  Py_ssize_t idx, count, step;
-  if (!IndexToRange(key, size, &idx, &count, &step)) return -1;
-  if (value) {
-    return PyUpb_RepeatedContainer_SetSubscript(self, arr, f, idx, count, step,
-                                                value);
-  } else {
-    return PyUpb_RepeatedContainer_DeleteSubscript(arr, idx, count, step);
-  }
-}
-
-static PyObject* PyUpb_RepeatedContainer_Pop(PyObject* _self, PyObject* args) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  Py_ssize_t index = -1;
-  if (!PyArg_ParseTuple(args, "|n", &index)) return NULL;
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  size_t size = upb_Array_Size(arr);
-  if (index < 0) index += size;
-  if (index >= size) index = size - 1;
-  PyObject* ret = PyUpb_RepeatedContainer_Item(_self, index);
-  if (!ret) return NULL;
-  upb_Array_Delete(self->ptr.arr, index, 1);
-  return ret;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Remove(PyObject* _self,
-                                                PyObject* value) {
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  Py_ssize_t match_index = -1;
-  Py_ssize_t n = PyUpb_RepeatedContainer_Length(_self);
-  for (Py_ssize_t i = 0; i < n; ++i) {
-    PyObject* elem = PyUpb_RepeatedContainer_Item(_self, i);
-    if (!elem) return NULL;
-    int eq = PyObject_RichCompareBool(elem, value, Py_EQ);
-    Py_DECREF(elem);
-    if (eq) {
-      match_index = i;
-      break;
-    }
-  }
-  if (match_index == -1) {
-    PyErr_SetString(PyExc_ValueError, "remove(x): x not in container");
-    return NULL;
-  }
-  if (PyUpb_RepeatedContainer_DeleteSubscript(arr, match_index, 1, 1) < 0) {
-    return NULL;
-  }
-  Py_RETURN_NONE;
-}
-
-// A helper function used only for Sort().
-static bool PyUpb_RepeatedContainer_Assign(PyObject* _self, PyObject* list) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  Py_ssize_t size = PyList_Size(list);
-  bool submsg = upb_FieldDef_IsSubMessage(f);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  for (Py_ssize_t i = 0; i < size; ++i) {
-    PyObject* obj = PyList_GetItem(list, i);
-    upb_MessageValue msgval;
-    if (submsg) {
-      msgval.msg_val = PyUpb_Message_GetIfReified(obj);
-      assert(msgval.msg_val);
-    } else {
-      if (!PyUpb_PyToUpb(obj, f, &msgval, arena)) return false;
-    }
-    upb_Array_Set(arr, i, msgval);
-  }
-  return true;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Sort(PyObject* pself, PyObject* args,
-                                              PyObject* kwds) {
-  // Support the old sort_function argument for backwards
-  // compatibility.
-  if (kwds != NULL) {
-    PyObject* sort_func = PyDict_GetItemString(kwds, "sort_function");
-    if (sort_func != NULL) {
-      // Must set before deleting as sort_func is a borrowed reference
-      // and kwds might be the only thing keeping it alive.
-      if (PyDict_SetItemString(kwds, "cmp", sort_func) == -1) return NULL;
-      if (PyDict_DelItemString(kwds, "sort_function") == -1) return NULL;
-    }
-  }
-
-  PyObject* ret = NULL;
-  PyObject* full_slice = NULL;
-  PyObject* list = NULL;
-  PyObject* m = NULL;
-  PyObject* res = NULL;
-  if ((full_slice = PySlice_New(NULL, NULL, NULL)) &&
-      (list = PyUpb_RepeatedContainer_Subscript(pself, full_slice)) &&
-      (m = PyObject_GetAttrString(list, "sort")) &&
-      (res = PyObject_Call(m, args, kwds)) &&
-      PyUpb_RepeatedContainer_Assign(pself, list)) {
-    Py_INCREF(Py_None);
-    ret = Py_None;
-  }
-
-  Py_XDECREF(full_slice);
-  Py_XDECREF(list);
-  Py_XDECREF(m);
-  Py_XDECREF(res);
-  return ret;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Reverse(PyObject* _self) {
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  size_t n = upb_Array_Size(arr);
-  size_t half = n / 2;  // Rounds down.
-  for (size_t i = 0; i < half; i++) {
-    size_t i2 = n - i - 1;
-    upb_MessageValue val1 = upb_Array_Get(arr, i);
-    upb_MessageValue val2 = upb_Array_Get(arr, i2);
-    upb_Array_Set(arr, i, val2);
-    upb_Array_Set(arr, i2, val1);
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* PyUpb_RepeatedContainer_MergeFrom(PyObject* _self,
-                                                   PyObject* args) {
-  return PyUpb_RepeatedContainer_Extend(_self, args);
-}
-
-// -----------------------------------------------------------------------------
-// RepeatedCompositeContainer
-// -----------------------------------------------------------------------------
-
-static PyObject* PyUpb_RepeatedCompositeContainer_AppendNew(PyObject* _self) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  if (!arr) return NULL;
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-  upb_Message* msg = upb_Message_New(layout, arena);
-  upb_MessageValue msgval = {.msg_val = msg};
-  upb_Array_Append(arr, msgval, arena);
-  return PyUpb_Message_Get(msg, m, self->arena);
-}
-
-PyObject* PyUpb_RepeatedCompositeContainer_Add(PyObject* _self, PyObject* args,
-                                               PyObject* kwargs) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  PyObject* py_msg = PyUpb_RepeatedCompositeContainer_AppendNew(_self);
-  if (!py_msg) return NULL;
-  if (PyUpb_Message_InitAttributes(py_msg, args, kwargs) < 0) {
-    Py_DECREF(py_msg);
-    upb_Array_Delete(self->ptr.arr, upb_Array_Size(self->ptr.arr) - 1, 1);
-    return NULL;
-  }
-  return py_msg;
-}
-
-static PyObject* PyUpb_RepeatedCompositeContainer_Append(PyObject* _self,
-                                                         PyObject* value) {
-  if (!PyUpb_Message_Verify(value)) return NULL;
-  PyObject* py_msg = PyUpb_RepeatedCompositeContainer_AppendNew(_self);
-  if (!py_msg) return NULL;
-  PyObject* none = PyUpb_Message_MergeFrom(py_msg, value);
-  if (!none) {
-    Py_DECREF(py_msg);
-    return NULL;
-  }
-  Py_DECREF(none);
-  return py_msg;
-}
-
-static PyObject* PyUpb_RepeatedContainer_Insert(PyObject* _self,
-                                                PyObject* args) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  Py_ssize_t index;
-  PyObject* value;
-  if (!PyArg_ParseTuple(args, "nO", &index, &value)) return NULL;
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  if (!arr) return NULL;
-
-  // Normalize index.
-  Py_ssize_t size = upb_Array_Size(arr);
-  if (index < 0) index += size;
-  if (index < 0) index = 0;
-  if (index > size) index = size;
-
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_MessageValue msgval;
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  if (upb_FieldDef_IsSubMessage(f)) {
-    // Create message.
-    const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-    const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-    upb_Message* msg = upb_Message_New(layout, arena);
-    PyObject* py_msg = PyUpb_Message_Get(msg, m, self->arena);
-    PyObject* ret = PyUpb_Message_MergeFrom(py_msg, value);
-    Py_DECREF(py_msg);
-    if (!ret) return NULL;
-    Py_DECREF(ret);
-    msgval.msg_val = msg;
-  } else {
-    if (!PyUpb_PyToUpb(value, f, &msgval, arena)) return NULL;
-  }
-
-  upb_Array_Insert(arr, index, 1, arena);
-  upb_Array_Set(arr, index, msgval);
-
-  Py_RETURN_NONE;
-}
-
-static PyMethodDef PyUpb_RepeatedCompositeContainer_Methods[] = {
-    {"__deepcopy__", PyUpb_RepeatedContainer_DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class."},
-    {"add", (PyCFunction)PyUpb_RepeatedCompositeContainer_Add,
-     METH_VARARGS | METH_KEYWORDS, "Adds an object to the repeated container."},
-    {"append", PyUpb_RepeatedCompositeContainer_Append, METH_O,
-     "Appends a message to the end of the repeated container."},
-    {"insert", PyUpb_RepeatedContainer_Insert, METH_VARARGS,
-     "Inserts a message before the specified index."},
-    {"extend", PyUpb_RepeatedContainer_Extend, METH_O,
-     "Adds objects to the repeated container."},
-    {"pop", PyUpb_RepeatedContainer_Pop, METH_VARARGS,
-     "Removes an object from the repeated container and returns it."},
-    {"remove", PyUpb_RepeatedContainer_Remove, METH_O,
-     "Removes an object from the repeated container."},
-    {"sort", (PyCFunction)PyUpb_RepeatedContainer_Sort,
-     METH_VARARGS | METH_KEYWORDS, "Sorts the repeated container."},
-    {"reverse", (PyCFunction)PyUpb_RepeatedContainer_Reverse, METH_NOARGS,
-     "Reverses elements order of the repeated container."},
-    {"MergeFrom", PyUpb_RepeatedContainer_MergeFrom, METH_O,
-     "Adds objects to the repeated container."},
-    {NULL, NULL}};
-
-static PyType_Slot PyUpb_RepeatedCompositeContainer_Slots[] = {
-    {Py_tp_dealloc, PyUpb_RepeatedContainer_Dealloc},
-    {Py_tp_methods, PyUpb_RepeatedCompositeContainer_Methods},
-    {Py_sq_length, PyUpb_RepeatedContainer_Length},
-    {Py_sq_item, PyUpb_RepeatedContainer_Item},
-    {Py_mp_length, PyUpb_RepeatedContainer_Length},
-    {Py_tp_repr, PyUpb_RepeatedContainer_Repr},
-    {Py_mp_subscript, PyUpb_RepeatedContainer_Subscript},
-    {Py_mp_ass_subscript, PyUpb_RepeatedContainer_AssignSubscript},
-    {Py_tp_new, PyUpb_Forbidden_New},
-    {Py_tp_richcompare, PyUpb_RepeatedContainer_RichCompare},
-    {Py_tp_hash, PyObject_HashNotImplemented},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_RepeatedCompositeContainer_Spec = {
-    PYUPB_MODULE_NAME ".RepeatedCompositeContainer",
-    sizeof(PyUpb_RepeatedContainer),
-    0,  // tp_itemsize
-    Py_TPFLAGS_DEFAULT,
-    PyUpb_RepeatedCompositeContainer_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// RepeatedScalarContainer
-// -----------------------------------------------------------------------------
-
-static PyObject* PyUpb_RepeatedScalarContainer_Append(PyObject* _self,
-                                                      PyObject* value) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_EnsureReified(_self);
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_MessageValue msgval;
-  if (!PyUpb_PyToUpb(value, f, &msgval, arena)) {
-    return NULL;
-  }
-  upb_Array_Append(arr, msgval, arena);
-  Py_RETURN_NONE;
-}
-
-static int PyUpb_RepeatedScalarContainer_AssignItem(PyObject* _self,
-                                                    Py_ssize_t index,
-                                                    PyObject* item) {
-  PyUpb_RepeatedContainer* self = (PyUpb_RepeatedContainer*)_self;
-  upb_Array* arr = PyUpb_RepeatedContainer_GetIfReified(self);
-  Py_ssize_t size = arr ? upb_Array_Size(arr) : 0;
-  if (index < 0 || index >= size) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return -1;
-  }
-  const upb_FieldDef* f = PyUpb_RepeatedContainer_GetField(self);
-  upb_MessageValue msgval;
-  upb_Arena* arena = PyUpb_Arena_Get(self->arena);
-  if (!PyUpb_PyToUpb(item, f, &msgval, arena)) {
-    return -1;
-  }
-  upb_Array_Set(self->ptr.arr, index, msgval);
-  return 0;
-}
-
-static PyObject* PyUpb_RepeatedScalarContainer_Reduce(PyObject* unused_self,
-                                                      PyObject* unused_other) {
-  PyObject* pickle_module = PyImport_ImportModule("pickle");
-  if (!pickle_module) return NULL;
-  PyObject* pickle_error = PyObject_GetAttrString(pickle_module, "PickleError");
-  Py_DECREF(pickle_module);
-  if (!pickle_error) return NULL;
-  PyErr_Format(pickle_error,
-               "can't pickle repeated message fields, convert to list first");
-  Py_DECREF(pickle_error);
-  return NULL;
-}
-
-static PyMethodDef PyUpb_RepeatedScalarContainer_Methods[] = {
-    {"__deepcopy__", PyUpb_RepeatedContainer_DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class."},
-    {"__reduce__", PyUpb_RepeatedScalarContainer_Reduce, METH_NOARGS,
-     "Outputs picklable representation of the repeated field."},
-    {"append", PyUpb_RepeatedScalarContainer_Append, METH_O,
-     "Appends an object to the repeated container."},
-    {"extend", PyUpb_RepeatedContainer_Extend, METH_O,
-     "Appends objects to the repeated container."},
-    {"insert", PyUpb_RepeatedContainer_Insert, METH_VARARGS,
-     "Inserts an object at the specified position in the container."},
-    {"pop", PyUpb_RepeatedContainer_Pop, METH_VARARGS,
-     "Removes an object from the repeated container and returns it."},
-    {"remove", PyUpb_RepeatedContainer_Remove, METH_O,
-     "Removes an object from the repeated container."},
-    {"sort", (PyCFunction)PyUpb_RepeatedContainer_Sort,
-     METH_VARARGS | METH_KEYWORDS, "Sorts the repeated container."},
-    {"reverse", (PyCFunction)PyUpb_RepeatedContainer_Reverse, METH_NOARGS,
-     "Reverses elements order of the repeated container."},
-    {"MergeFrom", PyUpb_RepeatedContainer_MergeFrom, METH_O,
-     "Merges a repeated container into the current container."},
-    {NULL, NULL}};
-
-static PyType_Slot PyUpb_RepeatedScalarContainer_Slots[] = {
-    {Py_tp_dealloc, PyUpb_RepeatedContainer_Dealloc},
-    {Py_tp_methods, PyUpb_RepeatedScalarContainer_Methods},
-    {Py_tp_new, PyUpb_Forbidden_New},
-    {Py_tp_repr, PyUpb_RepeatedContainer_Repr},
-    {Py_sq_length, PyUpb_RepeatedContainer_Length},
-    {Py_sq_item, PyUpb_RepeatedContainer_Item},
-    {Py_sq_ass_item, PyUpb_RepeatedScalarContainer_AssignItem},
-    {Py_mp_length, PyUpb_RepeatedContainer_Length},
-    {Py_mp_subscript, PyUpb_RepeatedContainer_Subscript},
-    {Py_mp_ass_subscript, PyUpb_RepeatedContainer_AssignSubscript},
-    {Py_tp_richcompare, PyUpb_RepeatedContainer_RichCompare},
-    {Py_tp_hash, PyObject_HashNotImplemented},
-    {0, NULL}};
-
-static PyType_Spec PyUpb_RepeatedScalarContainer_Spec = {
-    PYUPB_MODULE_NAME ".RepeatedScalarContainer",
-    sizeof(PyUpb_RepeatedContainer),
-    0,  // tp_itemsize
-    Py_TPFLAGS_DEFAULT,
-    PyUpb_RepeatedScalarContainer_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-static bool PyUpb_Repeated_RegisterAsSequence(PyUpb_ModuleState* state) {
-  PyObject* collections = NULL;
-  PyObject* seq = NULL;
-  PyObject* ret1 = NULL;
-  PyObject* ret2 = NULL;
-  PyTypeObject* type1 = state->repeated_scalar_container_type;
-  PyTypeObject* type2 = state->repeated_composite_container_type;
-
-  bool ok = (collections = PyImport_ImportModule("collections.abc")) &&
-            (seq = PyObject_GetAttrString(collections, "MutableSequence")) &&
-            (ret1 = PyObject_CallMethod(seq, "register", "O", type1)) &&
-            (ret2 = PyObject_CallMethod(seq, "register", "O", type2));
-
-  Py_XDECREF(collections);
-  Py_XDECREF(seq);
-  Py_XDECREF(ret1);
-  Py_XDECREF(ret2);
-  return ok;
-}
-
-bool PyUpb_Repeated_Init(PyObject* m) {
-  PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
-
-  state->repeated_composite_container_type =
-      PyUpb_AddClass(m, &PyUpb_RepeatedCompositeContainer_Spec);
-  state->repeated_scalar_container_type =
-      PyUpb_AddClass(m, &PyUpb_RepeatedScalarContainer_Spec);
-
-  return state->repeated_composite_container_type &&
-         state->repeated_scalar_container_type &&
-         PyUpb_Repeated_RegisterAsSequence(state);
-}
diff --git a/third_party/upb/python/repeated.h b/third_party/upb/python/repeated.h
deleted file mode 100644
index 8cd38721a566a..0000000000000
--- a/third_party/upb/python/repeated.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_REPEATED_H__
-#define PYUPB_REPEATED_H__
-
-#include <stdbool.h>
-
-#include "python/python_api.h"
-#include "upb/reflection/def.h"
-
-// Creates a new repeated field stub for field `f` of message object `parent`.
-// Precondition: `parent` must be a stub.
-PyObject* PyUpb_RepeatedContainer_NewStub(PyObject* parent,
-                                          const upb_FieldDef* f,
-                                          PyObject* arena);
-
-// Returns a repeated field object wrapping `arr`, of field type `f`, which
-// must be on `arena`.  If an existing wrapper object exists, it will be
-// returned, otherwise a new object will be created.  The caller always owns a
-// ref on the returned value.
-PyObject* PyUpb_RepeatedContainer_GetOrCreateWrapper(upb_Array* arr,
-                                                     const upb_FieldDef* f,
-                                                     PyObject* arena);
-
-// Reifies a repeated field stub to point to the concrete data in `arr`.
-// If `arr` is NULL, an appropriate empty array will be constructed.
-void PyUpb_RepeatedContainer_Reify(PyObject* self, upb_Array* arr);
-
-// Reifies this repeated object if it is not already reified.
-upb_Array* PyUpb_RepeatedContainer_EnsureReified(PyObject* self);
-
-// Implements repeated_field.extend(iterable).  `_self` must be a repeated
-// field (either repeated composite or repeated scalar).
-PyObject* PyUpb_RepeatedContainer_Extend(PyObject* _self, PyObject* value);
-
-// Implements repeated_field.add(initial_values).  `_self` must be a repeated
-// composite field.
-PyObject* PyUpb_RepeatedCompositeContainer_Add(PyObject* _self, PyObject* args,
-                                               PyObject* kwargs);
-
-// Module-level init.
-bool PyUpb_Repeated_Init(PyObject* m);
-
-#endif  // PYUPB_REPEATED_H__
diff --git a/third_party/upb/python/requirements.txt b/third_party/upb/python/requirements.txt
deleted file mode 100644
index ee6dfb448a73c..0000000000000
--- a/third_party/upb/python/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-numpy==1.21.6
diff --git a/third_party/upb/python/requirements_311.txt b/third_party/upb/python/requirements_311.txt
deleted file mode 100644
index 1f2c987a7e4aa..0000000000000
--- a/third_party/upb/python/requirements_311.txt
+++ /dev/null
@@ -1 +0,0 @@
-numpy==1.23.5
diff --git a/third_party/upb/python/unknown_fields.c b/third_party/upb/python/unknown_fields.c
deleted file mode 100644
index fd7716d73212e..0000000000000
--- a/third_party/upb/python/unknown_fields.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "python/unknown_fields.h"
-
-#include "python/message.h"
-#include "python/protobuf.h"
-#include "upb/wire/eps_copy_input_stream.h"
-#include "upb/wire/reader.h"
-#include "upb/wire/types.h"
-
-// -----------------------------------------------------------------------------
-// UnknownFieldSet
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  PyObject_HEAD;
-  PyObject* fields;
-} PyUpb_UnknownFieldSet;
-
-static void PyUpb_UnknownFieldSet_Dealloc(PyObject* _self) {
-  PyUpb_UnknownFieldSet* self = (PyUpb_UnknownFieldSet*)_self;
-  Py_XDECREF(self->fields);
-  PyUpb_Dealloc(self);
-}
-
-PyUpb_UnknownFieldSet* PyUpb_UnknownFieldSet_NewBare(void) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  PyUpb_UnknownFieldSet* self =
-      (void*)PyType_GenericAlloc(s->unknown_fields_type, 0);
-  return self;
-}
-
-// For MessageSet the established behavior is for UnknownFieldSet to interpret
-// the MessageSet wire format:
-//    message MessageSet {
-//      repeated group Item = 1 {
-//        required int32 type_id = 2;
-//        required bytes message = 3;
-//      }
-//    }
-//
-// And create unknown fields like:
-//   UnknownField(type_id, WIRE_TYPE_DELIMITED, message)
-//
-// For any unknown fields that are unexpected per the wire format defined above,
-// we drop them on the floor.
-
-enum {
-  kUpb_MessageSet_StartItemTag = (1 << 3) | kUpb_WireType_StartGroup,
-  kUpb_MessageSet_EndItemTag = (1 << 3) | kUpb_WireType_EndGroup,
-  kUpb_MessageSet_TypeIdTag = (2 << 3) | kUpb_WireType_Varint,
-  kUpb_MessageSet_MessageTag = (3 << 3) | kUpb_WireType_Delimited,
-};
-
-static const char* PyUpb_UnknownFieldSet_BuildMessageSetItem(
-    PyUpb_UnknownFieldSet* self, upb_EpsCopyInputStream* stream,
-    const char* ptr) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  int type_id = 0;
-  PyObject* msg = NULL;
-  while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) {
-    uint32_t tag;
-    ptr = upb_WireReader_ReadTag(ptr, &tag);
-    if (!ptr) goto err;
-    switch (tag) {
-      case kUpb_MessageSet_EndItemTag:
-        goto done;
-      case kUpb_MessageSet_TypeIdTag: {
-        uint64_t tmp;
-        ptr = upb_WireReader_ReadVarint(ptr, &tmp);
-        if (!ptr) goto err;
-        if (!type_id) type_id = tmp;
-        break;
-      }
-      case kUpb_MessageSet_MessageTag: {
-        int size;
-        ptr = upb_WireReader_ReadSize(ptr, &size);
-        if (!upb_EpsCopyInputStream_CheckDataSizeAvailable(stream, ptr, size)) {
-          goto err;
-        }
-        const char* str = ptr;
-        ptr = upb_EpsCopyInputStream_ReadStringAliased(stream, &str, size);
-        if (!msg) {
-          msg = PyBytes_FromStringAndSize(str, size);
-          if (!msg) goto err;
-        } else {
-          // already saw a message here so deliberately skipping the duplicate
-        }
-        break;
-      }
-      default:
-        ptr = upb_WireReader_SkipValue(ptr, tag, stream);
-        if (!ptr) goto err;
-    }
-  }
-
-done:
-  if (type_id && msg) {
-    PyObject* field = PyObject_CallFunction(
-        s->unknown_field_type, "iiO", type_id, kUpb_WireType_Delimited, msg);
-    if (!field) goto err;
-    PyList_Append(self->fields, field);
-    Py_DECREF(field);
-  }
-  Py_XDECREF(msg);
-  return ptr;
-
-err:
-  Py_XDECREF(msg);
-  return NULL;
-}
-
-static const char* PyUpb_UnknownFieldSet_BuildMessageSet(
-    PyUpb_UnknownFieldSet* self, upb_EpsCopyInputStream* stream,
-    const char* ptr) {
-  self->fields = PyList_New(0);
-  while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) {
-    uint32_t tag;
-    ptr = upb_WireReader_ReadTag(ptr, &tag);
-    if (!ptr) goto err;
-    if (tag == kUpb_MessageSet_StartItemTag) {
-      ptr = PyUpb_UnknownFieldSet_BuildMessageSetItem(self, stream, ptr);
-    } else {
-      ptr = upb_WireReader_SkipValue(ptr, tag, stream);
-    }
-    if (!ptr) goto err;
-  }
-  if (upb_EpsCopyInputStream_IsError(stream)) goto err;
-  return ptr;
-
-err:
-  Py_DECREF(self->fields);
-  self->fields = NULL;
-  return NULL;
-}
-
-static const char* PyUpb_UnknownFieldSet_Build(PyUpb_UnknownFieldSet* self,
-                                               upb_EpsCopyInputStream* stream,
-                                               const char* ptr,
-                                               int group_number);
-
-static const char* PyUpb_UnknownFieldSet_BuildValue(
-    PyUpb_UnknownFieldSet* self, upb_EpsCopyInputStream* stream,
-    const char* ptr, int field_number, int wire_type, int group_number,
-    PyObject** data) {
-  switch (wire_type) {
-    case kUpb_WireType_Varint: {
-      uint64_t val;
-      ptr = upb_WireReader_ReadVarint(ptr, &val);
-      if (!ptr) return NULL;
-      *data = PyLong_FromUnsignedLongLong(val);
-      return ptr;
-    }
-    case kUpb_WireType_64Bit: {
-      uint64_t val;
-      ptr = upb_WireReader_ReadFixed64(ptr, &val);
-      *data = PyLong_FromUnsignedLongLong(val);
-      return ptr;
-    }
-    case kUpb_WireType_32Bit: {
-      uint32_t val;
-      ptr = upb_WireReader_ReadFixed32(ptr, &val);
-      *data = PyLong_FromUnsignedLongLong(val);
-      return ptr;
-    }
-    case kUpb_WireType_Delimited: {
-      int size;
-      ptr = upb_WireReader_ReadSize(ptr, &size);
-      if (!upb_EpsCopyInputStream_CheckDataSizeAvailable(stream, ptr, size)) {
-        return NULL;
-      }
-      const char* str = ptr;
-      ptr = upb_EpsCopyInputStream_ReadStringAliased(stream, &str, size);
-      *data = PyBytes_FromStringAndSize(str, size);
-      return ptr;
-    }
-    case kUpb_WireType_StartGroup: {
-      PyUpb_UnknownFieldSet* sub = PyUpb_UnknownFieldSet_NewBare();
-      if (!sub) return NULL;
-      *data = &sub->ob_base;
-      return PyUpb_UnknownFieldSet_Build(sub, stream, ptr, field_number);
-    }
-    default:
-      assert(0);
-      *data = NULL;
-      return NULL;
-  }
-}
-
-// For non-MessageSet we just build the unknown fields exactly as they exist on
-// the wire.
-static const char* PyUpb_UnknownFieldSet_Build(PyUpb_UnknownFieldSet* self,
-                                               upb_EpsCopyInputStream* stream,
-                                               const char* ptr,
-                                               int group_number) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_Get();
-  self->fields = PyList_New(0);
-  while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) {
-    uint32_t tag;
-    ptr = upb_WireReader_ReadTag(ptr, &tag);
-    if (!ptr) goto err;
-    PyObject* data = NULL;
-    int field_number = upb_WireReader_GetFieldNumber(tag);
-    int wire_type = upb_WireReader_GetWireType(tag);
-    if (wire_type == kUpb_WireType_EndGroup) {
-      if (field_number != group_number) return NULL;
-      return ptr;
-    }
-    ptr = PyUpb_UnknownFieldSet_BuildValue(self, stream, ptr, field_number,
-                                           wire_type, group_number, &data);
-    if (!ptr) {
-      Py_XDECREF(data);
-      goto err;
-    }
-    assert(data);
-    PyObject* field = PyObject_CallFunction(s->unknown_field_type, "iiN",
-                                            field_number, wire_type, data);
-    PyList_Append(self->fields, field);
-    Py_DECREF(field);
-  }
-  if (upb_EpsCopyInputStream_IsError(stream)) goto err;
-  return ptr;
-
-err:
-  Py_DECREF(self->fields);
-  self->fields = NULL;
-  return NULL;
-}
-
-static PyObject* PyUpb_UnknownFieldSet_New(PyTypeObject* type, PyObject* args,
-                                           PyObject* kwargs) {
-  char* kwlist[] = {"message", 0};
-  PyObject* py_msg = NULL;
-
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &py_msg)) {
-    return NULL;
-  }
-
-  if (!PyUpb_Message_Verify(py_msg)) return NULL;
-  PyUpb_UnknownFieldSet* self = PyUpb_UnknownFieldSet_NewBare();
-  upb_Message* msg = PyUpb_Message_GetIfReified(py_msg);
-  if (!msg) return &self->ob_base;
-
-  size_t size;
-  const char* ptr = upb_Message_GetUnknown(msg, &size);
-  if (size == 0) return &self->ob_base;
-
-  upb_EpsCopyInputStream stream;
-  upb_EpsCopyInputStream_Init(&stream, &ptr, size, true);
-  const upb_MessageDef* msgdef = PyUpb_Message_GetMsgdef(py_msg);
-
-  bool ok;
-  if (upb_MessageDef_IsMessageSet(msgdef)) {
-    ok = PyUpb_UnknownFieldSet_BuildMessageSet(self, &stream, ptr) != NULL;
-  } else {
-    ok = PyUpb_UnknownFieldSet_Build(self, &stream, ptr, -1) != NULL;
-  }
-
-  if (!ok) {
-    Py_DECREF(&self->ob_base);
-    return NULL;
-  }
-
-  return &self->ob_base;
-}
-
-static Py_ssize_t PyUpb_UnknownFieldSet_Length(PyObject* _self) {
-  PyUpb_UnknownFieldSet* self = (PyUpb_UnknownFieldSet*)_self;
-  return self->fields ? PyObject_Length(self->fields) : 0;
-}
-
-static PyObject* PyUpb_UnknownFieldSet_GetItem(PyObject* _self,
-                                               Py_ssize_t index) {
-  PyUpb_UnknownFieldSet* self = (PyUpb_UnknownFieldSet*)_self;
-  if (!self->fields) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return NULL;
-  }
-  PyObject* ret = PyList_GetItem(self->fields, index);
-  if (ret) Py_INCREF(ret);
-  return ret;
-}
-
-static PyType_Slot PyUpb_UnknownFieldSet_Slots[] = {
-    {Py_tp_new, &PyUpb_UnknownFieldSet_New},
-    {Py_tp_dealloc, &PyUpb_UnknownFieldSet_Dealloc},
-    {Py_sq_length, PyUpb_UnknownFieldSet_Length},
-    {Py_sq_item, PyUpb_UnknownFieldSet_GetItem},
-    {Py_tp_hash, PyObject_HashNotImplemented},
-    {0, NULL},
-};
-
-static PyType_Spec PyUpb_UnknownFieldSet_Spec = {
-    PYUPB_MODULE_NAME ".UnknownFieldSet",  // tp_name
-    sizeof(PyUpb_UnknownFieldSet),         // tp_basicsize
-    0,                                     // tp_itemsize
-    Py_TPFLAGS_DEFAULT,                    // tp_flags
-    PyUpb_UnknownFieldSet_Slots,
-};
-
-// -----------------------------------------------------------------------------
-// Top Level
-// -----------------------------------------------------------------------------
-
-PyObject* PyUpb_UnknownFieldSet_CreateNamedTuple(void) {
-  PyObject* mod = NULL;
-  PyObject* namedtuple = NULL;
-  PyObject* ret = NULL;
-
-  mod = PyImport_ImportModule("collections");
-  if (!mod) goto done;
-  namedtuple = PyObject_GetAttrString(mod, "namedtuple");
-  if (!namedtuple) goto done;
-  ret = PyObject_CallFunction(namedtuple, "s[sss]", "PyUnknownField",
-                              "field_number", "wire_type", "data");
-
-done:
-  Py_XDECREF(mod);
-  Py_XDECREF(namedtuple);
-  return ret;
-}
-
-bool PyUpb_UnknownFields_Init(PyObject* m) {
-  PyUpb_ModuleState* s = PyUpb_ModuleState_GetFromModule(m);
-
-  s->unknown_fields_type = PyUpb_AddClass(m, &PyUpb_UnknownFieldSet_Spec);
-  s->unknown_field_type = PyUpb_UnknownFieldSet_CreateNamedTuple();
-
-  return s->unknown_fields_type && s->unknown_field_type;
-}
diff --git a/third_party/upb/python/unknown_fields.h b/third_party/upb/python/unknown_fields.h
deleted file mode 100644
index e78c830bbb6e2..0000000000000
--- a/third_party/upb/python/unknown_fields.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PYUPB_UNKNOWN_FIELDS_H__
-#define PYUPB_UNKNOWN_FIELDS_H__
-
-#include <stdbool.h>
-
-#include "python/python_api.h"
-
-PyObject* PyUpb_UnknownFields_New(PyObject* msg);
-
-bool PyUpb_UnknownFields_Init(PyObject* m);
-
-#endif  // PYUPB_UNKNOWN_FIELDS_H__
diff --git a/third_party/upb/python/version_script.lds b/third_party/upb/python/version_script.lds
deleted file mode 100644
index 7cb83000c42a0..0000000000000
--- a/third_party/upb/python/version_script.lds
+++ /dev/null
@@ -1,6 +0,0 @@
-message {
-  global:
-    PyInit__message;
-  local:
-    *;
-};
diff --git a/third_party/upb/third_party/lunit/LICENSE b/third_party/upb/third_party/lunit/LICENSE
deleted file mode 100644
index fb720fe4d641c..0000000000000
--- a/third_party/upb/third_party/lunit/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Lunit License
--------------
-
-Lunit is written by Michael Roth <mroth@nessie.de> and is licensed
-under the terms of the MIT license reproduced below.
-
-========================================================================
-
-Copyright (c) 2004-2010 Michael Roth <mroth@nessie.de>
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-========================================================================
-
diff --git a/third_party/upb/third_party/lunit/README.google b/third_party/upb/third_party/lunit/README.google
deleted file mode 100644
index af3e50e7396df..0000000000000
--- a/third_party/upb/third_party/lunit/README.google
+++ /dev/null
@@ -1,9 +0,0 @@
-URL: https://github.com/dcurrie/lunit
-Version: 0.5
-License: MIT
-License File: LICENSE
-Description:
-A unit testing library for Lua.
-
-Local Modifications:
-Extracted the two file we actually need from the distribution.
diff --git a/third_party/upb/third_party/lunit/console.lua b/third_party/upb/third_party/lunit/console.lua
deleted file mode 100644
index 0ff22a42967c8..0000000000000
--- a/third_party/upb/third_party/lunit/console.lua
+++ /dev/null
@@ -1,156 +0,0 @@
-
---[[--------------------------------------------------------------------------
-
-    This file is part of lunit 0.5.
-
-    For Details about lunit look at: http://www.mroth.net/lunit/
-
-    Author: Michael Roth <mroth@nessie.de>
-
-    Copyright (c) 2006-2008 Michael Roth <mroth@nessie.de>
-
-    Permission is hereby granted, free of charge, to any person 
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without restriction,
-    including without limitation the rights to use, copy, modify, merge,
-    publish, distribute, sublicense, and/or sell copies of the Software,
-    and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be 
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---]]--------------------------------------------------------------------------
-
-
-
---[[
-
-      begin()
-        run(testcasename, testname)
-          err(fullname, message, traceback)
-          fail(fullname, where, message, usermessage)
-          pass(testcasename, testname)
-      done()
-
-      Fullname:
-        testcase.testname
-        testcase.testname:setupname
-        testcase.testname:teardownname
-
---]]
-
-
-lunit = require "lunit"
-
-local lunit_console
-
-if _VERSION >= 'Lua 5.2' then 
-
-    lunit_console = setmetatable({},{__index = _ENV})
-    _ENV = lunit_console
-    
-else
-
-    module( "lunit-console", package.seeall )
-    lunit_console = _M
-    
-end
-
-
-
-local function printformat(format, ...)
-  io.write( string.format(format, ...) )
-end
-
-
-local columns_printed = 0
-
-local function writestatus(char)
-  if columns_printed == 0 then
-    io.write("    ")
-  end
-  if columns_printed == 60 then
-    io.write("\n    ")
-    columns_printed = 0
-  end
-  io.write(char)
-  io.flush()
-  columns_printed = columns_printed + 1
-end
-
-
-local msgs = {}
-
-
-function begin()
-  local total_tc = 0
-  local total_tests = 0
-  
-  msgs = {} -- e
-
-  for tcname in lunit.testcases() do
-    total_tc = total_tc + 1
-    for testname, test in lunit.tests(tcname) do
-      total_tests = total_tests + 1
-    end
-  end
-
-  printformat("Loaded testsuite with %d tests in %d testcases.\n\n", total_tests, total_tc)
-end
-
-
-function run(testcasename, testname)
-  -- NOP
-end
-
-
-function err(fullname, message, traceback)
-  writestatus("E")
-  msgs[#msgs+1] = "Error! ("..fullname.."):\n"..message.."\n\t"..table.concat(traceback, "\n\t") .. "\n"
-end
-
-
-function fail(fullname, where, message, usermessage)
-  writestatus("F")
-  local text =  "Failure ("..fullname.."):\n"..
-                where..": "..message.."\n"
-
-  if usermessage then
-    text = text .. where..": "..usermessage.."\n"
-  end
-
-  msgs[#msgs+1] = text
-end
-
-
-function pass(testcasename, testname)
-  writestatus(".")
-end
-
-
-
-function done()
-  printformat("\n\n%d Assertions checked.\n", lunit.stats.assertions )
-  print()
-
-  for i, msg in ipairs(msgs) do
-    printformat( "%3d) %s\n", i, msg )
-  end
-
-  printformat("Testsuite finished (%d passed, %d failed, %d errors).\n",
-      lunit.stats.passed, lunit.stats.failed, lunit.stats.errors )
-end
-
-
-return lunit_console
-
-
diff --git a/third_party/upb/third_party/lunit/lunit.lua b/third_party/upb/third_party/lunit/lunit.lua
deleted file mode 100644
index 80f43c18e011a..0000000000000
--- a/third_party/upb/third_party/lunit/lunit.lua
+++ /dev/null
@@ -1,725 +0,0 @@
---[[--------------------------------------------------------------------------
-
-    This file is part of lunit 0.5.
-
-    For Details about lunit look at: http://www.mroth.net/lunit/
-
-    Author: Michael Roth <mroth@nessie.de>
-
-    Copyright (c) 2004, 2006-2010 Michael Roth <mroth@nessie.de>
-
-    Permission is hereby granted, free of charge, to any person 
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without restriction,
-    including without limitation the rights to use, copy, modify, merge,
-    publish, distribute, sublicense, and/or sell copies of the Software,
-    and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be 
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---]]--------------------------------------------------------------------------
-
-
-local orig_assert     = assert
-
-local pairs           = pairs
-local ipairs          = ipairs
-local next            = next
-local type            = type
-local error           = error
-local tostring        = tostring
-local setmetatable    = setmetatable
-local pcall           = pcall
-local xpcall          = xpcall
-local require         = require
-local loadfile        = loadfile
-
-local string_sub      = string.sub
-local string_gsub     = string.gsub
-local string_format   = string.format
-local string_lower    = string.lower
-local string_find     = string.find
-
-local table_concat    = table.concat
-
-local debug_getinfo   = debug.getinfo
-
-local _G = _G
-
-local lunit
-
-if _VERSION >= 'Lua 5.2' then 
-
-    lunit = {}
-    _ENV = lunit
-    
-else
-
-    module("lunit")
-    lunit = _M
-    
-end
-
-
-local __failure__ = {}    -- Type tag for failed assertions
-
-local typenames = { "nil", "boolean", "number", "string", "table", "function", "thread", "userdata" }
-
-
-local traceback_hide      -- Traceback function which hides lunit internals
-local mypcall             -- Protected call to a function with own traceback
-do
-  local _tb_hide = setmetatable( {}, {__mode="k"} )
-
-  function traceback_hide(func)
-    _tb_hide[func] = true
-  end
-
-  local function my_traceback(errobj)
-    if is_table(errobj) and errobj.type == __failure__ then
-      local info = debug_getinfo(5, "Sl")   -- FIXME: Hardcoded integers are bad...
-      errobj.where = string_format( "%s:%d", info.short_src, info.currentline)
-    else
-      errobj = { msg = tostring(errobj) }
-      errobj.tb = {}
-      local i = 2
-      while true do
-        local info = debug_getinfo(i, "Snlf")
-        if not is_table(info) then
-          break
-        end
-        if not _tb_hide[info.func] then
-          local line = {}       -- Ripped from ldblib.c...
-          line[#line+1] = string_format("%s:", info.short_src)
-          if info.currentline > 0 then
-            line[#line+1] = string_format("%d:", info.currentline)
-          end
-          if info.namewhat ~= "" then
-            line[#line+1] = string_format(" in function '%s'", info.name)
-          else
-            if info.what == "main" then
-              line[#line+1] = " in main chunk"
-            elseif info.what == "C" or info.what == "tail" then
-              line[#line+1] = " ?"
-            else
-              line[#line+1] = string_format(" in function <%s:%d>", info.short_src, info.linedefined)
-            end
-          end
-          errobj.tb[#errobj.tb+1] = table_concat(line)
-        end
-        i = i + 1
-      end
-    end
-    return errobj
-  end
-
-  function mypcall(func)
-    orig_assert( is_function(func) )
-    local ok, errobj = xpcall(func, my_traceback)
-    if not ok then
-      return errobj
-    end
-  end
-  traceback_hide(mypcall)
-end
-
-
--- Type check functions
-
-for _, typename in ipairs(typenames) do
-  lunit["is_"..typename] = function(x)
-    return type(x) == typename
-  end
-end
-
-local is_nil      = is_nil
-local is_boolean  = is_boolean
-local is_number   = is_number
-local is_string   = is_string
-local is_table    = is_table
-local is_function = is_function
-local is_thread   = is_thread
-local is_userdata = is_userdata
-
-
-local function failure(name, usermsg, defaultmsg, ...)
-  local errobj = {
-    type    = __failure__,
-    name    = name,
-    msg     = string_format(defaultmsg,...),
-    usermsg = usermsg
-  }
-  error(errobj, 0)
-end
-traceback_hide( failure )
-
-
-local function format_arg(arg)
-  local argtype = type(arg)
-  if argtype == "string" then
-    return "'"..arg.."'"
-  elseif argtype == "number" or argtype == "boolean" or argtype == "nil" then
-    return tostring(arg)
-  else
-    return "["..tostring(arg).."]"
-  end
-end
-
-
-local function selected(map, name)
-    if not map then
-        return true
-    end
-
-    local m = {}
-    for k,v in pairs(map) do
-        m[k] = lunitpat2luapat(v)
-    end
-    return in_patternmap(m, name)
-end
-
-
-function fail(msg)
-  stats.assertions = stats.assertions + 1
-  failure( "fail", msg, "failure" )
-end
-traceback_hide( fail )
-
-
-function assert(assertion, msg)
-  stats.assertions = stats.assertions + 1
-  if not assertion then
-    failure( "assert", msg, "assertion failed" )
-  end
-  return assertion
-end
-traceback_hide( assert )
-
-
-function assert_true(actual, msg)
-  stats.assertions = stats.assertions + 1
-  if actual ~= true then
-    failure( "assert_true", msg, "true expected but was %s", format_arg(actual) )
-  end
-  return actual
-end
-traceback_hide( assert_true )
-
-
-function assert_false(actual, msg)
-  stats.assertions = stats.assertions + 1
-  if actual ~= false then
-    failure( "assert_false", msg, "false expected but was %s", format_arg(actual) )
-  end
-  return actual
-end
-traceback_hide( assert_false )
-
-
-function assert_equal(expected, actual, msg)
-  stats.assertions = stats.assertions + 1
-  if expected ~= actual then
-    failure( "assert_equal", msg, "expected %s but was %s", format_arg(expected), format_arg(actual) )
-  end
-  return actual
-end
-traceback_hide( assert_equal )
-
-
-function assert_not_equal(unexpected, actual, msg)
-  stats.assertions = stats.assertions + 1
-  if unexpected == actual then
-    failure( "assert_not_equal", msg, "%s not expected but was one", format_arg(unexpected) )
-  end
-  return actual
-end
-traceback_hide( assert_not_equal )
-
-
-function assert_match(pattern, actual, msg)
-  stats.assertions = stats.assertions + 1
-  if type(pattern) ~= "string" then
-    failure( "assert_match", msg, "expected a string as pattern but was %s", format_arg(pattern) )
-  end
-  if type(actual) ~= "string" then
-    failure( "assert_match", msg, "expected a string to match pattern '%s' but was a %s", pattern, format_arg(actual) )
-  end
-  if not string_find(actual, pattern) then
-    failure( "assert_match", msg, "expected '%s' to match pattern '%s' but doesn't", actual, pattern )
-  end
-  return actual
-end
-traceback_hide( assert_match )
-
-
-function assert_not_match(pattern, actual, msg)
-  stats.assertions = stats.assertions + 1
-  if type(pattern) ~= "string" then
-    failure( "assert_not_match", msg, "expected a string as pattern but was %s", format_arg(pattern) )
-  end
-  if type(actual) ~= "string" then
-    failure( "assert_not_match", msg, "expected a string to not match pattern '%s' but was %s", pattern, format_arg(actual) )
-  end
-  if string_find(actual, pattern) then
-    failure( "assert_not_match", msg, "expected '%s' to not match pattern '%s' but it does", actual, pattern )
-  end
-  return actual
-end
-traceback_hide( assert_not_match )
-
-
-function assert_error(msg, func)
-  stats.assertions = stats.assertions + 1
-  if func == nil then
-    func, msg = msg, nil
-  end
-  if type(func) ~= "function" then
-    failure( "assert_error", msg, "expected a function as last argument but was %s", format_arg(func) )
-  end
-  local ok, errmsg = pcall(func)
-  if ok then
-    failure( "assert_error", msg, "error expected but no error occurred" )
-  end
-end
-traceback_hide( assert_error )
-
-
-function assert_error_match(msg, pattern, func)
-  stats.assertions = stats.assertions + 1
-  if func == nil then
-    msg, pattern, func = nil, msg, pattern
-  end
-  if type(pattern) ~= "string" then
-    failure( "assert_error_match", msg, "expected the pattern as a string but was %s", format_arg(pattern) )
-  end
-  if type(func) ~= "function" then
-    failure( "assert_error_match", msg, "expected a function as last argument but was %s", format_arg(func) )
-  end
-  local ok, errmsg = pcall(func)
-  if ok then
-    failure( "assert_error_match", msg, "error expected but no error occurred" )
-  end
-  if type(errmsg) ~= "string" then
-    failure( "assert_error_match", msg, "error as string expected but was %s", format_arg(errmsg) )
-  end
-  if not string_find(errmsg, pattern) then
-    failure( "assert_error_match", msg, "expected error '%s' to match pattern '%s' but doesn't", errmsg, pattern )
-  end
-end
-traceback_hide( assert_error_match )
-
-
-function assert_pass(msg, func)
-  stats.assertions = stats.assertions + 1
-  if func == nil then
-    func, msg = msg, nil
-  end
-  if type(func) ~= "function" then
-    failure( "assert_pass", msg, "expected a function as last argument but was %s", format_arg(func) )
-  end
-  local ok, errmsg = pcall(func)
-  if not ok then
-    failure( "assert_pass", msg, "no error expected but error was: '%s'", errmsg )
-  end
-end
-traceback_hide( assert_pass )
-
-
--- lunit.assert_typename functions
-
-for _, typename in ipairs(typenames) do
-  local assert_typename = "assert_"..typename
-  lunit[assert_typename] = function(actual, msg)
-    stats.assertions = stats.assertions + 1
-    if type(actual) ~= typename then
-      failure( assert_typename, msg, "%s expected but was %s", typename, format_arg(actual) )
-    end
-    return actual
-  end
-  traceback_hide( lunit[assert_typename] )
-end
-
-
--- lunit.assert_not_typename functions
-
-for _, typename in ipairs(typenames) do
-  local assert_not_typename = "assert_not_"..typename
-  lunit[assert_not_typename] = function(actual, msg)
-    stats.assertions = stats.assertions + 1
-    if type(actual) == typename then
-      failure( assert_not_typename, msg, typename.." not expected but was one" )
-    end
-  end
-  traceback_hide( lunit[assert_not_typename] )
-end
-
-
-function lunit.clearstats()
-  stats = {
-    assertions  = 0;
-    passed      = 0;
-    failed      = 0;
-    errors      = 0;
-  }
-end
-
-
-local report, reporterrobj
-do
-  local testrunner
-
-  function lunit.setrunner(newrunner)
-    if not ( is_table(newrunner) or is_nil(newrunner) ) then
-      return error("lunit.setrunner: Invalid argument", 0)
-    end
-    local oldrunner = testrunner
-    testrunner = newrunner
-    return oldrunner
-  end
-
-  function lunit.loadrunner(name)
-    if not is_string(name) then
-      return error("lunit.loadrunner: Invalid argument", 0)
-    end
-    local ok, runner = pcall( require, name )
-    if not ok then
-      return error("lunit.loadrunner: Can't load test runner: "..runner, 0)
-    end
-    return setrunner(runner)
-  end
-
-  function lunit.getrunner()
-    return testrunner
-  end
-
-  function report(event, ...)
-    local f = testrunner and testrunner[event]
-    if is_function(f) then
-      pcall(f, ...)
-    end
-  end
-
-  function reporterrobj(context, tcname, testname, errobj)
-    local fullname = tcname .. "." .. testname
-    if context == "setup" then
-      fullname = fullname .. ":" .. setupname(tcname, testname)
-    elseif context == "teardown" then
-      fullname = fullname .. ":" .. teardownname(tcname, testname)
-    end
-    if errobj.type == __failure__ then
-      stats.failed = stats.failed + 1
-      report("fail", fullname, errobj.where, errobj.msg, errobj.usermsg)
-    else
-      stats.errors = stats.errors + 1
-      report("err", fullname, errobj.msg, errobj.tb)
-    end
-  end
-end
-
-
-
-local function key_iter(t, k)
-    return (next(t,k))
-end
-
-
-local testcase
-do
-  -- Array with all registered testcases
-  local _testcases = {}
-
-  -- Marks a module as a testcase.
-  -- Applied over a module from module("xyz", lunit.testcase).
-  function lunit.testcase(m)
-    orig_assert( is_table(m) )
-    --orig_assert( m._M == m )
-    orig_assert( is_string(m._NAME) )
-    --orig_assert( is_string(m._PACKAGE) )
-
-    -- Register the module as a testcase
-    _testcases[m._NAME] = m
-
-    -- Import lunit, fail, assert* and is_* function to the module/testcase
-    m.lunit = lunit
-    m.fail = lunit.fail
-    for funcname, func in pairs(lunit) do
-      if "assert" == string_sub(funcname, 1, 6) or "is_" == string_sub(funcname, 1, 3) then
-        m[funcname] = func
-      end
-    end
-  end
-  
-  function lunit.module(name,seeall)
-    local m = {}
-    if seeall == "seeall" then
-      setmetatable(m, { __index = _G })
-    end
-    m._NAME = name
-    lunit.testcase(m)
-    return m
-  end
-
-  -- Iterator (testcasename) over all Testcases
-  function lunit.testcases()
-    -- Make a copy of testcases to prevent confusing the iterator when
-    -- new testcase are defined
-    local _testcases2 = {}
-    for k,v in pairs(_testcases) do
-        _testcases2[k] = true
-    end
-    return key_iter, _testcases2, nil
-  end
-
-  function testcase(tcname)
-    return _testcases[tcname]
-  end
-end
-
-
-do
-  -- Finds a function in a testcase case insensitive
-  local function findfuncname(tcname, name)
-    for key, value in pairs(testcase(tcname)) do
-      if is_string(key) and is_function(value) and string_lower(key) == name then
-        return key
-      end
-    end
-  end
-
-  function lunit.setupname(tcname)
-    return findfuncname(tcname, "setup")
-  end
-
-  function lunit.teardownname(tcname)
-    return findfuncname(tcname, "teardown")
-  end
-
-  -- Iterator over all test names in a testcase.
-  -- Have to collect the names first in case one of the test
-  -- functions creates a new global and throws off the iteration.
-  function lunit.tests(tcname)
-    local testnames = {}
-    for key, value in pairs(testcase(tcname)) do
-      if is_string(key) and is_function(value) then
-        local lfn = string_lower(key)
-        if string_sub(lfn, 1, 4) == "test" or string_sub(lfn, -4) == "test" then
-          testnames[key] = true
-        end
-      end
-    end
-    return key_iter, testnames, nil
-  end
-end
-
-
-
-
-function lunit.runtest(tcname, testname)
-  orig_assert( is_string(tcname) )
-  orig_assert( is_string(testname) )
-
-  if (not getrunner()) then
-    loadrunner("console")
-  end
-
-  local function callit(context, func)
-    if func then
-      local err = mypcall(func)
-      if err then
-        reporterrobj(context, tcname, testname, err)
-        return false
-      end
-    end
-    return true
-  end
-  traceback_hide(callit)
-
-  report("run", tcname, testname)
-
-  local tc          = testcase(tcname)
-  local setup       = tc[setupname(tcname)]
-  local test        = tc[testname]
-  local teardown    = tc[teardownname(tcname)]
-
-  local setup_ok    =              callit( "setup", setup )
-  local test_ok     = setup_ok and callit( "test", test )
-  local teardown_ok = setup_ok and callit( "teardown", teardown )
-
-  if setup_ok and test_ok and teardown_ok then
-    stats.passed = stats.passed + 1
-    report("pass", tcname, testname)
-  end
-end
-traceback_hide(runtest)
-
-
-
-function lunit.run(testpatterns)
-  clearstats()
-  report("begin")
-  for testcasename in lunit.testcases() do
-    -- Run tests in the testcases
-    for testname in lunit.tests(testcasename) do
-      if selected(testpatterns, testname) then
-        runtest(testcasename, testname)
-      end
-    end
-  end
-  report("done")
-  return stats
-end
-traceback_hide(run)
-
-
-function lunit.loadonly()
-  clearstats()
-  report("begin")
-  report("done")
-  return stats
-end
-
-
-
-
-
-
-
-
-
-local lunitpat2luapat
-do 
-  local conv = {
-    ["^"] = "%^",
-    ["$"] = "%$",
-    ["("] = "%(",
-    [")"] = "%)",
-    ["%"] = "%%",
-    ["."] = "%.",
-    ["["] = "%[",
-    ["]"] = "%]",
-    ["+"] = "%+",
-    ["-"] = "%-",
-    ["?"] = ".",
-    ["*"] = ".*"
-  }
-  function lunitpat2luapat(str)
-    --return "^" .. string.gsub(str, "%W", conv) .. "$"
-    -- Above was very annoying, if I want to run all the tests having to do with
-    -- RSS, I want to be able to do "-t rss"   not "-t \*rss\*".
-    return string_gsub(str, "%W", conv)
-  end
-end
-
-
-
-local function in_patternmap(map, name)
-  if map[name] == true then
-    return true
-  else
-    for _, pat in ipairs(map) do
-      if string_find(name, pat) then
-        return true
-      end
-    end
-  end
-  return false
-end
-
-
-
-
-
-
-
-
--- Called from 'lunit' shell script.
-
-function main(argv)
-  argv = argv or {}
-
-  -- FIXME: Error handling and error messages aren't nice.
-
-  local function checkarg(optname, arg)
-    if not is_string(arg) then
-      return error("lunit.main: option "..optname..": argument missing.", 0)
-    end
-  end
-
-  local function loadtestcase(filename)
-    if not is_string(filename) then
-      return error("lunit.main: invalid argument")
-    end
-    local chunk, err = loadfile(filename)
-    if err then
-      return error(err)
-    else
-      chunk()
-    end
-  end
-
-  local testpatterns = nil
-  local doloadonly = false
-
-  local i = 0
-  while i < #argv do
-    i = i + 1
-    local arg = argv[i]
-    if arg == "--loadonly" then
-      doloadonly = true
-    elseif arg == "--runner" or arg == "-r" then
-      local optname = arg; i = i + 1; arg = argv[i]
-      checkarg(optname, arg)
-      loadrunner(arg)
-    elseif arg == "--test" or arg == "-t" then
-      local optname = arg; i = i + 1; arg = argv[i]
-      checkarg(optname, arg)
-      testpatterns = testpatterns or {}
-      testpatterns[#testpatterns+1] = arg
-    elseif arg == "--help" or arg == "-h" then
-        print[[
-lunit 0.5
-Copyright (c) 2004-2009 Michael Roth <mroth@nessie.de>
-This program comes WITHOUT WARRANTY OF ANY KIND.
-
-Usage: lua test [OPTIONS] [--] scripts
-
-Options:
-
-  -r, --runner RUNNER         Testrunner to use, defaults to 'lunit-console'.
-  -t, --test PATTERN          Which tests to run, may contain * or ? wildcards.
-      --loadonly              Only load the tests.
-  -h, --help                  Print this help screen.
-
-Please report bugs to <mroth@nessie.de>.
-]]
-        return
-    elseif arg == "--" then
-      while i < #argv do
-        i = i + 1; arg = argv[i]
-        loadtestcase(arg)
-      end
-    else
-      loadtestcase(arg)
-    end
-  end
-
-  if doloadonly then
-    return loadonly()
-  else
-    return run(testpatterns)
-  end
-end
-
-clearstats()
-
-return lunit
diff --git a/third_party/upb/upb/BUILD b/third_party/upb/upb/BUILD
new file mode 100644
index 0000000000000..02d65bdee245c
--- /dev/null
+++ b/third_party/upb/upb/BUILD
@@ -0,0 +1,736 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("@rules_python//python:defs.bzl", "py_binary")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
+load("//bazel:upb_proto_library.bzl", "upb_proto_reflection_library")
+load("//bazel:upb_proto_library_internal/copts.bzl", "upb_proto_library_copts")
+load(
+    "//upb_generator:bootstrap_compiler.bzl",
+    "bootstrap_cc_library",
+    "bootstrap_upb_proto_library",
+)
+
+# begin:google_only
+# load("//tools/build_defs/kotlin/native:rules.bzl", "kt_native_interop_hint")
+# load("//tools/build_defs/license:license.bzl", "license")
+# end:google_only
+
+# begin:github_only
+load(
+    "//bazel:amalgamation.bzl",
+    "upb_amalgamation",
+)
+# end:github_only
+
+# begin:google_only
+# package(default_applicable_licenses = ["//upb:license"])
+#
+# license(
+#     name = "license",
+#     package_name = "upb",
+# )
+# end:google_only
+
+licenses(["notice"])
+
+exports_files(["LICENSE"])
+
+exports_files(
+    [
+        "BUILD",
+        "WORKSPACE",
+    ],
+    visibility = ["//upb/cmake:__pkg__"],
+)
+
+config_setting(
+    name = "windows",
+    constraint_values = ["@platforms//os:windows"],
+    visibility = ["//visibility:public"],
+)
+
+bool_flag(
+    name = "fasttable_enabled",
+    build_setting_default = False,
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "fasttable_enabled_setting",
+    flag_values = {"//upb:fasttable_enabled": "true"},
+    visibility = ["//visibility:public"],
+)
+
+upb_proto_library_copts(
+    name = "upb_proto_library_copts__for_generated_code_only_do_not_use",
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+)
+
+# Please update copy.bara.sky target = ":friends" if
+# you make changes to this list.
+package_group(
+    name = "friends",
+    packages = ["//..."],
+)
+
+package_group(
+    name = "friend_generators",
+    packages = ["//..."],
+)
+
+cc_library(
+    name = "upb",
+    hdrs = [
+        "upb.hpp",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    deprecation = "use upb:base and/or upb:mem instead",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":base",
+        ":mem",
+    ],
+)
+
+# Common support routines used by generated code.  This library has no
+# implementation, but depends on :upb and exposes a few more hdrs.
+#
+# This is public only because we have no way of visibility-limiting it to
+# upb_proto_library() only.  This interface is not stable and by using it you
+# give up any backward compatibility guarantees.
+cc_library(
+    name = "generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+    hdrs = ["generated_code_support.h"],
+    copts = UPB_DEFAULT_COPTS,
+    textual_hdrs = [
+        "//upb/port:inc",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":base",
+        ":mem",
+        ":message",
+        ":message_accessors",
+        ":message_accessors_internal",
+        ":message_internal",
+        ":mini_descriptor",
+        ":mini_table",
+        ":wire",
+        ":wire_internal",
+    ],
+)
+
+# Common support code for C++ generated code.
+cc_library(
+    name = "generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+    copts = UPB_DEFAULT_COPTS,
+    textual_hdrs = [
+        "//upb/port:inc",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+    hdrs = [
+        "reflection/def.h",
+        "reflection/internal/def_pool.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    textual_hdrs = [
+        "//upb/port:inc",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":mem",
+        ":mini_descriptor",
+        ":reflection_internal",
+    ],
+)
+
+bootstrap_upb_proto_library(
+    name = "descriptor_upb_proto",
+    base_dir = "reflection/",
+    # TODO: Export 'net/proto2/proto/descriptor.upb.h' and remove "-layering_check".
+    features = ["-layering_check"],
+    google3_src_files = ["net/proto2/proto/descriptor.proto"],
+    google3_src_rules = ["//net/proto2/proto:descriptor_proto_source"],
+    oss_src_files = ["google/protobuf/descriptor.proto"],
+    oss_src_rules = ["//:descriptor_proto_srcs"],
+    oss_strip_prefix = "third_party/protobuf/github/bootstrap/src",
+    proto_lib_deps = ["//:descriptor_proto"],
+    visibility = ["//visibility:public"],
+)
+
+upb_proto_reflection_library(
+    name = "descriptor_upb_proto_reflection",
+    visibility = ["//visibility:public"],
+    deps = ["//:descriptor_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "descriptor_upb_minitable_proto",
+    visibility = [
+        "//upb:__subpackages__",
+        # begin:github_only
+        "//python:__subpackages__",
+        # end:github_only
+    ],
+    deps = ["//:descriptor_proto"],
+)
+
+# TODO: Once we can delete the deprecated forwarding headers
+# (= everything in upb/) we can move this build target down into reflection/
+bootstrap_cc_library(
+    name = "reflection",
+    hdrs = [
+        "reflection/def.h",
+        "reflection/def.hpp",
+        "reflection/message.h",
+        "reflection/message.hpp",
+    ],
+    bootstrap_deps = [":reflection_internal"],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":base",
+        ":mem",
+        ":message",
+        ":message_types",
+        ":message_value",
+        ":port",
+    ],
+)
+
+bootstrap_cc_library(
+    name = "reflection_internal",
+    srcs = [
+        "reflection/def_pool.c",
+        "reflection/def_type.c",
+        "reflection/desc_state.c",
+        "reflection/enum_def.c",
+        "reflection/enum_reserved_range.c",
+        "reflection/enum_value_def.c",
+        "reflection/extension_range.c",
+        "reflection/field_def.c",
+        "reflection/file_def.c",
+        "reflection/internal/def_builder.c",
+        "reflection/internal/def_builder.h",
+        "reflection/internal/strdup2.c",
+        "reflection/internal/strdup2.h",
+        "reflection/message.c",
+        "reflection/message_def.c",
+        "reflection/message_reserved_range.c",
+        "reflection/method_def.c",
+        "reflection/oneof_def.c",
+        "reflection/service_def.c",
+    ],
+    hdrs = [
+        "reflection/common.h",
+        "reflection/def.h",
+        "reflection/def.hpp",
+        "reflection/def_pool.h",
+        "reflection/def_type.h",
+        "reflection/enum_def.h",
+        "reflection/enum_reserved_range.h",
+        "reflection/enum_value_def.h",
+        "reflection/extension_range.h",
+        "reflection/field_def.h",
+        "reflection/file_def.h",
+        "reflection/internal/def_pool.h",
+        "reflection/internal/desc_state.h",
+        "reflection/internal/enum_def.h",
+        "reflection/internal/enum_reserved_range.h",
+        "reflection/internal/enum_value_def.h",
+        "reflection/internal/extension_range.h",
+        "reflection/internal/field_def.h",
+        "reflection/internal/file_def.h",
+        "reflection/internal/message_def.h",
+        "reflection/internal/message_reserved_range.h",
+        "reflection/internal/method_def.h",
+        "reflection/internal/oneof_def.h",
+        "reflection/internal/service_def.h",
+        "reflection/message.h",
+        "reflection/message.hpp",
+        "reflection/message_def.h",
+        "reflection/message_reserved_range.h",
+        "reflection/method_def.h",
+        "reflection/oneof_def.h",
+        "reflection/service_def.h",
+    ],
+    bootstrap_deps = [":descriptor_upb_proto"],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":base",
+        ":hash",
+        ":mem",
+        ":message",
+        ":message_accessors",
+        ":message_types",
+        ":message_value",
+        ":mini_descriptor",
+        ":mini_descriptor_internal",
+        ":mini_table",
+        ":port",
+    ],
+)
+
+# Aliases ######################################################################
+# TODO: Remove these.
+
+alias(
+    name = "base",
+    actual = "//upb/base",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "base_internal",
+    actual = "//upb/base:internal",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "collections",
+    actual = "//upb/collections",
+    deprecation = "use upb:message instead",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "hash",
+    actual = "//upb/hash",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "json",
+    actual = "//upb/json",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "lex",
+    actual = "//upb/lex",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "mem",
+    actual = "//upb/mem",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "mem_internal",
+    actual = "//upb/mem:internal",
+    visibility = ["//upb:__subpackages__"],
+)
+
+alias(
+    name = "message",
+    actual = "//upb/message",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_accessors",
+    actual = "//upb/message:accessors",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_accessors_internal",
+    actual = "//upb/message:accessors_internal",
+    visibility = ["//upb:friends"],
+)
+
+alias(
+    name = "message_copy",
+    actual = "//upb/message:copy",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_internal",
+    actual = "//upb/message:internal",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_internal_types",
+    actual = "//upb/message:internal_types",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_promote",
+    actual = "//upb/message:promote",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_split64",
+    actual = "//upb/message:split64",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_tagged_ptr",
+    actual = "//upb/message:tagged_ptr",
+    visibility = ["//upb:friends"],
+)
+
+alias(
+    name = "message_types",
+    actual = "//upb/message:types",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "message_value",
+    actual = "//upb/message:value",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "mini_descriptor",
+    actual = "//upb/mini_descriptor",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "mini_descriptor_internal",
+    actual = "//upb/mini_descriptor:internal",
+    visibility = ["//upb:__subpackages__"],
+)
+
+alias(
+    name = "mini_table",
+    actual = "//upb/mini_table",
+    visibility = ["//upb:friends"],
+)
+
+alias(
+    name = "mini_table_compat",
+    actual = "//upb/mini_table:compat",
+    visibility = ["//upb:friends"],
+)
+
+alias(
+    name = "mini_table_internal",
+    actual = "//upb/mini_table:internal",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "port",
+    actual = "//upb/port",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "text",
+    actual = "//upb/text",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "wire",
+    actual = "//upb/wire",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "wire_internal",
+    actual = "//upb/wire:internal",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "wire_reader",
+    actual = "//upb/wire:reader",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "wire_types",
+    actual = "//upb/wire:types",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "eps_copy_input_stream",
+    actual = "//upb/wire:eps_copy_input_stream",
+    visibility = ["//visibility:public"],
+)
+
+# Tests ########################################################################
+
+cc_test(
+    name = "def_builder_test",
+    srcs = [
+        "reflection/common.h",
+        "reflection/def_type.h",
+        "reflection/internal/def_builder.h",
+        "reflection/internal/def_builder_test.cc",
+    ],
+    deps = [
+        ":descriptor_upb_proto",
+        ":hash",
+        ":mem",
+        ":port",
+        ":reflection",
+        ":reflection_internal",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
+# Internal C/C++ libraries #####################################################
+
+cc_binary(
+    name = "libupb.so",
+    srcs = ["upb_so.c"],
+    copts = UPB_DEFAULT_COPTS + ["-DUPB_BUILD_API"],
+    linkshared = 1,
+    linkstatic = 1,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":mem",
+        ":message",
+        ":message_accessors",
+        ":message_split64",
+        ":mini_descriptor",
+        ":mini_table",
+        ":port",
+    ],
+)
+
+# Amalgamation #################################################################
+
+# begin:github_only
+
+upb_amalgamation(
+    name = "gen_amalgamation",
+    outs = [
+        "upb.c",
+        "upb.h",
+    ],
+    libs = [
+        ":base",
+        ":base_internal",
+        ":descriptor_upb_minitable_proto",
+        ":descriptor_upb_proto",
+        ":eps_copy_input_stream",
+        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        ":hash",
+        ":lex",
+        ":mem",
+        ":mem_internal",
+        ":message",
+        ":message_accessors",
+        ":message_internal",
+        ":message_internal_types",
+        ":message_tagged_ptr",
+        ":message_types",
+        ":message_value",
+        ":mini_descriptor",
+        ":mini_descriptor_internal",
+        ":mini_table",
+        ":mini_table_compat",
+        ":mini_table_internal",
+        ":port",
+        ":reflection",
+        ":reflection_internal",
+        ":wire",
+        ":wire_internal",
+        ":wire_reader",
+        ":wire_types",
+    ],
+    strip_import_prefix = ["src"],
+)
+
+cc_library(
+    name = "amalgamation",
+    srcs = ["upb.c"],
+    hdrs = ["upb.h"],
+    copts = UPB_DEFAULT_COPTS,
+    deps = ["@utf8_range"],
+)
+
+upb_amalgamation(
+    name = "gen_php_amalgamation",
+    outs = [
+        "php-upb.c",
+        "php-upb.h",
+    ],
+    libs = [
+        ":base",
+        ":base_internal",
+        ":descriptor_upb_minitable_proto",
+        ":descriptor_upb_proto_reflection",
+        ":descriptor_upb_proto",
+        ":eps_copy_input_stream",
+        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        ":hash",
+        ":json",
+        ":lex",
+        ":mem",
+        ":mem_internal",
+        ":message",
+        ":message_accessors",
+        ":message_internal",
+        ":message_internal_types",
+        ":message_tagged_ptr",
+        ":message_types",
+        ":message_value",
+        ":mini_descriptor",
+        ":mini_descriptor_internal",
+        ":mini_table",
+        ":mini_table_internal",
+        ":port",
+        ":reflection",
+        ":reflection_internal",
+        ":wire",
+        ":wire_internal",
+        ":wire_reader",
+        ":wire_types",
+    ],
+    prefix = "php-",
+    strip_import_prefix = ["src"],
+    visibility = ["@com_google_protobuf//php:__subpackages__"],
+)
+
+cc_library(
+    name = "php_amalgamation",
+    srcs = ["php-upb.c"],
+    hdrs = ["php-upb.h"],
+    copts = UPB_DEFAULT_COPTS,
+    deps = ["@utf8_range"],
+)
+
+upb_amalgamation(
+    name = "gen_ruby_amalgamation",
+    outs = [
+        "ruby-upb.c",
+        "ruby-upb.h",
+    ],
+    libs = [
+        ":base",
+        ":base_internal",
+        ":descriptor_upb_minitable_proto",
+        ":descriptor_upb_proto",
+        ":eps_copy_input_stream",
+        ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        ":hash",
+        ":json",
+        ":lex",
+        ":mem",
+        ":mem_internal",
+        ":message",
+        ":message_accessors",
+        ":message_internal",
+        ":message_internal_types",
+        ":message_tagged_ptr",
+        ":message_types",
+        ":message_value",
+        ":mini_descriptor",
+        ":mini_descriptor_internal",
+        ":mini_table",
+        ":mini_table_internal",
+        ":port",
+        ":reflection",
+        ":reflection_internal",
+        ":wire",
+        ":wire_internal",
+        ":wire_reader",
+        ":wire_types",
+    ],
+    prefix = "ruby-",
+    strip_import_prefix = ["src"],
+    visibility = ["@com_google_protobuf//ruby:__subpackages__"],
+)
+
+cc_library(
+    name = "ruby_amalgamation",
+    srcs = ["ruby-upb.c"],
+    hdrs = ["ruby-upb.h"],
+    copts = UPB_DEFAULT_COPTS,
+    deps = ["@utf8_range"],
+)
+
+exports_files(
+    [
+        "third_party/lunit/console.lua",
+        "third_party/lunit/lunit.lua",
+    ],
+    visibility = ["//lua:__pkg__"],
+)
+
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+            "**/*.hpp",
+       ],
+        exclude = [
+            "**/conformance_upb.c",
+            "reflection/stage0/**/*",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
+
+# begin:google_only
+#
+# py_binary(
+#     name = "update_check_runs",
+#     srcs = ["update_check_runs.py"],
+#     main = "update_check_runs.py",
+#     deps = [
+#         "//third_party/py/absl:app",
+#         "//third_party/py/absl/flags",
+#     ],
+# )
+#
+# kt_native_interop_hint(
+#     name = "upb_kotlin_native_hint",
+#     compatible_with = ["//buildenv/target:non_prod"],
+#     headers_to_exclude = glob([
+#         "**/*.hpp",
+#     ]),
+#     kotlin_package = "upb",
+#     no_string_conversion = ["_upb_MiniTable_Build"],
+#     strict_enums = [
+#         "upb_CType",
+#         "upb_DecodeStatus",
+#         "upb_EncodeStatus",
+#         "upb_FieldType",
+#         "upb_FindUnknown_Status",
+#         "upb_GetExtension_Status",
+#         "upb_GetExtensionAsBytes_Status",
+#         "upb_Label",
+#         "upb_MapInsertStatus",
+#         "upb_UnknownToMessage_Status",
+#         "upb_WireType",
+#     ],
+#     visibility = ["//upb:__subpackages__"],
+# )
+#
+# end:google_only
diff --git a/third_party/upb/upb/README.md b/third_party/upb/upb/README.md
new file mode 100644
index 0000000000000..a0c6849ecaffe
--- /dev/null
+++ b/third_party/upb/upb/README.md
@@ -0,0 +1,84 @@
+
+# μpb: small, fast C protos
+
+μpb (often written 'upb') is a small
+[protobuf](https://github.com/protocolbuffers/protobuf) implementation written
+in C.
+
+upb is the core runtime for protobuf languages extensions in
+[Ruby](https://github.com/protocolbuffers/protobuf/tree/main/ruby),
+[PHP](https://github.com/protocolbuffers/protobuf/tree/main/php), and
+[Python](https://github.com/protocolbuffers/protobuf/tree/main/upb/python).
+
+While upb offers a C API, the C API & ABI **are not stable**. For this reason,
+upb is not generally offered as a C library for direct consumption, and there
+are no releases.
+
+## Features
+
+upb has comparable speed to protobuf C++, but is an order of magnitude smaller
+in code size.
+
+Like the main protobuf implementation in C++, it supports:
+
+- a generated API (in C)
+- reflection
+- binary & JSON wire formats
+- text format serialization
+- all standard features of protobufs (oneofs, maps, unknown fields, extensions,
+  etc.)
+- full conformance with the protobuf conformance tests
+
+upb also supports some features that C++ does not:
+
+- **optional reflection:** generated messages are agnostic to whether
+  reflection will be linked in or not.
+- **no global state:** no pre-main registration or other global state.
+- **fast reflection-based parsing:** messages loaded at runtime parse
+  just as fast as compiled-in messages.
+
+However there are a few features it does not support:
+
+- text format parsing
+- deep descriptor verification: upb's descriptor validation is not as exhaustive
+  as `protoc`.
+
+## Install
+
+For Ruby, use [RubyGems](https://rubygems.org/gems/google-protobuf):
+
+```
+$ gem install google-protobuf
+```
+
+For PHP, use [PECL](https://pecl.php.net/package/protobuf):
+
+```
+$ sudo pecl install protobuf
+```
+
+For Python, use [PyPI](https://pypi.org/project/protobuf/):
+
+```
+$ sudo pip install protobuf
+```
+
+Alternatively, you can build and install upb using
+[vcpkg](https://github.com/microsoft/vcpkg/) dependency manager:
+
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
+    ./bootstrap-vcpkg.sh
+    ./vcpkg integrate install
+    ./vcpkg install upb
+
+The upb port in vcpkg is kept up to date by microsoft team members and community
+contributors.
+
+If the version is out of date, please
+[create an issue or pull request](https://github.com/Microsoft/vcpkg) on the
+vcpkg repository.
+
+## Contributing
+
+Please see [CONTRIBUTING.md](CONTRIBUTING.md).
diff --git a/third_party/upb/upb/alloc.h b/third_party/upb/upb/alloc.h
deleted file mode 100644
index b276b935ca490..0000000000000
--- a/third_party/upb/upb/alloc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/mem/alloc.h instead
-// IWYU pragma: private, include "upb/mem/alloc.h"
-
-#ifndef UPB_ALLOC_H_
-#define UPB_ALLOC_H_
-
-#include "upb/mem/alloc.h"
-
-#endif /* UPB_ALLOC_H_ */
diff --git a/third_party/upb/upb/arena.h b/third_party/upb/upb/arena.h
deleted file mode 100644
index 3d849e09fdef7..0000000000000
--- a/third_party/upb/upb/arena.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/mem/arena.h instead
-// IWYU pragma: private, include "upb/mem/arena.h"
-
-#ifndef UPB_ARENA_H_
-#define UPB_ARENA_H_
-
-#include "upb/mem/arena.h"
-
-#endif /* UPB_ARENA_H_ */
diff --git a/third_party/upb/upb/array.h b/third_party/upb/upb/array.h
deleted file mode 100644
index dafaedf5370b8..0000000000000
--- a/third_party/upb/upb/array.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/collections/array.h instead
-// IWYU pragma: private, include "upb/collections/array.h"
-
-#ifndef UPB_ARRAY_H_
-#define UPB_ARRAY_H_
-
-#include "upb/collections/array.h"
-
-#endif /* UPB_ARRAY_H_ */
diff --git a/third_party/upb/upb/base/BUILD b/third_party/upb/upb/base/BUILD
new file mode 100644
index 0000000000000..54ef6d1867997
--- /dev/null
+++ b/third_party/upb/upb/base/BUILD
@@ -0,0 +1,53 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "base",
+    srcs = [
+        "status.c",
+    ],
+    hdrs = [
+        "descriptor_constants.h",
+        "status.h",
+        "status.hpp",
+        "string_view.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    hdrs = [
+        "internal/log2.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = ["//upb:port"],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+            "**/*.hpp",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/base/descriptor_constants.h b/third_party/upb/upb/base/descriptor_constants.h
index 8cb1c9509621a..638649a9ca575 100644
--- a/third_party/upb/upb/base/descriptor_constants.h
+++ b/third_party/upb/upb/base/descriptor_constants.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_BASE_DESCRIPTOR_CONSTANTS_H_
 #define UPB_BASE_DESCRIPTOR_CONSTANTS_H_
@@ -40,7 +20,7 @@ typedef enum {
   kUpb_CType_Float = 2,
   kUpb_CType_Int32 = 3,
   kUpb_CType_UInt32 = 4,
-  kUpb_CType_Enum = 5,  // Enum values are int32. TODO(b/279178239): rename
+  kUpb_CType_Enum = 5,  // Enum values are int32. TODO: rename
   kUpb_CType_Message = 6,
   kUpb_CType_Double = 7,
   kUpb_CType_Int64 = 8,
diff --git a/third_party/upb/upb/base/internal/log2.h b/third_party/upb/upb/base/internal/log2.h
new file mode 100644
index 0000000000000..486e3b0e35970
--- /dev/null
+++ b/third_party/upb/upb/base/internal/log2.h
@@ -0,0 +1,38 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+///
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_BASE_INTERNAL_LOG2_H_
+#define UPB_BASE_INTERNAL_LOG2_H_
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+UPB_INLINE int upb_Log2Ceiling(int x) {
+  if (x <= 1) return 0;
+#ifdef __GNUC__
+  return 32 - __builtin_clz(x - 1);
+#else
+  int lg2 = 0;
+  while ((1 << lg2) < x) lg2++;
+  return lg2;
+#endif
+}
+
+UPB_INLINE int upb_Log2CeilingSize(int x) { return 1 << upb_Log2Ceiling(x); }
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_BASE_INTERNAL_LOG2_H_ */
diff --git a/third_party/upb/upb/base/log2.h b/third_party/upb/upb/base/log2.h
deleted file mode 100644
index d825e8b97f69c..0000000000000
--- a/third_party/upb/upb/base/log2.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_BASE_LOG2_H_
-#define UPB_BASE_LOG2_H_
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-UPB_INLINE int upb_Log2Ceiling(int x) {
-  if (x <= 1) return 0;
-#ifdef __GNUC__
-  return 32 - __builtin_clz(x - 1);
-#else
-  int lg2 = 0;
-  while (1 << lg2 < x) lg2++;
-  return lg2;
-#endif
-}
-
-UPB_INLINE int upb_Log2CeilingSize(int x) { return 1 << upb_Log2Ceiling(x); }
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_BASE_LOG2_H_ */
diff --git a/third_party/upb/upb/base/status.c b/third_party/upb/upb/base/status.c
index 234754c868d14..f2cd0a62299c5 100644
--- a/third_party/upb/upb/base/status.c
+++ b/third_party/upb/upb/base/status.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/base/status.h"
 
diff --git a/third_party/upb/upb/base/status.h b/third_party/upb/upb/base/status.h
index b0b7ebe923102..5b75f880fd270 100644
--- a/third_party/upb/upb/base/status.h
+++ b/third_party/upb/upb/base/status.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_BASE_STATUS_H_
 #define UPB_BASE_STATUS_H_
diff --git a/third_party/upb/upb/base/status.hpp b/third_party/upb/upb/base/status.hpp
new file mode 100644
index 0000000000000..4d7152b26be8b
--- /dev/null
+++ b/third_party/upb/upb/base/status.hpp
@@ -0,0 +1,50 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_BASE_STATUS_HPP_
+#define UPB_BASE_STATUS_HPP_
+
+#include "upb/base/status.h"
+
+namespace upb {
+
+class Status {
+ public:
+  Status() { upb_Status_Clear(&status_); }
+
+  upb_Status* ptr() { return &status_; }
+
+  // Returns true if there is no error.
+  bool ok() const { return upb_Status_IsOk(&status_); }
+
+  // Guaranteed to be NULL-terminated.
+  const char* error_message() const {
+    return upb_Status_ErrorMessage(&status_);
+  }
+
+  // The error message will be truncated if it is longer than
+  // _kUpb_Status_MaxMessage-4.
+  void SetErrorMessage(const char* msg) {
+    upb_Status_SetErrorMessage(&status_, msg);
+  }
+  void SetFormattedErrorMessage(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    upb_Status_VSetErrorFormat(&status_, fmt, args);
+    va_end(args);
+  }
+
+  // Resets the status to a successful state with no message.
+  void Clear() { upb_Status_Clear(&status_); }
+
+ private:
+  upb_Status status_;
+};
+
+}  // namespace upb
+
+#endif  // UPB_BASE_STATUS_HPP_
diff --git a/third_party/upb/upb/base/string_view.h b/third_party/upb/upb/base/string_view.h
index 36195bff531a2..28b17962f55fe 100644
--- a/third_party/upb/upb/base/string_view.h
+++ b/third_party/upb/upb/base/string_view.h
@@ -1,30 +1,10 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 #ifndef UPB_BASE_STRING_VIEW_H_
 #define UPB_BASE_STRING_VIEW_H_
 
@@ -44,7 +24,10 @@ typedef struct {
   const char* data;
   size_t size;
 } upb_StringView;
-// LINT.ThenChange(GoogleInternalName0)
+// LINT.ThenChange(
+//  GoogleInternalName0,
+//  //depot/google3/third_party/upb/bits/golang/accessor.go:map_go_string
+// )
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/third_party/upb/upb/cmake/BUILD.bazel b/third_party/upb/upb/cmake/BUILD.bazel
new file mode 100644
index 0000000000000..b2a5e5a7f8abd
--- /dev/null
+++ b/third_party/upb/upb/cmake/BUILD.bazel
@@ -0,0 +1,108 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load(
+    "//bazel:build_defs.bzl",
+    "make_shell_script",
+)
+load(
+    ":build_defs.bzl",
+    "staleness_test",
+)
+
+licenses(["notice"])
+
+exports_files(["staleness_test.py"])
+
+py_library(
+    name = "staleness_test_lib",
+    testonly = 1,
+    srcs = ["staleness_test_lib.py"],
+    # This is public only for use by the staleness_test() macro. Please do not
+    # depend on this target directly.
+    visibility = ["//visibility:public"],
+)
+
+py_binary(
+    name = "make_cmakelists",
+    srcs = ["make_cmakelists.py"],
+)
+
+genrule(
+    name = "gen_cmakelists",
+    srcs = [
+        "//upb:BUILD",
+    ],
+    outs = ["generated-in/CMakeLists.txt"],
+    cmd = "$(location :make_cmakelists) " +
+          "$(location //upb:BUILD) $@",
+    tools = [":make_cmakelists"],
+)
+
+genrule(
+    name = "copy_protos",
+    srcs = [
+        "//upb:descriptor_upb_proto",
+        "//upb:descriptor_upb_minitable_proto",
+    ],
+    outs = [
+        "generated-in/google/protobuf/descriptor.upb.h",
+        "generated-in/google/protobuf/descriptor.upb_minitable.c",
+        "generated-in/google/protobuf/descriptor.upb_minitable.h",
+    ],
+    cmd = "cp $(SRCS) $(@D)/generated-in/google/protobuf",
+)
+
+staleness_test(
+    name = "test_generated_files",
+    outs = [
+        "CMakeLists.txt",
+        "google/protobuf/descriptor.upb.h",
+        "google/protobuf/descriptor.upb_minitable.c",
+        "google/protobuf/descriptor.upb_minitable.h",
+    ],
+    generated_pattern = "generated-in/%s",
+    tags = ["manual"],
+)
+
+# Test the CMake build #########################################################
+
+make_shell_script(
+    name = "gen_run_cmake_build",
+    out = "run_cmake_build.sh",
+    contents = "set -ex\n" +
+               "cd $(dirname $1) && cp -r . .. && cd ../..\n" +
+               "mkdir build && cd build && cmake ../cmake && make -j8 && make test",
+)
+
+sh_test(
+    name = "cmake_build",
+    srcs = ["run_cmake_build.sh"],
+    args = ["$(location :gen_cmakelists)"],
+    data = [
+        ":copy_protos",
+        ":gen_cmakelists",
+        "//upb:source_files",
+        "//upb/base:source_files",
+        "//upb/collections:source_files",
+        "//upb/hash:source_files",
+        "//upb/lex:source_files",
+        "//upb/mem:source_files",
+        "//upb/message:source_files",
+        "//upb/mini_descriptor:source_files",
+        "//upb/mini_table:source_files",
+        "//upb/port:source_files",
+        "//upb/text:source_files",
+        "//upb/wire:source_files",
+        "@utf8_range//:utf8_range_srcs",
+    ],
+    target_compatible_with = select({
+        "@platforms//os:windows": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
+    deps = ["@bazel_tools//tools/bash/runfiles"],
+)
diff --git a/third_party/upb/upb/cmake/CMakeLists.txt b/third_party/upb/upb/cmake/CMakeLists.txt
new file mode 100644
index 0000000000000..3ebe25780658c
--- /dev/null
+++ b/third_party/upb/upb/cmake/CMakeLists.txt
@@ -0,0 +1,126 @@
+# This file was generated from BUILD using tools/make_cmakelists.py.
+
+cmake_minimum_required(VERSION 3.10...3.24)
+
+project(upb)
+set(CMAKE_C_STANDARD 99)
+
+# Prevent CMake from setting -rdynamic on Linux (!!).
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
+
+# Set default build type.
+if(NOT CMAKE_BUILD_TYPE)
+  message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+  set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+      "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+endif()
+
+# When using Ninja, compiler output won't be colorized without this.
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG(-fdiagnostics-color=always SUPPORTS_COLOR_ALWAYS)
+if(SUPPORTS_COLOR_ALWAYS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
+endif()
+
+# Implement ASAN/UBSAN options
+if(UPB_ENABLE_ASAN)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+endif()
+
+if(UPB_ENABLE_UBSAN)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+endif()
+
+if(NOT TARGET utf8_range)
+  if(EXISTS ../../external/utf8_range)
+    # utf8_range is already installed
+    include_directories(../external/utf8_range)
+  elseif(EXISTS ../../utf8_range)
+    include_directories(../../utf8_range)
+  else()
+    include(FetchContent)
+    FetchContent_Declare(
+      utf8_range
+      GIT_REPOSITORY "https://github.com/protocolbuffers/utf8_range.git"
+      GIT_TAG "d863bc33e15cba6d873c878dcca9e6fe52b2f8cb"
+    )
+    FetchContent_GetProperties(utf8_range)
+    if(NOT utf8_range_POPULATED)
+      FetchContent_Populate(utf8_range)
+      include_directories(${utf8_range_SOURCE_DIR})
+    endif()
+  endif()
+endif()
+
+if(APPLE)
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace")
+elseif(UNIX)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
+endif()
+
+enable_testing()
+
+
+add_library(upb INTERFACE
+    
+)
+target_include_directories(upb INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
+)
+target_link_libraries(upb INTERFACE
+  base
+  mem)
+
+add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    
+)
+target_include_directories(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
+)
+target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+  base
+  mem
+  message
+  message_accessors
+  message_accessors_internal
+  message_internal
+  mini_descriptor
+  mini_table
+  wire
+  wire_internal)
+
+add_library(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    
+)
+target_include_directories(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
+)
+
+add_library(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    
+)
+target_include_directories(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
+)
+target_link_libraries(generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
+  mem
+  mini_descriptor
+  reflection_internal)
+
+
diff --git a/third_party/upb/cmake/README.md b/third_party/upb/upb/cmake/README.md
similarity index 100%
rename from third_party/upb/cmake/README.md
rename to third_party/upb/upb/cmake/README.md
diff --git a/third_party/upb/upb/cmake/build_defs.bzl b/third_party/upb/upb/cmake/build_defs.bzl
new file mode 100644
index 0000000000000..325189c7f11fa
--- /dev/null
+++ b/third_party/upb/upb/cmake/build_defs.bzl
@@ -0,0 +1,59 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+"""Bazel support functions related to CMake support."""
+
+def staleness_test(name, outs, generated_pattern, target_files = None, tags = [], **kwargs):
+    """Tests that checked-in file(s) match the contents of generated file(s).
+
+    The resulting test will verify that all output files exist and have the
+    correct contents.  If the test fails, it can be invoked with --fix to
+    bring the checked-in files up to date.
+
+    Args:
+      name: Name of the rule.
+      outs: the checked-in files that are copied from generated files.
+      generated_pattern: the pattern for transforming each "out" file into a
+        generated file.  For example, if generated_pattern="generated/%s" then
+        a file foo.txt will look for generated file generated/foo.txt.
+      target_files: A glob representing all of the files that should be
+      covered by this rule.  Files in this glob but not generated will
+      be deleted.  (Not currently implemented in OSS).
+      **kwargs: Additional keyword arguments to pass through to py_test().
+    """
+
+    script_name = name + ".py"
+    script_src = Label("//upb/cmake:staleness_test.py")
+
+    # Filter out non-existing rules so Blaze doesn't error out before we even
+    # run the test.
+    existing_outs = native.glob(include = outs, allow_empty = True)
+
+    # The file list contains a few extra bits of information at the end.
+    # These get unpacked by the Config class in staleness_test_lib.py.
+    file_list = outs + [generated_pattern, native.package_name() or ".", name]
+
+    native.genrule(
+        name = name + "_makescript",
+        outs = [script_name],
+        srcs = [script_src],
+        testonly = 1,
+        cmd = "cp $< $@; " +
+              "sed -i.bak -e 's|INSERT_FILE_LIST_HERE|" + "\\\n  ".join(file_list) + "|' $@",
+    )
+
+    native.py_test(
+        name = name,
+        srcs = [script_name],
+        data = existing_outs + [generated_pattern % file for file in outs],
+        python_version = "PY3",
+        deps = [
+            Label("//upb/cmake:staleness_test_lib"),
+        ],
+        tags = ["staleness_test"] + tags,
+        **kwargs
+    )
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.c b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.c
new file mode 100644
index 0000000000000..521ced7399aba
--- /dev/null
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.c
@@ -0,0 +1,1351 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/upb/generated_code_support.h"
+#include "google/protobuf/descriptor.upb.h"
+
+// Must be last.
+#include "upb/upb/port/def.inc"
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
+  {.submsg = &google_protobuf_FileDescriptorProto_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init = {
+  &google_protobuf_FileDescriptorSet_submsgs[0],
+  &google_protobuf_FileDescriptorSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max192b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = {
+  {.submsg = &google_protobuf_DescriptorProto_msg_init},
+  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_ServiceDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_FileOptions_msg_init},
+  {.submsg = &google_protobuf_SourceCodeInfo_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[14] = {
+  {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {13, UPB_SIZE(68, 128), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(40, 4), 7, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init = {
+  &google_protobuf_FileDescriptorProto_submsgs[0],
+  &google_protobuf_FileDescriptorProto__fields[0],
+  UPB_SIZE(80, 144), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_prs_1bt},
+    {0x003000003f000022, &upb_prm_1bt_max128b},
+    {0x003800003f01002a, &upb_prm_1bt_max64b},
+    {0x004000003f020032, &upb_prm_1bt_max64b},
+    {0x004800003f03003a, &upb_prm_1bt_max128b},
+    {0x0050000003040042, &upb_psm_1bt_max256b},
+    {0x005800000405004a, &upb_psm_1bt_max64b},
+    {0x006000003f000050, &upb_prv4_1bt},
+    {0x006800003f000058, &upb_prv4_1bt},
+    {0x0070000005000062, &upb_pss_1bt},
+    {0x008000000600006a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
+  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_DescriptorProto_msg_init},
+  {.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msg_init},
+  {.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_MessageOptions_msg_init},
+  {.submsg = &google_protobuf_OneofDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_DescriptorProto_ReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
+  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_DescriptorProto_msg_init = {
+  &google_protobuf_DescriptorProto_submsgs[0],
+  &google_protobuf_DescriptorProto__fields[0],
+  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000003f01001a, &upb_prm_1bt_max128b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f03002a, &upb_prm_1bt_max64b},
+    {0x003800003f040032, &upb_prm_1bt_max128b},
+    {0x004000000205003a, &upb_psm_1bt_max64b},
+    {0x004800003f060042, &upb_prm_1bt_max64b},
+    {0x005000003f07004a, &upb_prm_1bt_max64b},
+    {0x005800003f000052, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+  {.submsg = &google_protobuf_ExtensionRangeOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init = {
+  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x001000000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+  {.submsg = &google_protobuf_ExtensionRangeOptions_Declaration_msg_init},
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init = {
+  &google_protobuf_ExtensionRangeOptions_submsgs[0],
+  &google_protobuf_ExtensionRangeOptions__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000002010392, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init = {
+  NULL,
+  &google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0010000002000012, &upb_pss_1bt},
+    {0x002000000300001a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000028, &upb_psb1_1bt},
+    {0x0009000005000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
+  {.submsg = &google_protobuf_FieldOptions_msg_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init = {
+  &google_protobuf_FieldDescriptorProto_submsgs[0],
+  &google_protobuf_FieldDescriptorProto__fields[0],
+  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0028000002000012, &upb_pss_1bt},
+    {0x0004000003000018, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0038000006000032, &upb_pss_1bt},
+    {0x004800000700003a, &upb_pss_1bt},
+    {0x0058000008000042, &upb_psm_1bt_max64b},
+    {0x0010000009000048, &upb_psv4_1bt},
+    {0x006000000a000052, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001400000b000188, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
+  {.submsg = &google_protobuf_OneofOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
+  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init = {
+  &google_protobuf_OneofDescriptorProto_submsgs[0],
+  &google_protobuf_OneofDescriptorProto__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
+  {.submsg = &google_protobuf_EnumValueDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_EnumOptions_msg_init},
+  {.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
+  {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init = {
+  &google_protobuf_EnumDescriptorProto_submsgs[0],
+  &google_protobuf_EnumDescriptorProto__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+  {.submsg = &google_protobuf_EnumValueOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init = {
+  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+  &google_protobuf_EnumValueDescriptorProto__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0004000002000010, &upb_psv4_1bt},
+    {0x001800000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+  {.submsg = &google_protobuf_MethodDescriptorProto_msg_init},
+  {.submsg = &google_protobuf_ServiceOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init = {
+  &google_protobuf_ServiceDescriptorProto_submsgs[0],
+  &google_protobuf_ServiceDescriptorProto__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
+  {.submsg = &google_protobuf_MethodOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init = {
+  &google_protobuf_MethodDescriptorProto_submsgs[0],
+  &google_protobuf_MethodDescriptorProto__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800000300001a, &upb_pss_1bt},
+    {0x0038000004000022, &upb_psm_1bt_max64b},
+    {0x0001000005000028, &upb_psb1_1bt},
+    {0x0002000006000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileOptions__fields[22] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FileOptions_msg_init = {
+  &google_protobuf_FileOptions_submsgs[0],
+  &google_protobuf_FileOptions__fields[0],
+  UPB_SIZE(112, 200), 22, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0028000002000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000050, &upb_psb1_1bt},
+    {0x003800000500005a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0009000006000180, &upb_psb1_2bt},
+    {0x000a000007000188, &upb_psb1_2bt},
+    {0x000b000008000190, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000c0000090001a0, &upb_psb1_2bt},
+    {0x005800000e0002aa, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000d00000a0001b8, &upb_psb1_2bt},
+    {0x00780000100002c2, &upb_pss_2bt},
+    {0x00880000110002ca, &upb_pss_2bt},
+    {0x00100000120002d0, &upb_psb1_2bt},
+    {0x000e00000b0001d8, &upb_psb1_2bt},
+    {0x00980000130002e2, &upb_pss_2bt},
+    {0x00a80000140002ea, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000f00000c0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_MessageOptions_msg_init = {
+  &google_protobuf_MessageOptions_submsgs[0],
+  &google_protobuf_MessageOptions__fields[0],
+  UPB_SIZE(16, 24), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0002000002000010, &upb_psb1_1bt},
+    {0x0003000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000004000038, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0005000005000058, &upb_psb1_1bt},
+    {0x0008000006000062, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = {
+  {.submsg = &google_protobuf_FieldOptions_EditionDefault_msg_init},
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FieldOptions_CType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = {
+  {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FieldOptions_msg_init = {
+  &google_protobuf_FieldOptions_submsgs[0],
+  &google_protobuf_FieldOptions__fields[0],
+  UPB_SIZE(40, 56), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000002000010, &upb_psb1_1bt},
+    {0x0009000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000a000004000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000006000050, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0011000007000078, &upb_psb1_1bt},
+    {0x0012000008000180, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f0001a2, &upb_prm_2bt_max64b},
+    {0x002800000a0101aa, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[3] = {
+  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 3, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FieldOptions_EditionDefault_msg_init = {
+  &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+  &google_protobuf_FieldOptions_EditionDefault__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_OneofOptions_msg_init = {
+  &google_protobuf_OneofOptions_submsgs[0],
+  &google_protobuf_OneofOptions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
+  {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_EnumOptions_msg_init = {
+  &google_protobuf_EnumOptions_submsgs[0],
+  &google_protobuf_EnumOptions__fields[0],
+  UPB_SIZE(16, 24), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000010, &upb_psb1_1bt},
+    {0x0002000002000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0003000003000030, &upb_psb1_1bt},
+    {0x000800000400003a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_EnumValueOptions_msg_init = {
+  &google_protobuf_EnumValueOptions_submsgs[0],
+  &google_protobuf_EnumValueOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0008000002000012, &upb_psm_1bt_max64b},
+    {0x0002000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_ServiceOptions_msg_init = {
+  &google_protobuf_ServiceOptions_submsgs[0],
+  &google_protobuf_ServiceOptions__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0008000002000292, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.submsg = &google_protobuf_UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_MethodOptions_msg_init = {
+  &google_protobuf_MethodOptions_submsgs[0],
+  &google_protobuf_MethodOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000300029a, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
+  {.submsg = &google_protobuf_UninterpretedOption_NamePart_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_UninterpretedOption_msg_init = {
+  &google_protobuf_UninterpretedOption_submsgs[0],
+  &google_protobuf_UninterpretedOption__fields[0],
+  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x001000000100001a, &upb_pss_1bt},
+    {0x0020000002000020, &upb_psv8_1bt},
+    {0x0028000003000028, &upb_psv8_1bt},
+    {0x0030000004000031, &upb_psf8_1bt},
+    {0x003800000500003a, &upb_psb_1bt},
+    {0x0048000006000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init = {
+  NULL,
+  &google_protobuf_UninterpretedOption_NamePart__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0001000002000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[5] = {
+  {.subenum = &google_protobuf_FeatureSet_FieldPresence_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_EnumType_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSet__fields[5] = {
+  {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FeatureSet_msg_init = {
+  &google_protobuf_FeatureSet_submsgs[0],
+  &google_protobuf_FeatureSet__fields[0],
+  24, 5, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = {
+  {.submsg = &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[5] = {
+  {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 4), 3, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 8), 4, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FeatureSetDefaults_msg_init = {
+  &google_protobuf_FeatureSetDefaults_submsgs[0],
+  &google_protobuf_FeatureSetDefaults__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_prm_1bt_max64b},
+    {0x0018000001000012, &upb_pss_1bt},
+    {0x002800000200001a, &upb_pss_1bt},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[2] = {
+  {.submsg = &google_protobuf_FeatureSet_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 3, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_msg_init = {
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
+  {.submsg = &google_protobuf_SourceCodeInfo_Location_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init = {
+  &google_protobuf_SourceCodeInfo_submsgs[0],
+  &google_protobuf_SourceCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init = {
+  NULL,
+  &google_protobuf_SourceCodeInfo_Location__fields[0],
+  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_ppv4_1bt},
+    {0x001000003f000012, &upb_ppv4_1bt},
+    {0x001800000100001a, &upb_pss_1bt},
+    {0x0028000002000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f000032, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+  {.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
+  {.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
+  {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
+  UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_ppv4_1bt},
+    {0x0018000001000012, &upb_pss_1bt},
+    {0x0004000002000018, &upb_psv4_1bt},
+    {0x0008000003000020, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[32] = {
+  &google_protobuf_FileDescriptorSet_msg_init,
+  &google_protobuf_FileDescriptorProto_msg_init,
+  &google_protobuf_DescriptorProto_msg_init,
+  &google_protobuf_DescriptorProto_ExtensionRange_msg_init,
+  &google_protobuf_DescriptorProto_ReservedRange_msg_init,
+  &google_protobuf_ExtensionRangeOptions_msg_init,
+  &google_protobuf_ExtensionRangeOptions_Declaration_msg_init,
+  &google_protobuf_FieldDescriptorProto_msg_init,
+  &google_protobuf_OneofDescriptorProto_msg_init,
+  &google_protobuf_EnumDescriptorProto_msg_init,
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init,
+  &google_protobuf_EnumValueDescriptorProto_msg_init,
+  &google_protobuf_ServiceDescriptorProto_msg_init,
+  &google_protobuf_MethodDescriptorProto_msg_init,
+  &google_protobuf_FileOptions_msg_init,
+  &google_protobuf_MessageOptions_msg_init,
+  &google_protobuf_FieldOptions_msg_init,
+  &google_protobuf_FieldOptions_EditionDefault_msg_init,
+  &google_protobuf_OneofOptions_msg_init,
+  &google_protobuf_EnumOptions_msg_init,
+  &google_protobuf_EnumValueOptions_msg_init,
+  &google_protobuf_ServiceOptions_msg_init,
+  &google_protobuf_MethodOptions_msg_init,
+  &google_protobuf_UninterpretedOption_msg_init,
+  &google_protobuf_UninterpretedOption_NamePart_msg_init,
+  &google_protobuf_FeatureSet_msg_init,
+  &google_protobuf_FeatureSetDefaults_msg_init,
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_msg_init,
+  &google_protobuf_SourceCodeInfo_msg_init,
+  &google_protobuf_SourceCodeInfo_Location_msg_init,
+  &google_protobuf_GeneratedCodeInfo_msg_init,
+  &google_protobuf_GeneratedCodeInfo_Annotation_msg_init,
+};
+
+const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+    64,
+    4,
+    {
+        0x7,
+        0x0,
+        0x3e8,
+        0x1869d,
+        0x1869e,
+        0x1869f,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+    64,
+    0,
+    {
+        0x3,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+    64,
+    0,
+    {
+        0xf,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+    64,
+    0,
+    {
+        0x7fffe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+    64,
+    0,
+    {
+        0x3ff,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+static const upb_MiniTableEnum *enums_layout[16] = {
+  &google_protobuf_Edition_enum_init,
+  &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
+  &google_protobuf_FeatureSet_EnumType_enum_init,
+  &google_protobuf_FeatureSet_FieldPresence_enum_init,
+  &google_protobuf_FeatureSet_JsonFormat_enum_init,
+  &google_protobuf_FeatureSet_MessageEncoding_enum_init,
+  &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
+  &google_protobuf_FieldDescriptorProto_Label_enum_init,
+  &google_protobuf_FieldDescriptorProto_Type_enum_init,
+  &google_protobuf_FieldOptions_CType_enum_init,
+  &google_protobuf_FieldOptions_JSType_enum_init,
+  &google_protobuf_FieldOptions_OptionRetention_enum_init,
+  &google_protobuf_FieldOptions_OptionTargetType_enum_init,
+  &google_protobuf_FileOptions_OptimizeMode_enum_init,
+  &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
+  &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+};
+
+const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
+  messages_layout,
+  enums_layout,
+  NULL,
+  32,
+  16,
+  0,
+};
+
+#include "upb/upb/port/undef.inc"
+
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h
new file mode 100644
index 0000000000000..44a98a31f2259
--- /dev/null
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h
@@ -0,0 +1,6397 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
+typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
+typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
+typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
+typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
+typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
+typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration;
+typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
+typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
+typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
+typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
+typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
+typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
+typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
+typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
+typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
+typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
+typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault;
+typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
+typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
+typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
+typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
+typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
+typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
+typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
+typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet;
+typedef struct google_protobuf_FeatureSetDefaults google_protobuf_FeatureSetDefaults;
+typedef struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault;
+typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
+typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
+typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
+typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
+
+typedef enum {
+  google_protobuf_EDITION_UNKNOWN = 0,
+  google_protobuf_EDITION_1_TEST_ONLY = 1,
+  google_protobuf_EDITION_2_TEST_ONLY = 2,
+  google_protobuf_EDITION_PROTO2 = 998,
+  google_protobuf_EDITION_PROTO3 = 999,
+  google_protobuf_EDITION_2023 = 1000,
+  google_protobuf_EDITION_99997_TEST_ONLY = 99997,
+  google_protobuf_EDITION_99998_TEST_ONLY = 99998,
+  google_protobuf_EDITION_99999_TEST_ONLY = 99999
+} google_protobuf_Edition;
+
+typedef enum {
+  google_protobuf_ExtensionRangeOptions_DECLARATION = 0,
+  google_protobuf_ExtensionRangeOptions_UNVERIFIED = 1
+} google_protobuf_ExtensionRangeOptions_VerificationState;
+
+typedef enum {
+  google_protobuf_FeatureSet_ENUM_TYPE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_OPEN = 1,
+  google_protobuf_FeatureSet_CLOSED = 2
+} google_protobuf_FeatureSet_EnumType;
+
+typedef enum {
+  google_protobuf_FeatureSet_FIELD_PRESENCE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_EXPLICIT = 1,
+  google_protobuf_FeatureSet_IMPLICIT = 2,
+  google_protobuf_FeatureSet_LEGACY_REQUIRED = 3
+} google_protobuf_FeatureSet_FieldPresence;
+
+typedef enum {
+  google_protobuf_FeatureSet_JSON_FORMAT_UNKNOWN = 0,
+  google_protobuf_FeatureSet_ALLOW = 1,
+  google_protobuf_FeatureSet_LEGACY_BEST_EFFORT = 2
+} google_protobuf_FeatureSet_JsonFormat;
+
+typedef enum {
+  google_protobuf_FeatureSet_MESSAGE_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_LENGTH_PREFIXED = 1,
+  google_protobuf_FeatureSet_DELIMITED = 2
+} google_protobuf_FeatureSet_MessageEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_PACKED = 1,
+  google_protobuf_FeatureSet_EXPANDED = 2
+} google_protobuf_FeatureSet_RepeatedFieldEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_UTF8_VALIDATION_UNKNOWN = 0,
+  google_protobuf_FeatureSet_NONE = 1,
+  google_protobuf_FeatureSet_VERIFY = 2
+} google_protobuf_FeatureSet_Utf8Validation;
+
+typedef enum {
+  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
+  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
+  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
+} google_protobuf_FieldDescriptorProto_Label;
+
+typedef enum {
+  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
+  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
+  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
+  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
+  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
+  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
+  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
+  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
+  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
+  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
+  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
+  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
+  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
+  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
+  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
+  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
+  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
+  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
+} google_protobuf_FieldDescriptorProto_Type;
+
+typedef enum {
+  google_protobuf_FieldOptions_STRING = 0,
+  google_protobuf_FieldOptions_CORD = 1,
+  google_protobuf_FieldOptions_STRING_PIECE = 2
+} google_protobuf_FieldOptions_CType;
+
+typedef enum {
+  google_protobuf_FieldOptions_JS_NORMAL = 0,
+  google_protobuf_FieldOptions_JS_STRING = 1,
+  google_protobuf_FieldOptions_JS_NUMBER = 2
+} google_protobuf_FieldOptions_JSType;
+
+typedef enum {
+  google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0,
+  google_protobuf_FieldOptions_RETENTION_RUNTIME = 1,
+  google_protobuf_FieldOptions_RETENTION_SOURCE = 2
+} google_protobuf_FieldOptions_OptionRetention;
+
+typedef enum {
+  google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0,
+  google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1,
+  google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2,
+  google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3,
+  google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4,
+  google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5,
+  google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6,
+  google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7,
+  google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8,
+  google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9
+} google_protobuf_FieldOptions_OptionTargetType;
+
+typedef enum {
+  google_protobuf_FileOptions_SPEED = 1,
+  google_protobuf_FileOptions_CODE_SIZE = 2,
+  google_protobuf_FileOptions_LITE_RUNTIME = 3
+} google_protobuf_FileOptions_OptimizeMode;
+
+typedef enum {
+  google_protobuf_GeneratedCodeInfo_Annotation_NONE = 0,
+  google_protobuf_GeneratedCodeInfo_Annotation_SET = 1,
+  google_protobuf_GeneratedCodeInfo_Annotation_ALIAS = 2
+} google_protobuf_GeneratedCodeInfo_Annotation_Semantic;
+
+typedef enum {
+  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
+  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
+  google_protobuf_MethodOptions_IDEMPOTENT = 2
+} google_protobuf_MethodOptions_IdempotencyLevel;
+
+
+
+/* google.protobuf.FileDescriptorSet */
+
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
+  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google__protobuf__FileDescriptorSet_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorSet_file(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google__protobuf__FileDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FileDescriptorProto */
+
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google__protobuf__FileDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_message_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_enum_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_service(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_extension(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
+  const google_protobuf_FileOptions* default_val = NULL;
+  const google_protobuf_FileOptions* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
+  const google_protobuf_SourceCodeInfo* default_val = NULL;
+  const google_protobuf_SourceCodeInfo* ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_public_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_FileDescriptorProto_weak_dependency(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_ServiceDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google__protobuf__ServiceDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google__protobuf__FileOptions_msg_init, arena);
+    if (sub) google_protobuf_FileDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google__protobuf__SourceCodeInfo_msg_init, arena);
+    if (sub) google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.DescriptorProto */
+
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_field(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_nested_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_enum_type(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_extension_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_extension(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
+  const google_protobuf_MessageOptions* default_val = NULL;
+  const google_protobuf_MessageOptions* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_oneof_decl(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_reserved_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_protobuf_DescriptorProto* msg) {
+  size_t size;
+  google_protobuf_DescriptorProto_reserved_name(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google__protobuf__DescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ExtensionRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google__protobuf__MessageOptions_msg_init, arena);
+    if (sub) google_protobuf_DescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_OneofDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google__protobuf__OneofDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ReservedRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.DescriptorProto.ExtensionRange */
+
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ExtensionRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ExtensionRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const google_protobuf_ExtensionRangeOptions* default_val = NULL;
+  const google_protobuf_ExtensionRangeOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
+  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions_msg_init, arena);
+    if (sub) google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.DescriptorProto.ReservedRange */
+
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
+  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google__protobuf__DescriptorProto__ReservedRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__DescriptorProto__ReservedRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ReservedRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__DescriptorProto__ReservedRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.ExtensionRangeOptions */
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
+  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_declaration(const google_protobuf_ExtensionRangeOptions* msg) {
+  size_t size;
+  google_protobuf_ExtensionRangeOptions_declaration(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
+  size_t size;
+  google_protobuf_ExtensionRangeOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_ExtensionRangeOptions_Declaration* sub = (struct google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_ExtensionRangeOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.ExtensionRangeOptions.Declaration */
+
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_new(upb_Arena* arena) {
+  return (google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(&google__protobuf__ExtensionRangeOptions__Declaration_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ExtensionRangeOptions__Declaration_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FieldDescriptorProto */
+
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google__protobuf__FieldDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
+  const google_protobuf_FieldOptions* default_val = NULL;
+  const google_protobuf_FieldOptions* ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google__protobuf__FieldOptions_msg_init, arena);
+    if (sub) google_protobuf_FieldDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.OneofDescriptorProto */
+
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google__protobuf__OneofDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
+  const google_protobuf_OneofOptions* default_val = NULL;
+  const google_protobuf_OneofOptions* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google__protobuf__OneofOptions_msg_init, arena);
+    if (sub) google_protobuf_OneofDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.EnumDescriptorProto */
+
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google__protobuf__EnumDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_value(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
+  const google_protobuf_EnumOptions* default_val = NULL;
+  const google_protobuf_EnumOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_reserved_range(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_EnumDescriptorProto_reserved_name(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumValueDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google__protobuf__EnumValueDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google__protobuf__EnumOptions_msg_init, arena);
+    if (sub) google_protobuf_EnumDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
+
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
+  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.EnumValueDescriptorProto */
+
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google__protobuf__EnumValueDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const google_protobuf_EnumValueOptions* default_val = NULL;
+  const google_protobuf_EnumValueOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google__protobuf__EnumValueOptions_msg_init, arena);
+    if (sub) google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.ServiceDescriptorProto */
+
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google__protobuf__ServiceDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
+  size_t size;
+  google_protobuf_ServiceDescriptorProto_method(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
+  const google_protobuf_ServiceOptions* default_val = NULL;
+  const google_protobuf_ServiceOptions* ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_MethodDescriptorProto**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google__protobuf__MethodDescriptorProto_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google__protobuf__ServiceOptions_msg_init, arena);
+    if (sub) google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+
+/* google.protobuf.MethodDescriptorProto */
+
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google__protobuf__MethodDescriptorProto_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodDescriptorProto_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodDescriptorProto_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodDescriptorProto_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodDescriptorProto_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
+  const google_protobuf_MethodOptions* default_val = NULL;
+  const google_protobuf_MethodOptions* ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
+  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google__protobuf__MethodOptions_msg_init, arena);
+    if (sub) google_protobuf_MethodDescriptorProto_set_options(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FileOptions */
+
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
+  return (google_protobuf_FileOptions*)_upb_Message_New(&google__protobuf__FileOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FileOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FileOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
+  bool default_val = true;
+  bool ret;
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
+  size_t size;
+  google_protobuf_FileOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
+  const upb_MiniTableField field = {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
+  const upb_MiniTableField field = {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FileOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.MessageOptions */
+
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
+  return (google_protobuf_MessageOptions*)_upb_Message_New(&google__protobuf__MessageOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MessageOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MessageOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MessageOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MessageOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
+  size_t size;
+  google_protobuf_MessageOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) {
+  const upb_MiniTableField field = {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_MessageOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FieldOptions */
+
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
+  return (google_protobuf_FieldOptions*)_upb_Message_New(&google__protobuf__FieldOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_targets(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_targets(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_edition_defaults(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_edition_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) {
+  const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FieldOptions_EditionDefault* sub = (struct google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google__protobuf__FieldOptions__EditionDefault_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FieldOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FieldOptions.EditionDefault */
+
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(&google__protobuf__FieldOptions__EditionDefault_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions__EditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FieldOptions__EditionDefault_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions__EditionDefault_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FieldOptions__EditionDefault_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.OneofOptions */
+
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
+  return (google_protobuf_OneofOptions*)_upb_Message_New(&google__protobuf__OneofOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__OneofOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__OneofOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
+  size_t size;
+  google_protobuf_OneofOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_OneofOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.EnumOptions */
+
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
+  return (google_protobuf_EnumOptions*)_upb_Message_New(&google__protobuf__EnumOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
+  size_t size;
+  google_protobuf_EnumOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) {
+  const upb_MiniTableField field = {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_EnumOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.EnumValueOptions */
+
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
+  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google__protobuf__EnumValueOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__EnumValueOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__EnumValueOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
+  size_t size;
+  google_protobuf_EnumValueOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
+  const upb_MiniTableField field = {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_EnumValueOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.ServiceOptions */
+
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
+  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google__protobuf__ServiceOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__ServiceOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__ServiceOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
+  size_t size;
+  google_protobuf_ServiceOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_ServiceOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.MethodOptions */
+
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
+  return (google_protobuf_MethodOptions*)_upb_Message_New(&google__protobuf__MethodOptions_msg_init, arena);
+}
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__MethodOptions_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodOptions_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__MethodOptions_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
+  size_t size;
+  google_protobuf_MethodOptions_uninterpreted_option(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
+  const upb_MiniTableField field = {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
+  const upb_MiniTableField field = {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_MethodOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.UninterpretedOption */
+
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
+  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google__protobuf__UninterpretedOption_msg_init, arena);
+}
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
+  size_t size;
+  google_protobuf_UninterpretedOption_name(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
+  uint64_t default_val = (uint64_t)0ull;
+  uint64_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
+  int64_t default_val = (int64_t)0ll;
+  int64_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
+  double default_val = 0;
+  double ret;
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google__protobuf__UninterpretedOption__NamePart_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
+  const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
+  const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.UninterpretedOption.NamePart */
+
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
+  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google__protobuf__UninterpretedOption__NamePart_msg_init, arena);
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption__NamePart_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__UninterpretedOption__NamePart_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption__NamePart_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__UninterpretedOption__NamePart_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
+  const upb_MiniTableField field = {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSet */
+
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSet_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSet_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSet_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_utf8_validation(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults*)_upb_Message_New(&google__protobuf__FeatureSetDefaults_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize(const google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize_ex(const google_protobuf_FeatureSetDefaults* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_defaults(const google_protobuf_FeatureSetDefaults* msg) {
+  size_t size;
+  google_protobuf_FeatureSetDefaults_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_minimum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_maximum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_resize_defaults(google_protobuf_FeatureSetDefaults* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* sub = (struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(&google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize_ex(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena);
+    if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.SourceCodeInfo */
+
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
+  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google__protobuf__SourceCodeInfo_msg_init, arena);
+}
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_location(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_SourceCodeInfo_Location**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google__protobuf__SourceCodeInfo__Location_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.SourceCodeInfo.Location */
+
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
+  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google__protobuf__SourceCodeInfo__Location_msg_init, arena);
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo__Location_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__SourceCodeInfo__Location_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo__Location_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__SourceCodeInfo__Location_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_path(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_span(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_span(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
+  size_t size;
+  google_protobuf_SourceCodeInfo_Location_leading_detached_comments(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (upb_StringView*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
+  upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+
+/* google.protobuf.GeneratedCodeInfo */
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
+  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo_msg_init, arena);
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
+  size_t size;
+  google_protobuf_GeneratedCodeInfo_annotation(msg, &size);
+  return size != 0;
+}
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init, arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.GeneratedCodeInfo.Annotation */
+
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
+  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google__protobuf__GeneratedCodeInfo__Annotation_msg_init, arena);
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, &google__protobuf__GeneratedCodeInfo__Annotation_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  size_t size;
+  google_protobuf_GeneratedCodeInfo_Annotation_path(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t*)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
+  const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* Max size 32 is google.protobuf.FileOptions */
+/* Max size 64 is google.protobuf.FileOptions */
+#define _UPB_MAXOPT_SIZE UPB_SIZE(112, 200)
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c
new file mode 100644
index 0000000000000..e7cdf4c4b22ab
--- /dev/null
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c
@@ -0,0 +1,1357 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
+  {.submsg = &google__protobuf__FileDescriptorProto_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
+  &google_protobuf_FileDescriptorSet_submsgs[0],
+  &google_protobuf_FileDescriptorSet__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max192b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[7] = {
+  {.submsg = &google__protobuf__DescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__ServiceDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__FileOptions_msg_init},
+  {.submsg = &google__protobuf__SourceCodeInfo_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
+  {1, UPB_SIZE(44, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(52, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(20, 72), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(24, 80), 3, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(28, 88), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {12, UPB_SIZE(60, 112), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {14, UPB_SIZE(40, 4), 6, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
+  &google_protobuf_FileDescriptorProto_submsgs[0],
+  &google_protobuf_FileDescriptorProto__fields[0],
+  UPB_SIZE(72, 128), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800003f00001a, &upb_prs_1bt},
+    {0x003000003f000022, &upb_prm_1bt_max128b},
+    {0x003800003f01002a, &upb_prm_1bt_max64b},
+    {0x004000003f020032, &upb_prm_1bt_max64b},
+    {0x004800003f03003a, &upb_prm_1bt_max128b},
+    {0x0050000003040042, &upb_psm_1bt_max256b},
+    {0x005800000405004a, &upb_psm_1bt_max64b},
+    {0x006000003f000050, &upb_prv4_1bt},
+    {0x006800003f000058, &upb_prv4_1bt},
+    {0x0070000005000062, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto__ExtensionRange_msg_init},
+  {.submsg = &google__protobuf__FieldDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__MessageOptions_msg_init},
+  {.submsg = &google__protobuf__OneofDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__DescriptorProto__ReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
+  {1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(20, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(24, 64), 2, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(28, 72), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(32, 80), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
+  &google_protobuf_DescriptorProto_submsgs[0],
+  &google_protobuf_DescriptorProto__fields[0],
+  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000003f01001a, &upb_prm_1bt_max128b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f03002a, &upb_prm_1bt_max64b},
+    {0x003800003f040032, &upb_prm_1bt_max128b},
+    {0x004000000205003a, &upb_psm_1bt_max64b},
+    {0x004800003f060042, &upb_prm_1bt_max64b},
+    {0x005000003f07004a, &upb_prm_1bt_max64b},
+    {0x005800003f000052, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+  {.submsg = &google__protobuf__ExtensionRangeOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 16), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = {
+  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x001000000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+  {.submsg = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init},
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(16, 24), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = {
+  &google_protobuf_ExtensionRangeOptions_submsgs[0],
+  &google_protobuf_ExtensionRangeOptions__fields[0],
+  UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000002010392, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[5] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {5, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 9, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init = {
+  NULL,
+  &google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
+  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0010000002000012, &upb_pss_1bt},
+    {0x002000000300001a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000028, &upb_psb1_1bt},
+    {0x0009000005000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
+  {.submsg = &google__protobuf__FieldOptions_msg_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
+  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 8, 4, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 12, 5, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(16, 88), 8, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
+  &google_protobuf_FieldDescriptorProto_submsgs[0],
+  &google_protobuf_FieldDescriptorProto__fields[0],
+  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0028000002000012, &upb_pss_1bt},
+    {0x0004000003000018, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0038000006000032, &upb_pss_1bt},
+    {0x004800000700003a, &upb_pss_1bt},
+    {0x0058000008000042, &upb_psm_1bt_max64b},
+    {0x0010000009000048, &upb_psv4_1bt},
+    {0x006000000a000052, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001400000b000188, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__OneofOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
+  {1, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
+  &google_protobuf_OneofDescriptorProto_submsgs[0],
+  &google_protobuf_OneofDescriptorProto__fields[0],
+  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
+  {.submsg = &google__protobuf__EnumValueDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__EnumOptions_msg_init},
+  {.submsg = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
+  {1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
+  &google_protobuf_EnumDescriptorProto_submsgs[0],
+  &google_protobuf_EnumDescriptorProto__fields[0],
+  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max64b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+    {0x002800003f020022, &upb_prm_1bt_max64b},
+    {0x003000003f00002a, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
+  {1, 4, 1, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init = {
+  NULL,
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000001000008, &upb_psv4_1bt},
+    {0x0008000002000010, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__EnumValueOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 4, 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 24), 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
+  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+  &google_protobuf_EnumValueDescriptorProto__fields[0],
+  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0004000002000010, &upb_psv4_1bt},
+    {0x001800000300001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+  {.submsg = &google__protobuf__MethodDescriptorProto_msg_init},
+  {.submsg = &google__protobuf__ServiceOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
+  &google_protobuf_ServiceDescriptorProto_submsgs[0],
+  &google_protobuf_ServiceDescriptorProto__fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x001800003f000012, &upb_prm_1bt_max128b},
+    {0x002000000201001a, &upb_psm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
+  {.submsg = &google__protobuf__MethodOptions_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
+  {1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(4, 56), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
+  &google_protobuf_MethodDescriptorProto_submsgs[0],
+  &google_protobuf_MethodDescriptorProto__fields[0],
+  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0018000002000012, &upb_pss_1bt},
+    {0x002800000300001a, &upb_pss_1bt},
+    {0x0038000004000022, &upb_psm_1bt_max64b},
+    {0x0001000005000028, &upb_psb1_1bt},
+    {0x0002000006000030, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FileOptions__fields[22] = {
+  {1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {9, 4, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 8, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, UPB_SIZE(44, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {16, 9, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 10, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {18, 11, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {20, 12, 9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {23, 13, 10, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {27, 14, 11, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {31, 15, 12, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {36, UPB_SIZE(52, 72), 13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {37, UPB_SIZE(60, 88), 14, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {39, UPB_SIZE(68, 104), 15, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {40, UPB_SIZE(76, 120), 16, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {41, UPB_SIZE(84, 136), 17, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {42, 16, 18, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {44, UPB_SIZE(92, 152), 19, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {45, UPB_SIZE(100, 168), 20, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {50, UPB_SIZE(20, 184), 21, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(24, 192), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FileOptions_msg_init = {
+  &google_protobuf_FileOptions_submsgs[0],
+  &google_protobuf_FileOptions__fields[0],
+  UPB_SIZE(112, 200), 22, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001800000100000a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0028000002000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000004000050, &upb_psb1_1bt},
+    {0x003800000500005a, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0009000006000180, &upb_psb1_2bt},
+    {0x000a000007000188, &upb_psb1_2bt},
+    {0x000b000008000190, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000c0000090001a0, &upb_psb1_2bt},
+    {0x005800000e0002aa, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000d00000a0001b8, &upb_psb1_2bt},
+    {0x00780000100002c2, &upb_pss_2bt},
+    {0x00880000110002ca, &upb_pss_2bt},
+    {0x00100000120002d0, &upb_psb1_2bt},
+    {0x000e00000b0001d8, &upb_psb1_2bt},
+    {0x00980000130002e2, &upb_pss_2bt},
+    {0x00a80000140002ea, &upb_pss_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000f00000c0001f8, &upb_psb1_2bt},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, 4, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {11, 5, 5, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {12, 8, 6, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
+  &google_protobuf_MessageOptions_submsgs[0],
+  &google_protobuf_MessageOptions__fields[0],
+  UPB_SIZE(16, 24), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0002000002000010, &upb_psb1_1bt},
+    {0x0003000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0004000004000038, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0005000005000058, &upb_psb1_1bt},
+    {0x0008000006000062, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = {
+  {.submsg = &google__protobuf__FieldOptions__EditionDefault_msg_init},
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_FieldOptions_CType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
+  {.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = {
+  {1, 4, 1, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 9, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {5, 10, 4, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 12, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {10, 16, 6, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {15, 17, 7, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {16, 18, 8, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {17, 20, 9, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {19, 24, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {20, UPB_SIZE(28, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {21, UPB_SIZE(32, 40), 10, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(36, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
+  &google_protobuf_FieldOptions_submsgs[0],
+  &google_protobuf_FieldOptions__fields[0],
+  UPB_SIZE(40, 56), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000002000010, &upb_psb1_1bt},
+    {0x0009000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000a000004000028, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0010000006000050, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0011000007000078, &upb_psb1_1bt},
+    {0x0012000008000180, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x002000003f0001a2, &upb_prm_2bt_max64b},
+    {0x002800000a0101aa, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003000003f023eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
+  {2, 8, 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, 4, 2, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
+  &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+  &google_protobuf_FieldOptions_EditionDefault__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
+  &google_protobuf_OneofOptions_submsgs[0],
+  &google_protobuf_OneofOptions__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
+  {2, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {3, 2, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {6, 3, 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(4, 8), 4, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
+  &google_protobuf_EnumOptions_submsgs[0],
+  &google_protobuf_EnumOptions__fields[0],
+  UPB_SIZE(16, 24), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000010, &upb_psb1_1bt},
+    {0x0002000002000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0003000003000030, &upb_psb1_1bt},
+    {0x000800000400003a, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = {
+  {1, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 2), 3, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
+  &google_protobuf_EnumValueOptions_submsgs[0],
+  &google_protobuf_EnumValueOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000008, &upb_psb1_1bt},
+    {0x0008000002000012, &upb_psm_1bt_max64b},
+    {0x0002000003000018, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, UPB_SIZE(4, 8), 2, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(8, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
+  &google_protobuf_ServiceOptions_submsgs[0],
+  &google_protobuf_ServiceOptions__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0008000002000292, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.submsg = &google__protobuf__UninterpretedOption_msg_init},
+  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
+  {33, 1, 1, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+  {34, 4, 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {35, 8, 3, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {999, UPB_SIZE(12, 16), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
+  &google_protobuf_MethodOptions_submsgs[0],
+  &google_protobuf_MethodOptions__fields[0],
+  UPB_SIZE(16, 24), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0001000001000288, &upb_psb1_2bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000300029a, &upb_psm_2bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f013eba, &upb_prm_2bt_max128b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
+  {.submsg = &google__protobuf__UninterpretedOption__NamePart_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
+  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = {
+  &google_protobuf_UninterpretedOption_submsgs[0],
+  &google_protobuf_UninterpretedOption__fields[0],
+  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f000012, &upb_prm_1bt_max64b},
+    {0x001000000100001a, &upb_pss_1bt},
+    {0x0020000002000020, &upb_psv8_1bt},
+    {0x0028000003000028, &upb_psv8_1bt},
+    {0x0030000004000031, &upb_psf8_1bt},
+    {0x003800000500003a, &upb_psb_1bt},
+    {0x0048000006000042, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {2, 1, 2, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = {
+  NULL,
+  &google_protobuf_UninterpretedOption_NamePart__fields[0],
+  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800000100000a, &upb_pss_1bt},
+    {0x0001000002000010, &upb_psb1_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = {
+  {.subenum = &google_protobuf_FeatureSet_FieldPresence_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_EnumType_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_Utf8Validation_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
+  {.subenum = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
+  {1, 4, 1, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {2, 8, 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {3, 12, 3, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, 16, 4, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, 20, 5, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {6, 24, 6, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
+  &google_protobuf_FeatureSet_submsgs[0],
+  &google_protobuf_FeatureSet__fields[0],
+  32, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0,
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = {
+  {.submsg = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = {
+  {1, UPB_SIZE(4, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(8, 4), 1, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(12, 8), 2, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
+  &google_protobuf_FeatureSetDefaults_submsgs[0],
+  &google_protobuf_FeatureSetDefaults__fields[0],
+  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[2] = {
+  {.submsg = &google__protobuf__FeatureSet_msg_init},
+  {.subenum = &google_protobuf_Edition_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[2] = {
+  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 2, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = {
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+  &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
+  16, 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0008000001000012, &upb_psm_1bt_max64b},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
+  {.submsg = &google__protobuf__SourceCodeInfo__Location_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = {
+  &google_protobuf_SourceCodeInfo_submsgs[0],
+  &google_protobuf_SourceCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max128b},
+  })
+};
+
+static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
+  {1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = {
+  NULL,
+  &google_protobuf_SourceCodeInfo_Location__fields[0],
+  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000800003f00000a, &upb_ppv4_1bt},
+    {0x001000003f000012, &upb_ppv4_1bt},
+    {0x001800000100001a, &upb_pss_1bt},
+    {0x0028000002000022, &upb_pss_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x003800003f000032, &upb_prs_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+  {.submsg = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
+  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo__fields[0],
+  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x000000003f00000a, &upb_prm_1bt_max64b},
+  })
+};
+
+static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
+  {.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+};
+
+static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
+  {1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+  {5, UPB_SIZE(16, 12), 4, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
+  &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
+  UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_ppv4_1bt},
+    {0x0018000001000012, &upb_pss_1bt},
+    {0x0004000002000018, &upb_psv4_1bt},
+    {0x0008000003000020, &upb_psv4_1bt},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+  })
+};
+
+static const upb_MiniTable *messages_layout[32] = {
+  &google__protobuf__FileDescriptorSet_msg_init,
+  &google__protobuf__FileDescriptorProto_msg_init,
+  &google__protobuf__DescriptorProto_msg_init,
+  &google__protobuf__DescriptorProto__ExtensionRange_msg_init,
+  &google__protobuf__DescriptorProto__ReservedRange_msg_init,
+  &google__protobuf__ExtensionRangeOptions_msg_init,
+  &google__protobuf__ExtensionRangeOptions__Declaration_msg_init,
+  &google__protobuf__FieldDescriptorProto_msg_init,
+  &google__protobuf__OneofDescriptorProto_msg_init,
+  &google__protobuf__EnumDescriptorProto_msg_init,
+  &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init,
+  &google__protobuf__EnumValueDescriptorProto_msg_init,
+  &google__protobuf__ServiceDescriptorProto_msg_init,
+  &google__protobuf__MethodDescriptorProto_msg_init,
+  &google__protobuf__FileOptions_msg_init,
+  &google__protobuf__MessageOptions_msg_init,
+  &google__protobuf__FieldOptions_msg_init,
+  &google__protobuf__FieldOptions__EditionDefault_msg_init,
+  &google__protobuf__OneofOptions_msg_init,
+  &google__protobuf__EnumOptions_msg_init,
+  &google__protobuf__EnumValueOptions_msg_init,
+  &google__protobuf__ServiceOptions_msg_init,
+  &google__protobuf__MethodOptions_msg_init,
+  &google__protobuf__UninterpretedOption_msg_init,
+  &google__protobuf__UninterpretedOption__NamePart_msg_init,
+  &google__protobuf__FeatureSet_msg_init,
+  &google__protobuf__FeatureSetDefaults_msg_init,
+  &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init,
+  &google__protobuf__SourceCodeInfo_msg_init,
+  &google__protobuf__SourceCodeInfo__Location_msg_init,
+  &google__protobuf__GeneratedCodeInfo_msg_init,
+  &google__protobuf__GeneratedCodeInfo__Annotation_msg_init,
+};
+
+const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+    64,
+    6,
+    {
+        0x7,
+        0x0,
+        0x3e6,
+        0x3e7,
+        0x3e8,
+        0x1869d,
+        0x1869e,
+        0x1869f,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+    64,
+    0,
+    {
+        0x3,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+    64,
+    0,
+    {
+        0xf,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+    64,
+    0,
+    {
+        0x7fffe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+    64,
+    0,
+    {
+        0x3ff,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+    64,
+    0,
+    {
+        0xe,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+    64,
+    0,
+    {
+        0x7,
+        0x0,
+    },
+};
+
+static const upb_MiniTableEnum *enums_layout[17] = {
+  &google_protobuf_Edition_enum_init,
+  &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
+  &google_protobuf_FeatureSet_EnumType_enum_init,
+  &google_protobuf_FeatureSet_FieldPresence_enum_init,
+  &google_protobuf_FeatureSet_JsonFormat_enum_init,
+  &google_protobuf_FeatureSet_MessageEncoding_enum_init,
+  &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
+  &google_protobuf_FeatureSet_Utf8Validation_enum_init,
+  &google_protobuf_FieldDescriptorProto_Label_enum_init,
+  &google_protobuf_FieldDescriptorProto_Type_enum_init,
+  &google_protobuf_FieldOptions_CType_enum_init,
+  &google_protobuf_FieldOptions_JSType_enum_init,
+  &google_protobuf_FieldOptions_OptionRetention_enum_init,
+  &google_protobuf_FieldOptions_OptionTargetType_enum_init,
+  &google_protobuf_FileOptions_OptimizeMode_enum_init,
+  &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
+  &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+};
+
+const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
+  messages_layout,
+  enums_layout,
+  NULL,
+  32,
+  17,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h
new file mode 100644
index 0000000000000..8416e9a4f500d
--- /dev/null
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h
@@ -0,0 +1,78 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_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 google__protobuf__FileDescriptorSet_msg_init;
+extern const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init;
+extern const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init;
+extern const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init;
+extern const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_init;
+extern const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init;
+extern const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init;
+extern const upb_MiniTable google__protobuf__FileOptions_msg_init;
+extern const upb_MiniTable google__protobuf__MessageOptions_msg_init;
+extern const upb_MiniTable google__protobuf__FieldOptions_msg_init;
+extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init;
+extern const upb_MiniTable google__protobuf__OneofOptions_msg_init;
+extern const upb_MiniTable google__protobuf__EnumOptions_msg_init;
+extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init;
+extern const upb_MiniTable google__protobuf__ServiceOptions_msg_init;
+extern const upb_MiniTable google__protobuf__MethodOptions_msg_init;
+extern const upb_MiniTable google__protobuf__UninterpretedOption_msg_init;
+extern const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSet_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init;
+extern const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init;
+extern const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init;
+extern const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init;
+extern const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init;
+extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
+
+extern const upb_MiniTableEnum google_protobuf_Edition_enum_init;
+extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
+extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
+extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
+extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
+extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */
diff --git a/third_party/upb/upb/cmake/make_cmakelists.py b/third_party/upb/upb/cmake/make_cmakelists.py
new file mode 100755
index 0000000000000..d1a6bb2ee5a85
--- /dev/null
+++ b/third_party/upb/upb/cmake/make_cmakelists.py
@@ -0,0 +1,346 @@
+#!/usr/bin/python
+#
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google LLC.  All rights reserved.
+# https://developers.google.com/protocol-buffers/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google LLC nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""A tool to convert BUILD -> CMakeLists.txt.
+
+This tool is very upb-specific at the moment, and should not be seen as a
+generic Bazel -> CMake converter.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import sys
+import textwrap
+import os
+
+def StripFirstChar(deps):
+  return [dep[1:] for dep in deps]
+
+def IsSourceFile(name):
+  return name.endswith(".c") or name.endswith(".cc")
+
+
+ADD_LIBRARY_FORMAT = """
+add_library(%(name)s %(type)s
+    %(sources)s
+)
+target_include_directories(%(name)s %(keyword)s
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
+)
+"""
+
+
+class BuildFileFunctions(object):
+  def __init__(self, converter):
+    self.converter = converter
+
+  def _add_deps(self, kwargs, keyword=""):
+    if "deps" not in kwargs:
+      return
+    self.converter.toplevel += "target_link_libraries(%s%s\n  %s)\n" % (
+        kwargs["name"],
+        keyword,
+        "\n  ".join(StripFirstChar(kwargs["deps"]))
+    )
+
+  def load(self, *args):
+    pass
+  
+  def cc_library(self, **kwargs):
+    if kwargs["name"].endswith("amalgamation"):
+      return
+    if kwargs["name"] == "upbc_generator":
+      return
+    if kwargs["name"] == "lupb":
+      return
+    if "testonly" in kwargs:
+      return
+    files = kwargs.get("srcs", []) + kwargs.get("hdrs", [])
+    found_files = []
+    pregenerated_files = [
+        "CMakeLists.txt", "descriptor.upb.h", "descriptor.upb.c"
+    ]
+    for file in files:
+      if os.path.basename(file) in pregenerated_files:
+        found_files.append("../cmake/" + file)
+      else:
+        found_files.append("../" + file)
+
+    if list(filter(IsSourceFile, files)):
+      # Has sources, make this a normal library.
+      self.converter.toplevel += ADD_LIBRARY_FORMAT % {
+          "name": kwargs["name"],
+          "type": "",
+          "keyword": "PUBLIC",
+          "sources": "\n  ".join(found_files),
+      }
+      self._add_deps(kwargs)
+    else:
+      # Header-only library, have to do a couple things differently.
+      # For some info, see:
+      #  http://mariobadr.com/creating-a-header-only-library-with-cmake.html
+      self.converter.toplevel += ADD_LIBRARY_FORMAT % {
+          "name": kwargs["name"],
+          "type": "INTERFACE",
+          "keyword": "INTERFACE",
+          "sources": "",
+      }
+      self._add_deps(kwargs, " INTERFACE")
+
+  def cc_binary(self, **kwargs):
+    pass
+
+  def cc_test(self, **kwargs):
+    # Disable this until we properly support upb_proto_library().
+    # self.converter.toplevel += "add_executable(%s\n  %s)\n" % (
+    #     kwargs["name"],
+    #     "\n  ".join(kwargs["srcs"])
+    # )
+    # self.converter.toplevel += "add_test(NAME %s COMMAND %s)\n" % (
+    #     kwargs["name"],
+    #     kwargs["name"],
+    # )
+
+    # if "data" in kwargs:
+    #   for data_dep in kwargs["data"]:
+    #     self.converter.toplevel += textwrap.dedent("""\
+    #       add_custom_command(
+    #           TARGET %s POST_BUILD
+    #           COMMAND ${CMAKE_COMMAND} -E copy
+    #                   ${CMAKE_SOURCE_DIR}/%s
+    #                   ${CMAKE_CURRENT_BINARY_DIR}/%s)\n""" % (
+    #       kwargs["name"], data_dep, data_dep
+    #     ))
+
+    # self._add_deps(kwargs)
+    pass
+
+  def cc_fuzz_test(self, **kwargs):
+    pass
+
+  def pkg_files(self, **kwargs):
+    pass
+
+  def py_library(self, **kwargs):
+    pass
+
+  def py_binary(self, **kwargs):
+    pass
+
+  def lua_proto_library(self, **kwargs):
+    pass
+
+  def sh_test(self, **kwargs):
+    pass
+
+  def make_shell_script(self, **kwargs):
+    pass
+
+  def exports_files(self, files, **kwargs):
+    pass
+
+  def proto_library(self, **kwargs):
+    pass
+
+  def cc_proto_library(self, **kwargs):
+    pass
+
+  def staleness_test(self, **kwargs):
+    pass
+
+  def upb_amalgamation(self, **kwargs):
+    pass
+
+  def upb_proto_library(self, **kwargs):
+    pass
+
+  def upb_minitable_proto_library(self, **kwargs):
+    pass
+
+  def upb_proto_library_copts(self, **kwargs):
+    pass
+
+  def upb_proto_reflection_library(self, **kwargs):
+    pass
+
+  def upb_proto_srcs(self, **kwargs):
+    pass
+
+  def genrule(self, **kwargs):
+    pass
+
+  def config_setting(self, **kwargs):
+    pass
+
+  def upb_fasttable_enabled(self, **kwargs):
+    pass
+
+  def select(self, arg_dict):
+    return []
+
+  def glob(self, *args, **kwargs):
+    return []
+
+  def licenses(self, *args):
+    pass
+
+  def filegroup(self, **kwargs):
+    pass
+
+  def map_dep(self, arg):
+    return arg
+
+  def package_group(self, **kwargs):
+    pass
+
+  def bool_flag(self, **kwargs):
+    pass
+
+  def bootstrap_upb_proto_library(self, **kwargs):
+    pass
+
+  def bootstrap_cc_library(self, **kwargs):
+    pass
+
+  def alias(self, **kwargs):
+    pass
+
+
+class Converter(object):
+  def __init__(self):
+    self.toplevel = ""
+    self.if_lua = ""
+
+  def convert(self):
+    return self.template % {
+        "toplevel": converter.toplevel,
+    }
+
+  template = textwrap.dedent("""\
+    # This file was generated from BUILD using tools/make_cmakelists.py.
+
+    cmake_minimum_required(VERSION 3.10...3.24)
+
+    project(upb)
+    set(CMAKE_C_STANDARD 99)
+
+    # Prevent CMake from setting -rdynamic on Linux (!!).
+    SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+    SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
+
+    # Set default build type.
+    if(NOT CMAKE_BUILD_TYPE)
+      message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+      set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+          "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+          FORCE)
+    endif()
+
+    # When using Ninja, compiler output won't be colorized without this.
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG(-fdiagnostics-color=always SUPPORTS_COLOR_ALWAYS)
+    if(SUPPORTS_COLOR_ALWAYS)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
+    endif()
+
+    # Implement ASAN/UBSAN options
+    if(UPB_ENABLE_ASAN)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+    endif()
+
+    if(UPB_ENABLE_UBSAN)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+    endif()
+
+    if(NOT TARGET utf8_range)
+      if(EXISTS ../../external/utf8_range)
+        # utf8_range is already installed
+        include_directories(../external/utf8_range)
+      elseif(EXISTS ../../utf8_range)
+        include_directories(../../utf8_range)
+      else()
+        include(FetchContent)
+        FetchContent_Declare(
+          utf8_range
+          GIT_REPOSITORY "https://github.com/protocolbuffers/utf8_range.git"
+          GIT_TAG "d863bc33e15cba6d873c878dcca9e6fe52b2f8cb"
+        )
+        FetchContent_GetProperties(utf8_range)
+        if(NOT utf8_range_POPULATED)
+          FetchContent_Populate(utf8_range)
+          include_directories(${utf8_range_SOURCE_DIR})
+        endif()
+      endif()
+    endif()
+
+    if(APPLE)
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace")
+    elseif(UNIX)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
+    endif()
+
+    enable_testing()
+
+    %(toplevel)s
+
+  """)
+
+data = {}
+converter = Converter()
+
+def GetDict(obj):
+  ret = {}
+  ret["UPB_DEFAULT_COPTS"] = []  # HACK
+  ret["UPB_DEFAULT_CPPOPTS"] = []  # HACK
+  for k in dir(obj):
+    if not k.startswith("_"):
+      ret[k] = getattr(obj, k);
+  return ret
+
+globs = GetDict(converter)
+
+# We take the BUILD path as a command-line argument to ensure that we can find
+# it regardless of how exactly Bazel was invoked.
+exec(open(sys.argv[1]).read(), GetDict(BuildFileFunctions(converter)))  # BUILD
+
+with open(sys.argv[2], "w") as f:
+  f.write(converter.convert())
diff --git a/third_party/upb/upb/cmake/push_auto_update.sh b/third_party/upb/upb/cmake/push_auto_update.sh
new file mode 100755
index 0000000000000..6b7dba00ad4d3
--- /dev/null
+++ b/third_party/upb/upb/cmake/push_auto_update.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google LLC.  All rights reserved.
+# https://developers.google.com/protocol-buffers/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google LLC nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This script updates checked-in generated files (currently CMakeLists.txt,
+# descriptor.upb.h, and descriptor.upb.c), commits the resulting change, and
+# pushes it. This does not do anything useful when run manually, but should be
+# run by our GitHub action instead.
+
+set -ex
+
+# Exit early if the previous commit was made by the bot. This reduces the risk
+# of a bug causing an infinite loop of auto-generated commits.
+if (git log -1 --pretty=format:'%an' | grep -q "Protobuf Team Bot"); then
+  echo "Previous commit was authored by bot"
+  exit 0
+fi
+
+cd $(dirname -- "$0")/..
+bazel test //cmake:test_generated_files || bazel-bin/cmake/test_generated_files --fix
+
+# Try to determine the most recent pull request number.
+title=$(git log -1 --pretty='%s')
+pr_from_merge=$(echo "$title" | sed -n 's/^Merge pull request #\([0-9]\+\).*/\1/p')
+pr_from_squash=$(echo "$title" | sed -n 's/^.*(#\([0-9]\+\))$/\1/p')
+
+pr_number=""
+if [ ! -z "$pr_from_merge" ]; then
+  pr_number="$pr_from_merge"
+elif [ ! -z "$pr_from_squash" ]; then
+  pr_number="$pr_from_squash"
+fi
+
+if [ ! -z "$pr_number" ]; then
+  commit_message="Auto-generate CMake file lists after PR #$pr_number"
+else
+  # If we are unable to determine the pull request number, we fall back on this
+  # default commit message. Typically this should not occur, but could happen
+  # if a pull request was merged via a rebase.
+  commit_message="Auto-generate CMake file lists"
+fi
+
+git add -A
+git diff --staged --quiet || git commit -am "$commit_message"
+git push
diff --git a/third_party/upb/upb/cmake/staleness_test.py b/third_party/upb/upb/cmake/staleness_test.py
new file mode 100644
index 0000000000000..f9fe04ed2caa5
--- /dev/null
+++ b/third_party/upb/upb/cmake/staleness_test.py
@@ -0,0 +1,60 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google LLC.  All rights reserved.
+# https://developers.google.com/protocol-buffers/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google LLC nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""The py_test() script for staleness_test() rules.
+
+Note that this file is preprocessed!  The INSERT_<...> text below is replaced
+with the actual list of files before we actually run the script.
+"""
+
+from __future__ import absolute_import
+
+from upb.cmake import staleness_test_lib
+import unittest
+import sys
+
+file_list = """
+  INSERT_FILE_LIST_HERE
+""".split()
+
+config = staleness_test_lib.Config(file_list)
+
+
+class TestFilesMatch(unittest.TestCase):
+
+  def testFilesMatch(self):
+    errors = staleness_test_lib.CheckFilesMatch(config)
+    self.assertFalse(errors, errors)
+
+
+if len(sys.argv) > 1 and sys.argv[1] == "--fix":
+  staleness_test_lib.FixFiles(config)
+else:
+  unittest.main()
diff --git a/third_party/upb/cmake/staleness_test_lib.py b/third_party/upb/upb/cmake/staleness_test_lib.py
similarity index 78%
rename from third_party/upb/cmake/staleness_test_lib.py
rename to third_party/upb/upb/cmake/staleness_test_lib.py
index 4887f248557b3..d9b78a6eb7ebe 100644
--- a/third_party/upb/cmake/staleness_test_lib.py
+++ b/third_party/upb/upb/cmake/staleness_test_lib.py
@@ -1,29 +1,34 @@
 #!/usr/bin/python
 #
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google LLC.  All rights reserved.
+# https://developers.google.com/protocol-buffers/
 #
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions are
+# met:
+#
 #     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google LLC nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Shared code for validating staleness_test() rules.
 
diff --git a/third_party/upb/upb/collections.h b/third_party/upb/upb/collections.h
deleted file mode 100644
index a865f3d948f46..0000000000000
--- a/third_party/upb/upb/collections.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_COLLECTIONS_H_
-#define UPB_COLLECTIONS_H_
-
-// TODO(b/232091617): Delete this entire header which currently exists only for
-// temporary backwards compatibility.
-#include "upb/collections/array.h"
-#include "upb/collections/map.h"
-
-#endif /* UPB_COLLECTIONS_H_ */
diff --git a/third_party/upb/upb/collections/BUILD b/third_party/upb/upb/collections/BUILD
new file mode 100644
index 0000000000000..8437cd598ad43
--- /dev/null
+++ b/third_party/upb/upb/collections/BUILD
@@ -0,0 +1,36 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "collections",
+    hdrs = [
+        "array.h",
+        "map.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//upb:message",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/collections/array.c b/third_party/upb/upb/collections/array.c
deleted file mode 100644
index b122fe7bfc914..0000000000000
--- a/third_party/upb/upb/collections/array.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <string.h>
-
-#include "upb/collections/array_internal.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-const char _upb_Array_CTypeSizeLg2Table[] = {
-    [kUpb_CType_Bool] = 0,
-    [kUpb_CType_Float] = 2,
-    [kUpb_CType_Int32] = 2,
-    [kUpb_CType_UInt32] = 2,
-    [kUpb_CType_Enum] = 2,
-    [kUpb_CType_Message] = UPB_SIZE(2, 3),
-    [kUpb_CType_Double] = 3,
-    [kUpb_CType_Int64] = 3,
-    [kUpb_CType_UInt64] = 3,
-    [kUpb_CType_String] = UPB_SIZE(3, 4),
-    [kUpb_CType_Bytes] = UPB_SIZE(3, 4),
-};
-
-upb_Array* upb_Array_New(upb_Arena* a, upb_CType type) {
-  return _upb_Array_New(a, 4, _upb_Array_CTypeSizeLg2(type));
-}
-
-const void* upb_Array_DataPtr(const upb_Array* arr) {
-  return _upb_array_ptr((upb_Array*)arr);
-}
-
-void* upb_Array_MutableDataPtr(upb_Array* arr) { return _upb_array_ptr(arr); }
-
-size_t upb_Array_Size(const upb_Array* arr) { return arr->size; }
-
-upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i) {
-  upb_MessageValue ret;
-  const char* data = _upb_array_constptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->size);
-  memcpy(&ret, data + (i << lg2), 1 << lg2);
-  return ret;
-}
-
-void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val) {
-  char* data = _upb_array_ptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->size);
-  memcpy(data + (i << lg2), &val, 1 << lg2);
-}
-
-bool upb_Array_Append(upb_Array* arr, upb_MessageValue val, upb_Arena* arena) {
-  UPB_ASSERT(arena);
-  if (!upb_Array_Resize(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  upb_Array_Set(arr, arr->size - 1, val);
-  return true;
-}
-
-void upb_Array_Move(upb_Array* arr, size_t dst_idx, size_t src_idx,
-                    size_t count) {
-  const int lg2 = arr->data & 7;
-  char* data = _upb_array_ptr(arr);
-  memmove(&data[dst_idx << lg2], &data[src_idx << lg2], count << lg2);
-}
-
-bool upb_Array_Insert(upb_Array* arr, size_t i, size_t count,
-                      upb_Arena* arena) {
-  UPB_ASSERT(arena);
-  UPB_ASSERT(i <= arr->size);
-  UPB_ASSERT(count + arr->size >= count);
-  const size_t oldsize = arr->size;
-  if (!upb_Array_Resize(arr, arr->size + count, arena)) {
-    return false;
-  }
-  upb_Array_Move(arr, i + count, i, oldsize - i);
-  return true;
-}
-
-/*
- *              i        end      arr->size
- * |------------|XXXXXXXX|--------|
- */
-void upb_Array_Delete(upb_Array* arr, size_t i, size_t count) {
-  const size_t end = i + count;
-  UPB_ASSERT(i <= end);
-  UPB_ASSERT(end <= arr->size);
-  upb_Array_Move(arr, i, end, arr->size - end);
-  arr->size -= count;
-}
-
-bool upb_Array_Resize(upb_Array* arr, size_t size, upb_Arena* arena) {
-  const size_t oldsize = arr->size;
-  if (UPB_UNLIKELY(!_upb_Array_ResizeUninitialized(arr, size, arena))) {
-    return false;
-  }
-  const size_t newsize = arr->size;
-  if (newsize > oldsize) {
-    const int lg2 = arr->data & 7;
-    char* data = _upb_array_ptr(arr);
-    memset(data + (oldsize << lg2), 0, (newsize - oldsize) << lg2);
-  }
-  return true;
-}
-
-// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
-
-bool _upb_array_realloc(upb_Array* arr, size_t min_capacity, upb_Arena* arena) {
-  size_t new_capacity = UPB_MAX(arr->capacity, 4);
-  int elem_size_lg2 = arr->data & 7;
-  size_t old_bytes = arr->capacity << elem_size_lg2;
-  size_t new_bytes;
-  void* ptr = _upb_array_ptr(arr);
-
-  // Log2 ceiling of size.
-  while (new_capacity < min_capacity) new_capacity *= 2;
-
-  new_bytes = new_capacity << elem_size_lg2;
-  ptr = upb_Arena_Realloc(arena, ptr, old_bytes, new_bytes);
-  if (!ptr) return false;
-
-  arr->data = _upb_tag_arrptr(ptr, elem_size_lg2);
-  arr->capacity = new_capacity;
-  return true;
-}
diff --git a/third_party/upb/upb/collections/array.h b/third_party/upb/upb/collections/array.h
index 5c5b6e459a7c3..187e74eeab4ac 100644
--- a/third_party/upb/upb/collections/array.h
+++ b/third_party/upb/upb/collections/array.h
@@ -1,91 +1,17 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Temporary hack to fix gRPC. Do not use.
 
 #ifndef UPB_COLLECTIONS_ARRAY_H_
 #define UPB_COLLECTIONS_ARRAY_H_
 
-#include "upb/base/descriptor_constants.h"
-#include "upb/collections/message_value.h"
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Creates a new array on the given arena that holds elements of this type.
-UPB_API upb_Array* upb_Array_New(upb_Arena* a, upb_CType type);
-
-// Returns the number of elements in the array.
-UPB_API size_t upb_Array_Size(const upb_Array* arr);
-
-// Returns the given element, which must be within the array's current size.
-UPB_API upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i);
-
-// Sets the given element, which must be within the array's current size.
-UPB_API void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val);
-
-// Appends an element to the array. Returns false on allocation failure.
-UPB_API bool upb_Array_Append(upb_Array* array, upb_MessageValue val,
-                              upb_Arena* arena);
-
-// Moves elements within the array using memmove().
-// Like memmove(), the source and destination elements may be overlapping.
-UPB_API void upb_Array_Move(upb_Array* array, size_t dst_idx, size_t src_idx,
-                            size_t count);
-
-// Inserts one or more empty elements into the array.
-// Existing elements are shifted right.
-// The new elements have undefined state and must be set with `upb_Array_Set()`.
-// REQUIRES: `i <= upb_Array_Size(arr)`
-UPB_API bool upb_Array_Insert(upb_Array* array, size_t i, size_t count,
-                              upb_Arena* arena);
-
-// Deletes one or more elements from the array.
-// Existing elements are shifted left.
-// REQUIRES: `i + count <= upb_Array_Size(arr)`
-UPB_API void upb_Array_Delete(upb_Array* array, size_t i, size_t count);
-
-// Changes the size of a vector. New elements are initialized to NULL/0.
-// Returns false on allocation failure.
-UPB_API bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena);
-
-// Returns pointer to array data.
-UPB_API const void* upb_Array_DataPtr(const upb_Array* arr);
-
-// Returns mutable pointer to array data.
-UPB_API void* upb_Array_MutableDataPtr(upb_Array* arr);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
+// IWYU pragma: begin_exports
+#include "upb/message/array.h"
+// IWYU pragma: end_exports
 
 #endif /* UPB_COLLECTIONS_ARRAY_H_ */
diff --git a/third_party/upb/upb/collections/array_internal.h b/third_party/upb/upb/collections/array_internal.h
deleted file mode 100644
index cb842f5c3600b..0000000000000
--- a/third_party/upb/upb/collections/array_internal.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_INTERNAL_ARRAY_INTERNAL_H_
-#define UPB_INTERNAL_ARRAY_INTERNAL_H_
-
-#include <string.h>
-
-#include "upb/collections/array.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// LINT.IfChange(struct_definition)
-// Our internal representation for repeated fields.
-struct upb_Array {
-  uintptr_t data;  /* Tagged ptr: low 3 bits of ptr are lg2(elem size). */
-  size_t size;     /* The number of elements in the array. */
-  size_t capacity; /* Allocated storage. Measured in elements. */
-};
-// LINT.ThenChange(GoogleInternalName1)
-
-UPB_INLINE size_t _upb_Array_ElementSizeLg2(const upb_Array* arr) {
-  size_t ret = arr->data & 7;
-  UPB_ASSERT(ret <= 4);
-  return ret;
-}
-
-UPB_INLINE const void* _upb_array_constptr(const upb_Array* arr) {
-  _upb_Array_ElementSizeLg2(arr);  // Check assertion.
-  return (void*)(arr->data & ~(uintptr_t)7);
-}
-
-UPB_INLINE uintptr_t _upb_array_tagptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  return (uintptr_t)ptr | elem_size_lg2;
-}
-
-UPB_INLINE void* _upb_array_ptr(upb_Array* arr) {
-  return (void*)_upb_array_constptr(arr);
-}
-
-UPB_INLINE uintptr_t _upb_tag_arrptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  UPB_ASSERT(((uintptr_t)ptr & 7) == 0);
-  return (uintptr_t)ptr | (unsigned)elem_size_lg2;
-}
-
-extern const char _upb_Array_CTypeSizeLg2Table[];
-
-UPB_INLINE size_t _upb_Array_CTypeSizeLg2(upb_CType ctype) {
-  return _upb_Array_CTypeSizeLg2Table[ctype];
-}
-
-UPB_INLINE upb_Array* _upb_Array_New(upb_Arena* a, size_t init_capacity,
-                                     int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  const size_t arr_size = UPB_ALIGN_UP(sizeof(upb_Array), UPB_MALLOC_ALIGN);
-  const size_t bytes = arr_size + (init_capacity << elem_size_lg2);
-  upb_Array* arr = (upb_Array*)upb_Arena_Malloc(a, bytes);
-  if (!arr) return NULL;
-  arr->data = _upb_tag_arrptr(UPB_PTR_AT(arr, arr_size, void), elem_size_lg2);
-  arr->size = 0;
-  arr->capacity = init_capacity;
-  return arr;
-}
-
-// Resizes the capacity of the array to be at least min_size.
-bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena);
-
-UPB_INLINE bool _upb_array_reserve(upb_Array* arr, size_t size,
-                                   upb_Arena* arena) {
-  if (arr->capacity < size) return _upb_array_realloc(arr, size, arena);
-  return true;
-}
-
-// Resize without initializing new elements.
-UPB_INLINE bool _upb_Array_ResizeUninitialized(upb_Array* arr, size_t size,
-                                               upb_Arena* arena) {
-  UPB_ASSERT(size <= arr->size || arena);  // Allow NULL arena when shrinking.
-  if (!_upb_array_reserve(arr, size, arena)) return false;
-  arr->size = size;
-  return true;
-}
-
-// This function is intended for situations where elem_size is compile-time
-// constant or a known expression of the form (1 << lg2), so that the expression
-// i*elem_size does not result in an actual multiplication.
-UPB_INLINE void _upb_Array_Set(upb_Array* arr, size_t i, const void* data,
-                               size_t elem_size) {
-  UPB_ASSERT(i < arr->size);
-  UPB_ASSERT(elem_size == 1U << _upb_Array_ElementSizeLg2(arr));
-  char* arr_data = (char*)_upb_array_ptr(arr);
-  memcpy(arr_data + (i * elem_size), data, elem_size);
-}
-
-UPB_INLINE void _upb_array_detach(const void* msg, size_t ofs) {
-  *UPB_PTR_AT(msg, ofs, upb_Array*) = NULL;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_INTERNAL_ARRAY_INTERNAL_H_ */
diff --git a/third_party/upb/upb/collections/array_split64.h b/third_party/upb/upb/collections/array_split64.h
deleted file mode 100644
index 3b1b216febca2..0000000000000
--- a/third_party/upb/upb/collections/array_split64.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_COLLECTIONS_ARRAY_SPLIT64_H_
-#define UPB_COLLECTIONS_ARRAY_SPLIT64_H_
-
-#include "upb/collections/array.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// JavaScript doesn't directly support 64-bit ints so we must split them.
-
-UPB_API_INLINE uint32_t upb_Array_GetInt64Hi(const upb_Array* array, size_t i) {
-  return (uint32_t)(upb_Array_Get(array, i).int64_val >> 32);
-}
-
-UPB_API_INLINE uint32_t upb_Array_GetInt64Lo(const upb_Array* array, size_t i) {
-  return (uint32_t)upb_Array_Get(array, i).int64_val;
-}
-
-UPB_API_INLINE void upb_Array_SetInt64Split(upb_Array* array, size_t i,
-                                            uint32_t hi, uint32_t lo) {
-  const upb_MessageValue val = {.int64_val = ((int64_t)hi) << 32 | lo};
-  upb_Array_Set(array, i, val);
-}
-
-UPB_API_INLINE bool upb_Array_AppendInt64Split(upb_Array* array, uint32_t hi,
-                                               uint32_t lo, upb_Arena* arena) {
-  const upb_MessageValue val = {.int64_val = ((int64_t)hi) << 32 | lo};
-  return upb_Array_Append(array, val, arena);
-}
-
-UPB_API_INLINE uint32_t upb_Array_GetUInt64Hi(const upb_Array* array,
-                                              size_t i) {
-  return (uint32_t)(upb_Array_Get(array, i).uint64_val >> 32);
-}
-
-UPB_API_INLINE uint32_t upb_Array_GetUInt64Lo(const upb_Array* array,
-                                              size_t i) {
-  return (uint32_t)upb_Array_Get(array, i).uint64_val;
-}
-
-UPB_API_INLINE void upb_Array_SetUInt64Split(upb_Array* array, size_t i,
-                                             uint32_t hi, uint32_t lo) {
-  const upb_MessageValue val = {.uint64_val = ((uint64_t)hi) << 32 | lo};
-  upb_Array_Set(array, i, val);
-}
-
-UPB_API_INLINE bool upb_Array_AppendUInt64Split(upb_Array* array, uint32_t hi,
-                                                uint32_t lo, upb_Arena* arena) {
-  const upb_MessageValue val = {.uint64_val = ((uint64_t)hi) << 32 | lo};
-  return upb_Array_Append(array, val, arena);
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_COLLECTIONS_ARRAY_SPLIT64_H_ */
diff --git a/third_party/upb/upb/collections/map.c b/third_party/upb/upb/collections/map.c
deleted file mode 100644
index 9b73973d675db..0000000000000
--- a/third_party/upb/upb/collections/map.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/collections/map.h"
-
-#include <string.h>
-
-#include "upb/collections/map_internal.h"
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-// Strings/bytes are special-cased in maps.
-char _upb_Map_CTypeSizeTable[12] = {
-    [kUpb_CType_Bool] = 1,
-    [kUpb_CType_Float] = 4,
-    [kUpb_CType_Int32] = 4,
-    [kUpb_CType_UInt32] = 4,
-    [kUpb_CType_Enum] = 4,
-    [kUpb_CType_Message] = sizeof(void*),
-    [kUpb_CType_Double] = 8,
-    [kUpb_CType_Int64] = 8,
-    [kUpb_CType_UInt64] = 8,
-    [kUpb_CType_String] = UPB_MAPTYPE_STRING,
-    [kUpb_CType_Bytes] = UPB_MAPTYPE_STRING,
-};
-
-upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type) {
-  return _upb_Map_New(a, _upb_Map_CTypeSize(key_type),
-                      _upb_Map_CTypeSize(value_type));
-}
-
-size_t upb_Map_Size(const upb_Map* map) { return _upb_Map_Size(map); }
-
-bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                 upb_MessageValue* val) {
-  return _upb_Map_Get(map, &key, map->key_size, val, map->val_size);
-}
-
-void upb_Map_Clear(upb_Map* map) { _upb_Map_Clear(map); }
-
-upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                   upb_MessageValue val, upb_Arena* arena) {
-  UPB_ASSERT(arena);
-  return (upb_MapInsertStatus)_upb_Map_Insert(map, &key, map->key_size, &val,
-                                              map->val_size, arena);
-}
-
-bool upb_Map_Delete(upb_Map* map, upb_MessageValue key, upb_MessageValue* val) {
-  upb_value v;
-  const bool removed = _upb_Map_Delete(map, &key, map->key_size, &v);
-  if (val) _upb_map_fromvalue(v, val, map->val_size);
-  return removed;
-}
-
-bool upb_Map_Next(const upb_Map* map, upb_MessageValue* key,
-                  upb_MessageValue* val, size_t* iter) {
-  upb_StringView k;
-  upb_value v;
-  const bool ok = upb_strtable_next2(&map->table, &k, &v, (intptr_t*)iter);
-  if (ok) {
-    _upb_map_fromkey(k, key, map->key_size);
-    _upb_map_fromvalue(v, val, map->val_size);
-  }
-  return ok;
-}
-
-UPB_API void upb_Map_SetEntryValue(upb_Map* map, size_t iter,
-                                   upb_MessageValue val) {
-  upb_value v;
-  _upb_map_tovalue(&val, map->val_size, &v, NULL);
-  upb_strtable_setentryvalue(&map->table, iter, v);
-}
-
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter) {
-  return _upb_map_next(map, iter);
-}
-
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  UPB_ASSERT(iter != kUpb_Map_Begin);
-  i.t = &map->table;
-  i.index = iter;
-  return upb_strtable_done(&i);
-}
-
-// Returns the key and value for this entry of the map.
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromkey(upb_strtable_iter_key(&i), &ret, map->key_size);
-  return ret;
-}
-
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromvalue(upb_strtable_iter_value(&i), &ret, map->val_size);
-  return ret;
-}
-
-// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
-
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size) {
-  upb_Map* map = upb_Arena_Malloc(a, sizeof(upb_Map));
-  if (!map) return NULL;
-
-  upb_strtable_init(&map->table, 4, a);
-  map->key_size = key_size;
-  map->val_size = value_size;
-
-  return map;
-}
diff --git a/third_party/upb/upb/collections/map.h b/third_party/upb/upb/collections/map.h
index 0349beb03ba12..0729cb3ec3e99 100644
--- a/third_party/upb/upb/collections/map.h
+++ b/third_party/upb/upb/collections/map.h
@@ -1,140 +1,17 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_COLLECTIONS_MAP_H_
-#define UPB_COLLECTIONS_MAP_H_
-
-#include "upb/base/descriptor_constants.h"
-#include "upb/collections/message_value.h"
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Creates a new map on the given arena with the given key/value size.
-UPB_API upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type,
-                             upb_CType value_type);
-
-// Returns the number of entries in the map.
-UPB_API size_t upb_Map_Size(const upb_Map* map);
-
-// Stores a value for the given key into |*val| (or the zero value if the key is
-// not present). Returns whether the key was present. The |val| pointer may be
-// NULL, in which case the function tests whether the given key is present.
-UPB_API bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                         upb_MessageValue* val);
-
-// Removes all entries in the map.
-UPB_API void upb_Map_Clear(upb_Map* map);
-
-typedef enum {
-  kUpb_MapInsertStatus_Inserted = 0,
-  kUpb_MapInsertStatus_Replaced = 1,
-  kUpb_MapInsertStatus_OutOfMemory = 2,
-} upb_MapInsertStatus;
-
-// Sets the given key to the given value, returning whether the key was inserted
-// or replaced. If the key was inserted, then any existing iterators will be
-// invalidated.
-UPB_API upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                           upb_MessageValue val,
-                                           upb_Arena* arena);
-
-// Sets the given key to the given value. Returns false if memory allocation
-// failed. If the key is newly inserted, then any existing iterators will be
-// invalidated.
-UPB_API_INLINE bool upb_Map_Set(upb_Map* map, upb_MessageValue key,
-                                upb_MessageValue val, upb_Arena* arena) {
-  return upb_Map_Insert(map, key, val, arena) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-
-// Deletes this key from the table. Returns true if the key was present.
-// If present and |val| is non-NULL, stores the deleted value.
-UPB_API bool upb_Map_Delete(upb_Map* map, upb_MessageValue key,
-                            upb_MessageValue* val);
-
-// (DEPRECATED and going away soon. Do not use.)
-UPB_INLINE bool upb_Map_Delete2(upb_Map* map, upb_MessageValue key,
-                                upb_MessageValue* val) {
-  return upb_Map_Delete(map, key, val);
-}
-
-// Map iteration:
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// size_t iter = kUpb_Map_Begin;
-// upb_MessageValue key, val;
-// while (upb_Map_Next(map, &key, &val, &iter)) {
-//   ...
-// }
-
-#define kUpb_Map_Begin ((size_t)-1)
-
-// Advances to the next entry. Returns false if no more entries are present.
-// Otherwise returns true and populates both *key and *value.
-UPB_API bool upb_Map_Next(const upb_Map* map, upb_MessageValue* key,
-                          upb_MessageValue* val, size_t* iter);
-
-// Sets the value for the entry pointed to by iter.
-// WARNING: this does not currently work for string values!
-UPB_API void upb_Map_SetEntryValue(upb_Map* map, size_t iter,
-                                   upb_MessageValue val);
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-// DEPRECATED iterator, slated for removal.
+// Temporary hack to fix gRPC. Do not use.
 
-/* Map iteration:
- *
- * size_t iter = kUpb_Map_Begin;
- * while (upb_MapIterator_Next(map, &iter)) {
- *   upb_MessageValue key = upb_MapIterator_Key(map, iter);
- *   upb_MessageValue val = upb_MapIterator_Value(map, iter);
- * }
- */
-
-// Advances to the next entry. Returns false if no more entries are present.
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter);
-
-// Returns true if the iterator still points to a valid entry, or false if the
-// iterator is past the last element. It is an error to call this function with
-// kUpb_Map_Begin (you must call next() at least once first).
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter);
-
-// Returns the key and value for this entry of the map.
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter);
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+#ifndef UPB_COLLECTIONS_MAP_H_
+#define UPB_COLLECTIONS_MAP_H_
 
-#include "upb/port/undef.inc"
+// IWYU pragma: begin_exports
+#include "upb/message/map.h"
+// IWYU pragma: end_exports
 
 #endif /* UPB_COLLECTIONS_MAP_H_ */
diff --git a/third_party/upb/upb/collections/map_gencode_util.h b/third_party/upb/upb/collections/map_gencode_util.h
deleted file mode 100644
index 794d76b9f4ab4..0000000000000
--- a/third_party/upb/upb/collections/map_gencode_util.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// These functions are only used by generated code.
-
-#ifndef UPB_COLLECTIONS_MAP_GENCODE_UTIL_H_
-#define UPB_COLLECTIONS_MAP_GENCODE_UTIL_H_
-
-#include "upb/collections/map_internal.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Message map operations, these get the map from the message first.
-
-UPB_INLINE void _upb_msg_map_key(const void* msg, void* key, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  uint32_t u32len;
-  upb_StringView k;
-  k.data = upb_tabstr(ent->key, &u32len);
-  k.size = u32len;
-  _upb_map_fromkey(k, key, size);
-}
-
-UPB_INLINE void _upb_msg_map_value(const void* msg, void* val, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  upb_value v = {ent->val.val};
-  _upb_map_fromvalue(v, val, size);
-}
-
-UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val,
-                                       size_t size) {
-  upb_tabent* ent = (upb_tabent*)msg;
-  // This is like _upb_map_tovalue() except the entry already exists
-  // so we can reuse the allocated upb_StringView for string fields.
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)(uintptr_t)ent->val.val;
-    memcpy(strp, val, sizeof(*strp));
-  } else {
-    memcpy(&ent->val.val, val, size);
-  }
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_COLLECTIONS_MAP_GENCODE_UTIL_H_ */
diff --git a/third_party/upb/upb/collections/map_internal.h b/third_party/upb/upb/collections/map_internal.h
deleted file mode 100644
index ceadf83359c39..0000000000000
--- a/third_party/upb/upb/collections/map_internal.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
-
-#ifndef UPB_COLLECTIONS_MAP_INTERNAL_H_
-#define UPB_COLLECTIONS_MAP_INTERNAL_H_
-
-#include "upb/base/string_view.h"
-#include "upb/collections/map.h"
-#include "upb/hash/str_table.h"
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-struct upb_Map {
-  // Size of key and val, based on the map type.
-  // Strings are represented as '0' because they must be handled specially.
-  char key_size;
-  char val_size;
-
-  upb_strtable table;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Converting between internal table representation and user values.
-//
-// _upb_map_tokey() and _upb_map_fromkey() are inverses.
-// _upb_map_tovalue() and _upb_map_fromvalue() are inverses.
-//
-// These functions account for the fact that strings are treated differently
-// from other types when stored in a map.
-
-UPB_INLINE upb_StringView _upb_map_tokey(const void* key, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    return *(upb_StringView*)key;
-  } else {
-    return upb_StringView_FromDataAndSize((const char*)key, size);
-  }
-}
-
-UPB_INLINE void _upb_map_fromkey(upb_StringView key, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    memcpy(out, &key, sizeof(key));
-  } else {
-    memcpy(out, key.data, size);
-  }
-}
-
-UPB_INLINE bool _upb_map_tovalue(const void* val, size_t size,
-                                 upb_value* msgval, upb_Arena* a) {
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)upb_Arena_Malloc(a, sizeof(*strp));
-    if (!strp) return false;
-    *strp = *(upb_StringView*)val;
-    *msgval = upb_value_ptr(strp);
-  } else {
-    memcpy(msgval, val, size);
-  }
-  return true;
-}
-
-UPB_INLINE void _upb_map_fromvalue(upb_value val, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    const upb_StringView* strp = (const upb_StringView*)upb_value_getptr(val);
-    memcpy(out, strp, sizeof(upb_StringView));
-  } else {
-    memcpy(out, &val, size);
-  }
-}
-
-UPB_INLINE void* _upb_map_next(const upb_Map* map, size_t* iter) {
-  upb_strtable_iter it;
-  it.t = &map->table;
-  it.index = *iter;
-  upb_strtable_next(&it);
-  *iter = it.index;
-  if (upb_strtable_done(&it)) return NULL;
-  return (void*)str_tabent(&it);
-}
-
-UPB_INLINE void _upb_Map_Clear(upb_Map* map) {
-  upb_strtable_clear(&map->table);
-}
-
-UPB_INLINE bool _upb_Map_Delete(upb_Map* map, const void* key, size_t key_size,
-                                upb_value* val) {
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  return upb_strtable_remove2(&map->table, k.data, k.size, val);
-}
-
-UPB_INLINE bool _upb_Map_Get(const upb_Map* map, const void* key,
-                             size_t key_size, void* val, size_t val_size) {
-  upb_value tabval;
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  bool ret = upb_strtable_lookup2(&map->table, k.data, k.size, &tabval);
-  if (ret && val) {
-    _upb_map_fromvalue(tabval, val, val_size);
-  }
-  return ret;
-}
-
-UPB_INLINE upb_MapInsertStatus _upb_Map_Insert(upb_Map* map, const void* key,
-                                               size_t key_size, void* val,
-                                               size_t val_size, upb_Arena* a) {
-  upb_StringView strkey = _upb_map_tokey(key, key_size);
-  upb_value tabval = {0};
-  if (!_upb_map_tovalue(val, val_size, &tabval, a)) {
-    return kUpb_MapInsertStatus_OutOfMemory;
-  }
-
-  // TODO(haberman): add overwrite operation to minimize number of lookups.
-  bool removed =
-      upb_strtable_remove2(&map->table, strkey.data, strkey.size, NULL);
-  if (!upb_strtable_insert(&map->table, strkey.data, strkey.size, tabval, a)) {
-    return kUpb_MapInsertStatus_OutOfMemory;
-  }
-  return removed ? kUpb_MapInsertStatus_Replaced
-                 : kUpb_MapInsertStatus_Inserted;
-}
-
-UPB_INLINE size_t _upb_Map_Size(const upb_Map* map) {
-  return map->table.t.count;
-}
-
-// Strings/bytes are special-cased in maps.
-extern char _upb_Map_CTypeSizeTable[12];
-
-UPB_INLINE size_t _upb_Map_CTypeSize(upb_CType ctype) {
-  return _upb_Map_CTypeSizeTable[ctype];
-}
-
-// Creates a new map on the given arena with this key/value type.
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_COLLECTIONS_MAP_INTERNAL_H_ */
diff --git a/third_party/upb/upb/collections/map_sorter.c b/third_party/upb/upb/collections/map_sorter.c
deleted file mode 100644
index c18e03c784820..0000000000000
--- a/third_party/upb/upb/collections/map_sorter.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/base/log2.h"
-#include "upb/collections/map_sorter_internal.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-static void _upb_mapsorter_getkeys(const void* _a, const void* _b, void* a_key,
-                                   void* b_key, size_t size) {
-  const upb_tabent* const* a = _a;
-  const upb_tabent* const* b = _b;
-  upb_StringView a_tabkey = upb_tabstrview((*a)->key);
-  upb_StringView b_tabkey = upb_tabstrview((*b)->key);
-  _upb_map_fromkey(a_tabkey, a_key, size);
-  _upb_map_fromkey(b_tabkey, b_key, size);
-}
-
-static int _upb_mapsorter_cmpi64(const void* _a, const void* _b) {
-  int64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return a < b ? -1 : a > b;
-}
-
-static int _upb_mapsorter_cmpu64(const void* _a, const void* _b) {
-  uint64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return a < b ? -1 : a > b;
-}
-
-static int _upb_mapsorter_cmpi32(const void* _a, const void* _b) {
-  int32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return a < b ? -1 : a > b;
-}
-
-static int _upb_mapsorter_cmpu32(const void* _a, const void* _b) {
-  uint32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return a < b ? -1 : a > b;
-}
-
-static int _upb_mapsorter_cmpbool(const void* _a, const void* _b) {
-  bool a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 1);
-  return a < b ? -1 : a > b;
-}
-
-static int _upb_mapsorter_cmpstr(const void* _a, const void* _b) {
-  upb_StringView a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, UPB_MAPTYPE_STRING);
-  size_t common_size = UPB_MIN(a.size, b.size);
-  int cmp = memcmp(a.data, b.data, common_size);
-  if (cmp) return -cmp;
-  return a.size < b.size ? -1 : a.size > b.size;
-}
-
-static int (*const compar[kUpb_FieldType_SizeOf])(const void*, const void*) = {
-    [kUpb_FieldType_Int64] = _upb_mapsorter_cmpi64,
-    [kUpb_FieldType_SFixed64] = _upb_mapsorter_cmpi64,
-    [kUpb_FieldType_SInt64] = _upb_mapsorter_cmpi64,
-
-    [kUpb_FieldType_UInt64] = _upb_mapsorter_cmpu64,
-    [kUpb_FieldType_Fixed64] = _upb_mapsorter_cmpu64,
-
-    [kUpb_FieldType_Int32] = _upb_mapsorter_cmpi32,
-    [kUpb_FieldType_SInt32] = _upb_mapsorter_cmpi32,
-    [kUpb_FieldType_SFixed32] = _upb_mapsorter_cmpi32,
-    [kUpb_FieldType_Enum] = _upb_mapsorter_cmpi32,
-
-    [kUpb_FieldType_UInt32] = _upb_mapsorter_cmpu32,
-    [kUpb_FieldType_Fixed32] = _upb_mapsorter_cmpu32,
-
-    [kUpb_FieldType_Bool] = _upb_mapsorter_cmpbool,
-
-    [kUpb_FieldType_String] = _upb_mapsorter_cmpstr,
-    [kUpb_FieldType_Bytes] = _upb_mapsorter_cmpstr,
-};
-
-static bool _upb_mapsorter_resize(_upb_mapsorter* s, _upb_sortedmap* sorted,
-                                  int size) {
-  sorted->start = s->size;
-  sorted->pos = sorted->start;
-  sorted->end = sorted->start + size;
-
-  if (sorted->end > s->cap) {
-    s->cap = upb_Log2CeilingSize(sorted->end);
-    s->entries = realloc(s->entries, s->cap * sizeof(*s->entries));
-    if (!s->entries) return false;
-  }
-
-  s->size = sorted->end;
-  return true;
-}
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted) {
-  int map_size = _upb_Map_Size(map);
-
-  if (!_upb_mapsorter_resize(s, sorted, map_size)) return false;
-
-  // Copy non-empty entries from the table to s->entries.
-  const void** dst = &s->entries[sorted->start];
-  const upb_tabent* src = map->table.t.entries;
-  const upb_tabent* end = src + upb_table_size(&map->table.t);
-  for (; src < end; src++) {
-    if (!upb_tabent_isempty(src)) {
-      *dst = src;
-      dst++;
-    }
-  }
-  UPB_ASSERT(dst == &s->entries[sorted->end]);
-
-  // Sort entries according to the key type.
-  qsort(&s->entries[sorted->start], map_size, sizeof(*s->entries),
-        compar[key_type]);
-  return true;
-}
-
-static int _upb_mapsorter_cmpext(const void* _a, const void* _b) {
-  const upb_Message_Extension* const* a = _a;
-  const upb_Message_Extension* const* b = _b;
-  uint32_t a_num = (*a)->ext->field.number;
-  uint32_t b_num = (*b)->ext->field.number;
-  assert(a_num != b_num);
-  return a_num < b_num ? -1 : 1;
-}
-
-bool _upb_mapsorter_pushexts(_upb_mapsorter* s,
-                             const upb_Message_Extension* exts, size_t count,
-                             _upb_sortedmap* sorted) {
-  if (!_upb_mapsorter_resize(s, sorted, count)) return false;
-
-  for (size_t i = 0; i < count; i++) {
-    s->entries[sorted->start + i] = &exts[i];
-  }
-
-  qsort(&s->entries[sorted->start], count, sizeof(*s->entries),
-        _upb_mapsorter_cmpext);
-  return true;
-}
diff --git a/third_party/upb/upb/collections/map_sorter_internal.h b/third_party/upb/upb/collections/map_sorter_internal.h
deleted file mode 100644
index 3905f8a264f8c..0000000000000
--- a/third_party/upb/upb/collections/map_sorter_internal.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
-
-#ifndef UPB_COLLECTIONS_MAP_SORTER_INTERNAL_H_
-#define UPB_COLLECTIONS_MAP_SORTER_INTERNAL_H_
-
-#include <stdlib.h>
-
-#include "upb/collections/map_internal.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/internal/map_entry.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// _upb_mapsorter sorts maps and provides ordered iteration over the entries.
-// Since maps can be recursive (map values can be messages which contain other
-// maps), _upb_mapsorter can contain a stack of maps.
-
-typedef struct {
-  void const** entries;
-  int size;
-  int cap;
-} _upb_mapsorter;
-
-typedef struct {
-  int start;
-  int pos;
-  int end;
-} _upb_sortedmap;
-
-UPB_INLINE void _upb_mapsorter_init(_upb_mapsorter* s) {
-  s->entries = NULL;
-  s->size = 0;
-  s->cap = 0;
-}
-
-UPB_INLINE void _upb_mapsorter_destroy(_upb_mapsorter* s) {
-  if (s->entries) free(s->entries);
-}
-
-UPB_INLINE bool _upb_sortedmap_next(_upb_mapsorter* s, const upb_Map* map,
-                                    _upb_sortedmap* sorted, upb_MapEntry* ent) {
-  if (sorted->pos == sorted->end) return false;
-  const upb_tabent* tabent = (const upb_tabent*)s->entries[sorted->pos++];
-  upb_StringView key = upb_tabstrview(tabent->key);
-  _upb_map_fromkey(key, &ent->data.k, map->key_size);
-  upb_value val = {tabent->val.val};
-  _upb_map_fromvalue(val, &ent->data.v, map->val_size);
-  return true;
-}
-
-UPB_INLINE bool _upb_sortedmap_nextext(_upb_mapsorter* s,
-                                       _upb_sortedmap* sorted,
-                                       const upb_Message_Extension** ext) {
-  if (sorted->pos == sorted->end) return false;
-  *ext = (const upb_Message_Extension*)s->entries[sorted->pos++];
-  return true;
-}
-
-UPB_INLINE void _upb_mapsorter_popmap(_upb_mapsorter* s,
-                                      _upb_sortedmap* sorted) {
-  s->size = sorted->start;
-}
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted);
-
-bool _upb_mapsorter_pushexts(_upb_mapsorter* s,
-                             const upb_Message_Extension* exts, size_t count,
-                             _upb_sortedmap* sorted);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_COLLECTIONS_MAP_SORTER_INTERNAL_H_ */
diff --git a/third_party/upb/upb/collections/message_value.h b/third_party/upb/upb/collections/message_value.h
deleted file mode 100644
index 2e485eff21abf..0000000000000
--- a/third_party/upb/upb/collections/message_value.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Users should include array.h or map.h instead.
-// IWYU pragma: private, include "upb/collections/array.h"
-
-#ifndef UPB_MESSAGE_VALUE_H_
-#define UPB_MESSAGE_VALUE_H_
-
-#include "upb/base/string_view.h"
-#include "upb/message/tagged_ptr.h"
-#include "upb/mini_table/message.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-typedef struct upb_Array upb_Array;
-typedef struct upb_Map upb_Map;
-
-typedef union {
-  bool bool_val;
-  float float_val;
-  double double_val;
-  int32_t int32_val;
-  int64_t int64_val;
-  uint32_t uint32_val;
-  uint64_t uint64_val;
-  const upb_Array* array_val;
-  const upb_Map* map_val;
-  const upb_Message* msg_val;
-  upb_StringView str_val;
-
-  // EXPERIMENTAL: A tagged upb_Message*.  Users must use this instead of
-  // msg_val if unlinked sub-messages may possibly be in use.  See the
-  // documentation in kUpb_DecodeOption_ExperimentalAllowUnlinked for more
-  // information.
-  upb_TaggedMessagePtr tagged_msg_val;
-} upb_MessageValue;
-
-typedef union {
-  upb_Array* array;
-  upb_Map* map;
-  upb_Message* msg;
-} upb_MutableMessageValue;
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_MESSAGE_VALUE_H_ */
diff --git a/third_party/upb/upb/collections/test.cc b/third_party/upb/upb/collections/test.cc
deleted file mode 100644
index 7046cedf821be..0000000000000
--- a/third_party/upb/upb/collections/test.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gtest/gtest.h"
-#include "upb/base/descriptor_constants.h"
-#include "upb/base/string_view.h"
-#include "upb/collections/array.h"
-#include "upb/collections/map.h"
-#include "upb/upb.hpp"
-
-TEST(CollectionsTest, Arrays) {
-  upb::Arena arena;
-  upb::Status status;
-
-  upb_Array* array = upb_Array_New(arena.ptr(), kUpb_CType_Int32);
-  EXPECT_TRUE(array);
-
-  for (int i = 0; i < 10; i++) {
-    upb_MessageValue mv = {.int32_val = 3 * i};
-    upb_Array_Append(array, mv, arena.ptr());
-    EXPECT_EQ(upb_Array_Size(array), i + 1);
-    EXPECT_EQ(upb_Array_Get(array, i).int32_val, 3 * i);
-  }
-
-  upb_Array_Resize(array, 12, arena.ptr());
-  EXPECT_EQ(upb_Array_Get(array, 10).int32_val, 0);
-  EXPECT_EQ(upb_Array_Get(array, 11).int32_val, 0);
-
-  upb_Array_Resize(array, 4, arena.ptr());
-  EXPECT_EQ(upb_Array_Size(array), 4);
-
-  upb_Array_Resize(array, 6, arena.ptr());
-  EXPECT_EQ(upb_Array_Size(array), 6);
-
-  EXPECT_EQ(upb_Array_Get(array, 3).int32_val, 9);
-  EXPECT_EQ(upb_Array_Get(array, 4).int32_val, 0);
-  EXPECT_EQ(upb_Array_Get(array, 5).int32_val, 0);
-}
-
-TEST(CollectionsTest, MapDeleteRegression) {
-  upb::Arena arena;
-  upb_Map* map = upb_Map_New(arena.ptr(), kUpb_CType_Int32, kUpb_CType_String);
-  upb_MessageValue key = {.int32_val = 0};
-  const char str[] = "abcde";
-  upb_MessageValue insert_value = {.str_val = upb_StringView_FromString(str)};
-  upb_MapInsertStatus st = upb_Map_Insert(map, key, insert_value, arena.ptr());
-  EXPECT_EQ(kUpb_MapInsertStatus_Inserted, st);
-
-  upb_MessageValue delete_value;
-  bool removed = upb_Map_Delete(map, key, &delete_value);
-  EXPECT_TRUE(removed);
-
-  EXPECT_TRUE(
-      upb_StringView_IsEqual(insert_value.str_val, delete_value.str_val));
-}
diff --git a/third_party/upb/upb/conformance/BUILD b/third_party/upb/upb/conformance/BUILD
index 74b2fc043d4e1..c22ea413014c1 100644
--- a/third_party/upb/upb/conformance/BUILD
+++ b/third_party/upb/upb/conformance/BUILD
@@ -1,27 +1,9 @@
 # Copyright (c) 2009-2021, Google LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 load(
     "//bazel:build_defs.bzl",
@@ -35,7 +17,7 @@ load(
 )
 
 # begin:google_only
-# package(default_applicable_licenses = ["//:license"])
+# package(default_applicable_licenses = ["//upb:license"])
 # end:google_only
 
 licenses(["notice"])
@@ -49,27 +31,31 @@ config_setting(
 upb_proto_library(
     name = "conformance_upb_proto",
     testonly = 1,
-    deps = ["@com_google_protobuf//conformance:conformance_proto"],
+    deps = ["//conformance:conformance_proto"],
 )
 
 upb_proto_reflection_library(
     name = "conformance_upb_proto_reflection",
     testonly = 1,
-    deps = ["@com_google_protobuf//conformance:conformance_proto"],
+    deps = ["//conformance:conformance_proto"],
 )
 
 upb_proto_reflection_library(
     name = "test_messages_proto2_upbdefs",
     testonly = 1,
-    visibility = ["//:__subpackages__"],
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto2_proto"],
+    visibility = [
+        "//visibility:private",  # Only private by automation, not intent. Owner may accept CLs adding visibility. See go/scheuklappen#explicit-private.
+    ],
+    deps = ["//src/google/protobuf:test_messages_proto2_proto"],
 )
 
 upb_proto_reflection_library(
     name = "test_messages_proto3_upbdefs",
     testonly = 1,
-    visibility = ["//:__subpackages__"],
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto3_proto"],
+    visibility = [
+        "//visibility:private",  # Only private by automation, not intent. Owner may accept CLs adding visibility. See go/scheuklappen#explicit-private.
+    ],
+    deps = ["//src/google/protobuf:test_messages_proto3_proto"],
 )
 
 cc_binary(
@@ -87,31 +73,32 @@ cc_binary(
         ":conformance_upb_proto_reflection",
         ":test_messages_proto2_upbdefs",
         ":test_messages_proto3_upbdefs",
-        "//:json",
-        "//:port",
-        "//:reflection",
-        "//:textformat",
-        "//:wire",
-        "//upb/json",
+        "//upb:json",
+        "//upb:port",
+        "//upb:reflection",
+        "//upb:text",
+        "//upb:wire",
     ],
 )
 
 make_shell_script(
     name = "gen_test_conformance_upb",
     out = "test_conformance_upb.sh",
-    contents = "external/com_google_protobuf/conformance/conformance_test_runner" +
-               " --enforce_recommended" +
-               " --failure_list upb/conformance/conformance_upb_failures.txt" +
-               " upb/conformance/conformance_upb",
+    contents = "$1 --enforce_recommended --failure_list $2 $3",
 )
 
 sh_test(
     name = "test_conformance_upb",
     srcs = ["test_conformance_upb.sh"],
+    args = [
+        "$(location //conformance:conformance_test_runner)",
+        "$(location :conformance_upb_failures.txt)",
+        "$(location :conformance_upb)",
+    ],
     data = [
         "conformance_upb_failures.txt",
         ":conformance_upb",
-        "@com_google_protobuf//conformance:conformance_test_runner",
+        "//conformance:conformance_test_runner",
     ],
     target_compatible_with = select({
         "@platforms//os:windows": ["@platforms//:incompatible"],
@@ -137,31 +124,32 @@ cc_binary(
         ":conformance_upb_proto_reflection",
         ":test_messages_proto2_upbdefs",
         ":test_messages_proto3_upbdefs",
-        "//:json",
-        "//:port",
-        "//:reflection",
-        "//:textformat",
-        "//:wire",
-        "//upb/json",
+        "//upb:json",
+        "//upb:port",
+        "//upb:reflection",
+        "//upb:text",
+        "//upb:wire",
     ],
 )
 
 make_shell_script(
     name = "gen_test_conformance_upb_dynamic_minitable",
     out = "test_conformance_upb_dynamic_minitable.sh",
-    contents = "external/com_google_protobuf/conformance/conformance_test_runner" +
-               " --enforce_recommended" +
-               " --failure_list upb/conformance/conformance_upb_failures.txt" +
-               " upb/conformance/conformance_upb_dynamic_minitable",
+    contents = "$1 --enforce_recommended --failure_list $2 $3",
 )
 
 sh_test(
     name = "test_conformance_upb_dynamic_minitable",
     srcs = ["test_conformance_upb_dynamic_minitable.sh"],
+    args = [
+        "$(location //conformance:conformance_test_runner)",
+        "$(location :conformance_upb_failures.txt)",
+        "$(location :conformance_upb_dynamic_minitable)",
+    ],
     data = [
         "conformance_upb_failures.txt",
         ":conformance_upb_dynamic_minitable",
-        "@com_google_protobuf//conformance:conformance_test_runner",
+        "//conformance:conformance_test_runner",
     ],
     deps = ["@bazel_tools//tools/bash/runfiles"],
 )
diff --git a/third_party/upb/upb/conformance/conformance_upb.c b/third_party/upb/upb/conformance/conformance_upb.c
index c124e1b4cf0b1..a91224bf3520f 100644
--- a/third_party/upb/upb/conformance/conformance_upb.c
+++ b/third_party/upb/upb/conformance/conformance_upb.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* This is a upb implementation of the upb conformance tests, see:
  *   https://github.com/google/protobuf/tree/master/conformance
diff --git a/third_party/upb/upb/decode.h b/third_party/upb/upb/decode.h
deleted file mode 100644
index 2e554969784db..0000000000000
--- a/third_party/upb/upb/decode.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/wire/decode.h instead
-// IWYU pragma: private, include "upb/wire/decode.h"
-
-#ifndef UPB_DECODE_H_
-#define UPB_DECODE_H_
-
-#include "upb/wire/decode.h"
-
-#endif /* UPB_DECODE_H_ */
diff --git a/third_party/upb/upb/decode_fast.h b/third_party/upb/upb/decode_fast.h
deleted file mode 100644
index 2e927350beae0..0000000000000
--- a/third_party/upb/upb/decode_fast.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/wire/decode_fast.h instead
-// IWYU pragma: private, include "upb/wire/decode_fast.h"
-
-#ifndef UPB_DECODE_FAST_H_
-#define UPB_DECODE_FAST_H_
-
-#include "upb/wire/decode_fast.h"
-
-#endif /* UPB_DECODE_FAST_H_ */
diff --git a/third_party/upb/upb/def.h b/third_party/upb/upb/def.h
deleted file mode 100644
index ebf1d9d3bddd4..0000000000000
--- a/third_party/upb/upb/def.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/reflection/def.h instead
-// IWYU pragma: private, include "upb/reflection/def.h"
-
-#ifndef UPB_DEF_H_
-#define UPB_DEF_H_
-
-#include "upb/reflection/def.h"
-
-#endif /* UPB_DEF_H_ */
diff --git a/third_party/upb/upb/def.hpp b/third_party/upb/upb/def.hpp
deleted file mode 100644
index 4a62909ab2faa..0000000000000
--- a/third_party/upb/upb/def.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is deprecated, use upb/reflection/def.hpp instead
-
-#ifndef UPB_DEF_HPP_
-#define UPB_DEF_HPP_
-
-#include "upb/reflection/def.hpp"
-
-#endif  // UPB_DEF_HPP_
diff --git a/third_party/upb/upb/encode.h b/third_party/upb/upb/encode.h
deleted file mode 100644
index 37d424fd9cb9b..0000000000000
--- a/third_party/upb/upb/encode.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/wire/encode.h instead
-// IWYU pragma: private, include "upb/wire/encode.h"
-
-#ifndef UPB_ENCODE_H_
-#define UPB_ENCODE_H_
-
-#include "upb/wire/encode.h"
-
-#endif /* UPB_ENCODE_H_ */
diff --git a/third_party/upb/upb/extension_registry.h b/third_party/upb/upb/extension_registry.h
deleted file mode 100644
index 5a9564fb8b001..0000000000000
--- a/third_party/upb/upb/extension_registry.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/mini_table/extension_registry.h instead
-
-#ifndef UPB_EXTENSION_REGISTRY_H_
-#define UPB_EXTENSION_REGISTRY_H_
-
-#include "upb/mini_table/extension_registry.h"
-
-#endif /* UPB_EXTENSION_REGISTRY_H_ */
diff --git a/third_party/upb/upb/generated_code_support.h b/third_party/upb/upb/generated_code_support.h
index a328ccbfa0721..cbc72945b9ca3 100644
--- a/third_party/upb/upb/generated_code_support.h
+++ b/third_party/upb/upb/generated_code_support.h
@@ -1,47 +1,26 @@
-/*
- * Copyright (c) 2009-2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_GENERATED_CODE_SUPPORT_H_
 #define UPB_GENERATED_CODE_SUPPORT_H_
 
 // IWYU pragma: begin_exports
-#include "upb/collections/array.h"
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map_gencode_util.h"
-#include "upb/collections/message_value.h"
-#include "upb/extension_registry.h"
 #include "upb/message/accessors.h"
-#include "upb/message/accessors_internal.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/internal.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/accessors.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map_gencode_util.h"
 #include "upb/message/message.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_table/enum.h"
 #include "upb/mini_table/extension.h"
+#include "upb/mini_table/extension_registry.h"
 #include "upb/mini_table/field.h"
 #include "upb/mini_table/file.h"
 #include "upb/mini_table/message.h"
diff --git a/third_party/upb/upb/hash/BUILD b/third_party/upb/upb/hash/BUILD
new file mode 100644
index 0000000000000..4c18e0cc4d04b
--- /dev/null
+++ b/third_party/upb/upb/hash/BUILD
@@ -0,0 +1,56 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "hash",
+    srcs = [
+        "common.c",
+    ],
+    hdrs = [
+        "common.h",
+        "int_table.h",
+        "str_table.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//upb:base",
+        "//upb:base_internal",
+        "//upb:mem",
+        "//upb:port",
+    ],
+)
+
+cc_test(
+    name = "test",
+    srcs = ["test.cc"],
+    deps = [
+        ":hash",
+        "@com_google_googletest//:gtest_main",
+        "//upb:mem",
+        "//upb:port",
+        "@com_google_absl//absl/container:flat_hash_map",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/hash/common.c b/third_party/upb/upb/hash/common.c
index 5095ef28e70a8..f8bb7fc00a3cc 100644
--- a/third_party/upb/upb/hash/common.c
+++ b/third_party/upb/upb/hash/common.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /*
  * upb_table Implementation
@@ -33,7 +13,7 @@
 
 #include <string.h>
 
-#include "upb/base/log2.h"
+#include "upb/base/internal/log2.h"
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
 
@@ -69,23 +49,6 @@ static int log2ceil(uint64_t v) {
   return UPB_MIN(UPB_MAXARRSIZE, ret);
 }
 
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a) {
-  size_t n;
-  char* p;
-
-  /* Prevent overflow errors. */
-  if (len == SIZE_MAX) return NULL;
-  /* Always null-terminate, even if binary data; but don't rely on the input to
-   * have a null-terminating byte since it may be a raw binary buffer. */
-  n = len + 1;
-  p = upb_Arena_Malloc(a, n);
-  if (p) {
-    if (len != 0) memcpy(p, s, len);
-    p[len] = 0;
-  }
-  return p;
-}
-
 /* A type to represent the lookup key of either a strtable or an inttable. */
 typedef union {
   uintptr_t num;
diff --git a/third_party/upb/upb/hash/common.h b/third_party/upb/upb/hash/common.h
index fceaa8858f499..889d375657c26 100644
--- a/third_party/upb/upb/hash/common.h
+++ b/third_party/upb/upb/hash/common.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /*
  * upb_table
@@ -65,10 +45,6 @@ typedef struct {
   uint64_t val;
 } upb_value;
 
-/* Variant that works with a length-delimited rather than NULL-delimited string,
- * as supported by strtable. */
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a);
-
 UPB_INLINE void _upb_value_setval(upb_value* v, uint64_t val) { v->val = val; }
 
 /* For each value ctype, define the following set of functions:
@@ -79,7 +55,7 @@ UPB_INLINE void _upb_value_setval(upb_value* v, uint64_t val) { v->val = val; }
  *
  * // Construct a new upb_value from an int32.
  * upb_value upb_value_int32(int32_t val); */
-#define FUNCS(name, membername, type_t, converter, proto_type)       \
+#define FUNCS(name, membername, type_t, converter)                   \
   UPB_INLINE void upb_value_set##name(upb_value* val, type_t cval) { \
     val->val = (converter)cval;                                      \
   }                                                                  \
@@ -92,15 +68,15 @@ UPB_INLINE void _upb_value_setval(upb_value* v, uint64_t val) { v->val = val; }
     return (type_t)(converter)val.val;                               \
   }
 
-FUNCS(int32, int32, int32_t, int32_t, UPB_CTYPE_INT32)
-FUNCS(int64, int64, int64_t, int64_t, UPB_CTYPE_INT64)
-FUNCS(uint32, uint32, uint32_t, uint32_t, UPB_CTYPE_UINT32)
-FUNCS(uint64, uint64, uint64_t, uint64_t, UPB_CTYPE_UINT64)
-FUNCS(bool, _bool, bool, bool, UPB_CTYPE_BOOL)
-FUNCS(cstr, cstr, char*, uintptr_t, UPB_CTYPE_CSTR)
-FUNCS(uintptr, uptr, uintptr_t, uintptr_t, UPB_CTYPE_UPTR)
-FUNCS(ptr, ptr, void*, uintptr_t, UPB_CTYPE_PTR)
-FUNCS(constptr, constptr, const void*, uintptr_t, UPB_CTYPE_CONSTPTR)
+FUNCS(int32, int32, int32_t, int32_t)
+FUNCS(int64, int64, int64_t, int64_t)
+FUNCS(uint32, uint32, uint32_t, uint32_t)
+FUNCS(uint64, uint64, uint64_t, uint64_t)
+FUNCS(bool, _bool, bool, bool)
+FUNCS(cstr, cstr, char*, uintptr_t)
+FUNCS(uintptr, uptr, uintptr_t, uintptr_t)
+FUNCS(ptr, ptr, void*, uintptr_t)
+FUNCS(constptr, constptr, const void*, uintptr_t)
 
 #undef FUNCS
 
@@ -124,8 +100,6 @@ UPB_INLINE upb_value upb_value_double(double cval) {
   return ret;
 }
 
-#undef SET_TYPE
-
 /* upb_tabkey *****************************************************************/
 
 /* Either:
diff --git a/third_party/upb/upb/hash/int_table.h b/third_party/upb/upb/hash/int_table.h
index 7b1d6ccbc56a9..f7a41ea9f76c0 100644
--- a/third_party/upb/upb/hash/int_table.h
+++ b/third_party/upb/upb/hash/int_table.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_HASH_INT_TABLE_H_
 #define UPB_HASH_INT_TABLE_H_
diff --git a/third_party/upb/upb/hash/str_table.h b/third_party/upb/upb/hash/str_table.h
index a9944f9a66d8f..c90c1e973ac89 100644
--- a/third_party/upb/upb/hash/str_table.h
+++ b/third_party/upb/upb/hash/str_table.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_HASH_STR_TABLE_H_
 #define UPB_HASH_STR_TABLE_H_
diff --git a/third_party/upb/upb/hash/test.cc b/third_party/upb/upb/hash/test.cc
index 42d692fbe2119..e85940bb3d16e 100644
--- a/third_party/upb/upb/hash/test.cc
+++ b/third_party/upb/upb/hash/test.cc
@@ -1,27 +1,9 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Tests for upb_table.
 
@@ -32,13 +14,13 @@
 #include <map>
 #include <set>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+#include "absl/container/flat_hash_map.h"
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -141,7 +123,7 @@ TEST_P(IntTableTest, TestIntTable) {
   upb_inttable_init(&t, arena.ptr());
   uint32_t largest_key = 0;
   std::map<uint32_t, uint32_t> m;
-  std::unordered_map<uint32_t, uint32_t> hm;
+  absl::flat_hash_map<uint32_t, uint32_t> hm;
   for (const auto& key : keys_) {
     largest_key = UPB_MAX((int32_t)largest_key, key);
     upb_value val = upb_value_uint32(key * 2);
@@ -235,15 +217,15 @@ TEST(Table, Delete) {
   upb_inttable_insert(&t, 2, upb_value_bool(true), arena.ptr());
   upb_inttable_insert(&t, 4, upb_value_bool(true), arena.ptr());
   upb_inttable_compact(&t, arena.ptr());
-  upb_inttable_remove(&t, 0, NULL);
-  upb_inttable_remove(&t, 2, NULL);
-  upb_inttable_remove(&t, 4, NULL);
+  upb_inttable_remove(&t, 0, nullptr);
+  upb_inttable_remove(&t, 2, nullptr);
+  upb_inttable_remove(&t, 4, nullptr);
 
   intptr_t iter = UPB_INTTABLE_BEGIN;
   uintptr_t key;
   upb_value val;
   while (upb_inttable_next(&t, &key, &val, &iter)) {
-    ASSERT_TRUE(false);
+    FAIL();
   }
 }
 
diff --git a/third_party/upb/upb/io/BUILD b/third_party/upb/upb/io/BUILD
index 539ca67c4f130..31648646baf5f 100644
--- a/third_party/upb/upb/io/BUILD
+++ b/third_party/upb/upb/io/BUILD
@@ -1,13 +1,13 @@
 # begin:google_only
-# package(default_applicable_licenses = ["//:license"])
+# package(default_applicable_licenses = ["//upb:license"])
 # end:google_only
 
 cc_library(
     name = "string",
     hdrs = ["string.h"],
     deps = [
-        "//:mem",
-        "//:port",
+        "//upb:mem",
+        "//upb:port",
     ],
 )
 
@@ -18,10 +18,10 @@ cc_library(
     deps = [
         ":string",
         ":zero_copy_stream",
-        "//:base",
-        "//:lex",
-        "//:mem",
-        "//:port",
+        "//upb:base",
+        "//upb:lex",
+        "//upb:mem",
+        "//upb:port",
     ],
 )
 
@@ -32,9 +32,9 @@ cc_library(
         "zero_copy_output_stream.h",
     ],
     deps = [
-        "//:base",
-        "//:mem",
-        "//:port",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:port",
     ],
 )
 
@@ -53,8 +53,8 @@ cc_library(
     ],
     deps = [
         ":zero_copy_stream",
-        "//:upb",
-        "//:port",
+        "//upb:mem",
+        "//upb:port",
     ],
 )
 
@@ -64,8 +64,8 @@ cc_test(
     srcs = ["string_test.cc"],
     deps = [
         ":string",
-        "//:upb",
         "@com_google_googletest//:gtest_main",
+        "//upb:mem",
     ],
 )
 
@@ -78,12 +78,12 @@ cc_test(
         ":string",
         ":tokenizer",
         ":zero_copy_stream",
+        "@com_google_googletest//:gtest_main",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
-        "//:upb",
-        "//:lex",
-        "//:port",
-        "@com_google_googletest//:gtest_main",
+        "//upb:lex",
+        "//upb:mem",
+        "//upb:port",
     ],
 )
 
@@ -96,7 +96,8 @@ cc_test(
     deps = [
         ":chunked_stream",
         ":zero_copy_stream",
-        "//:upb",
         "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
     ],
 )
diff --git a/third_party/upb/upb/io/chunked_input_stream.c b/third_party/upb/upb/io/chunked_input_stream.c
index 0b456de50fede..0493cf59b1ea1 100644
--- a/third_party/upb/upb/io/chunked_input_stream.c
+++ b/third_party/upb/upb/io/chunked_input_stream.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/io/chunked_input_stream.h"
 
diff --git a/third_party/upb/upb/io/chunked_input_stream.h b/third_party/upb/upb/io/chunked_input_stream.h
index 909ae3f945ea3..e872075c6cb7e 100644
--- a/third_party/upb/upb/io/chunked_input_stream.h
+++ b/third_party/upb/upb/io/chunked_input_stream.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_IO_CHUNKED_INPUT_STREAM_H_
 #define UPB_IO_CHUNKED_INPUT_STREAM_H_
diff --git a/third_party/upb/upb/io/chunked_output_stream.c b/third_party/upb/upb/io/chunked_output_stream.c
index 9dc2375f5ae87..a960fbf665e45 100644
--- a/third_party/upb/upb/io/chunked_output_stream.c
+++ b/third_party/upb/upb/io/chunked_output_stream.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/io/chunked_output_stream.h"
 
diff --git a/third_party/upb/upb/io/chunked_output_stream.h b/third_party/upb/upb/io/chunked_output_stream.h
index e5487199c0f3f..2e1e31f4fbda3 100644
--- a/third_party/upb/upb/io/chunked_output_stream.h
+++ b/third_party/upb/upb/io/chunked_output_stream.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_IO_CHUNKED_OUTPUT_STREAM_H_
 #define UPB_IO_CHUNKED_OUTPUT_STREAM_H_
diff --git a/third_party/upb/upb/io/string.h b/third_party/upb/upb/io/string.h
index 4aee795181d24..ffaffb009bf02 100644
--- a/third_party/upb/upb/io/string.h
+++ b/third_party/upb/upb/io/string.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // An attempt to provide some of the C++ string functionality in C.
 // Function names generally match those of corresponding C++ string methods.
@@ -49,7 +29,7 @@ extern "C" {
 #endif
 
 // Do not directly access the fields of this struct - use the accessors only.
-// TODO(salo): Add a small (16 bytes, maybe?) internal buffer so we can avoid
+// TODO: Add a small (16 bytes, maybe?) internal buffer so we can avoid
 // hitting the arena for short strings.
 typedef struct {
   size_t size_;
diff --git a/third_party/upb/upb/io/string_test.cc b/third_party/upb/upb/io/string_test.cc
index 42b49309db513..dcdaa4d77f289 100644
--- a/third_party/upb/upb/io/string_test.cc
+++ b/third_party/upb/upb/io/string_test.cc
@@ -1,36 +1,16 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/io/string.h"
 
 #include <string.h>
 
-#include "gtest/gtest.h"
-#include "upb/upb.hpp"
+#include <gtest/gtest.h>
+#include "upb/mem/arena.hpp"
 
 TEST(StringTest, Append) {
   upb::Arena arena;
diff --git a/third_party/upb/upb/io/tokenizer.c b/third_party/upb/upb/io/tokenizer.c
index c3d4f966c95ac..cfc1d400f778b 100644
--- a/third_party/upb/upb/io/tokenizer.c
+++ b/third_party/upb/upb/io/tokenizer.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/io/tokenizer.h"
 
diff --git a/third_party/upb/upb/io/tokenizer.h b/third_party/upb/upb/io/tokenizer.h
index d8a6c5c2d0281..3ef7f30a6e8a0 100644
--- a/third_party/upb/upb/io/tokenizer.h
+++ b/third_party/upb/upb/io/tokenizer.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Class for parsing tokenized text from a ZeroCopyInputStream.
 
diff --git a/third_party/upb/upb/io/tokenizer_test.cc b/third_party/upb/upb/io/tokenizer_test.cc
index 35542419b4901..68f93f66863a3 100644
--- a/third_party/upb/upb/io/tokenizer_test.cc
+++ b/third_party/upb/upb/io/tokenizer_test.cc
@@ -1,44 +1,25 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/io/tokenizer.h"
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_format.h"
 #include "upb/io/chunked_input_stream.h"
 #include "upb/io/string.h"
 #include "upb/lex/unicode.h"
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 // Must be last.
 #include "upb/port/def.inc"
 
-namespace proto2 {
+namespace google {
+namespace protobuf {
 namespace io {
 namespace {
 
@@ -53,11 +34,11 @@ static bool StringEquals(const char* a, const char* b) {
 // ===================================================================
 // Data-Driven Test Infrastructure
 
-// TODO(kenton):  This is copied from coded_stream_unittest.  This is
-//   temporary until these features are integrated into gUnit itself.
+// TODO:  This is copied from coded_stream_unittest.  This is
+//   temporary until these features are integrated into gTest itself.
 
 // TEST_1D and TEST_2D are macros I'd eventually like to see added to
-// gUnit.  These macros can be used to declare tests which should be
+// gTest.  These macros can be used to declare tests which should be
 // run multiple times, once for each item in some input array.  TEST_1D
 // tests all cases in a single input array.  TEST_2D tests all
 // combinations of cases from two arrays.  The arrays must be statically
@@ -209,7 +190,7 @@ TEST_2D(TokenizerTest, SimpleTokens, kSimpleTokenCases, kBlockSizes) {
   auto input = TestInputStream(kSimpleTokenCases_case.input.data(),
                                kSimpleTokenCases_case.input.size(),
                                kBlockSizes_case, arena.ptr());
-  auto t = upb_Tokenizer_New(NULL, 0, input, 0, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, 0, arena.ptr());
 
   // Before Next() is called, the initial token should always be TYPE_START.
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Start);
@@ -219,7 +200,7 @@ TEST_2D(TokenizerTest, SimpleTokens, kSimpleTokenCases, kBlockSizes) {
   EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), ""));
 
   // Parse the token.
-  EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+  EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
   // Check that it has the right type.
   EXPECT_EQ(upb_Tokenizer_Type(t), kSimpleTokenCases_case.type);
   // Check that it contains the complete input text.
@@ -255,23 +236,23 @@ TEST_1D(TokenizerTest, FloatSuffix, kBlockSizes) {
   auto input =
       TestInputStream(text, strlen(text), kBlockSizes_case, arena.ptr());
   const int options = kUpb_TokenizerOption_AllowFAfterFloat;
-  auto t = upb_Tokenizer_New(NULL, 0, input, options, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, options, arena.ptr());
 
   // Advance through tokens and check that they are parsed as expected.
 
-  EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+  EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Float);
   EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), "1f"));
 
-  EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+  EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Float);
   EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), "2.5f"));
 
-  EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+  EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Float);
   EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), "6e3f"));
 
-  EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+  EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Float);
   EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), "7F"));
 
@@ -301,23 +282,23 @@ TEST_2D(TokenizerTest, Whitespace, kWhitespaceTokenCases, kBlockSizes) {
     auto input = TestInputStream(kWhitespaceTokenCases_case.input.data(),
                                  kWhitespaceTokenCases_case.input.size(),
                                  kBlockSizes_case, arena.ptr());
-    auto t = upb_Tokenizer_New(NULL, 0, input, 0, arena.ptr());
+    auto t = upb_Tokenizer_New(nullptr, 0, input, 0, arena.ptr());
 
-    EXPECT_FALSE(upb_Tokenizer_Next(t, NULL));
+    EXPECT_FALSE(upb_Tokenizer_Next(t, nullptr));
   }
   {
     auto input = TestInputStream(kWhitespaceTokenCases_case.input.data(),
                                  kWhitespaceTokenCases_case.input.size(),
                                  kBlockSizes_case, arena.ptr());
     const int options = kUpb_TokenizerOption_ReportNewlines;
-    auto t = upb_Tokenizer_New(NULL, 0, input, options, arena.ptr());
+    auto t = upb_Tokenizer_New(nullptr, 0, input, options, arena.ptr());
 
-    EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+    EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
 
     EXPECT_EQ(upb_Tokenizer_Type(t), kWhitespaceTokenCases_case.type);
     EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t),
                              kWhitespaceTokenCases_case.input.data()));
-    EXPECT_FALSE(upb_Tokenizer_Next(t, NULL));
+    EXPECT_FALSE(upb_Tokenizer_Next(t, nullptr));
   }
 }
 
@@ -442,7 +423,7 @@ TEST_2D(TokenizerTest, MultipleTokens, kMultiTokenCases, kBlockSizes) {
   auto input = TestInputStream(kMultiTokenCases_case.input.data(),
                                kMultiTokenCases_case.input.size(),
                                kBlockSizes_case, arena.ptr());
-  auto t = upb_Tokenizer_New(NULL, 0, input, 0, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, 0, arena.ptr());
 
   // Before Next() is called, the initial token should always be TYPE_START.
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Start);
@@ -467,7 +448,7 @@ TEST_2D(TokenizerTest, MultipleTokens, kMultiTokenCases, kBlockSizes) {
       EXPECT_FALSE(upb_Tokenizer_Next(t, &status));
       EXPECT_TRUE(upb_Status_IsOk(&status));
     } else {
-      EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+      EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
     }
 
     // Check that the token matches the expected one.
@@ -509,7 +490,7 @@ TEST_2D(TokenizerTest, MultipleWhitespaceTokens, kMultiWhitespaceTokenCases,
                                kMultiWhitespaceTokenCases_case.input.size(),
                                kBlockSizes_case, arena.ptr());
   const int options = kUpb_TokenizerOption_ReportNewlines;
-  auto t = upb_Tokenizer_New(NULL, 0, input, options, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, options, arena.ptr());
 
   // Before Next() is called, the initial token should always be TYPE_START.
   EXPECT_EQ(upb_Tokenizer_Type(t), kUpb_TokenType_Start);
@@ -534,7 +515,7 @@ TEST_2D(TokenizerTest, MultipleWhitespaceTokens, kMultiWhitespaceTokenCases,
       EXPECT_FALSE(upb_Tokenizer_Next(t, &status));
       EXPECT_TRUE(upb_Status_IsOk(&status));
     } else {
-      EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+      EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
     }
 
     // Check that the token matches the expected one.
@@ -568,11 +549,11 @@ TEST_1D(TokenizerTest, ShCommentStyle, kBlockSizes) {
   auto input =
       TestInputStream(text, strlen(text), kBlockSizes_case, arena.ptr());
   const int options = kUpb_TokenizerOption_CommentStyleShell;
-  auto t = upb_Tokenizer_New(NULL, 0, input, options, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, options, arena.ptr());
 
   // Advance through tokens and check that they are parsed as expected.
   for (size_t i = 0; i < arraysize(kTokens); i++) {
-    EXPECT_TRUE(upb_Tokenizer_Next(t, NULL));
+    EXPECT_TRUE(upb_Tokenizer_Next(t, nullptr));
     EXPECT_TRUE(StringEquals(upb_Tokenizer_TextData(t), kTokens[i]));
   }
 
@@ -587,7 +568,7 @@ TEST_1D(TokenizerTest, ShCommentStyle, kBlockSizes) {
 
 // -------------------------------------------------------------------
 
-#if 0  // TODO(salo): Extended comments are currently unimplemented.
+#if 0  // TODO: Extended comments are currently unimplemented.
 
 // In each case, the input is expected to have two tokens named "prev" and
 // "next" with comments in between.
@@ -748,7 +729,7 @@ TEST_2D(TokenizerTest, DocComments, kDocCommentCases, kBlockSizes) {
   std::string next_leading_comments;
   tokenizer.NextWithComments(&prev_trailing_comments, &detached_comments,
                              &next_leading_comments);
-  tokenizer2.NextWithComments(NULL, NULL, NULL);
+  tokenizer2.NextWithComments(nullptr, nullptr, nullptr);
   EXPECT_EQ("next", tokenizer.current().text);
   EXPECT_EQ("next", tokenizer2.current().text);
 
@@ -757,12 +738,12 @@ TEST_2D(TokenizerTest, DocComments, kDocCommentCases, kBlockSizes) {
 
   for (int i = 0; i < detached_comments.size(); i++) {
     EXPECT_LT(i, arraysize(kDocCommentCases));
-    EXPECT_TRUE(kDocCommentCases_case.detached_comments[i] != NULL);
+    EXPECT_TRUE(kDocCommentCases_case.detached_comments[i] != nullptr);
     EXPECT_EQ(kDocCommentCases_case.detached_comments[i], detached_comments[i]);
   }
 
   // Verify that we matched all the detached comments.
-  EXPECT_EQ(NULL,
+  EXPECT_EQ(nullptr,
             kDocCommentCases_case.detached_comments[detached_comments.size()]);
 
   EXPECT_EQ(kDocCommentCases_case.next_leading_comments, next_leading_comments);
@@ -773,7 +754,7 @@ TEST_2D(TokenizerTest, DocComments, kDocCommentCases, kBlockSizes) {
 // -------------------------------------------------------------------
 
 // Test parse helpers.
-// TODO(b/225783758): Add a fuzz test for this.
+// TODO: Add a fuzz test for this.
 TEST_F(TokenizerTest, ParseInteger) {
   EXPECT_EQ(0, ParseInteger("0"));
   EXPECT_EQ(123, ParseInteger("123"));
@@ -1103,7 +1084,7 @@ TEST_2D(TokenizerTest, Errors, kErrorCases, kBlockSizes) {
   auto input = TestInputStream(kErrorCases_case.input.data(),
                                kErrorCases_case.input.size(), kBlockSizes_case,
                                arena.ptr());
-  auto t = upb_Tokenizer_New(NULL, 0, input, 0, arena.ptr());
+  auto t = upb_Tokenizer_New(nullptr, 0, input, 0, arena.ptr());
 
   upb_Status status;
   upb_Status_Clear(&status);
@@ -1123,8 +1104,8 @@ TEST_1D(TokenizerTest, BackUpOnDestruction, kBlockSizes) {
       TestInputStream(text.data(), text.size(), kBlockSizes_case, arena.ptr());
 
   // Create a tokenizer, read one token, then destroy it.
-  auto t = upb_Tokenizer_New(NULL, 0, input, 0, arena.ptr());
-  upb_Tokenizer_Next(t, NULL);
+  auto t = upb_Tokenizer_New(nullptr, 0, input, 0, arena.ptr());
+  upb_Tokenizer_Next(t, nullptr);
   upb_Tokenizer_Fini(t);
 
   // Only "foo" should have been read.
@@ -1250,4 +1231,5 @@ TEST(TokenizerHandlesUnicode, NonBMPCodes) {
 
 }  // namespace
 }  // namespace io
-}  // namespace proto2
+}  // namespace protobuf
+}  // namespace google
diff --git a/third_party/upb/upb/io/zero_copy_input_stream.h b/third_party/upb/upb/io/zero_copy_input_stream.h
index 62520fc2b65fc..e5b05ec2fd8b3 100644
--- a/third_party/upb/upb/io/zero_copy_input_stream.h
+++ b/third_party/upb/upb/io/zero_copy_input_stream.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_IO_ZERO_COPY_INPUT_STREAM_H_
 #define UPB_IO_ZERO_COPY_INPUT_STREAM_H_
diff --git a/third_party/upb/upb/io/zero_copy_output_stream.h b/third_party/upb/upb/io/zero_copy_output_stream.h
index 9fd75babb05ea..dae386a4e3a8b 100644
--- a/third_party/upb/upb/io/zero_copy_output_stream.h
+++ b/third_party/upb/upb/io/zero_copy_output_stream.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_IO_ZERO_COPY_OUTPUT_STREAM_H_
 #define UPB_IO_ZERO_COPY_OUTPUT_STREAM_H_
diff --git a/third_party/upb/upb/io/zero_copy_stream_test.cc b/third_party/upb/upb/io/zero_copy_stream_test.cc
index 6cdb4f2eae6b5..392d924848b5f 100644
--- a/third_party/upb/upb/io/zero_copy_stream_test.cc
+++ b/third_party/upb/upb/io/zero_copy_stream_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Testing strategy:  For each type of I/O (array, string, file, etc.) we
 // create an output stream and write some data to it, then create a
@@ -34,10 +14,11 @@
 // process is run with a variety of block sizes for both the input and
 // the output.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+#include "upb/base/status.hpp"
 #include "upb/io/chunked_input_stream.h"
 #include "upb/io/chunked_output_stream.h"
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 namespace upb {
 namespace {
diff --git a/third_party/upb/upb/json/BUILD b/third_party/upb/upb/json/BUILD
index 9a2ff40d91321..31840a4f29a98 100644
--- a/third_party/upb/upb/json/BUILD
+++ b/third_party/upb/upb/json/BUILD
@@ -1,4 +1,4 @@
-# TODO(haberman): describe this package.
+# TODO: describe this package.
 
 load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 load(
@@ -20,11 +20,11 @@ cc_library(
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
     deps = [
-        "//:collections",
-        "//:lex",
-        "//:port",
-        "//:reflection",
-        "//:wire",
+        "//upb:lex",
+        "//upb:message",
+        "//upb:port",
+        "//upb:reflection",
+        "//upb:wire",
     ],
 )
 
@@ -36,9 +36,9 @@ cc_test(
         ":struct_upb_proto",
         ":test_upb_proto",
         ":test_upb_proto_reflection",
-        "//:reflection",
-        "//:upb",
         "@com_google_googletest//:gtest_main",
+        "//upb:mem",
+        "//upb:reflection",
     ],
 )
 
@@ -50,9 +50,10 @@ cc_test(
         ":struct_upb_proto",
         ":test_upb_proto",
         ":test_upb_proto_reflection",
-        "//:reflection",
-        "//:upb",
         "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:reflection",
     ],
 )
 
@@ -60,7 +61,7 @@ proto_library(
     name = "test_proto",
     testonly = 1,
     srcs = ["test.proto"],
-    deps = ["@com_google_protobuf//:struct_proto"],
+    deps = ["//:struct_proto"],
 )
 
 upb_proto_library(
@@ -79,5 +80,5 @@ upb_proto_reflection_library(
 upb_proto_library(
     name = "struct_upb_proto",
     testonly = 1,
-    deps = ["@com_google_protobuf//:struct_proto"],
+    deps = ["//:struct_proto"],
 )
diff --git a/third_party/upb/upb/json/decode.c b/third_party/upb/upb/json/decode.c
index 51a0937b5e964..5b7fc3d9f4bee 100644
--- a/third_party/upb/upb/json/decode.c
+++ b/third_party/upb/upb/json/decode.c
@@ -1,29 +1,32 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "upb/json/decode.h"
 
@@ -35,9 +38,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "upb/collections/map.h"
 #include "upb/lex/atoi.h"
 #include "upb/lex/unicode.h"
+#include "upb/message/map.h"
 #include "upb/reflection/message.h"
 #include "upb/wire/encode.h"
 
@@ -1394,7 +1397,7 @@ static void jsondec_any(jsondec* d, upb_Message* msg, const upb_MessageDef* m) {
   upb_EncodeStatus status =
       upb_Encode(any_msg, upb_MessageDef_MiniTable(any_m), 0, d->arena,
                  (char**)&encoded.str_val.data, &encoded.str_val.size);
-  // TODO(b/235839510): We should fail gracefully here on a bad return status.
+  // TODO: We should fail gracefully here on a bad return status.
   UPB_ASSERT(status == kUpb_EncodeStatus_Ok);
   upb_Message_SetFieldByDef(msg, value_f, encoded, d->arena);
 }
diff --git a/third_party/upb/upb/json/decode.h b/third_party/upb/upb/json/decode.h
index 7f8b8554d3eb1..8f5879738a4f9 100644
--- a/third_party/upb/upb/json/decode.h
+++ b/third_party/upb/upb/json/decode.h
@@ -1,29 +1,32 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef UPB_JSON_DECODE_H_
 #define UPB_JSON_DECODE_H_
@@ -39,9 +42,9 @@ extern "C" {
 
 enum { upb_JsonDecode_IgnoreUnknown = 1 };
 
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
-                    const upb_MessageDef* m, const upb_DefPool* symtab,
-                    int options, upb_Arena* arena, upb_Status* status);
+UPB_API bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
+                            const upb_MessageDef* m, const upb_DefPool* symtab,
+                            int options, upb_Arena* arena, upb_Status* status);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/json/decode_test.cc b/third_party/upb/upb/json/decode_test.cc
index deb40f4ad1c81..9d40b02b74e21 100644
--- a/third_party/upb/upb/json/decode_test.cc
+++ b/third_party/upb/upb/json/decode_test.cc
@@ -1,38 +1,41 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "upb/json/decode.h"
 
 #include "google/protobuf/struct.upb.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "upb/json/test.upb.h"
 #include "upb/json/test.upbdefs.h"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
-#include "upb/upb.hpp"
 
 static upb_test_Box* JsonDecode(const char* json, upb_Arena* a) {
   upb::Status status;
@@ -89,3 +92,11 @@ TEST(JsonTest, DecodeFloats) {
     EXPECT_EQ(box, nullptr);
   }
 }
+
+TEST(JsonTest, DecodeConflictJsonName) {
+  upb::Arena a;
+  std::string json_string = R"({"value": 2})";
+  upb_test_Box* box = JsonDecode(json_string.c_str(), a.ptr());
+  EXPECT_EQ(2, upb_test_Box_new_value(box));
+  EXPECT_EQ(0, upb_test_Box_value(box));
+}
diff --git a/third_party/upb/upb/json/encode.c b/third_party/upb/upb/json/encode.c
index 325131c1f629c..1ec9f83665b48 100644
--- a/third_party/upb/upb/json/encode.c
+++ b/third_party/upb/upb/json/encode.c
@@ -1,29 +1,32 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "upb/json/encode.h"
 
@@ -34,8 +37,8 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "upb/collections/map.h"
 #include "upb/lex/round_trip.h"
+#include "upb/message/map.h"
 #include "upb/port/vsnprintf_compat.h"
 #include "upb/reflection/message.h"
 #include "upb/wire/decode.h"
@@ -519,7 +522,7 @@ static void jsonenc_listvalue(jsonenc* e, const upb_Message* msg,
 
 static void jsonenc_value(jsonenc* e, const upb_Message* msg,
                           const upb_MessageDef* m) {
-  /* TODO(haberman): do we want a reflection method to get oneof case? */
+  /* TODO: do we want a reflection method to get oneof case? */
   size_t iter = kUpb_Message_Begin;
   const upb_FieldDef* f;
   upb_MessageValue val;
diff --git a/third_party/upb/upb/json/encode.h b/third_party/upb/upb/json/encode.h
index ad9444a3e23c2..ec8b25b3e4650 100644
--- a/third_party/upb/upb/json/encode.h
+++ b/third_party/upb/upb/json/encode.h
@@ -1,29 +1,32 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef UPB_JSON_ENCODE_H_
 #define UPB_JSON_ENCODE_H_
@@ -38,7 +41,7 @@ extern "C" {
 #endif
 
 enum {
-  /* When set, emits 0/default values.  TODO(haberman): proto3 only? */
+  /* When set, emits 0/default values.  TODO: proto3 only? */
   upb_JsonEncode_EmitDefaults = 1 << 0,
 
   /* When set, use normal (snake_case) field names instead of JSON (camelCase)
@@ -50,16 +53,16 @@ enum {
 };
 
 /* Encodes the given |msg| to JSON format.  The message's reflection is given in
- * |m|.  The symtab in |symtab| is used to find extensions (if NULL, extensions
- * will not be printed).
+ * |m|.  The DefPool in |ext_pool| is used to find extensions (if NULL,
+ * extensions will not be printed).
  *
  * Output is placed in the given buffer, and always NULL-terminated.  The output
  * size (excluding NULL) is returned.  This means that a return value >= |size|
  * implies that the output was truncated.  (These are the same semantics as
  * snprintf()). */
-size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size, upb_Status* status);
+UPB_API size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
+                              const upb_DefPool* ext_pool, int options,
+                              char* buf, size_t size, upb_Status* status);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/json/encode_test.cc b/third_party/upb/upb/json/encode_test.cc
index 4c0d1a7745798..a79c00799c1f4 100644
--- a/third_party/upb/upb/json/encode_test.cc
+++ b/third_party/upb/upb/json/encode_test.cc
@@ -1,38 +1,46 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "upb/json/encode.h"
 
+#include <cstddef>
+#include <string>
+
 #include "google/protobuf/struct.upb.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+#include "upb/base/status.hpp"
 #include "upb/json/test.upb.h"
 #include "upb/json/test.upbdefs.h"
+#include "upb/mem/arena.h"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
-#include "upb/upb.hpp"
 
 static std::string JsonEncode(const upb_test_Box* msg, int options) {
   upb::Arena a;
@@ -41,8 +49,8 @@ static std::string JsonEncode(const upb_test_Box* msg, int options) {
   upb::MessageDefPtr m(upb_test_Box_getmsgdef(defpool.ptr()));
   EXPECT_TRUE(m.ptr() != nullptr);
 
-  size_t json_size = upb_JsonEncode(msg, m.ptr(), defpool.ptr(), options, NULL,
-                                    0, status.ptr());
+  size_t json_size = upb_JsonEncode(msg, m.ptr(), defpool.ptr(), options,
+                                    nullptr, 0, status.ptr());
   char* json_buf = (char*)upb_Arena_Malloc(a.ptr(), json_size + 1);
 
   size_t size = upb_JsonEncode(msg, m.ptr(), defpool.ptr(), options, json_buf,
@@ -99,3 +107,14 @@ TEST(JsonTest, EncodeNullEnum) {
   EXPECT_EQ(R"({"val":null})",
             JsonEncode(foo, upb_JsonEncode_FormatEnumsAsIntegers));
 }
+
+TEST(JsonTest, EncodeConflictJsonName) {
+  upb::Arena a;
+  upb_test_Box* box = upb_test_Box_new(a.ptr());
+  upb_test_Box_set_value(box, 2);
+  EXPECT_EQ(R"({"old_value":2})", JsonEncode(box, 0));
+
+  upb_test_Box* new_box = upb_test_Box_new(a.ptr());
+  upb_test_Box_set_new_value(new_box, 2);
+  EXPECT_EQ(R"({"value":2})", JsonEncode(new_box, 0));
+}
diff --git a/third_party/upb/upb/json/test.proto b/third_party/upb/upb/json/test.proto
index 0765333f5eeba..b3980a63f5863 100644
--- a/third_party/upb/upb/json/test.proto
+++ b/third_party/upb/upb/json/test.proto
@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 syntax = "proto2";
 
 package upb_test;
@@ -19,4 +49,6 @@ message Box {
   optional google.protobuf.Value val = 6;
   optional float f = 7;
   optional double d = 8;
+  optional int32 value = 9 [json_name = "old_value"];
+  optional int32 new_value = 10 [json_name = "value"];
 }
diff --git a/third_party/upb/upb/lex/BUILD b/third_party/upb/upb/lex/BUILD
new file mode 100644
index 0000000000000..664074b85f7d0
--- /dev/null
+++ b/third_party/upb/upb/lex/BUILD
@@ -0,0 +1,53 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "lex",
+    srcs = [
+        "atoi.c",
+        "round_trip.c",
+        "strtod.c",
+        "unicode.c",
+    ],
+    hdrs = [
+        "atoi.h",
+        "round_trip.h",
+        "strtod.h",
+        "unicode.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = ["//upb:port"],
+)
+
+cc_test(
+    name = "atoi_test",
+    srcs = ["atoi_test.cc"],
+    deps = [
+        ":lex",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/lex/atoi.c b/third_party/upb/upb/lex/atoi.c
index 35bebfce9ff5d..720aacf29b575 100644
--- a/third_party/upb/upb/lex/atoi.c
+++ b/third_party/upb/upb/lex/atoi.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/lex/atoi.h"
 
diff --git a/third_party/upb/upb/lex/atoi.h b/third_party/upb/upb/lex/atoi.h
index e8f37119a2135..6d57fa07f72c7 100644
--- a/third_party/upb/upb/lex/atoi.h
+++ b/third_party/upb/upb/lex/atoi.h
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_LEX_ATOI_H_
 #define UPB_LEX_ATOI_H_
 
+#include <stdint.h>
+
 // Must be last.
 #include "upb/port/def.inc"
 
diff --git a/third_party/upb/upb/lex/atoi_test.cc b/third_party/upb/upb/lex/atoi_test.cc
index 40fc9731638fd..edd949fb5c901 100644
--- a/third_party/upb/upb/lex/atoi_test.cc
+++ b/third_party/upb/upb/lex/atoi_test.cc
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/lex/atoi.h"
 
-#include "gtest/gtest.h"
+#include <string.h>
+
+#include <gtest/gtest.h>
 #include "absl/strings/str_cat.h"
 
 TEST(AtoiTest, Uint64) {
@@ -51,7 +33,7 @@ TEST(AtoiTest, Uint64) {
 
   // Integer overflow
   const char* u = "1000000000000000000000000000000";
-  EXPECT_EQ(NULL, upb_BufToUint64(u, u + strlen(u), &val));
+  EXPECT_EQ(nullptr, upb_BufToUint64(u, u + strlen(u), &val));
 
   // Not an integer
   const char* v = "foobar";
@@ -78,19 +60,19 @@ TEST(AtoiTest, Int64) {
   EXPECT_EQ(s + 1, upb_BufToInt64(s, s + 1, &val, &neg));
   EXPECT_EQ(val, 1);
   EXPECT_EQ(neg, false);
-  EXPECT_EQ(s + 4, upb_BufToInt64(s, s + 4, &val, NULL));
+  EXPECT_EQ(s + 4, upb_BufToInt64(s, s + 4, &val, nullptr));
   EXPECT_EQ(val, 1234);
-  EXPECT_EQ(s + 4, upb_BufToInt64(s, s + 5, &val, NULL));
+  EXPECT_EQ(s + 4, upb_BufToInt64(s, s + 5, &val, nullptr));
   EXPECT_EQ(val, 1234);
 
   const char* t = "-42.6";
   EXPECT_EQ(t + 2, upb_BufToInt64(t, t + 2, &val, &neg));
   EXPECT_EQ(val, -4);
   EXPECT_EQ(neg, true);
-  EXPECT_EQ(t + 3, upb_BufToInt64(t, t + 3, &val, NULL));
+  EXPECT_EQ(t + 3, upb_BufToInt64(t, t + 3, &val, nullptr));
   EXPECT_EQ(val, -42);
   EXPECT_EQ(neg, true);
-  EXPECT_EQ(t + 3, upb_BufToInt64(t, t + 5, &val, NULL));
+  EXPECT_EQ(t + 3, upb_BufToInt64(t, t + 5, &val, nullptr));
   EXPECT_EQ(val, -42);
 
   const int64_t values[] = {
@@ -103,7 +85,7 @@ TEST(AtoiTest, Int64) {
     std::string v = absl::StrCat(values[i]);
     const char* ptr = v.c_str();
     const char* end = ptr + strlen(ptr);
-    EXPECT_EQ(end, upb_BufToInt64(ptr, end, &val, NULL));
+    EXPECT_EQ(end, upb_BufToInt64(ptr, end, &val, nullptr));
     EXPECT_EQ(val, values[i]);
   }
 }
diff --git a/third_party/upb/upb/lex/round_trip.c b/third_party/upb/upb/lex/round_trip.c
index f4d95453a1bde..13104341b1495 100644
--- a/third_party/upb/upb/lex/round_trip.c
+++ b/third_party/upb/upb/lex/round_trip.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/lex/round_trip.h"
 
diff --git a/third_party/upb/upb/lex/round_trip.h b/third_party/upb/upb/lex/round_trip.h
index 307910b477cd6..0306c4494dd4b 100644
--- a/third_party/upb/upb/lex/round_trip.h
+++ b/third_party/upb/upb/lex/round_trip.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_LEX_ROUND_TRIP_H_
 #define UPB_LEX_ROUND_TRIP_H_
diff --git a/third_party/upb/upb/lex/strtod.c b/third_party/upb/upb/lex/strtod.c
index 2b3c61e3657ff..d59e369934557 100644
--- a/third_party/upb/upb/lex/strtod.c
+++ b/third_party/upb/upb/lex/strtod.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/lex/strtod.h"
 
diff --git a/third_party/upb/upb/lex/strtod.h b/third_party/upb/upb/lex/strtod.h
index bda9242513aca..86b18dbcbee29 100644
--- a/third_party/upb/upb/lex/strtod.h
+++ b/third_party/upb/upb/lex/strtod.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_LEX_STRTOD_H_
 #define UPB_LEX_STRTOD_H_
diff --git a/third_party/upb/upb/lex/unicode.c b/third_party/upb/upb/lex/unicode.c
index ec08c34a3236b..53121e977578b 100644
--- a/third_party/upb/upb/lex/unicode.c
+++ b/third_party/upb/upb/lex/unicode.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/lex/unicode.h"
 
diff --git a/third_party/upb/upb/lex/unicode.h b/third_party/upb/upb/lex/unicode.h
index c7407ff606b16..9b8a4051e7808 100644
--- a/third_party/upb/upb/lex/unicode.h
+++ b/third_party/upb/upb/lex/unicode.h
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_LEX_UNICODE_H_
 #define UPB_LEX_UNICODE_H_
 
+#include <stdint.h>
+
 // Must be last.
 #include "upb/port/def.inc"
 
diff --git a/third_party/upb/upb/map.h b/third_party/upb/upb/map.h
deleted file mode 100644
index 9ce69f69fc6b8..0000000000000
--- a/third_party/upb/upb/map.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/collections/map.h instead
-// IWYU pragma: private, include "upb/collections/map.h"
-
-#ifndef UPB_MAP_H_
-#define UPB_MAP_H_
-
-#include "upb/collections/map.h"
-
-#endif /* UPB_MAP_H_ */
diff --git a/third_party/upb/upb/mem/BUILD b/third_party/upb/upb/mem/BUILD
new file mode 100644
index 0000000000000..f6bc19e7f1022
--- /dev/null
+++ b/third_party/upb/upb/mem/BUILD
@@ -0,0 +1,73 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "mem",
+    hdrs = [
+        "alloc.h",
+        "arena.h",
+        "arena.hpp",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    srcs = [
+        "alloc.c",
+        "alloc.h",
+        "arena.c",
+        "arena.h",
+    ],
+    hdrs = [
+        "internal/arena.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//upb:__pkg__"],
+    deps = [
+        "//upb:port",
+    ],
+)
+
+cc_test(
+    name = "arena_test",
+    srcs = ["arena_test.cc"],
+    deps = [
+        "@com_google_googletest//:gtest_main",
+        "//upb:mem",
+        "//upb:mem_internal",
+        "//upb:port",
+        "@com_google_absl//absl/random",
+        "@com_google_absl//absl/random:distributions",
+        "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/time",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+            "**/*.hpp",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/mem/alloc.c b/third_party/upb/upb/mem/alloc.c
index 23650655cedb9..d103f98f3097d 100644
--- a/third_party/upb/upb/mem/alloc.c
+++ b/third_party/upb/upb/mem/alloc.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mem/alloc.h"
 
diff --git a/third_party/upb/upb/mem/alloc.h b/third_party/upb/upb/mem/alloc.h
index df7a65ecca1e5..441731d2d8b59 100644
--- a/third_party/upb/upb/mem/alloc.h
+++ b/third_party/upb/upb/mem/alloc.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MEM_ALLOC_H_
 #define UPB_MEM_ALLOC_H_
diff --git a/third_party/upb/upb/mem/arena.c b/third_party/upb/upb/mem/arena.c
index c4037eb28173b..b9d3d9d8f9849 100644
--- a/third_party/upb/upb/mem/arena.c
+++ b/third_party/upb/upb/mem/arena.c
@@ -1,31 +1,12 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/mem/arena_internal.h"
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/mem/internal/arena.h"
+
 #include "upb/port/atomic.h"
 
 // Must be last.
@@ -67,7 +48,7 @@ static _upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {
       //
       // This is true because:
       // - If no fuses occur, this will eventually become the root.
-      // - If fuses are actively occuring, the root may change, but the
+      // - If fuses are actively occurring, the root may change, but the
       //   invariant is that `parent_or_count` merely points to *a* parent.
       //
       // In other words, it is moving towards "the" root, and that root may move
@@ -365,3 +346,23 @@ bool upb_Arena_Fuse(upb_Arena* a1, upb_Arena* a2) {
     }
   }
 }
+
+void upb_Arena_IncRefFor(upb_Arena* arena, const void* owner) {
+  _upb_ArenaRoot r;
+retry:
+  r = _upb_Arena_FindRoot(arena);
+  if (upb_Atomic_CompareExchangeWeak(
+          &r.root->parent_or_count, &r.tagged_count,
+          _upb_Arena_TaggedFromRefcount(
+              _upb_Arena_RefCountFromTagged(r.tagged_count) + 1),
+          memory_order_release, memory_order_acquire)) {
+    // We incremented it successfully, so we are done.
+    return;
+  }
+  // We failed update due to parent switching on the arena.
+  goto retry;
+}
+
+void upb_Arena_DecRefFor(upb_Arena* arena, const void* owner) {
+  upb_Arena_Free(arena);
+}
diff --git a/third_party/upb/upb/mem/arena.h b/third_party/upb/upb/mem/arena.h
index 551fc65623bab..e4afceaa438b2 100644
--- a/third_party/upb/upb/mem/arena.h
+++ b/third_party/upb/upb/mem/arena.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* upb_Arena is a specific allocator implementation that uses arena allocation.
  * The user provides an allocator that will be used to allocate the underlying
@@ -40,6 +20,8 @@
 #ifndef UPB_MEM_ARENA_H_
 #define UPB_MEM_ARENA_H_
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 #include "upb/mem/alloc.h"
@@ -49,14 +31,10 @@
 
 typedef struct upb_Arena upb_Arena;
 
-// LINT.IfChange(arena_head)
-
 typedef struct {
   char *ptr, *end;
 } _upb_ArenaHead;
 
-// LINT.ThenChange(//depot/google3/third_party/upb/js/impl/upb_bits/arena.ts:arena_head)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -69,6 +47,9 @@ UPB_API upb_Arena* upb_Arena_Init(void* mem, size_t n, upb_alloc* alloc);
 UPB_API void upb_Arena_Free(upb_Arena* a);
 UPB_API bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
 
+void upb_Arena_IncRefFor(upb_Arena* arena, const void* owner);
+void upb_Arena_DecRefFor(upb_Arena* arena, const void* owner);
+
 void* _upb_Arena_SlowMalloc(upb_Arena* a, size_t size);
 size_t upb_Arena_SpaceAllocated(upb_Arena* arena);
 uint32_t upb_Arena_DebugRefCount(upb_Arena* arena);
@@ -80,7 +61,8 @@ UPB_INLINE size_t _upb_ArenaHas(upb_Arena* a) {
 
 UPB_API_INLINE void* upb_Arena_Malloc(upb_Arena* a, size_t size) {
   size = UPB_ALIGN_MALLOC(size);
-  if (UPB_UNLIKELY(_upb_ArenaHas(a) < size)) {
+  size_t span = size + UPB_ASAN_GUARD_SIZE;
+  if (UPB_UNLIKELY(_upb_ArenaHas(a) < span)) {
     return _upb_Arena_SlowMalloc(a, size);
   }
 
@@ -91,18 +73,7 @@ UPB_API_INLINE void* upb_Arena_Malloc(upb_Arena* a, size_t size) {
   UPB_ASSERT(UPB_ALIGN_MALLOC(size) == size);
   UPB_UNPOISON_MEMORY_REGION(ret, size);
 
-  h->ptr += size;
-
-#if UPB_ASAN
-  {
-    size_t guard_size = 32;
-    if (_upb_ArenaHas(a) >= guard_size) {
-      h->ptr += guard_size;
-    } else {
-      h->ptr = h->end;
-    }
-  }
-#endif
+  h->ptr += span;
 
   return ret;
 }
@@ -116,7 +87,8 @@ UPB_API_INLINE void upb_Arena_ShrinkLast(upb_Arena* a, void* ptr,
   _upb_ArenaHead* h = (_upb_ArenaHead*)a;
   oldsize = UPB_ALIGN_MALLOC(oldsize);
   size = UPB_ALIGN_MALLOC(size);
-  UPB_ASSERT((char*)ptr + oldsize == h->ptr);  // Must be the last alloc.
+  // Must be the last alloc.
+  UPB_ASSERT((char*)ptr + oldsize == h->ptr - UPB_ASAN_GUARD_SIZE);
   UPB_ASSERT(size <= oldsize);
   h->ptr = (char*)ptr + size;
 }
diff --git a/third_party/upb/upb/mem/arena.hpp b/third_party/upb/upb/mem/arena.hpp
new file mode 100644
index 0000000000000..4a0bc330f4cf0
--- /dev/null
+++ b/third_party/upb/upb/mem/arena.hpp
@@ -0,0 +1,54 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MEM_ARENA_HPP_
+#define UPB_MEM_ARENA_HPP_
+
+#include <memory>
+
+#include "upb/mem/arena.h"
+
+namespace upb {
+
+class Arena {
+ public:
+  // A simple arena with no initial memory block and the default allocator.
+  Arena() : ptr_(upb_Arena_New(), upb_Arena_Free) {}
+  Arena(char* initial_block, size_t size)
+      : ptr_(upb_Arena_Init(initial_block, size, &upb_alloc_global),
+             upb_Arena_Free) {}
+
+  upb_Arena* ptr() const { return ptr_.get(); }
+
+  void Fuse(Arena& other) { upb_Arena_Fuse(ptr(), other.ptr()); }
+
+ protected:
+  std::unique_ptr<upb_Arena, decltype(&upb_Arena_Free)> ptr_;
+};
+
+// InlinedArena seeds the arenas with a predefined amount of memory.  No
+// heap memory will be allocated until the initial block is exceeded.
+template <int N>
+class InlinedArena : public Arena {
+ public:
+  InlinedArena() : Arena(initial_block_, N) {}
+  ~InlinedArena() {
+    // Explicitly destroy the arena now so that it does not outlive
+    // initial_block_.
+    ptr_.reset();
+  }
+
+ private:
+  InlinedArena(const InlinedArena*) = delete;
+  InlinedArena& operator=(const InlinedArena*) = delete;
+
+  char initial_block_[N];
+};
+
+}  // namespace upb
+
+#endif  // UPB_MEM_ARENA_HPP_
diff --git a/third_party/upb/upb/mem/arena_internal.h b/third_party/upb/upb/mem/arena_internal.h
deleted file mode 100644
index cecc4d7a9de39..0000000000000
--- a/third_party/upb/upb/mem/arena_internal.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_MEM_ARENA_INTERNAL_H_
-#define UPB_MEM_ARENA_INTERNAL_H_
-
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-typedef struct _upb_MemBlock _upb_MemBlock;
-
-struct upb_Arena {
-  _upb_ArenaHead head;
-
-  // upb_alloc* together with a low bit which signals if there is an initial
-  // block.
-  uintptr_t block_alloc;
-
-  // When multiple arenas are fused together, each arena points to a parent
-  // arena (root points to itself). The root tracks how many live arenas
-  // reference it.
-
-  // The low bit is tagged:
-  //   0: pointer to parent
-  //   1: count, left shifted by one
-  UPB_ATOMIC(uintptr_t) parent_or_count;
-
-  // All nodes that are fused together are in a singly-linked list.
-  UPB_ATOMIC(upb_Arena*) next;  // NULL at end of list.
-
-  // The last element of the linked list.  This is present only as an
-  // optimization, so that we do not have to iterate over all members for every
-  // fuse.  Only significant for an arena root.  In other cases it is ignored.
-  UPB_ATOMIC(upb_Arena*) tail;  // == self when no other list members.
-
-  // Linked list of blocks to free/cleanup.  Atomic only for the benefit of
-  // upb_Arena_SpaceAllocated().
-  UPB_ATOMIC(_upb_MemBlock*) blocks;
-};
-
-UPB_INLINE bool _upb_Arena_IsTaggedRefcount(uintptr_t parent_or_count) {
-  return (parent_or_count & 1) == 1;
-}
-
-UPB_INLINE bool _upb_Arena_IsTaggedPointer(uintptr_t parent_or_count) {
-  return (parent_or_count & 1) == 0;
-}
-
-UPB_INLINE uintptr_t _upb_Arena_RefCountFromTagged(uintptr_t parent_or_count) {
-  UPB_ASSERT(_upb_Arena_IsTaggedRefcount(parent_or_count));
-  return parent_or_count >> 1;
-}
-
-UPB_INLINE uintptr_t _upb_Arena_TaggedFromRefcount(uintptr_t refcount) {
-  uintptr_t parent_or_count = (refcount << 1) | 1;
-  UPB_ASSERT(_upb_Arena_IsTaggedRefcount(parent_or_count));
-  return parent_or_count;
-}
-
-UPB_INLINE upb_Arena* _upb_Arena_PointerFromTagged(uintptr_t parent_or_count) {
-  UPB_ASSERT(_upb_Arena_IsTaggedPointer(parent_or_count));
-  return (upb_Arena*)parent_or_count;
-}
-
-UPB_INLINE uintptr_t _upb_Arena_TaggedFromPointer(upb_Arena* a) {
-  uintptr_t parent_or_count = (uintptr_t)a;
-  UPB_ASSERT(_upb_Arena_IsTaggedPointer(parent_or_count));
-  return parent_or_count;
-}
-
-UPB_INLINE upb_alloc* upb_Arena_BlockAlloc(upb_Arena* arena) {
-  return (upb_alloc*)(arena->block_alloc & ~0x1);
-}
-
-UPB_INLINE uintptr_t upb_Arena_MakeBlockAlloc(upb_alloc* alloc,
-                                              bool has_initial) {
-  uintptr_t alloc_uint = (uintptr_t)alloc;
-  UPB_ASSERT((alloc_uint & 1) == 0);
-  return alloc_uint | (has_initial ? 1 : 0);
-}
-
-UPB_INLINE bool upb_Arena_HasInitialBlock(upb_Arena* arena) {
-  return arena->block_alloc & 0x1;
-}
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_MEM_ARENA_INTERNAL_H_ */
diff --git a/third_party/upb/upb/mem/arena_test.cc b/third_party/upb/upb/mem/arena_test.cc
index 445122708bdaf..0b13e1a365272 100644
--- a/third_party/upb/upb/mem/arena_test.cc
+++ b/third_party/upb/upb/mem/arena_test.cc
@@ -1,3 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include "upb/mem/arena.h"
 
 #include <array>
@@ -5,14 +12,15 @@
 #include <thread>
 #include <vector>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "absl/random/distributions.h"
 #include "absl/random/random.h"
 #include "absl/synchronization/notification.h"
-#include "upb/upb.hpp"
 
 // Must be last.
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "upb/port/def.inc"
 
 namespace {
@@ -38,7 +46,7 @@ TEST(ArenaTest, FuseWithInitialBlock) {
   char buf2[1024];
   upb_Arena* arenas[] = {upb_Arena_Init(buf1, 1024, &upb_alloc_global),
                          upb_Arena_Init(buf2, 1024, &upb_alloc_global),
-                         upb_Arena_Init(NULL, 0, &upb_alloc_global)};
+                         upb_Arena_Init(nullptr, 0, &upb_alloc_global)};
   int size = sizeof(arenas) / sizeof(arenas[0]);
   for (int i = 0; i < size; ++i) {
     for (int j = 0; j < size; ++j) {
@@ -68,6 +76,15 @@ class Environment {
     if (old != nullptr) upb_Arena_Free(old);
   }
 
+  void RandomIncRefCount(absl::BitGen& gen) {
+    auto* a = SwapRandomly(gen, nullptr);
+    if (a != nullptr) {
+      upb_Arena_IncRefFor(a, nullptr);
+      upb_Arena_DecRefFor(a, nullptr);
+      upb_Arena_Free(a);
+    }
+  }
+
   void RandomFuse(absl::BitGen& gen) {
     std::array<upb_Arena*, 2> old;
     for (auto& o : old) {
@@ -162,6 +179,40 @@ TEST(ArenaTest, FuzzFuseFuseRace) {
   for (auto& t : threads) t.join();
 }
 
+TEST(ArenaTest, ArenaIncRef) {
+  upb_Arena* arena1 = upb_Arena_New();
+  EXPECT_EQ(upb_Arena_DebugRefCount(arena1), 1);
+  upb_Arena_IncRefFor(arena1, nullptr);
+  EXPECT_EQ(upb_Arena_DebugRefCount(arena1), 2);
+  upb_Arena_DecRefFor(arena1, nullptr);
+  EXPECT_EQ(upb_Arena_DebugRefCount(arena1), 1);
+  upb_Arena_Free(arena1);
+}
+
+TEST(ArenaTest, FuzzFuseIncRefCountRace) {
+  Environment env;
+
+  absl::Notification done;
+  std::vector<std::thread> threads;
+  for (int i = 0; i < 10; ++i) {
+    threads.emplace_back([&]() {
+      absl::BitGen gen;
+      while (!done.HasBeenNotified()) {
+        env.RandomNewFree(gen);
+      }
+    });
+  }
+
+  absl::BitGen gen;
+  auto end = absl::Now() + absl::Seconds(2);
+  while (absl::Now() < end) {
+    env.RandomFuse(gen);
+    env.RandomIncRefCount(gen);
+  }
+  done.Notify();
+  for (auto& t : threads) t.join();
+}
+
 #endif
 
 }  // namespace
diff --git a/third_party/upb/upb/mem/internal/arena.h b/third_party/upb/upb/mem/internal/arena.h
new file mode 100644
index 0000000000000..21741c53bab40
--- /dev/null
+++ b/third_party/upb/upb/mem/internal/arena.h
@@ -0,0 +1,94 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MEM_INTERNAL_ARENA_H_
+#define UPB_MEM_INTERNAL_ARENA_H_
+
+#include "upb/mem/arena.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+typedef struct _upb_MemBlock _upb_MemBlock;
+
+struct upb_Arena {
+  _upb_ArenaHead head;
+
+  // upb_alloc* together with a low bit which signals if there is an initial
+  // block.
+  uintptr_t block_alloc;
+
+  // When multiple arenas are fused together, each arena points to a parent
+  // arena (root points to itself). The root tracks how many live arenas
+  // reference it.
+
+  // The low bit is tagged:
+  //   0: pointer to parent
+  //   1: count, left shifted by one
+  UPB_ATOMIC(uintptr_t) parent_or_count;
+
+  // All nodes that are fused together are in a singly-linked list.
+  UPB_ATOMIC(upb_Arena*) next;  // NULL at end of list.
+
+  // The last element of the linked list.  This is present only as an
+  // optimization, so that we do not have to iterate over all members for every
+  // fuse.  Only significant for an arena root.  In other cases it is ignored.
+  UPB_ATOMIC(upb_Arena*) tail;  // == self when no other list members.
+
+  // Linked list of blocks to free/cleanup.  Atomic only for the benefit of
+  // upb_Arena_SpaceAllocated().
+  UPB_ATOMIC(_upb_MemBlock*) blocks;
+};
+
+UPB_INLINE bool _upb_Arena_IsTaggedRefcount(uintptr_t parent_or_count) {
+  return (parent_or_count & 1) == 1;
+}
+
+UPB_INLINE bool _upb_Arena_IsTaggedPointer(uintptr_t parent_or_count) {
+  return (parent_or_count & 1) == 0;
+}
+
+UPB_INLINE uintptr_t _upb_Arena_RefCountFromTagged(uintptr_t parent_or_count) {
+  UPB_ASSERT(_upb_Arena_IsTaggedRefcount(parent_or_count));
+  return parent_or_count >> 1;
+}
+
+UPB_INLINE uintptr_t _upb_Arena_TaggedFromRefcount(uintptr_t refcount) {
+  uintptr_t parent_or_count = (refcount << 1) | 1;
+  UPB_ASSERT(_upb_Arena_IsTaggedRefcount(parent_or_count));
+  return parent_or_count;
+}
+
+UPB_INLINE upb_Arena* _upb_Arena_PointerFromTagged(uintptr_t parent_or_count) {
+  UPB_ASSERT(_upb_Arena_IsTaggedPointer(parent_or_count));
+  return (upb_Arena*)parent_or_count;
+}
+
+UPB_INLINE uintptr_t _upb_Arena_TaggedFromPointer(upb_Arena* a) {
+  uintptr_t parent_or_count = (uintptr_t)a;
+  UPB_ASSERT(_upb_Arena_IsTaggedPointer(parent_or_count));
+  return parent_or_count;
+}
+
+UPB_INLINE upb_alloc* upb_Arena_BlockAlloc(upb_Arena* arena) {
+  return (upb_alloc*)(arena->block_alloc & ~0x1);
+}
+
+UPB_INLINE uintptr_t upb_Arena_MakeBlockAlloc(upb_alloc* alloc,
+                                              bool has_initial) {
+  uintptr_t alloc_uint = (uintptr_t)alloc;
+  UPB_ASSERT((alloc_uint & 1) == 0);
+  return alloc_uint | (has_initial ? 1 : 0);
+}
+
+UPB_INLINE bool upb_Arena_HasInitialBlock(upb_Arena* arena) {
+  return arena->block_alloc & 0x1;
+}
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MEM_INTERNAL_ARENA_H_ */
diff --git a/third_party/upb/upb/message/BUILD b/third_party/upb/upb/message/BUILD
new file mode 100644
index 0000000000000..72a4500e67a3e
--- /dev/null
+++ b/third_party/upb/upb/message/BUILD
@@ -0,0 +1,413 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+load(
+    "//bazel:upb_minitable_proto_library.bzl",
+    "upb_minitable_proto_library",
+)
+load(
+    "//bazel:upb_proto_library.bzl",
+    "upb_proto_library",
+    "upb_proto_reflection_library",
+)
+
+cc_library(
+    name = "accessors",
+    srcs = [
+        "accessors.c",
+        "internal/accessors.h",
+    ],
+    hdrs = [
+        "accessors.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        ":message",
+        "//upb:base",
+        "//upb:eps_copy_input_stream",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
+        "//upb:wire",
+        "//upb:wire_reader",
+    ],
+)
+
+cc_library(
+    name = "accessors_internal",
+    hdrs = [
+        "internal/accessors.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        "//upb:mini_table_internal",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "copy",
+    srcs = [
+        "copy.c",
+    ],
+    hdrs = [
+        "copy.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":accessors",
+        ":internal",
+        ":message",
+        ":types",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    srcs = [
+        "array.c",
+        "array.h",
+        "map.c",
+        "map.h",
+        "map_sorter.c",
+        "message.c",
+        "message.h",
+    ],
+    hdrs = [
+        "internal/array.h",
+        "internal/extension.h",
+        "internal/map.h",
+        "internal/map_entry.h",
+        "internal/map_sorter.h",
+        "internal/message.h",
+        "map_gencode_util.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal_types",
+        ":types",
+        ":value",
+        "//upb:base",
+        "//upb:base_internal",
+        "//upb:hash",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal_types",
+    hdrs = [
+        "internal/types.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+    ],
+)
+
+cc_library(
+    name = "message",
+    hdrs = [
+        "array.h",
+        "map.h",
+        "message.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        ":types",
+        ":value",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "promote",
+    srcs = [
+        "promote.c",
+    ],
+    hdrs = [
+        "promote.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":accessors",
+        ":accessors_internal",
+        ":internal",
+        ":message",
+        ":tagged_ptr",
+        ":types",
+        "//upb:base",
+        "//upb:eps_copy_input_stream",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
+        "//upb:wire",
+        "//upb:wire_internal",
+        "//upb:wire_reader",
+    ],
+)
+
+cc_library(
+    name = "split64",
+    hdrs = [
+        "accessors_split64.h",
+        "array_split64.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":accessors",
+        ":message",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "tagged_ptr",
+    hdrs = ["tagged_ptr.h"],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":types",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "types",
+    hdrs = [
+        "types.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [],
+)
+
+cc_library(
+    name = "value",
+    hdrs = [
+        "value.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":tagged_ptr",
+        ":types",
+        "//upb:base",
+    ],
+)
+
+proto_library(
+    name = "message_test_proto",
+    testonly = 1,
+    srcs = ["test.proto"],
+    deps = ["//src/google/protobuf:test_messages_proto3_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "message_test_upb_minitable_proto",
+    testonly = 1,
+    deps = [":message_test_proto"],
+)
+
+upb_proto_library(
+    name = "message_test_upb_proto",
+    testonly = 1,
+    deps = [":message_test_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "message_test_upb_proto_reflection",
+    testonly = 1,
+    deps = [":message_test_proto"],
+)
+
+cc_test(
+    name = "accessors_test",
+    srcs = ["accessors_test.cc"],
+    deps = [
+        ":accessors",
+        ":message",
+        "//:protobuf",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_descriptor",
+        "//upb:mini_descriptor_internal",
+        "//upb:mini_table",
+        "//upb:port",
+        "//upb:wire",
+        "//upb/test:test_messages_proto2_upb_minitable",
+        "//upb/test:test_messages_proto2_upb_proto",
+        "//upb/test:test_messages_proto3_upb_minitable",
+        "//upb/test:test_messages_proto3_upb_proto",
+        "//upb/test:test_upb_proto",
+        "@com_google_absl//absl/container:flat_hash_set",
+    ],
+)
+
+cc_test(
+    name = "array_test",
+    srcs = ["array_test.cc"],
+    deps = [
+        ":message",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+    ],
+)
+
+cc_test(
+    name = "copy_test",
+    srcs = ["copy_test.cc"],
+    deps = [
+        ":accessors",
+        ":copy",
+        ":internal",
+        ":message",
+        "//:protobuf",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:wire",
+        "//upb/test:test_messages_proto2_upb_minitable",
+        "//upb/test:test_messages_proto2_upb_proto",
+        "//upb/test:test_upb_proto",
+        "@com_google_absl//absl/container:flat_hash_set",
+    ],
+)
+
+cc_test(
+    name = "map_test",
+    srcs = ["map_test.cc"],
+    deps = [
+        ":message",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+    ],
+)
+
+cc_test(
+    name = "promote_test",
+    srcs = ["promote_test.cc"],
+    deps = [
+        ":accessors",
+        ":copy",
+        ":internal",
+        ":message",
+        ":promote",
+        ":tagged_ptr",
+        "//:protobuf",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_descriptor",
+        "//upb:mini_descriptor_internal",
+        "//upb:mini_table",
+        "//upb:port",
+        "//upb:wire",
+        "//upb/test:test_messages_proto2_upb_proto",
+        "//upb/test:test_messages_proto3_upb_proto",
+        "//upb/test:test_proto_upb_minitable",
+        "//upb/test:test_upb_proto",
+        "@com_google_absl//absl/container:flat_hash_set",
+    ],
+)
+
+# This test doesn't directly include any files from this subdir so it probably
+# should live elsewhere.
+cc_test(
+    name = "test",
+    srcs = ["test.cc"],
+    deps = [
+        ":message_test_upb_minitable_proto",
+        ":message_test_upb_proto",
+        ":message_test_upb_proto_reflection",
+        ":value",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:json",
+        "//upb:mem",
+        "//upb:message",
+        "//upb:mini_table",
+        "//upb:reflection",
+        "//upb:wire",
+        "//upb/test:fuzz_util",
+        "//upb/test:test_messages_proto3_upb_proto",
+    ],
+)
+
+proto_library(
+    name = "utf8_test_proto",
+    testonly = 1,
+    srcs = ["utf8_test.proto"],
+    deps = ["//src/google/protobuf:test_messages_proto3_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "utf8_test_upb_minitable_proto",
+    testonly = 1,
+    deps = [":utf8_test_proto"],
+)
+
+upb_proto_library(
+    name = "utf8_test_upb_proto",
+    testonly = 1,
+    deps = [":utf8_test_proto"],
+)
+
+cc_test(
+    name = "utf8_test",
+    srcs = ["utf8_test.cc"],
+    deps = [
+        ":utf8_test_upb_minitable_proto",
+        ":utf8_test_upb_proto",
+        "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:wire",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/message/accessors.c b/third_party/upb/upb/message/accessors.c
index 9cd8e6de4ab22..25c0f9e5ef8d3 100644
--- a/third_party/upb/upb/message/accessors.c
+++ b/third_party/upb/upb/message/accessors.c
@@ -1,38 +1,17 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/message/accessors.h"
 
-#include "upb/collections/array.h"
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/map.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/field.h"
-#include "upb/wire/common.h"
 #include "upb/wire/decode.h"
 #include "upb/wire/encode.h"
 #include "upb/wire/eps_copy_input_stream.h"
@@ -81,7 +60,7 @@ bool upb_Message_IsExactlyEqual(const upb_Message* m1, const upb_Message* m2,
   upb_EncodeStatus status2 = upb_Encode(m2, layout, opts, a, &data2, &size2);
 
   if (status1 != kUpb_EncodeStatus_Ok || status2 != kUpb_EncodeStatus_Ok) {
-    // TODO(salo): How should we fail here? (In Ruby we throw an exception.)
+    // TODO: How should we fail here? (In Ruby we throw an exception.)
     upb_Arena_Free(a);
     return false;
   }
diff --git a/third_party/upb/upb/message/accessors.h b/third_party/upb/upb/message/accessors.h
index f037ba09be812..f8a9f9987bc37 100644
--- a/third_party/upb/upb/message/accessors.h
+++ b/third_party/upb/upb/message/accessors.h
@@ -1,40 +1,20 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MESSAGE_ACCESSORS_H_
 #define UPB_MESSAGE_ACCESSORS_H_
 
 #include "upb/base/descriptor_constants.h"
-#include "upb/collections/array.h"
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map.h"
-#include "upb/collections/map_internal.h"
-#include "upb/message/accessors_internal.h"
-#include "upb/message/internal.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/accessors.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/map.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map.h"
 #include "upb/mini_table/enum.h"
 #include "upb/mini_table/field.h"
 
diff --git a/third_party/upb/upb/message/accessors_internal.h b/third_party/upb/upb/message/accessors_internal.h
deleted file mode 100644
index 6096f8cf1d7c0..0000000000000
--- a/third_party/upb/upb/message/accessors_internal.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (c) 2009-2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_MESSAGE_ACCESSORS_INTERNAL_H_
-#define UPB_MESSAGE_ACCESSORS_INTERNAL_H_
-
-#include "upb/collections/map_internal.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/internal.h"
-#include "upb/mini_table/internal/field.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#if defined(__GNUC__) && !defined(__clang__)
-// GCC raises incorrect warnings in these functions.  It thinks that we are
-// overrunning buffers, but we carefully write the functions in this file to
-// guarantee that this is impossible.  GCC gets this wrong due it its failure
-// to perform constant propagation as we expect:
-//   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108217
-//   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108226
-//
-// Unfortunately this also indicates that GCC is not optimizing away the
-// switch() in cases where it should be, compromising the performance.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic ignored "-Wstringop-overflow"
-#if __GNUC__ >= 11
-#pragma GCC diagnostic ignored "-Wstringop-overread"
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// LINT.IfChange(presence_logic)
-
-// Hasbit access ///////////////////////////////////////////////////////////////
-
-UPB_INLINE size_t _upb_hasbit_ofs(size_t idx) { return idx / 8; }
-
-UPB_INLINE char _upb_hasbit_mask(size_t idx) { return 1 << (idx % 8); }
-
-UPB_INLINE bool _upb_hasbit(const upb_Message* msg, size_t idx) {
-  return (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), const char) &
-          _upb_hasbit_mask(idx)) != 0;
-}
-
-UPB_INLINE void _upb_sethas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), char)) |= _upb_hasbit_mask(idx);
-}
-
-UPB_INLINE void _upb_clearhas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), char)) &= ~_upb_hasbit_mask(idx);
-}
-
-UPB_INLINE size_t _upb_Message_Hasidx(const upb_MiniTableField* f) {
-  UPB_ASSERT(f->presence > 0);
-  return f->presence;
-}
-
-UPB_INLINE bool _upb_hasbit_field(const upb_Message* msg,
-                                  const upb_MiniTableField* f) {
-  return _upb_hasbit(msg, _upb_Message_Hasidx(f));
-}
-
-UPB_INLINE void _upb_sethas_field(const upb_Message* msg,
-                                  const upb_MiniTableField* f) {
-  _upb_sethas(msg, _upb_Message_Hasidx(f));
-}
-
-// Oneof case access ///////////////////////////////////////////////////////////
-
-UPB_INLINE size_t _upb_oneofcase_ofs(const upb_MiniTableField* f) {
-  UPB_ASSERT(f->presence < 0);
-  return ~(ptrdiff_t)f->presence;
-}
-
-UPB_INLINE uint32_t* _upb_oneofcase_field(upb_Message* msg,
-                                          const upb_MiniTableField* f) {
-  return UPB_PTR_AT(msg, _upb_oneofcase_ofs(f), uint32_t);
-}
-
-UPB_INLINE uint32_t _upb_getoneofcase_field(const upb_Message* msg,
-                                            const upb_MiniTableField* f) {
-  return *_upb_oneofcase_field((upb_Message*)msg, f);
-}
-
-// LINT.ThenChange(GoogleInternalName2)
-// LINT.ThenChange(//depot/google3/third_party/upb/js/impl/upb_bits/presence.ts:presence_logic)
-
-UPB_INLINE bool _upb_MiniTableField_InOneOf(const upb_MiniTableField* field) {
-  return field->presence < 0;
-}
-
-UPB_INLINE void* _upb_MiniTableField_GetPtr(upb_Message* msg,
-                                            const upb_MiniTableField* field) {
-  return (char*)msg + field->offset;
-}
-
-UPB_INLINE const void* _upb_MiniTableField_GetConstPtr(
-    const upb_Message* msg, const upb_MiniTableField* field) {
-  return (char*)msg + field->offset;
-}
-
-UPB_INLINE void _upb_Message_SetPresence(upb_Message* msg,
-                                         const upb_MiniTableField* field) {
-  if (field->presence > 0) {
-    _upb_sethas_field(msg, field);
-  } else if (_upb_MiniTableField_InOneOf(field)) {
-    *_upb_oneofcase_field(msg, field) = field->number;
-  }
-}
-
-// LINT.IfChange(message_raw_fields)
-
-UPB_INLINE bool _upb_MiniTable_ValueIsNonZero(const void* default_val,
-                                              const upb_MiniTableField* field) {
-  char zero[16] = {0};
-  switch (_upb_MiniTableField_GetRep(field)) {
-    case kUpb_FieldRep_1Byte:
-      return memcmp(&zero, default_val, 1) != 0;
-    case kUpb_FieldRep_4Byte:
-      return memcmp(&zero, default_val, 4) != 0;
-    case kUpb_FieldRep_8Byte:
-      return memcmp(&zero, default_val, 8) != 0;
-    case kUpb_FieldRep_StringView: {
-      const upb_StringView* sv = (const upb_StringView*)default_val;
-      return sv->size != 0;
-    }
-  }
-  UPB_UNREACHABLE();
-}
-
-UPB_INLINE void _upb_MiniTable_CopyFieldData(void* to, const void* from,
-                                             const upb_MiniTableField* field) {
-  switch (_upb_MiniTableField_GetRep(field)) {
-    case kUpb_FieldRep_1Byte:
-      memcpy(to, from, 1);
-      return;
-    case kUpb_FieldRep_4Byte:
-      memcpy(to, from, 4);
-      return;
-    case kUpb_FieldRep_8Byte:
-      memcpy(to, from, 8);
-      return;
-    case kUpb_FieldRep_StringView: {
-      memcpy(to, from, sizeof(upb_StringView));
-      return;
-    }
-  }
-  UPB_UNREACHABLE();
-}
-
-// LINT.ThenChange(//depot/google3/third_party/upb/js/impl/upb_bits/message.ts:message_raw_fields)
-
-UPB_INLINE size_t
-_upb_MiniTable_ElementSizeLg2(const upb_MiniTableField* field) {
-  const unsigned char table[] = {
-      0,
-      3,               // kUpb_FieldType_Double = 1,
-      2,               // kUpb_FieldType_Float = 2,
-      3,               // kUpb_FieldType_Int64 = 3,
-      3,               // kUpb_FieldType_UInt64 = 4,
-      2,               // kUpb_FieldType_Int32 = 5,
-      3,               // kUpb_FieldType_Fixed64 = 6,
-      2,               // kUpb_FieldType_Fixed32 = 7,
-      0,               // kUpb_FieldType_Bool = 8,
-      UPB_SIZE(3, 4),  // kUpb_FieldType_String = 9,
-      UPB_SIZE(2, 3),  // kUpb_FieldType_Group = 10,
-      UPB_SIZE(2, 3),  // kUpb_FieldType_Message = 11,
-      UPB_SIZE(3, 4),  // kUpb_FieldType_Bytes = 12,
-      2,               // kUpb_FieldType_UInt32 = 13,
-      2,               // kUpb_FieldType_Enum = 14,
-      2,               // kUpb_FieldType_SFixed32 = 15,
-      3,               // kUpb_FieldType_SFixed64 = 16,
-      2,               // kUpb_FieldType_SInt32 = 17,
-      3,               // kUpb_FieldType_SInt64 = 18,
-  };
-  return table[field->UPB_PRIVATE(descriptortype)];
-}
-
-// Here we define universal getter/setter functions for message fields.
-// These look very branchy and inefficient, but as long as the MiniTableField
-// values are known at compile time, all the branches are optimized away and
-// we are left with ideal code.  This can happen either through through
-// literals or UPB_ASSUME():
-//
-//   // Via struct literals.
-//   bool FooMessage_set_bool_field(const upb_Message* msg, bool val) {
-//     const upb_MiniTableField field = {1, 0, 0, /* etc... */};
-//     // All value in "field" are compile-time known.
-//     _upb_Message_SetNonExtensionField(msg, &field, &value);
-//   }
-//
-//   // Via UPB_ASSUME().
-//   UPB_INLINE bool upb_Message_SetBool(upb_Message* msg,
-//                                       const upb_MiniTableField* field,
-//                                       bool value, upb_Arena* a) {
-//     UPB_ASSUME(field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Bool);
-//     UPB_ASSUME(!upb_IsRepeatedOrMap(field));
-//     UPB_ASSUME(_upb_MiniTableField_GetRep(field) == kUpb_FieldRep_1Byte);
-//     _upb_Message_SetField(msg, field, &value, a);
-//   }
-//
-// As a result, we can use these universal getters/setters for *all* message
-// accessors: generated code, MiniTable accessors, and reflection.  The only
-// exception is the binary encoder/decoder, which need to be a bit more clever
-// about how they read/write the message data, for efficiency.
-//
-// These functions work on both extensions and non-extensions. If the field
-// of a setter is known to be a non-extension, the arena may be NULL and the
-// returned bool value may be ignored since it will always succeed.
-
-UPB_INLINE bool _upb_Message_HasExtensionField(
-    const upb_Message* msg, const upb_MiniTableExtension* ext) {
-  UPB_ASSERT(upb_MiniTableField_HasPresence(&ext->field));
-  return _upb_Message_Getext(msg, ext) != NULL;
-}
-
-UPB_INLINE bool _upb_Message_HasNonExtensionField(
-    const upb_Message* msg, const upb_MiniTableField* field) {
-  UPB_ASSERT(upb_MiniTableField_HasPresence(field));
-  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
-  if (_upb_MiniTableField_InOneOf(field)) {
-    return _upb_getoneofcase_field(msg, field) == field->number;
-  } else {
-    return _upb_hasbit_field(msg, field);
-  }
-}
-
-static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField(
-    const upb_Message* msg, const upb_MiniTableField* field,
-    const void* default_val, void* val) {
-  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
-  if ((_upb_MiniTableField_InOneOf(field) ||
-       _upb_MiniTable_ValueIsNonZero(default_val, field)) &&
-      !_upb_Message_HasNonExtensionField(msg, field)) {
-    _upb_MiniTable_CopyFieldData(val, default_val, field);
-    return;
-  }
-  _upb_MiniTable_CopyFieldData(val, _upb_MiniTableField_GetConstPtr(msg, field),
-                               field);
-}
-
-UPB_INLINE void _upb_Message_GetExtensionField(
-    const upb_Message* msg, const upb_MiniTableExtension* mt_ext,
-    const void* default_val, void* val) {
-  UPB_ASSUME(upb_MiniTableField_IsExtension(&mt_ext->field));
-  const upb_Message_Extension* ext = _upb_Message_Getext(msg, mt_ext);
-  if (ext) {
-    _upb_MiniTable_CopyFieldData(val, &ext->data, &mt_ext->field);
-  } else {
-    _upb_MiniTable_CopyFieldData(val, default_val, &mt_ext->field);
-  }
-}
-
-UPB_INLINE void _upb_Message_GetField(const upb_Message* msg,
-                                      const upb_MiniTableField* field,
-                                      const void* default_val, void* val) {
-  if (upb_MiniTableField_IsExtension(field)) {
-    _upb_Message_GetExtensionField(msg, (upb_MiniTableExtension*)field,
-                                   default_val, val);
-  } else {
-    _upb_Message_GetNonExtensionField(msg, field, default_val, val);
-  }
-}
-
-UPB_INLINE void _upb_Message_SetNonExtensionField(
-    upb_Message* msg, const upb_MiniTableField* field, const void* val) {
-  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
-  _upb_Message_SetPresence(msg, field);
-  _upb_MiniTable_CopyFieldData(_upb_MiniTableField_GetPtr(msg, field), val,
-                               field);
-}
-
-UPB_INLINE bool _upb_Message_SetExtensionField(
-    upb_Message* msg, const upb_MiniTableExtension* mt_ext, const void* val,
-    upb_Arena* a) {
-  UPB_ASSERT(a);
-  upb_Message_Extension* ext =
-      _upb_Message_GetOrCreateExtension(msg, mt_ext, a);
-  if (!ext) return false;
-  _upb_MiniTable_CopyFieldData(&ext->data, val, &mt_ext->field);
-  return true;
-}
-
-UPB_INLINE bool _upb_Message_SetField(upb_Message* msg,
-                                      const upb_MiniTableField* field,
-                                      const void* val, upb_Arena* a) {
-  if (upb_MiniTableField_IsExtension(field)) {
-    const upb_MiniTableExtension* ext = (const upb_MiniTableExtension*)field;
-    return _upb_Message_SetExtensionField(msg, ext, val, a);
-  } else {
-    _upb_Message_SetNonExtensionField(msg, field, val);
-    return true;
-  }
-}
-
-UPB_INLINE void _upb_Message_ClearExtensionField(
-    upb_Message* msg, const upb_MiniTableExtension* ext_l) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (!in->internal) return;
-  const upb_Message_Extension* base =
-      UPB_PTR_AT(in->internal, in->internal->ext_begin, upb_Message_Extension);
-  upb_Message_Extension* ext =
-      (upb_Message_Extension*)_upb_Message_Getext(msg, ext_l);
-  if (ext) {
-    *ext = *base;
-    in->internal->ext_begin += sizeof(upb_Message_Extension);
-  }
-}
-
-UPB_INLINE void _upb_Message_ClearNonExtensionField(
-    upb_Message* msg, const upb_MiniTableField* field) {
-  if (field->presence > 0) {
-    _upb_clearhas(msg, _upb_Message_Hasidx(field));
-  } else if (_upb_MiniTableField_InOneOf(field)) {
-    uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
-    if (*oneof_case != field->number) return;
-    *oneof_case = 0;
-  }
-  const char zeros[16] = {0};
-  _upb_MiniTable_CopyFieldData(_upb_MiniTableField_GetPtr(msg, field), zeros,
-                               field);
-}
-
-UPB_INLINE void _upb_Message_AssertMapIsUntagged(
-    const upb_Message* msg, const upb_MiniTableField* field) {
-  _upb_MiniTableField_CheckIsMap(field);
-#ifndef NDEBUG
-  upb_TaggedMessagePtr default_val = 0;
-  upb_TaggedMessagePtr tagged;
-  _upb_Message_GetNonExtensionField(msg, field, &default_val, &tagged);
-  UPB_ASSERT(!upb_TaggedMessagePtr_IsEmpty(tagged));
-#endif
-}
-
-UPB_INLINE upb_Map* _upb_Message_GetOrCreateMutableMap(
-    upb_Message* msg, const upb_MiniTableField* field, size_t key_size,
-    size_t val_size, upb_Arena* arena) {
-  _upb_MiniTableField_CheckIsMap(field);
-  _upb_Message_AssertMapIsUntagged(msg, field);
-  upb_Map* map = NULL;
-  upb_Map* default_map_value = NULL;
-  _upb_Message_GetNonExtensionField(msg, field, &default_map_value, &map);
-  if (!map) {
-    map = _upb_Map_New(arena, key_size, val_size);
-    // Check again due to: https://godbolt.org/z/7WfaoKG1r
-    _upb_MiniTableField_CheckIsMap(field);
-    _upb_Message_SetNonExtensionField(msg, field, &map);
-  }
-  return map;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  // UPB_MESSAGE_ACCESSORS_INTERNAL_H_
diff --git a/third_party/upb/upb/message/accessors_split64.h b/third_party/upb/upb/message/accessors_split64.h
index 463f8c04d0791..e284bb14f46f8 100644
--- a/third_party/upb/upb/message/accessors_split64.h
+++ b/third_party/upb/upb/message/accessors_split64.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MESSAGE_ACCESSORS_SPLIT64_H_
 #define UPB_MESSAGE_ACCESSORS_SPLIT64_H_
diff --git a/third_party/upb/upb/message/accessors_test.cc b/third_party/upb/upb/message/accessors_test.cc
index f83a164f1ece5..5f2eccc4dbfe6 100644
--- a/third_party/upb/upb/message/accessors_test.cc
+++ b/third_party/upb/upb/message/accessors_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* Test of mini table accessors.
  *
@@ -33,20 +13,28 @@
 
 #include "upb/message/accessors.h"
 
+#include <string.h>
+
+#include <cstddef>
+#include <cstdint>
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "google/protobuf/test_messages_proto2.upb.h"
+#include "google/protobuf/test_messages_proto2.upb_minitable.h"
 #include "google/protobuf/test_messages_proto3.upb.h"
+#include "google/protobuf/test_messages_proto3.upb_minitable.h"
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/status.h"
 #include "upb/base/string_view.h"
-#include "upb/collections/array.h"
+#include "upb/mem/arena.h"
+#include "upb/message/array.h"
+#include "upb/message/message.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_descriptor/internal/encode.hpp"
 #include "upb/mini_descriptor/internal/modifiers.h"
-#include "upb/test/test.upb.h"
-#include "upb/upb.h"
-#include "upb/wire/common.h"
-#include "upb/wire/decode.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/message.h"
 
 // Must be last
 #include "upb/port/def.inc"
@@ -75,12 +63,14 @@ const uint64_t kTestUInt64 = 0xFEDCBAFF87654321;
 
 const upb_MiniTableField* find_proto3_field(int field_number) {
   return upb_MiniTable_FindFieldByNumber(
-      &protobuf_test_messages_proto3_TestAllTypesProto3_msg_init, field_number);
+      &protobuf_0test_0messages__proto3__TestAllTypesProto3_msg_init,
+      field_number);
 }
 
 const upb_MiniTableField* find_proto2_field(int field_number) {
   return upb_MiniTable_FindFieldByNumber(
-      &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init, field_number);
+      &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
+      field_number);
 }
 
 TEST(GeneratedCode, HazzersProto2) {
@@ -233,7 +223,7 @@ TEST(GeneratedCode, Strings) {
       msg, upb_StringView_FromString(kTestStr1));
   EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field));
   upb_StringView value = upb_Message_GetString(msg, optional_string_field,
-                                               upb_StringView{NULL, 0});
+                                               upb_StringView{nullptr, 0});
   std::string read_value = std::string(value.data, value.size);
   EXPECT_EQ(kTestStr1, read_value);
   // Clear.
@@ -287,7 +277,7 @@ TEST(GeneratedCode, SubMessage) {
 
   const upb_MiniTableField* nested_message_a_field =
       upb_MiniTable_FindFieldByNumber(
-          &protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_msg_init,
+          &protobuf_0test_0messages__proto2__TestAllTypesProto2__NestedMessage_msg_init,
           kFieldOptionalNestedMessageA);
   EXPECT_EQ(5, upb_Message_GetInt32(sub_message, nested_message_a_field, 0));
 
@@ -303,11 +293,11 @@ TEST(GeneratedCode, SubMessage) {
   upb_Message_SetInt32(new_nested_message, nested_message_a_field, 123,
                        nullptr);
   upb_Message_SetMessage(
-      msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+      msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
       optional_message_field, new_nested_message);
 
   upb_Message* mutable_message = upb_Message_GetOrCreateMutableMessage(
-      msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+      msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
       optional_message_field, arena);
   EXPECT_EQ(
       true,
@@ -380,10 +370,10 @@ TEST(GeneratedCode, GetMutableMessage) {
   const upb_MiniTableField* optional_message_field =
       find_proto2_field(kFieldOptionalNestedMessage);
   upb_Message* msg1 = upb_Message_GetOrCreateMutableMessage(
-      msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+      msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
       optional_message_field, arena);
   upb_Message* msg2 = upb_Message_GetOrCreateMutableMessage(
-      msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+      msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
       optional_message_field, arena);
   // Verify that newly constructed sub message is stored in msg.
   EXPECT_EQ(msg1, msg2);
diff --git a/third_party/upb/upb/message/array.c b/third_party/upb/upb/message/array.c
new file mode 100644
index 0000000000000..bf59f0139ed46
--- /dev/null
+++ b/third_party/upb/upb/message/array.c
@@ -0,0 +1,154 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "upb/message/internal/array.h"
+
+#include <string.h>
+
+// Must be last.
+#include "upb/port/def.inc"
+
+const char _upb_Array_CTypeSizeLg2Table[] = {
+    [kUpb_CType_Bool] = 0,
+    [kUpb_CType_Float] = 2,
+    [kUpb_CType_Int32] = 2,
+    [kUpb_CType_UInt32] = 2,
+    [kUpb_CType_Enum] = 2,
+    [kUpb_CType_Message] = UPB_SIZE(2, 3),
+    [kUpb_CType_Double] = 3,
+    [kUpb_CType_Int64] = 3,
+    [kUpb_CType_UInt64] = 3,
+    [kUpb_CType_String] = UPB_SIZE(3, 4),
+    [kUpb_CType_Bytes] = UPB_SIZE(3, 4),
+};
+
+upb_Array* upb_Array_New(upb_Arena* a, upb_CType type) {
+  return _upb_Array_New(a, 4, _upb_Array_CTypeSizeLg2(type));
+}
+
+const void* upb_Array_DataPtr(const upb_Array* arr) {
+  return _upb_array_ptr((upb_Array*)arr);
+}
+
+void* upb_Array_MutableDataPtr(upb_Array* arr) { return _upb_array_ptr(arr); }
+
+size_t upb_Array_Size(const upb_Array* arr) { return arr->size; }
+
+upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i) {
+  upb_MessageValue ret;
+  const char* data = _upb_array_constptr(arr);
+  int lg2 = arr->data & 7;
+  UPB_ASSERT(i < arr->size);
+  memcpy(&ret, data + (i << lg2), 1 << lg2);
+  return ret;
+}
+
+void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val) {
+  char* data = _upb_array_ptr(arr);
+  int lg2 = arr->data & 7;
+  UPB_ASSERT(i < arr->size);
+  memcpy(data + (i << lg2), &val, 1 << lg2);
+}
+
+bool upb_Array_Append(upb_Array* arr, upb_MessageValue val, upb_Arena* arena) {
+  UPB_ASSERT(arena);
+  if (!upb_Array_Resize(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  upb_Array_Set(arr, arr->size - 1, val);
+  return true;
+}
+
+void upb_Array_Move(upb_Array* arr, size_t dst_idx, size_t src_idx,
+                    size_t count) {
+  const int lg2 = arr->data & 7;
+  char* data = _upb_array_ptr(arr);
+  memmove(&data[dst_idx << lg2], &data[src_idx << lg2], count << lg2);
+}
+
+bool upb_Array_Insert(upb_Array* arr, size_t i, size_t count,
+                      upb_Arena* arena) {
+  UPB_ASSERT(arena);
+  UPB_ASSERT(i <= arr->size);
+  UPB_ASSERT(count + arr->size >= count);
+  const size_t oldsize = arr->size;
+  if (!upb_Array_Resize(arr, arr->size + count, arena)) {
+    return false;
+  }
+  upb_Array_Move(arr, i + count, i, oldsize - i);
+  return true;
+}
+
+/*
+ *              i        end      arr->size
+ * |------------|XXXXXXXX|--------|
+ */
+void upb_Array_Delete(upb_Array* arr, size_t i, size_t count) {
+  const size_t end = i + count;
+  UPB_ASSERT(i <= end);
+  UPB_ASSERT(end <= arr->size);
+  upb_Array_Move(arr, i, end, arr->size - end);
+  arr->size -= count;
+}
+
+bool upb_Array_Resize(upb_Array* arr, size_t size, upb_Arena* arena) {
+  const size_t oldsize = arr->size;
+  if (UPB_UNLIKELY(!_upb_Array_ResizeUninitialized(arr, size, arena))) {
+    return false;
+  }
+  const size_t newsize = arr->size;
+  if (newsize > oldsize) {
+    const int lg2 = arr->data & 7;
+    char* data = _upb_array_ptr(arr);
+    memset(data + (oldsize << lg2), 0, (newsize - oldsize) << lg2);
+  }
+  return true;
+}
+
+// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
+
+bool _upb_array_realloc(upb_Array* arr, size_t min_capacity, upb_Arena* arena) {
+  size_t new_capacity = UPB_MAX(arr->capacity, 4);
+  int elem_size_lg2 = arr->data & 7;
+  size_t old_bytes = arr->capacity << elem_size_lg2;
+  size_t new_bytes;
+  void* ptr = _upb_array_ptr(arr);
+
+  // Log2 ceiling of size.
+  while (new_capacity < min_capacity) new_capacity *= 2;
+
+  new_bytes = new_capacity << elem_size_lg2;
+  ptr = upb_Arena_Realloc(arena, ptr, old_bytes, new_bytes);
+  if (!ptr) return false;
+
+  arr->data = _upb_tag_arrptr(ptr, elem_size_lg2);
+  arr->capacity = new_capacity;
+  return true;
+}
diff --git a/third_party/upb/upb/message/array.h b/third_party/upb/upb/message/array.h
new file mode 100644
index 0000000000000..55290c8b2df2e
--- /dev/null
+++ b/third_party/upb/upb/message/array.h
@@ -0,0 +1,98 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef UPB_MESSAGE_ARRAY_H_
+#define UPB_MESSAGE_ARRAY_H_
+
+#include <stddef.h>
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/mem/arena.h"
+#include "upb/message/value.h"  // IWYU pragma: export
+
+// Must be last.
+#include "upb/port/def.inc"
+
+typedef struct upb_Array upb_Array;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Creates a new array on the given arena that holds elements of this type.
+UPB_API upb_Array* upb_Array_New(upb_Arena* a, upb_CType type);
+
+// Returns the number of elements in the array.
+UPB_API size_t upb_Array_Size(const upb_Array* arr);
+
+// Returns the given element, which must be within the array's current size.
+UPB_API upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i);
+
+// Sets the given element, which must be within the array's current size.
+UPB_API void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val);
+
+// Appends an element to the array. Returns false on allocation failure.
+UPB_API bool upb_Array_Append(upb_Array* array, upb_MessageValue val,
+                              upb_Arena* arena);
+
+// Moves elements within the array using memmove().
+// Like memmove(), the source and destination elements may be overlapping.
+UPB_API void upb_Array_Move(upb_Array* array, size_t dst_idx, size_t src_idx,
+                            size_t count);
+
+// Inserts one or more empty elements into the array.
+// Existing elements are shifted right.
+// The new elements have undefined state and must be set with `upb_Array_Set()`.
+// REQUIRES: `i <= upb_Array_Size(arr)`
+UPB_API bool upb_Array_Insert(upb_Array* array, size_t i, size_t count,
+                              upb_Arena* arena);
+
+// Deletes one or more elements from the array.
+// Existing elements are shifted left.
+// REQUIRES: `i + count <= upb_Array_Size(arr)`
+UPB_API void upb_Array_Delete(upb_Array* array, size_t i, size_t count);
+
+// Changes the size of a vector. New elements are initialized to NULL/0.
+// Returns false on allocation failure.
+UPB_API bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena);
+
+// Returns pointer to array data.
+UPB_API const void* upb_Array_DataPtr(const upb_Array* arr);
+
+// Returns mutable pointer to array data.
+UPB_API void* upb_Array_MutableDataPtr(upb_Array* arr);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_ARRAY_H_ */
diff --git a/third_party/upb/upb/message/array_split64.h b/third_party/upb/upb/message/array_split64.h
new file mode 100644
index 0000000000000..5d136bd7fbc8d
--- /dev/null
+++ b/third_party/upb/upb/message/array_split64.h
@@ -0,0 +1,93 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef UPB_MESSAGE_ARRAY_SPLIT64_H_
+#define UPB_MESSAGE_ARRAY_SPLIT64_H_
+
+#include "upb/message/array.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// JavaScript doesn't directly support 64-bit ints so we must split them.
+
+UPB_API_INLINE uint32_t upb_Array_GetInt64Hi(const upb_Array* array, size_t i) {
+  return (uint32_t)(upb_Array_Get(array, i).int64_val >> 32);
+}
+
+UPB_API_INLINE uint32_t upb_Array_GetInt64Lo(const upb_Array* array, size_t i) {
+  return (uint32_t)upb_Array_Get(array, i).int64_val;
+}
+
+UPB_API_INLINE void upb_Array_SetInt64Split(upb_Array* array, size_t i,
+                                            uint32_t hi, uint32_t lo) {
+  const upb_MessageValue val = {.int64_val = ((int64_t)hi) << 32 | lo};
+  upb_Array_Set(array, i, val);
+}
+
+UPB_API_INLINE bool upb_Array_AppendInt64Split(upb_Array* array, uint32_t hi,
+                                               uint32_t lo, upb_Arena* arena) {
+  const upb_MessageValue val = {.int64_val = ((int64_t)hi) << 32 | lo};
+  return upb_Array_Append(array, val, arena);
+}
+
+UPB_API_INLINE uint32_t upb_Array_GetUInt64Hi(const upb_Array* array,
+                                              size_t i) {
+  return (uint32_t)(upb_Array_Get(array, i).uint64_val >> 32);
+}
+
+UPB_API_INLINE uint32_t upb_Array_GetUInt64Lo(const upb_Array* array,
+                                              size_t i) {
+  return (uint32_t)upb_Array_Get(array, i).uint64_val;
+}
+
+UPB_API_INLINE void upb_Array_SetUInt64Split(upb_Array* array, size_t i,
+                                             uint32_t hi, uint32_t lo) {
+  const upb_MessageValue val = {.uint64_val = ((uint64_t)hi) << 32 | lo};
+  upb_Array_Set(array, i, val);
+}
+
+UPB_API_INLINE bool upb_Array_AppendUInt64Split(upb_Array* array, uint32_t hi,
+                                                uint32_t lo, upb_Arena* arena) {
+  const upb_MessageValue val = {.uint64_val = ((uint64_t)hi) << 32 | lo};
+  return upb_Array_Append(array, val, arena);
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_ARRAY_SPLIT64_H_ */
diff --git a/third_party/upb/upb/message/array_test.cc b/third_party/upb/upb/message/array_test.cc
new file mode 100644
index 0000000000000..11f88d627e901
--- /dev/null
+++ b/third_party/upb/upb/message/array_test.cc
@@ -0,0 +1,66 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "upb/message/array.h"
+
+#include <gtest/gtest.h>
+#include "upb/base/status.hpp"
+#include "upb/mem/arena.hpp"
+
+TEST(ArrayTest, Resize) {
+  upb::Arena arena;
+  upb::Status status;
+
+  upb_Array* array = upb_Array_New(arena.ptr(), kUpb_CType_Int32);
+  EXPECT_TRUE(array);
+
+  for (int i = 0; i < 10; i++) {
+    upb_MessageValue mv;
+    mv.int32_val = 3 * i;
+
+    upb_Array_Append(array, mv, arena.ptr());
+    EXPECT_EQ(upb_Array_Size(array), i + 1);
+    EXPECT_EQ(upb_Array_Get(array, i).int32_val, 3 * i);
+  }
+
+  upb_Array_Resize(array, 12, arena.ptr());
+  EXPECT_EQ(upb_Array_Get(array, 10).int32_val, 0);
+  EXPECT_EQ(upb_Array_Get(array, 11).int32_val, 0);
+
+  upb_Array_Resize(array, 4, arena.ptr());
+  EXPECT_EQ(upb_Array_Size(array), 4);
+
+  upb_Array_Resize(array, 6, arena.ptr());
+  EXPECT_EQ(upb_Array_Size(array), 6);
+
+  EXPECT_EQ(upb_Array_Get(array, 3).int32_val, 9);
+  EXPECT_EQ(upb_Array_Get(array, 4).int32_val, 0);
+  EXPECT_EQ(upb_Array_Get(array, 5).int32_val, 0);
+}
diff --git a/third_party/upb/upb/message/copy.c b/third_party/upb/upb/message/copy.c
index 335b4d5a4a08a..2747a0ce1328b 100644
--- a/third_party/upb/upb/message/copy.c
+++ b/third_party/upb/upb/message/copy.c
@@ -1,35 +1,23 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/message/copy.h"
 
+#include <stdbool.h>
+#include <string.h>
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/message/accessors.h"
+#include "upb/message/internal/message.h"
 #include "upb/message/message.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/internal/field.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -287,20 +275,17 @@ upb_Message* _upb_Message_Copy(upb_Message* dst, const upb_Message* src,
   if (unknown_size != 0) {
     UPB_ASSERT(ptr);
     // Make a copy into destination arena.
-    void* dst_unknowns = upb_Arena_Malloc(arena, unknown_size);
-    if (dst_unknowns == NULL) return NULL;
-    memcpy(dst_unknowns, ptr, unknown_size);
-    if (!_upb_Message_AddUnknown(dst, dst_unknowns, unknown_size, arena)) {
+    if (!_upb_Message_AddUnknown(dst, ptr, unknown_size, arena)) {
       return NULL;
     }
   }
   return dst;
 }
 
-void upb_Message_DeepCopy(upb_Message* dst, const upb_Message* src,
+bool upb_Message_DeepCopy(upb_Message* dst, const upb_Message* src,
                           const upb_MiniTable* mini_table, upb_Arena* arena) {
   upb_Message_Clear(dst, mini_table);
-  _upb_Message_Copy(dst, src, mini_table, arena);
+  return _upb_Message_Copy(dst, src, mini_table, arena) != NULL;
 }
 
 // Deep clones a message using the provided target arena.
diff --git a/third_party/upb/upb/message/copy.h b/third_party/upb/upb/message/copy.h
index 23510533fb823..ce682efa53b4f 100644
--- a/third_party/upb/upb/message/copy.h
+++ b/third_party/upb/upb/message/copy.h
@@ -1,35 +1,17 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MESSAGE_COPY_H_
 #define UPB_MESSAGE_COPY_H_
 
-#include "upb/collections/message_value.h"
-#include "upb/message/internal.h"
+#include "upb/mem/arena.h"
+#include "upb/message/array.h"
+#include "upb/message/map.h"
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -54,7 +36,7 @@ upb_Map* upb_Map_DeepClone(const upb_Map* map, upb_CType key_type,
                            upb_Arena* arena);
 
 // Deep copies the message from src to dst.
-void upb_Message_DeepCopy(upb_Message* dst, const upb_Message* src,
+bool upb_Message_DeepCopy(upb_Message* dst, const upb_Message* src,
                           const upb_MiniTable* mini_table, upb_Arena* arena);
 
 #ifdef __cplusplus
diff --git a/third_party/upb/upb/message/copy_test.cc b/third_party/upb/upb/message/copy_test.cc
index bdcde326abeb2..ad50f6614a9aa 100644
--- a/third_party/upb/upb/message/copy_test.cc
+++ b/third_party/upb/upb/message/copy_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* Test of mini table accessors.
  *
@@ -33,19 +13,24 @@
 
 #include "upb/message/copy.h"
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <string>
 #include <vector>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "google/protobuf/test_messages_proto2.upb.h"
-#include "google/protobuf/test_messages_proto3.upb.h"
+#include "google/protobuf/test_messages_proto2.upb_minitable.h"
 #include "upb/base/string_view.h"
-#include "upb/collections/array.h"
-#include "upb/collections/map.h"
 #include "upb/mem/arena.h"
 #include "upb/message/accessors.h"
-#include "upb/test/test.upb.h"
-#include "upb/upb.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map.h"
+#include "upb/message/message.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/message.h"
+#include "upb/wire/encode.h"
 
 namespace {
 
@@ -61,7 +46,8 @@ const int32_t kTestNestedInt32 = 123;
 
 const upb_MiniTableField* find_proto2_field(int field_number) {
   return upb_MiniTable_FindFieldByNumber(
-      &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init, field_number);
+      &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
+      field_number);
 }
 
 TEST(GeneratedCode, DeepCloneMessageScalarAndString) {
@@ -83,7 +69,7 @@ TEST(GeneratedCode, DeepCloneMessageScalarAndString) {
   upb_Arena* arena = upb_Arena_New();
   protobuf_test_messages_proto2_TestAllTypesProto2* clone =
       (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone(
-          msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+          msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
           arena);
   // After cloning overwrite values and destroy source arena for MSAN.
   memset(string_in_arena, 0, sizeof(kTestStr1));
@@ -114,12 +100,12 @@ TEST(GeneratedCode, DeepCloneMessageSubMessage) {
   protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(
       nested, kTestNestedInt32);
   upb_Message_SetMessage(
-      msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+      msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
       nested_message_field, nested);
   upb_Arena* arena = upb_Arena_New();
   protobuf_test_messages_proto2_TestAllTypesProto2* clone =
       (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone(
-          msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+          msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
           arena);
   // After cloning overwrite values and destroy source arena for MSAN.
   protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(nested,
@@ -149,7 +135,7 @@ TEST(GeneratedCode, DeepCloneMessageArrayField) {
   upb_Arena* arena = upb_Arena_New();
   protobuf_test_messages_proto2_TestAllTypesProto2* clone =
       (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone(
-          msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+          msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
           arena);
   protobuf_test_messages_proto2_TestAllTypesProto2_clear_repeated_sint32(msg);
   upb_Arena_Free(source_arena);
@@ -188,7 +174,7 @@ TEST(GeneratedCode, DeepCloneMessageMapField) {
   upb_Arena* arena = upb_Arena_New();
   protobuf_test_messages_proto2_TestAllTypesProto2* clone =
       (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone(
-          msg, &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init,
+          msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
           arena);
   protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(nested,
                                                                        0);
@@ -265,7 +251,7 @@ TEST(GeneratedCode, DeepCloneMessageExtensions) {
       (protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect*)
           upb_Message_DeepClone(
               msg,
-              &protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect_msg_init,
+              &protobuf_0test_0messages__proto2__TestAllTypesProto2__MessageSetCorrect_msg_init,
               arena);
 
   // Mutate original extension.
@@ -284,4 +270,55 @@ TEST(GeneratedCode, DeepCloneMessageExtensions) {
       upb_StringView_FromString(kTestStr1)));
   upb_Arena_Free(arena);
 }
+
+TEST(GeneratedCode, DeepCloneMessageWithUnknowns) {
+  upb_Arena* source_arena = upb_Arena_New();
+  upb_Arena* unknown_arena = upb_Arena_New();
+  protobuf_test_messages_proto2_TestAllTypesProto2* msg =
+      protobuf_test_messages_proto2_TestAllTypesProto2_new(source_arena);
+  ASSERT_TRUE(
+      protobuf_test_messages_proto2_TestAllTypesProto2_map_int32_double_set(
+          msg, 12, 1200.5, source_arena));
+  ASSERT_TRUE(
+      protobuf_test_messages_proto2_TestAllTypesProto2_map_string_string_set(
+          msg, upb_StringView_FromString("key1"),
+          upb_StringView_FromString("value1"), source_arena));
+  // Create unknown data.
+  protobuf_test_messages_proto2_UnknownToTestAllTypes* unknown_source =
+      protobuf_test_messages_proto2_UnknownToTestAllTypes_new(unknown_arena);
+  protobuf_test_messages_proto2_UnknownToTestAllTypes_set_optional_bool(
+      unknown_source, true);
+  protobuf_test_messages_proto2_UnknownToTestAllTypes_set_optional_int32(
+      unknown_source, 123);
+  // Encode unknown message to bytes.
+  size_t len;
+  char* data;
+  upb_Arena* encode_arena = upb_Arena_New();
+  upb_EncodeStatus status = upb_Encode(
+      unknown_source,
+      &protobuf_0test_0messages__proto2__UnknownToTestAllTypes_msg_init,
+      kUpb_EncodeOption_CheckRequired, encode_arena, &data, &len);
+  ASSERT_EQ(status, kUpb_EncodeStatus_Ok);
+  std::string unknown_data(data, len);
+  // Add unknown data.
+  _upb_Message_AddUnknown(msg, data, len, source_arena);
+  // Create clone.
+  upb_Arena* clone_arena = upb_Arena_New();
+  protobuf_test_messages_proto2_TestAllTypesProto2* clone =
+      (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone(
+          msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
+          clone_arena);
+  upb_Arena_Free(source_arena);
+  upb_Arena_Free(unknown_arena);
+  upb_Arena_Free(encode_arena);
+  // Read unknown data from clone and verify.
+  size_t cloned_length;
+  const char* cloned_unknown_data =
+      upb_Message_GetUnknown(clone, &cloned_length);
+  EXPECT_EQ(cloned_length, len);
+  EXPECT_EQ(memcmp(cloned_unknown_data, unknown_data.c_str(), cloned_length),
+            0);
+  upb_Arena_Free(clone_arena);
+}
+
 }  // namespace
diff --git a/third_party/upb/upb/message/extension_internal.h b/third_party/upb/upb/message/extension_internal.h
deleted file mode 100644
index e6536bd90453c..0000000000000
--- a/third_party/upb/upb/message/extension_internal.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_MESSAGE_EXTENSION_INTERNAL_H_
-#define UPB_MESSAGE_EXTENSION_INTERNAL_H_
-
-#include "upb/base/descriptor_constants.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/message/message.h"
-#include "upb/mini_table/extension.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-// The internal representation of an extension is self-describing: it contains
-// enough information that we can serialize it to binary format without needing
-// to look it up in a upb_ExtensionRegistry.
-//
-// This representation allocates 16 bytes to data on 64-bit platforms.
-// This is rather wasteful for scalars (in the extreme case of bool,
-// it wastes 15 bytes). We accept this because we expect messages to be
-// the most common extension type.
-typedef struct {
-  const upb_MiniTableExtension* ext;
-  union {
-    upb_StringView str;
-    void* ptr;
-    char scalar_data[8];
-  } data;
-} upb_Message_Extension;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Adds the given extension data to the given message.
-// |ext| is copied into the message instance.
-// This logically replaces any previously-added extension with this number.
-upb_Message_Extension* _upb_Message_GetOrCreateExtension(
-    upb_Message* msg, const upb_MiniTableExtension* ext, upb_Arena* arena);
-
-// Returns an array of extensions for this message.
-// Note: the array is ordered in reverse relative to the order of creation.
-const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
-                                                  size_t* count);
-
-// Returns an extension for the given field number, or NULL if no extension
-// exists for this field number.
-const upb_Message_Extension* _upb_Message_Getext(
-    const upb_Message* msg, const upb_MiniTableExtension* ext);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_MESSAGE_EXTENSION_INTERNAL_H_ */
diff --git a/third_party/upb/upb/message/internal.h b/third_party/upb/upb/message/internal.h
deleted file mode 100644
index c71e189514faa..0000000000000
--- a/third_party/upb/upb/message/internal.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
-** Our memory representation for parsing tables and messages themselves.
-** Functions in this file are used by generated code and possibly reflection.
-**
-** The definitions in this file are internal to upb.
-**/
-
-#ifndef UPB_MESSAGE_INTERNAL_H_
-#define UPB_MESSAGE_INTERNAL_H_
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "upb/hash/common.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/message.h"
-#include "upb/mini_table/extension.h"
-#include "upb/mini_table/extension_registry.h"
-#include "upb/mini_table/message.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const float kUpb_FltInfinity;
-extern const double kUpb_Infinity;
-extern const double kUpb_NaN;
-
-/* Internal members of a upb_Message that track unknown fields and/or
- * extensions. We can change this without breaking binary compatibility.  We put
- * these before the user's data.  The user's upb_Message* points after the
- * upb_Message_Internal. */
-
-typedef struct {
-  /* Total size of this structure, including the data that follows.
-   * Must be aligned to 8, which is alignof(upb_Message_Extension) */
-  uint32_t size;
-
-  /* Offsets relative to the beginning of this structure.
-   *
-   * Unknown data grows forward from the beginning to unknown_end.
-   * Extension data grows backward from size to ext_begin.
-   * When the two meet, we're out of data and have to realloc.
-   *
-   * If we imagine that the final member of this struct is:
-   *   char data[size - overhead];  // overhead =
-   * sizeof(upb_Message_InternalData)
-   *
-   * Then we have:
-   *   unknown data: data[0 .. (unknown_end - overhead)]
-   *   extensions data: data[(ext_begin - overhead) .. (size - overhead)] */
-  uint32_t unknown_end;
-  uint32_t ext_begin;
-  /* Data follows, as if there were an array:
-   *   char data[size - sizeof(upb_Message_InternalData)]; */
-} upb_Message_InternalData;
-
-typedef struct {
-  upb_Message_InternalData* internal;
-  /* Message data follows. */
-} upb_Message_Internal;
-
-/* Maps upb_CType -> memory size. */
-extern char _upb_CTypeo_size[12];
-
-UPB_INLINE size_t upb_msg_sizeof(const upb_MiniTable* t) {
-  return t->size + sizeof(upb_Message_Internal);
-}
-
-// Inline version upb_Message_New(), for internal use.
-UPB_INLINE upb_Message* _upb_Message_New(const upb_MiniTable* mini_table,
-                                         upb_Arena* arena) {
-  size_t size = upb_msg_sizeof(mini_table);
-  void* mem = upb_Arena_Malloc(arena, size + sizeof(upb_Message_Internal));
-  if (UPB_UNLIKELY(!mem)) return NULL;
-  upb_Message* msg = UPB_PTR_AT(mem, sizeof(upb_Message_Internal), upb_Message);
-  memset(mem, 0, size);
-  return msg;
-}
-
-UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(
-    const upb_Message* msg) {
-  ptrdiff_t size = sizeof(upb_Message_Internal);
-  return (upb_Message_Internal*)((char*)msg - size);
-}
-
-// Discards the unknown fields for this message only.
-void _upb_Message_DiscardUnknown_shallow(upb_Message* msg);
-
-// Adds unknown data (serialized protobuf data) to the given message.
-// The data is copied into the message instance.
-bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                             upb_Arena* arena);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_MESSAGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/message/internal/accessors.h b/third_party/upb/upb/message/internal/accessors.h
new file mode 100644
index 0000000000000..2ec295a22c3ed
--- /dev/null
+++ b/third_party/upb/upb/message/internal/accessors.h
@@ -0,0 +1,367 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MESSAGE_INTERNAL_ACCESSORS_H_
+#define UPB_MESSAGE_INTERNAL_ACCESSORS_H_
+
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/map.h"
+#include "upb/message/internal/message.h"
+#include "upb/mini_table/internal/field.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#if defined(__GNUC__) && !defined(__clang__)
+// GCC raises incorrect warnings in these functions.  It thinks that we are
+// overrunning buffers, but we carefully write the functions in this file to
+// guarantee that this is impossible.  GCC gets this wrong due it its failure
+// to perform constant propagation as we expect:
+//   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108217
+//   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108226
+//
+// Unfortunately this also indicates that GCC is not optimizing away the
+// switch() in cases where it should be, compromising the performance.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#if __GNUC__ >= 11
+#pragma GCC diagnostic ignored "-Wstringop-overread"
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// LINT.IfChange(presence_logic)
+
+// Hasbit access ///////////////////////////////////////////////////////////////
+
+UPB_INLINE size_t _upb_hasbit_ofs(size_t idx) { return idx / 8; }
+
+UPB_INLINE char _upb_hasbit_mask(size_t idx) { return 1 << (idx % 8); }
+
+UPB_INLINE bool _upb_hasbit(const upb_Message* msg, size_t idx) {
+  return (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), const char) &
+          _upb_hasbit_mask(idx)) != 0;
+}
+
+UPB_INLINE void _upb_sethas(const upb_Message* msg, size_t idx) {
+  (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), char)) |= _upb_hasbit_mask(idx);
+}
+
+UPB_INLINE void _upb_clearhas(const upb_Message* msg, size_t idx) {
+  (*UPB_PTR_AT(msg, _upb_hasbit_ofs(idx), char)) &= ~_upb_hasbit_mask(idx);
+}
+
+UPB_INLINE size_t _upb_Message_Hasidx(const upb_MiniTableField* f) {
+  UPB_ASSERT(f->presence > 0);
+  return f->presence;
+}
+
+UPB_INLINE bool _upb_hasbit_field(const upb_Message* msg,
+                                  const upb_MiniTableField* f) {
+  return _upb_hasbit(msg, _upb_Message_Hasidx(f));
+}
+
+UPB_INLINE void _upb_sethas_field(const upb_Message* msg,
+                                  const upb_MiniTableField* f) {
+  _upb_sethas(msg, _upb_Message_Hasidx(f));
+}
+
+// Oneof case access ///////////////////////////////////////////////////////////
+
+UPB_INLINE size_t _upb_oneofcase_ofs(const upb_MiniTableField* f) {
+  UPB_ASSERT(f->presence < 0);
+  return ~(ptrdiff_t)f->presence;
+}
+
+UPB_INLINE uint32_t* _upb_oneofcase_field(upb_Message* msg,
+                                          const upb_MiniTableField* f) {
+  return UPB_PTR_AT(msg, _upb_oneofcase_ofs(f), uint32_t);
+}
+
+UPB_INLINE uint32_t _upb_getoneofcase_field(const upb_Message* msg,
+                                            const upb_MiniTableField* f) {
+  return *_upb_oneofcase_field((upb_Message*)msg, f);
+}
+
+// LINT.ThenChange(GoogleInternalName2)
+
+UPB_INLINE bool _upb_MiniTableField_InOneOf(const upb_MiniTableField* field) {
+  return field->presence < 0;
+}
+
+UPB_INLINE void* _upb_MiniTableField_GetPtr(upb_Message* msg,
+                                            const upb_MiniTableField* field) {
+  return (char*)msg + field->offset;
+}
+
+UPB_INLINE const void* _upb_MiniTableField_GetConstPtr(
+    const upb_Message* msg, const upb_MiniTableField* field) {
+  return (char*)msg + field->offset;
+}
+
+UPB_INLINE void _upb_Message_SetPresence(upb_Message* msg,
+                                         const upb_MiniTableField* field) {
+  if (field->presence > 0) {
+    _upb_sethas_field(msg, field);
+  } else if (_upb_MiniTableField_InOneOf(field)) {
+    *_upb_oneofcase_field(msg, field) = field->number;
+  }
+}
+
+UPB_INLINE bool _upb_MiniTable_ValueIsNonZero(const void* default_val,
+                                              const upb_MiniTableField* field) {
+  char zero[16] = {0};
+  switch (_upb_MiniTableField_GetRep(field)) {
+    case kUpb_FieldRep_1Byte:
+      return memcmp(&zero, default_val, 1) != 0;
+    case kUpb_FieldRep_4Byte:
+      return memcmp(&zero, default_val, 4) != 0;
+    case kUpb_FieldRep_8Byte:
+      return memcmp(&zero, default_val, 8) != 0;
+    case kUpb_FieldRep_StringView: {
+      const upb_StringView* sv = (const upb_StringView*)default_val;
+      return sv->size != 0;
+    }
+  }
+  UPB_UNREACHABLE();
+}
+
+UPB_INLINE void _upb_MiniTable_CopyFieldData(void* to, const void* from,
+                                             const upb_MiniTableField* field) {
+  switch (_upb_MiniTableField_GetRep(field)) {
+    case kUpb_FieldRep_1Byte:
+      memcpy(to, from, 1);
+      return;
+    case kUpb_FieldRep_4Byte:
+      memcpy(to, from, 4);
+      return;
+    case kUpb_FieldRep_8Byte:
+      memcpy(to, from, 8);
+      return;
+    case kUpb_FieldRep_StringView: {
+      memcpy(to, from, sizeof(upb_StringView));
+      return;
+    }
+  }
+  UPB_UNREACHABLE();
+}
+
+UPB_INLINE size_t
+_upb_MiniTable_ElementSizeLg2(const upb_MiniTableField* field) {
+  const unsigned char table[] = {
+      0,
+      3,               // kUpb_FieldType_Double = 1,
+      2,               // kUpb_FieldType_Float = 2,
+      3,               // kUpb_FieldType_Int64 = 3,
+      3,               // kUpb_FieldType_UInt64 = 4,
+      2,               // kUpb_FieldType_Int32 = 5,
+      3,               // kUpb_FieldType_Fixed64 = 6,
+      2,               // kUpb_FieldType_Fixed32 = 7,
+      0,               // kUpb_FieldType_Bool = 8,
+      UPB_SIZE(3, 4),  // kUpb_FieldType_String = 9,
+      UPB_SIZE(2, 3),  // kUpb_FieldType_Group = 10,
+      UPB_SIZE(2, 3),  // kUpb_FieldType_Message = 11,
+      UPB_SIZE(3, 4),  // kUpb_FieldType_Bytes = 12,
+      2,               // kUpb_FieldType_UInt32 = 13,
+      2,               // kUpb_FieldType_Enum = 14,
+      2,               // kUpb_FieldType_SFixed32 = 15,
+      3,               // kUpb_FieldType_SFixed64 = 16,
+      2,               // kUpb_FieldType_SInt32 = 17,
+      3,               // kUpb_FieldType_SInt64 = 18,
+  };
+  return table[field->UPB_PRIVATE(descriptortype)];
+}
+
+// Here we define universal getter/setter functions for message fields.
+// These look very branchy and inefficient, but as long as the MiniTableField
+// values are known at compile time, all the branches are optimized away and
+// we are left with ideal code.  This can happen either through through
+// literals or UPB_ASSUME():
+//
+//   // Via struct literals.
+//   bool FooMessage_set_bool_field(const upb_Message* msg, bool val) {
+//     const upb_MiniTableField field = {1, 0, 0, /* etc... */};
+//     // All value in "field" are compile-time known.
+//     _upb_Message_SetNonExtensionField(msg, &field, &value);
+//   }
+//
+//   // Via UPB_ASSUME().
+//   UPB_INLINE bool upb_Message_SetBool(upb_Message* msg,
+//                                       const upb_MiniTableField* field,
+//                                       bool value, upb_Arena* a) {
+//     UPB_ASSUME(field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Bool);
+//     UPB_ASSUME(!upb_IsRepeatedOrMap(field));
+//     UPB_ASSUME(_upb_MiniTableField_GetRep(field) == kUpb_FieldRep_1Byte);
+//     _upb_Message_SetField(msg, field, &value, a);
+//   }
+//
+// As a result, we can use these universal getters/setters for *all* message
+// accessors: generated code, MiniTable accessors, and reflection.  The only
+// exception is the binary encoder/decoder, which need to be a bit more clever
+// about how they read/write the message data, for efficiency.
+//
+// These functions work on both extensions and non-extensions. If the field
+// of a setter is known to be a non-extension, the arena may be NULL and the
+// returned bool value may be ignored since it will always succeed.
+
+UPB_INLINE bool _upb_Message_HasExtensionField(
+    const upb_Message* msg, const upb_MiniTableExtension* ext) {
+  UPB_ASSERT(upb_MiniTableField_HasPresence(&ext->field));
+  return _upb_Message_Getext(msg, ext) != NULL;
+}
+
+UPB_INLINE bool _upb_Message_HasNonExtensionField(
+    const upb_Message* msg, const upb_MiniTableField* field) {
+  UPB_ASSERT(upb_MiniTableField_HasPresence(field));
+  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
+  if (_upb_MiniTableField_InOneOf(field)) {
+    return _upb_getoneofcase_field(msg, field) == field->number;
+  } else {
+    return _upb_hasbit_field(msg, field);
+  }
+}
+
+static UPB_FORCEINLINE void _upb_Message_GetNonExtensionField(
+    const upb_Message* msg, const upb_MiniTableField* field,
+    const void* default_val, void* val) {
+  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
+  if ((_upb_MiniTableField_InOneOf(field) ||
+       _upb_MiniTable_ValueIsNonZero(default_val, field)) &&
+      !_upb_Message_HasNonExtensionField(msg, field)) {
+    _upb_MiniTable_CopyFieldData(val, default_val, field);
+    return;
+  }
+  _upb_MiniTable_CopyFieldData(val, _upb_MiniTableField_GetConstPtr(msg, field),
+                               field);
+}
+
+UPB_INLINE void _upb_Message_GetExtensionField(
+    const upb_Message* msg, const upb_MiniTableExtension* mt_ext,
+    const void* default_val, void* val) {
+  UPB_ASSUME(upb_MiniTableField_IsExtension(&mt_ext->field));
+  const upb_Message_Extension* ext = _upb_Message_Getext(msg, mt_ext);
+  if (ext) {
+    _upb_MiniTable_CopyFieldData(val, &ext->data, &mt_ext->field);
+  } else {
+    _upb_MiniTable_CopyFieldData(val, default_val, &mt_ext->field);
+  }
+}
+
+UPB_INLINE void _upb_Message_GetField(const upb_Message* msg,
+                                      const upb_MiniTableField* field,
+                                      const void* default_val, void* val) {
+  if (upb_MiniTableField_IsExtension(field)) {
+    _upb_Message_GetExtensionField(msg, (upb_MiniTableExtension*)field,
+                                   default_val, val);
+  } else {
+    _upb_Message_GetNonExtensionField(msg, field, default_val, val);
+  }
+}
+
+UPB_INLINE void _upb_Message_SetNonExtensionField(
+    upb_Message* msg, const upb_MiniTableField* field, const void* val) {
+  UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
+  _upb_Message_SetPresence(msg, field);
+  _upb_MiniTable_CopyFieldData(_upb_MiniTableField_GetPtr(msg, field), val,
+                               field);
+}
+
+UPB_INLINE bool _upb_Message_SetExtensionField(
+    upb_Message* msg, const upb_MiniTableExtension* mt_ext, const void* val,
+    upb_Arena* a) {
+  UPB_ASSERT(a);
+  upb_Message_Extension* ext =
+      _upb_Message_GetOrCreateExtension(msg, mt_ext, a);
+  if (!ext) return false;
+  _upb_MiniTable_CopyFieldData(&ext->data, val, &mt_ext->field);
+  return true;
+}
+
+UPB_INLINE bool _upb_Message_SetField(upb_Message* msg,
+                                      const upb_MiniTableField* field,
+                                      const void* val, upb_Arena* a) {
+  if (upb_MiniTableField_IsExtension(field)) {
+    const upb_MiniTableExtension* ext = (const upb_MiniTableExtension*)field;
+    return _upb_Message_SetExtensionField(msg, ext, val, a);
+  } else {
+    _upb_Message_SetNonExtensionField(msg, field, val);
+    return true;
+  }
+}
+
+UPB_INLINE void _upb_Message_ClearExtensionField(
+    upb_Message* msg, const upb_MiniTableExtension* ext_l) {
+  upb_Message_Internal* in = upb_Message_Getinternal(msg);
+  if (!in->internal) return;
+  const upb_Message_Extension* base =
+      UPB_PTR_AT(in->internal, in->internal->ext_begin, upb_Message_Extension);
+  upb_Message_Extension* ext =
+      (upb_Message_Extension*)_upb_Message_Getext(msg, ext_l);
+  if (ext) {
+    *ext = *base;
+    in->internal->ext_begin += sizeof(upb_Message_Extension);
+  }
+}
+
+UPB_INLINE void _upb_Message_ClearNonExtensionField(
+    upb_Message* msg, const upb_MiniTableField* field) {
+  if (field->presence > 0) {
+    _upb_clearhas(msg, _upb_Message_Hasidx(field));
+  } else if (_upb_MiniTableField_InOneOf(field)) {
+    uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
+    if (*oneof_case != field->number) return;
+    *oneof_case = 0;
+  }
+  const char zeros[16] = {0};
+  _upb_MiniTable_CopyFieldData(_upb_MiniTableField_GetPtr(msg, field), zeros,
+                               field);
+}
+
+UPB_INLINE void _upb_Message_AssertMapIsUntagged(
+    const upb_Message* msg, const upb_MiniTableField* field) {
+  UPB_UNUSED(msg);
+  _upb_MiniTableField_CheckIsMap(field);
+#ifndef NDEBUG
+  upb_TaggedMessagePtr default_val = 0;
+  upb_TaggedMessagePtr tagged;
+  _upb_Message_GetNonExtensionField(msg, field, &default_val, &tagged);
+  UPB_ASSERT(!upb_TaggedMessagePtr_IsEmpty(tagged));
+#endif
+}
+
+UPB_INLINE upb_Map* _upb_Message_GetOrCreateMutableMap(
+    upb_Message* msg, const upb_MiniTableField* field, size_t key_size,
+    size_t val_size, upb_Arena* arena) {
+  _upb_MiniTableField_CheckIsMap(field);
+  _upb_Message_AssertMapIsUntagged(msg, field);
+  upb_Map* map = NULL;
+  upb_Map* default_map_value = NULL;
+  _upb_Message_GetNonExtensionField(msg, field, &default_map_value, &map);
+  if (!map) {
+    map = _upb_Map_New(arena, key_size, val_size);
+    // Check again due to: https://godbolt.org/z/7WfaoKG1r
+    _upb_MiniTableField_CheckIsMap(field);
+    _upb_Message_SetNonExtensionField(msg, field, &map);
+  }
+  return map;
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  // UPB_MESSAGE_INTERNAL_ACCESSORS_H_
diff --git a/third_party/upb/upb/message/internal/array.h b/third_party/upb/upb/message/internal/array.h
new file mode 100644
index 0000000000000..e8e8429cfdd06
--- /dev/null
+++ b/third_party/upb/upb/message/internal/array.h
@@ -0,0 +1,138 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef UPB_MESSAGE_INTERNAL_ARRAY_H_
+#define UPB_MESSAGE_INTERNAL_ARRAY_H_
+
+#include <string.h>
+
+#include "upb/message/array.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// LINT.IfChange(struct_definition)
+// Our internal representation for repeated fields.
+struct upb_Array {
+  uintptr_t data;  /* Tagged ptr: low 3 bits of ptr are lg2(elem size). */
+  size_t size;     /* The number of elements in the array. */
+  size_t capacity; /* Allocated storage. Measured in elements. */
+};
+// LINT.ThenChange(GoogleInternalName1)
+
+UPB_INLINE size_t _upb_Array_ElementSizeLg2(const upb_Array* arr) {
+  size_t ret = arr->data & 7;
+  UPB_ASSERT(ret <= 4);
+  return ret;
+}
+
+UPB_INLINE const void* _upb_array_constptr(const upb_Array* arr) {
+  _upb_Array_ElementSizeLg2(arr);  // Check assertion.
+  return (void*)(arr->data & ~(uintptr_t)7);
+}
+
+UPB_INLINE uintptr_t _upb_array_tagptr(void* ptr, int elem_size_lg2) {
+  UPB_ASSERT(elem_size_lg2 <= 4);
+  return (uintptr_t)ptr | elem_size_lg2;
+}
+
+UPB_INLINE void* _upb_array_ptr(upb_Array* arr) {
+  return (void*)_upb_array_constptr(arr);
+}
+
+UPB_INLINE uintptr_t _upb_tag_arrptr(void* ptr, int elem_size_lg2) {
+  UPB_ASSERT(elem_size_lg2 <= 4);
+  UPB_ASSERT(((uintptr_t)ptr & 7) == 0);
+  return (uintptr_t)ptr | (unsigned)elem_size_lg2;
+}
+
+extern const char _upb_Array_CTypeSizeLg2Table[];
+
+UPB_INLINE size_t _upb_Array_CTypeSizeLg2(upb_CType ctype) {
+  return _upb_Array_CTypeSizeLg2Table[ctype];
+}
+
+UPB_INLINE upb_Array* _upb_Array_New(upb_Arena* a, size_t init_capacity,
+                                     int elem_size_lg2) {
+  UPB_ASSERT(elem_size_lg2 <= 4);
+  const size_t arr_size = UPB_ALIGN_UP(sizeof(upb_Array), UPB_MALLOC_ALIGN);
+  const size_t bytes = arr_size + (init_capacity << elem_size_lg2);
+  upb_Array* arr = (upb_Array*)upb_Arena_Malloc(a, bytes);
+  if (!arr) return NULL;
+  arr->data = _upb_tag_arrptr(UPB_PTR_AT(arr, arr_size, void), elem_size_lg2);
+  arr->size = 0;
+  arr->capacity = init_capacity;
+  return arr;
+}
+
+// Resizes the capacity of the array to be at least min_size.
+bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena);
+
+UPB_INLINE bool _upb_array_reserve(upb_Array* arr, size_t size,
+                                   upb_Arena* arena) {
+  if (arr->capacity < size) return _upb_array_realloc(arr, size, arena);
+  return true;
+}
+
+// Resize without initializing new elements.
+UPB_INLINE bool _upb_Array_ResizeUninitialized(upb_Array* arr, size_t size,
+                                               upb_Arena* arena) {
+  UPB_ASSERT(size <= arr->size || arena);  // Allow NULL arena when shrinking.
+  if (!_upb_array_reserve(arr, size, arena)) return false;
+  arr->size = size;
+  return true;
+}
+
+// This function is intended for situations where elem_size is compile-time
+// constant or a known expression of the form (1 << lg2), so that the expression
+// i*elem_size does not result in an actual multiplication.
+UPB_INLINE void _upb_Array_Set(upb_Array* arr, size_t i, const void* data,
+                               size_t elem_size) {
+  UPB_ASSERT(i < arr->size);
+  UPB_ASSERT(elem_size == 1U << _upb_Array_ElementSizeLg2(arr));
+  char* arr_data = (char*)_upb_array_ptr(arr);
+  memcpy(arr_data + (i * elem_size), data, elem_size);
+}
+
+UPB_INLINE void _upb_array_detach(const void* msg, size_t ofs) {
+  *UPB_PTR_AT(msg, ofs, upb_Array*) = NULL;
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_INTERNAL_ARRAY_H_ */
diff --git a/third_party/upb/upb/message/internal/extension.h b/third_party/upb/upb/message/internal/extension.h
new file mode 100644
index 0000000000000..ab653abc848bc
--- /dev/null
+++ b/third_party/upb/upb/message/internal/extension.h
@@ -0,0 +1,63 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MESSAGE_INTERNAL_EXTENSION_H_
+#define UPB_MESSAGE_INTERNAL_EXTENSION_H_
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
+#include "upb/message/message.h"
+#include "upb/mini_table/extension.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// The internal representation of an extension is self-describing: it contains
+// enough information that we can serialize it to binary format without needing
+// to look it up in a upb_ExtensionRegistry.
+//
+// This representation allocates 16 bytes to data on 64-bit platforms.
+// This is rather wasteful for scalars (in the extreme case of bool,
+// it wastes 15 bytes). We accept this because we expect messages to be
+// the most common extension type.
+typedef struct {
+  const upb_MiniTableExtension* ext;
+  union {
+    upb_StringView str;
+    void* ptr;
+    char scalar_data[8];
+  } data;
+} upb_Message_Extension;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Adds the given extension data to the given message.
+// |ext| is copied into the message instance.
+// This logically replaces any previously-added extension with this number.
+upb_Message_Extension* _upb_Message_GetOrCreateExtension(
+    upb_Message* msg, const upb_MiniTableExtension* ext, upb_Arena* arena);
+
+// Returns an array of extensions for this message.
+// Note: the array is ordered in reverse relative to the order of creation.
+const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
+                                                  size_t* count);
+
+// Returns an extension for the given field number, or NULL if no extension
+// exists for this field number.
+const upb_Message_Extension* _upb_Message_Getext(
+    const upb_Message* msg, const upb_MiniTableExtension* ext);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_INTERNAL_EXTENSION_H_ */
diff --git a/third_party/upb/upb/message/internal/map.h b/third_party/upb/upb/message/internal/map.h
new file mode 100644
index 0000000000000..26d23ca0f9d5d
--- /dev/null
+++ b/third_party/upb/upb/message/internal/map.h
@@ -0,0 +1,173 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
+
+#ifndef UPB_COLLECTIONS_INTERNAL_MAP_H_
+#define UPB_COLLECTIONS_INTERNAL_MAP_H_
+
+#include "upb/base/string_view.h"
+#include "upb/hash/str_table.h"
+#include "upb/mem/arena.h"
+#include "upb/message/map.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+struct upb_Map {
+  // Size of key and val, based on the map type.
+  // Strings are represented as '0' because they must be handled specially.
+  char key_size;
+  char val_size;
+
+  upb_strtable table;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Converting between internal table representation and user values.
+//
+// _upb_map_tokey() and _upb_map_fromkey() are inverses.
+// _upb_map_tovalue() and _upb_map_fromvalue() are inverses.
+//
+// These functions account for the fact that strings are treated differently
+// from other types when stored in a map.
+
+UPB_INLINE upb_StringView _upb_map_tokey(const void* key, size_t size) {
+  if (size == UPB_MAPTYPE_STRING) {
+    return *(upb_StringView*)key;
+  } else {
+    return upb_StringView_FromDataAndSize((const char*)key, size);
+  }
+}
+
+UPB_INLINE void _upb_map_fromkey(upb_StringView key, void* out, size_t size) {
+  if (size == UPB_MAPTYPE_STRING) {
+    memcpy(out, &key, sizeof(key));
+  } else {
+    memcpy(out, key.data, size);
+  }
+}
+
+UPB_INLINE bool _upb_map_tovalue(const void* val, size_t size,
+                                 upb_value* msgval, upb_Arena* a) {
+  if (size == UPB_MAPTYPE_STRING) {
+    upb_StringView* strp = (upb_StringView*)upb_Arena_Malloc(a, sizeof(*strp));
+    if (!strp) return false;
+    *strp = *(upb_StringView*)val;
+    *msgval = upb_value_ptr(strp);
+  } else {
+    memcpy(msgval, val, size);
+  }
+  return true;
+}
+
+UPB_INLINE void _upb_map_fromvalue(upb_value val, void* out, size_t size) {
+  if (size == UPB_MAPTYPE_STRING) {
+    const upb_StringView* strp = (const upb_StringView*)upb_value_getptr(val);
+    memcpy(out, strp, sizeof(upb_StringView));
+  } else {
+    memcpy(out, &val, size);
+  }
+}
+
+UPB_INLINE void* _upb_map_next(const upb_Map* map, size_t* iter) {
+  upb_strtable_iter it;
+  it.t = &map->table;
+  it.index = *iter;
+  upb_strtable_next(&it);
+  *iter = it.index;
+  if (upb_strtable_done(&it)) return NULL;
+  return (void*)str_tabent(&it);
+}
+
+UPB_INLINE void _upb_Map_Clear(upb_Map* map) {
+  upb_strtable_clear(&map->table);
+}
+
+UPB_INLINE bool _upb_Map_Delete(upb_Map* map, const void* key, size_t key_size,
+                                upb_value* val) {
+  upb_StringView k = _upb_map_tokey(key, key_size);
+  return upb_strtable_remove2(&map->table, k.data, k.size, val);
+}
+
+UPB_INLINE bool _upb_Map_Get(const upb_Map* map, const void* key,
+                             size_t key_size, void* val, size_t val_size) {
+  upb_value tabval;
+  upb_StringView k = _upb_map_tokey(key, key_size);
+  bool ret = upb_strtable_lookup2(&map->table, k.data, k.size, &tabval);
+  if (ret && val) {
+    _upb_map_fromvalue(tabval, val, val_size);
+  }
+  return ret;
+}
+
+UPB_INLINE upb_MapInsertStatus _upb_Map_Insert(upb_Map* map, const void* key,
+                                               size_t key_size, void* val,
+                                               size_t val_size, upb_Arena* a) {
+  upb_StringView strkey = _upb_map_tokey(key, key_size);
+  upb_value tabval = {0};
+  if (!_upb_map_tovalue(val, val_size, &tabval, a)) {
+    return kUpb_MapInsertStatus_OutOfMemory;
+  }
+
+  // TODO: add overwrite operation to minimize number of lookups.
+  bool removed =
+      upb_strtable_remove2(&map->table, strkey.data, strkey.size, NULL);
+  if (!upb_strtable_insert(&map->table, strkey.data, strkey.size, tabval, a)) {
+    return kUpb_MapInsertStatus_OutOfMemory;
+  }
+  return removed ? kUpb_MapInsertStatus_Replaced
+                 : kUpb_MapInsertStatus_Inserted;
+}
+
+UPB_INLINE size_t _upb_Map_Size(const upb_Map* map) {
+  return map->table.t.count;
+}
+
+// Strings/bytes are special-cased in maps.
+extern char _upb_Map_CTypeSizeTable[12];
+
+UPB_INLINE size_t _upb_Map_CTypeSize(upb_CType ctype) {
+  return _upb_Map_CTypeSizeTable[ctype];
+}
+
+// Creates a new map on the given arena with this key/value type.
+upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_COLLECTIONS_INTERNAL_MAP_H_ */
diff --git a/third_party/upb/upb/message/internal/map_entry.h b/third_party/upb/upb/message/internal/map_entry.h
index 95c7181f684a9..27185447cbc27 100644
--- a/third_party/upb/upb/message/internal/map_entry.h
+++ b/third_party/upb/upb/message/internal/map_entry.h
@@ -1,37 +1,39 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_MINI_TABLE_INTERNAL_MAP_ENTRY_DATA_H_
-#define UPB_MINI_TABLE_INTERNAL_MAP_ENTRY_DATA_H_
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdint.h>
+#ifndef UPB_COLLECTIONS_INTERNAL_MAP_ENTRY_H_
+#define UPB_COLLECTIONS_INTERNAL_MAP_ENTRY_H_
 
 #include "upb/base/string_view.h"
 #include "upb/hash/common.h"
+#include "upb/message/internal/types.h"
 
 // Map entries aren't actually stored for map fields, they are only used during
 // parsing. For parsing, it helps a lot if all map entry messages have the same
@@ -41,7 +43,7 @@
 // Note that users can and do create map entries directly, which will also use
 // this layout.
 //
-// NOTE: sync with mini_table/decode.c.
+// NOTE: sync with wire/decode.c.
 typedef struct {
   // We only need 2 hasbits max, but due to alignment we'll use 8 bytes here,
   // and the uint64_t helps make this clear.
@@ -57,8 +59,8 @@ typedef struct {
 } upb_MapEntryData;
 
 typedef struct {
-  void* internal_data;
+  upb_Message_Internal internal;
   upb_MapEntryData data;
 } upb_MapEntry;
 
-#endif  // UPB_MINI_TABLE_INTERNAL_MAP_ENTRY_DATA_H_
+#endif  // UPB_COLLECTIONS_INTERNAL_MAP_ENTRY_H_
diff --git a/third_party/upb/upb/message/internal/map_sorter.h b/third_party/upb/upb/message/internal/map_sorter.h
new file mode 100644
index 0000000000000..77e62630915a8
--- /dev/null
+++ b/third_party/upb/upb/message/internal/map_sorter.h
@@ -0,0 +1,112 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
+
+#ifndef UPB_COLLECTIONS_INTERNAL_MAP_SORTER_H_
+#define UPB_COLLECTIONS_INTERNAL_MAP_SORTER_H_
+
+#include <stdlib.h>
+
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/map.h"
+#include "upb/message/internal/map_entry.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// _upb_mapsorter sorts maps and provides ordered iteration over the entries.
+// Since maps can be recursive (map values can be messages which contain other
+// maps), _upb_mapsorter can contain a stack of maps.
+
+typedef struct {
+  void const** entries;
+  int size;
+  int cap;
+} _upb_mapsorter;
+
+typedef struct {
+  int start;
+  int pos;
+  int end;
+} _upb_sortedmap;
+
+UPB_INLINE void _upb_mapsorter_init(_upb_mapsorter* s) {
+  s->entries = NULL;
+  s->size = 0;
+  s->cap = 0;
+}
+
+UPB_INLINE void _upb_mapsorter_destroy(_upb_mapsorter* s) {
+  if (s->entries) free(s->entries);
+}
+
+UPB_INLINE bool _upb_sortedmap_next(_upb_mapsorter* s, const upb_Map* map,
+                                    _upb_sortedmap* sorted, upb_MapEntry* ent) {
+  if (sorted->pos == sorted->end) return false;
+  const upb_tabent* tabent = (const upb_tabent*)s->entries[sorted->pos++];
+  upb_StringView key = upb_tabstrview(tabent->key);
+  _upb_map_fromkey(key, &ent->data.k, map->key_size);
+  upb_value val = {tabent->val.val};
+  _upb_map_fromvalue(val, &ent->data.v, map->val_size);
+  return true;
+}
+
+UPB_INLINE bool _upb_sortedmap_nextext(_upb_mapsorter* s,
+                                       _upb_sortedmap* sorted,
+                                       const upb_Message_Extension** ext) {
+  if (sorted->pos == sorted->end) return false;
+  *ext = (const upb_Message_Extension*)s->entries[sorted->pos++];
+  return true;
+}
+
+UPB_INLINE void _upb_mapsorter_popmap(_upb_mapsorter* s,
+                                      _upb_sortedmap* sorted) {
+  s->size = sorted->start;
+}
+
+bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
+                            const upb_Map* map, _upb_sortedmap* sorted);
+
+bool _upb_mapsorter_pushexts(_upb_mapsorter* s,
+                             const upb_Message_Extension* exts, size_t count,
+                             _upb_sortedmap* sorted);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_COLLECTIONS_INTERNAL_MAP_SORTER_H_ */
diff --git a/third_party/upb/upb/message/internal/message.h b/third_party/upb/upb/message/internal/message.h
new file mode 100644
index 0000000000000..d270a01f5a969
--- /dev/null
+++ b/third_party/upb/upb/message/internal/message.h
@@ -0,0 +1,106 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+/*
+** Our memory representation for parsing tables and messages themselves.
+** Functions in this file are used by generated code and possibly reflection.
+**
+** The definitions in this file are internal to upb.
+**/
+
+#ifndef UPB_MESSAGE_INTERNAL_H_
+#define UPB_MESSAGE_INTERNAL_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/types.h"
+#include "upb/message/message.h"
+#include "upb/mini_table/extension.h"
+#include "upb/mini_table/extension_registry.h"
+#include "upb/mini_table/message.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const float kUpb_FltInfinity;
+extern const double kUpb_Infinity;
+extern const double kUpb_NaN;
+
+/* Internal members of a upb_Message that track unknown fields and/or
+ * extensions. We can change this without breaking binary compatibility.  We put
+ * these before the user's data.  The user's upb_Message* points after the
+ * upb_Message_Internal. */
+
+struct upb_Message_InternalData {
+  /* Total size of this structure, including the data that follows.
+   * Must be aligned to 8, which is alignof(upb_Message_Extension) */
+  uint32_t size;
+
+  /* Offsets relative to the beginning of this structure.
+   *
+   * Unknown data grows forward from the beginning to unknown_end.
+   * Extension data grows backward from size to ext_begin.
+   * When the two meet, we're out of data and have to realloc.
+   *
+   * If we imagine that the final member of this struct is:
+   *   char data[size - overhead];  // overhead =
+   * sizeof(upb_Message_InternalData)
+   *
+   * Then we have:
+   *   unknown data: data[0 .. (unknown_end - overhead)]
+   *   extensions data: data[(ext_begin - overhead) .. (size - overhead)] */
+  uint32_t unknown_end;
+  uint32_t ext_begin;
+  /* Data follows, as if there were an array:
+   *   char data[size - sizeof(upb_Message_InternalData)]; */
+};
+
+/* Maps upb_CType -> memory size. */
+extern char _upb_CTypeo_size[12];
+
+UPB_INLINE size_t upb_msg_sizeof(const upb_MiniTable* t) {
+  return t->size + sizeof(upb_Message_Internal);
+}
+
+// Inline version upb_Message_New(), for internal use.
+UPB_INLINE upb_Message* _upb_Message_New(const upb_MiniTable* mini_table,
+                                         upb_Arena* arena) {
+  size_t size = upb_msg_sizeof(mini_table);
+  void* mem = upb_Arena_Malloc(arena, size + sizeof(upb_Message_Internal));
+  if (UPB_UNLIKELY(!mem)) return NULL;
+  upb_Message* msg = UPB_PTR_AT(mem, sizeof(upb_Message_Internal), upb_Message);
+  memset(mem, 0, size);
+  return msg;
+}
+
+UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(
+    const upb_Message* msg) {
+  ptrdiff_t size = sizeof(upb_Message_Internal);
+  return (upb_Message_Internal*)((char*)msg - size);
+}
+
+// Discards the unknown fields for this message only.
+void _upb_Message_DiscardUnknown_shallow(upb_Message* msg);
+
+// Adds unknown data (serialized protobuf data) to the given message.
+// The data is copied into the message instance.
+bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
+                             upb_Arena* arena);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/message/internal/types.h b/third_party/upb/upb/message/internal/types.h
new file mode 100644
index 0000000000000..2bd3b0b1344c5
--- /dev/null
+++ b/third_party/upb/upb/message/internal/types.h
@@ -0,0 +1,23 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MINI_TABLE_INTERNAL_TYPES_H_
+#define UPB_MINI_TABLE_INTERNAL_TYPES_H_
+
+typedef struct upb_Message_InternalData upb_Message_InternalData;
+
+typedef struct {
+  union {
+    upb_Message_InternalData* internal;
+
+    // Force 8-byte alignment, since the data members may contain members that
+    // require 8-byte alignment.
+    double d;
+  };
+} upb_Message_Internal;
+
+#endif  // UPB_MINI_TABLE_INTERNAL_TYPES_H_
diff --git a/third_party/upb/upb/message/map.c b/third_party/upb/upb/message/map.c
new file mode 100644
index 0000000000000..2a90cd0c79e93
--- /dev/null
+++ b/third_party/upb/upb/message/map.c
@@ -0,0 +1,145 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "upb/message/map.h"
+
+#include <string.h>
+
+#include "upb/mem/arena.h"
+#include "upb/message/internal/map.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// Strings/bytes are special-cased in maps.
+char _upb_Map_CTypeSizeTable[12] = {
+    [kUpb_CType_Bool] = 1,
+    [kUpb_CType_Float] = 4,
+    [kUpb_CType_Int32] = 4,
+    [kUpb_CType_UInt32] = 4,
+    [kUpb_CType_Enum] = 4,
+    [kUpb_CType_Message] = sizeof(void*),
+    [kUpb_CType_Double] = 8,
+    [kUpb_CType_Int64] = 8,
+    [kUpb_CType_UInt64] = 8,
+    [kUpb_CType_String] = UPB_MAPTYPE_STRING,
+    [kUpb_CType_Bytes] = UPB_MAPTYPE_STRING,
+};
+
+upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type) {
+  return _upb_Map_New(a, _upb_Map_CTypeSize(key_type),
+                      _upb_Map_CTypeSize(value_type));
+}
+
+size_t upb_Map_Size(const upb_Map* map) { return _upb_Map_Size(map); }
+
+bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
+                 upb_MessageValue* val) {
+  return _upb_Map_Get(map, &key, map->key_size, val, map->val_size);
+}
+
+void upb_Map_Clear(upb_Map* map) { _upb_Map_Clear(map); }
+
+upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
+                                   upb_MessageValue val, upb_Arena* arena) {
+  UPB_ASSERT(arena);
+  return (upb_MapInsertStatus)_upb_Map_Insert(map, &key, map->key_size, &val,
+                                              map->val_size, arena);
+}
+
+bool upb_Map_Delete(upb_Map* map, upb_MessageValue key, upb_MessageValue* val) {
+  upb_value v;
+  const bool removed = _upb_Map_Delete(map, &key, map->key_size, &v);
+  if (val) _upb_map_fromvalue(v, val, map->val_size);
+  return removed;
+}
+
+bool upb_Map_Next(const upb_Map* map, upb_MessageValue* key,
+                  upb_MessageValue* val, size_t* iter) {
+  upb_StringView k;
+  upb_value v;
+  const bool ok = upb_strtable_next2(&map->table, &k, &v, (intptr_t*)iter);
+  if (ok) {
+    _upb_map_fromkey(k, key, map->key_size);
+    _upb_map_fromvalue(v, val, map->val_size);
+  }
+  return ok;
+}
+
+UPB_API void upb_Map_SetEntryValue(upb_Map* map, size_t iter,
+                                   upb_MessageValue val) {
+  upb_value v;
+  _upb_map_tovalue(&val, map->val_size, &v, NULL);
+  upb_strtable_setentryvalue(&map->table, iter, v);
+}
+
+bool upb_MapIterator_Next(const upb_Map* map, size_t* iter) {
+  return _upb_map_next(map, iter);
+}
+
+bool upb_MapIterator_Done(const upb_Map* map, size_t iter) {
+  upb_strtable_iter i;
+  UPB_ASSERT(iter != kUpb_Map_Begin);
+  i.t = &map->table;
+  i.index = iter;
+  return upb_strtable_done(&i);
+}
+
+// Returns the key and value for this entry of the map.
+upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter) {
+  upb_strtable_iter i;
+  upb_MessageValue ret;
+  i.t = &map->table;
+  i.index = iter;
+  _upb_map_fromkey(upb_strtable_iter_key(&i), &ret, map->key_size);
+  return ret;
+}
+
+upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter) {
+  upb_strtable_iter i;
+  upb_MessageValue ret;
+  i.t = &map->table;
+  i.index = iter;
+  _upb_map_fromvalue(upb_strtable_iter_value(&i), &ret, map->val_size);
+  return ret;
+}
+
+// EVERYTHING BELOW THIS LINE IS INTERNAL - DO NOT USE /////////////////////////
+
+upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size) {
+  upb_Map* map = upb_Arena_Malloc(a, sizeof(upb_Map));
+  if (!map) return NULL;
+
+  upb_strtable_init(&map->table, 4, a);
+  map->key_size = key_size;
+  map->val_size = value_size;
+
+  return map;
+}
diff --git a/third_party/upb/upb/message/map.h b/third_party/upb/upb/message/map.h
new file mode 100644
index 0000000000000..051f954e40acc
--- /dev/null
+++ b/third_party/upb/upb/message/map.h
@@ -0,0 +1,147 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef UPB_MESSAGE_MAP_H_
+#define UPB_MESSAGE_MAP_H_
+
+#include <stddef.h>
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/mem/arena.h"
+#include "upb/message/value.h"  // IWYU pragma: export
+
+// Must be last.
+#include "upb/port/def.inc"
+
+typedef struct upb_Map upb_Map;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Creates a new map on the given arena with the given key/value size.
+UPB_API upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type,
+                             upb_CType value_type);
+
+// Returns the number of entries in the map.
+UPB_API size_t upb_Map_Size(const upb_Map* map);
+
+// Stores a value for the given key into |*val| (or the zero value if the key is
+// not present). Returns whether the key was present. The |val| pointer may be
+// NULL, in which case the function tests whether the given key is present.
+UPB_API bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
+                         upb_MessageValue* val);
+
+// Removes all entries in the map.
+UPB_API void upb_Map_Clear(upb_Map* map);
+
+typedef enum {
+  kUpb_MapInsertStatus_Inserted = 0,
+  kUpb_MapInsertStatus_Replaced = 1,
+  kUpb_MapInsertStatus_OutOfMemory = 2,
+} upb_MapInsertStatus;
+
+// Sets the given key to the given value, returning whether the key was inserted
+// or replaced. If the key was inserted, then any existing iterators will be
+// invalidated.
+UPB_API upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
+                                           upb_MessageValue val,
+                                           upb_Arena* arena);
+
+// Sets the given key to the given value. Returns false if memory allocation
+// failed. If the key is newly inserted, then any existing iterators will be
+// invalidated.
+UPB_API_INLINE bool upb_Map_Set(upb_Map* map, upb_MessageValue key,
+                                upb_MessageValue val, upb_Arena* arena) {
+  return upb_Map_Insert(map, key, val, arena) !=
+         kUpb_MapInsertStatus_OutOfMemory;
+}
+
+// Deletes this key from the table. Returns true if the key was present.
+// If present and |val| is non-NULL, stores the deleted value.
+UPB_API bool upb_Map_Delete(upb_Map* map, upb_MessageValue key,
+                            upb_MessageValue* val);
+
+// (DEPRECATED and going away soon. Do not use.)
+UPB_INLINE bool upb_Map_Delete2(upb_Map* map, upb_MessageValue key,
+                                upb_MessageValue* val) {
+  return upb_Map_Delete(map, key, val);
+}
+
+// Map iteration:
+//
+// size_t iter = kUpb_Map_Begin;
+// upb_MessageValue key, val;
+// while (upb_Map_Next(map, &key, &val, &iter)) {
+//   ...
+// }
+
+#define kUpb_Map_Begin ((size_t)-1)
+
+// Advances to the next entry. Returns false if no more entries are present.
+// Otherwise returns true and populates both *key and *value.
+UPB_API bool upb_Map_Next(const upb_Map* map, upb_MessageValue* key,
+                          upb_MessageValue* val, size_t* iter);
+
+// Sets the value for the entry pointed to by iter.
+// WARNING: this does not currently work for string values!
+UPB_API void upb_Map_SetEntryValue(upb_Map* map, size_t iter,
+                                   upb_MessageValue val);
+
+// DEPRECATED iterator, slated for removal.
+
+/* Map iteration:
+ *
+ * size_t iter = kUpb_Map_Begin;
+ * while (upb_MapIterator_Next(map, &iter)) {
+ *   upb_MessageValue key = upb_MapIterator_Key(map, iter);
+ *   upb_MessageValue val = upb_MapIterator_Value(map, iter);
+ * }
+ */
+
+// Advances to the next entry. Returns false if no more entries are present.
+UPB_API bool upb_MapIterator_Next(const upb_Map* map, size_t* iter);
+
+// Returns true if the iterator still points to a valid entry, or false if the
+// iterator is past the last element. It is an error to call this function with
+// kUpb_Map_Begin (you must call next() at least once first).
+UPB_API bool upb_MapIterator_Done(const upb_Map* map, size_t iter);
+
+// Returns the key and value for this entry of the map.
+UPB_API upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter);
+UPB_API upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_MAP_H_ */
diff --git a/third_party/upb/upb/message/map_gencode_util.h b/third_party/upb/upb/message/map_gencode_util.h
new file mode 100644
index 0000000000000..52ad69f5a2a43
--- /dev/null
+++ b/third_party/upb/upb/message/map_gencode_util.h
@@ -0,0 +1,81 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// These functions are only used by generated code.
+
+#ifndef UPB_MESSAGE_MAP_GENCODE_UTIL_H_
+#define UPB_MESSAGE_MAP_GENCODE_UTIL_H_
+
+#include "upb/message/internal/map.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Message map operations, these get the map from the message first.
+
+UPB_INLINE void _upb_msg_map_key(const void* msg, void* key, size_t size) {
+  const upb_tabent* ent = (const upb_tabent*)msg;
+  uint32_t u32len;
+  upb_StringView k;
+  k.data = upb_tabstr(ent->key, &u32len);
+  k.size = u32len;
+  _upb_map_fromkey(k, key, size);
+}
+
+UPB_INLINE void _upb_msg_map_value(const void* msg, void* val, size_t size) {
+  const upb_tabent* ent = (const upb_tabent*)msg;
+  upb_value v = {ent->val.val};
+  _upb_map_fromvalue(v, val, size);
+}
+
+UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val,
+                                       size_t size) {
+  upb_tabent* ent = (upb_tabent*)msg;
+  // This is like _upb_map_tovalue() except the entry already exists
+  // so we can reuse the allocated upb_StringView for string fields.
+  if (size == UPB_MAPTYPE_STRING) {
+    upb_StringView* strp = (upb_StringView*)(uintptr_t)ent->val.val;
+    memcpy(strp, val, sizeof(*strp));
+  } else {
+    memcpy(&ent->val.val, val, size);
+  }
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MESSAGE_MAP_GENCODE_UTIL_H_ */
diff --git a/third_party/upb/upb/message/map_sorter.c b/third_party/upb/upb/message/map_sorter.c
new file mode 100644
index 0000000000000..bdbfb59c539a9
--- /dev/null
+++ b/third_party/upb/upb/message/map_sorter.c
@@ -0,0 +1,170 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "upb/message/internal/map_sorter.h"
+
+#include "upb/base/internal/log2.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+static void _upb_mapsorter_getkeys(const void* _a, const void* _b, void* a_key,
+                                   void* b_key, size_t size) {
+  const upb_tabent* const* a = _a;
+  const upb_tabent* const* b = _b;
+  upb_StringView a_tabkey = upb_tabstrview((*a)->key);
+  upb_StringView b_tabkey = upb_tabstrview((*b)->key);
+  _upb_map_fromkey(a_tabkey, a_key, size);
+  _upb_map_fromkey(b_tabkey, b_key, size);
+}
+
+static int _upb_mapsorter_cmpi64(const void* _a, const void* _b) {
+  int64_t a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
+  return a < b ? -1 : a > b;
+}
+
+static int _upb_mapsorter_cmpu64(const void* _a, const void* _b) {
+  uint64_t a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
+  return a < b ? -1 : a > b;
+}
+
+static int _upb_mapsorter_cmpi32(const void* _a, const void* _b) {
+  int32_t a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
+  return a < b ? -1 : a > b;
+}
+
+static int _upb_mapsorter_cmpu32(const void* _a, const void* _b) {
+  uint32_t a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
+  return a < b ? -1 : a > b;
+}
+
+static int _upb_mapsorter_cmpbool(const void* _a, const void* _b) {
+  bool a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, 1);
+  return a < b ? -1 : a > b;
+}
+
+static int _upb_mapsorter_cmpstr(const void* _a, const void* _b) {
+  upb_StringView a, b;
+  _upb_mapsorter_getkeys(_a, _b, &a, &b, UPB_MAPTYPE_STRING);
+  size_t common_size = UPB_MIN(a.size, b.size);
+  int cmp = memcmp(a.data, b.data, common_size);
+  if (cmp) return -cmp;
+  return a.size < b.size ? -1 : a.size > b.size;
+}
+
+static int (*const compar[kUpb_FieldType_SizeOf])(const void*, const void*) = {
+    [kUpb_FieldType_Int64] = _upb_mapsorter_cmpi64,
+    [kUpb_FieldType_SFixed64] = _upb_mapsorter_cmpi64,
+    [kUpb_FieldType_SInt64] = _upb_mapsorter_cmpi64,
+
+    [kUpb_FieldType_UInt64] = _upb_mapsorter_cmpu64,
+    [kUpb_FieldType_Fixed64] = _upb_mapsorter_cmpu64,
+
+    [kUpb_FieldType_Int32] = _upb_mapsorter_cmpi32,
+    [kUpb_FieldType_SInt32] = _upb_mapsorter_cmpi32,
+    [kUpb_FieldType_SFixed32] = _upb_mapsorter_cmpi32,
+    [kUpb_FieldType_Enum] = _upb_mapsorter_cmpi32,
+
+    [kUpb_FieldType_UInt32] = _upb_mapsorter_cmpu32,
+    [kUpb_FieldType_Fixed32] = _upb_mapsorter_cmpu32,
+
+    [kUpb_FieldType_Bool] = _upb_mapsorter_cmpbool,
+
+    [kUpb_FieldType_String] = _upb_mapsorter_cmpstr,
+    [kUpb_FieldType_Bytes] = _upb_mapsorter_cmpstr,
+};
+
+static bool _upb_mapsorter_resize(_upb_mapsorter* s, _upb_sortedmap* sorted,
+                                  int size) {
+  sorted->start = s->size;
+  sorted->pos = sorted->start;
+  sorted->end = sorted->start + size;
+
+  if (sorted->end > s->cap) {
+    s->cap = upb_Log2CeilingSize(sorted->end);
+    s->entries = realloc(s->entries, s->cap * sizeof(*s->entries));
+    if (!s->entries) return false;
+  }
+
+  s->size = sorted->end;
+  return true;
+}
+
+bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
+                            const upb_Map* map, _upb_sortedmap* sorted) {
+  int map_size = _upb_Map_Size(map);
+
+  if (!_upb_mapsorter_resize(s, sorted, map_size)) return false;
+
+  // Copy non-empty entries from the table to s->entries.
+  const void** dst = &s->entries[sorted->start];
+  const upb_tabent* src = map->table.t.entries;
+  const upb_tabent* end = src + upb_table_size(&map->table.t);
+  for (; src < end; src++) {
+    if (!upb_tabent_isempty(src)) {
+      *dst = src;
+      dst++;
+    }
+  }
+  UPB_ASSERT(dst == &s->entries[sorted->end]);
+
+  // Sort entries according to the key type.
+  qsort(&s->entries[sorted->start], map_size, sizeof(*s->entries),
+        compar[key_type]);
+  return true;
+}
+
+static int _upb_mapsorter_cmpext(const void* _a, const void* _b) {
+  const upb_Message_Extension* const* a = _a;
+  const upb_Message_Extension* const* b = _b;
+  uint32_t a_num = (*a)->ext->field.number;
+  uint32_t b_num = (*b)->ext->field.number;
+  assert(a_num != b_num);
+  return a_num < b_num ? -1 : 1;
+}
+
+bool _upb_mapsorter_pushexts(_upb_mapsorter* s,
+                             const upb_Message_Extension* exts, size_t count,
+                             _upb_sortedmap* sorted) {
+  if (!_upb_mapsorter_resize(s, sorted, count)) return false;
+
+  for (size_t i = 0; i < count; i++) {
+    s->entries[sorted->start + i] = &exts[i];
+  }
+
+  qsort(&s->entries[sorted->start], count, sizeof(*s->entries),
+        _upb_mapsorter_cmpext);
+  return true;
+}
diff --git a/third_party/upb/upb/message/map_test.cc b/third_party/upb/upb/message/map_test.cc
new file mode 100644
index 0000000000000..bb7e424bf55a5
--- /dev/null
+++ b/third_party/upb/upb/message/map_test.cc
@@ -0,0 +1,56 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "upb/message/map.h"
+
+#include <gtest/gtest.h>
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
+
+TEST(MapTest, DeleteRegression) {
+  upb::Arena arena;
+  upb_Map* map = upb_Map_New(arena.ptr(), kUpb_CType_Int32, kUpb_CType_String);
+
+  upb_MessageValue key;
+  key.int32_val = 0;
+
+  upb_MessageValue insert_value;
+  insert_value.str_val = upb_StringView_FromString("abcde");
+
+  upb_MapInsertStatus st = upb_Map_Insert(map, key, insert_value, arena.ptr());
+  EXPECT_EQ(kUpb_MapInsertStatus_Inserted, st);
+
+  upb_MessageValue delete_value;
+  bool removed = upb_Map_Delete(map, key, &delete_value);
+  EXPECT_TRUE(removed);
+
+  EXPECT_TRUE(
+      upb_StringView_IsEqual(insert_value.str_val, delete_value.str_val));
+}
diff --git a/third_party/upb/upb/message/message.c b/third_party/upb/upb/message/message.c
index b47cddd2df28c..265d30df13c52 100644
--- a/third_party/upb/upb/message/message.c
+++ b/third_party/upb/upb/message/message.c
@@ -1,36 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/message/message.h"
 
 #include <math.h>
 
-#include "upb/base/log2.h"
-#include "upb/message/internal.h"
+#include "upb/base/internal/log2.h"
+#include "upb/message/internal/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/message/message.h b/third_party/upb/upb/message/message.h
index 25372f1703c5f..705803acbe5a3 100644
--- a/third_party/upb/upb/message/message.h
+++ b/third_party/upb/upb/message/message.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Public APIs for message operations that do not depend on the schema.
 //
@@ -32,7 +12,10 @@
 #ifndef UPB_MESSAGE_MESSAGE_H_
 #define UPB_MESSAGE_MESSAGE_H_
 
+#include <stddef.h>
+
 #include "upb/mem/arena.h"
+#include "upb/message/types.h"  // IWYU pragma: export
 #include "upb/mini_table/message.h"
 
 // Must be last.
diff --git a/third_party/upb/upb/message/promote.c b/third_party/upb/upb/message/promote.c
index d340f2ba096ce..b414eaa80bf0a 100644
--- a/third_party/upb/upb/message/promote.c
+++ b/third_party/upb/upb/message/promote.c
@@ -1,42 +1,34 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/message/promote.h"
 
-#include "upb/collections/array.h"
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/mem/arena.h"
 #include "upb/message/accessors.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/accessors.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map.h"
 #include "upb/message/message.h"
+#include "upb/message/tagged_ptr.h"
+#include "upb/mini_table/extension.h"
 #include "upb/mini_table/field.h"
-#include "upb/wire/common.h"
+#include "upb/mini_table/internal/field.h"
+#include "upb/mini_table/message.h"
 #include "upb/wire/decode.h"
-#include "upb/wire/encode.h"
 #include "upb/wire/eps_copy_input_stream.h"
+#include "upb/wire/internal/constants.h"
 #include "upb/wire/reader.h"
 
 // Must be last.
@@ -85,8 +77,7 @@ upb_GetExtension_Status upb_MiniTable_GetOrPromoteExtension(
 
   // Check unknown fields, if available promote.
   int field_number = ext_table->field.number;
-  upb_FindUnknownRet result = upb_MiniTable_FindUnknown(
-      msg, field_number, kUpb_WireFormat_DefaultDepthLimit);
+  upb_FindUnknownRet result = upb_MiniTable_FindUnknown(msg, field_number, 0);
   if (result.status != kUpb_FindUnknown_Ok) {
     return kUpb_GetExtension_NotPresent;
   }
@@ -128,6 +119,8 @@ static upb_FindUnknownRet upb_FindUnknownRet_ParseError(void) {
 upb_FindUnknownRet upb_MiniTable_FindUnknown(const upb_Message* msg,
                                              uint32_t field_number,
                                              int depth_limit) {
+  depth_limit = depth_limit ? depth_limit : kUpb_WireFormat_DefaultDepthLimit;
+
   size_t size;
   upb_FindUnknownRet ret;
 
@@ -233,7 +226,7 @@ upb_DecodeStatus upb_Map_PromoteMessages(upb_Map* map,
 // OLD promotion functions, will be removed!
 ////////////////////////////////////////////////////////////////////////////////
 
-// Warning: See TODO(b/267655898)
+// Warning: See TODO
 upb_UnknownToMessageRet upb_MiniTable_PromoteUnknownToMessage(
     upb_Message* msg, const upb_MiniTable* mini_table,
     const upb_MiniTableField* field, const upb_MiniTable* sub_mini_table,
@@ -290,7 +283,7 @@ upb_UnknownToMessageRet upb_MiniTable_PromoteUnknownToMessage(
 //
 // Since the repeated field is not a scalar type we don't check for
 // kUpb_LabelFlags_IsPacked.
-// TODO(b/251007554): Optimize. Instead of converting messages one at a time,
+// TODO: Optimize. Instead of converting messages one at a time,
 // scan all unknown data once and compact.
 upb_UnknownToMessage_Status upb_MiniTable_PromoteUnknownToMessageArray(
     upb_Message* msg, const upb_MiniTableField* field,
diff --git a/third_party/upb/upb/message/promote.h b/third_party/upb/upb/message/promote.h
index f7ab345628fce..fb3823e205d20 100644
--- a/third_party/upb/upb/message/promote.h
+++ b/third_party/upb/upb/message/promote.h
@@ -1,35 +1,16 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MESSAGE_PROMOTE_H_
 #define UPB_MESSAGE_PROMOTE_H_
 
-#include "upb/collections/array.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/map.h"
 #include "upb/wire/decode.h"
 
 // Must be last.
@@ -55,7 +36,7 @@ typedef enum {
 // Returns a message extension or promotes an unknown field to
 // an extension.
 //
-// TODO(ferhat): Only supports extension fields that are messages,
+// TODO: Only supports extension fields that are messages,
 // expand support to include non-message types.
 upb_GetExtension_Status upb_MiniTable_GetOrPromoteExtension(
     upb_Message* msg, const upb_MiniTableExtension* ext_table,
@@ -77,6 +58,7 @@ typedef struct {
 } upb_FindUnknownRet;
 
 // Finds first occurrence of unknown data by tag id in message.
+// A depth_limit of zero means to just use the upb default depth limit.
 upb_FindUnknownRet upb_MiniTable_FindUnknown(const upb_Message* msg,
                                              uint32_t field_number,
                                              int depth_limit);
diff --git a/third_party/upb/upb/message/promote_test.cc b/third_party/upb/upb/message/promote_test.cc
index 1fe559f12918e..1bfbb15fcdbd1 100644
--- a/third_party/upb/upb/message/promote_test.cc
+++ b/third_party/upb/upb/message/promote_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* Test of mini table accessors.
  *
@@ -33,48 +13,43 @@
 
 #include "upb/message/promote.h"
 
+#include <string.h>
+
+#include <cstddef>
+#include <cstdint>
 #include <string>
 
-#include "gtest/gtest.h"
-#include "google/protobuf/test_messages_proto2.upb.h"
-#include "google/protobuf/test_messages_proto3.upb.h"
+#include <gtest/gtest.h>
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/status.h"
 #include "upb/base/string_view.h"
-#include "upb/collections/array.h"
+#include "upb/mem/arena.h"
+#include "upb/mem/arena.hpp"
 #include "upb/message/accessors.h"
+#include "upb/message/array.h"
 #include "upb/message/copy.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map.h"
+#include "upb/message/message.h"
+#include "upb/message/tagged_ptr.h"
+#include "upb/mini_descriptor/decode.h"
 #include "upb/mini_descriptor/internal/encode.hpp"
 #include "upb/mini_descriptor/internal/modifiers.h"
+#include "upb/mini_descriptor/link.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/message.h"
+#include "upb/mini_table/sub.h"
 #include "upb/test/test.upb.h"
-#include "upb/upb.h"
-#include "upb/upb.hpp"
-#include "upb/wire/common.h"
+#include "upb/test/test.upb_minitable.h"
 #include "upb/wire/decode.h"
+#include "upb/wire/encode.h"
 
 // Must be last
 #include "upb/port/def.inc"
 
 namespace {
 
-// Proto2 test messages field numbers used for reflective access.
-const uint32_t kFieldOptionalInt32 = 1;
-const uint32_t kFieldOptionalUInt32 = 3;
-const uint32_t kFieldOptionalBool = 13;
-const uint32_t kFieldOptionalString = 14;
-const uint32_t kFieldOptionalNestedMessage = 18;
-const uint32_t kFieldOptionalRepeatedInt32 = 31;
-const uint32_t kFieldOptionalNestedMessageA = 1;
-const uint32_t kFieldOptionalOneOfUInt32 = 111;
-const uint32_t kFieldOptionalOneOfString = 113;
-
-const uint32_t kFieldProto3OptionalInt64 = 2;
-const uint32_t kFieldProto3OptionalUInt64 = 4;
-
-const char kTestStr1[] = "Hello1";
-const char kTestStr2[] = "Hello2";
-const int32_t kTestInt32 = 567;
-const int32_t kTestUInt32 = 0xF1234567;
-const uint64_t kTestUInt64 = 0xFEDCBAFF87654321;
-
 TEST(GeneratedCode, FindUnknown) {
   upb_Arena* arena = upb_Arena_New();
   upb_test_ModelWithExtensions* msg = upb_test_ModelWithExtensions_new(arena);
@@ -97,13 +72,11 @@ TEST(GeneratedCode, FindUnknown) {
                                                 arena);
 
   upb_FindUnknownRet result = upb_MiniTable_FindUnknown(
-      base_msg, upb_test_ModelExtension1_model_ext_ext.field.number,
-      kUpb_WireFormat_DefaultDepthLimit);
+      base_msg, upb_test_ModelExtension1_model_ext_ext.field.number, 0);
   EXPECT_EQ(kUpb_FindUnknown_Ok, result.status);
 
   result = upb_MiniTable_FindUnknown(
-      base_msg, upb_test_ModelExtension2_model_ext_ext.field.number,
-      kUpb_WireFormat_DefaultDepthLimit);
+      base_msg, upb_test_ModelExtension2_model_ext_ext.field.number, 0);
   EXPECT_EQ(kUpb_FindUnknown_NotPresent, result.status);
 
   upb_Arena_Free(arena);
@@ -349,7 +322,7 @@ TEST(GeneratedCode, PromoteUnknownMessage) {
   upb_DecodeStatus decode_status;
 
   // If we parse without allowing unlinked objects, the parse will fail.
-  // TODO(haberman): re-enable this test once the old method of tree shaking is
+  // TODO: re-enable this test once the old method of tree shaking is
   // removed
   // upb_Message* fail_msg = _upb_Message_New(mini_table, arena.ptr());
   // decode_status =
@@ -393,10 +366,10 @@ TEST(GeneratedCode, PromoteUnknownMessage) {
   // Update mini table and promote unknown to a message.
   EXPECT_TRUE(
       upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)submsg_field,
-                                  &upb_test_ModelWithExtensions_msg_init));
+                                  &upb_0test__ModelWithExtensions_msg_init));
 
-  const int decode_options = upb_DecodeOptions_MaxDepth(
-      kUpb_WireFormat_DefaultDepthLimit);  // UPB_DECODE_ALIAS disabled.
+  const int decode_options =
+      upb_DecodeOptions_MaxDepth(0);  // UPB_DECODE_ALIAS disabled.
   upb_test_ModelWithExtensions* promoted;
   upb_DecodeStatus promote_result =
       upb_Message_PromoteMessage(msg, mini_table, submsg_field, decode_options,
@@ -441,10 +414,10 @@ TEST(GeneratedCode, ReparseUnlinked) {
       upb_MiniTable_FindFieldByNumber(mini_table, 5);
   EXPECT_TRUE(
       upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)submsg_field,
-                                  &upb_test_ModelWithExtensions_msg_init));
+                                  &upb_0test__ModelWithExtensions_msg_init));
 
-  const int decode_options = upb_DecodeOptions_MaxDepth(
-      kUpb_WireFormat_DefaultDepthLimit);  // UPB_DECODE_ALIAS disabled.
+  const int decode_options =
+      upb_DecodeOptions_MaxDepth(0);  // UPB_DECODE_ALIAS disabled.
   upb_test_ModelWithExtensions* promoted;
   upb_DecodeStatus promote_result =
       upb_Message_PromoteMessage(msg, mini_table, submsg_field, decode_options,
@@ -491,7 +464,7 @@ TEST(GeneratedCode, PromoteInParser) {
       upb_MiniTable_FindFieldByNumber(mini_table, 5);
   EXPECT_TRUE(
       upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)submsg_field,
-                                  &upb_test_ModelWithExtensions_msg_init));
+                                  &upb_0test__ModelWithExtensions_msg_init));
 
   // Parse again.  This will promote the message.  An explicit promote will not
   // be required.
@@ -536,7 +509,7 @@ TEST(GeneratedCode, PromoteUnknownRepeatedMessage) {
   upb_DecodeStatus decode_status;
 
   // If we parse without allowing unlinked objects, the parse will fail.
-  // TODO(haberman): re-enable this test once the old method of tree shaking is
+  // TODO: re-enable this test once the old method of tree shaking is
   // removed
   // upb_Message* fail_msg = _upb_Message_New(mini_table, arena.ptr());
   // decode_status =
@@ -570,11 +543,11 @@ TEST(GeneratedCode, PromoteUnknownRepeatedMessage) {
   // Update mini table and promote unknown to a message.
   EXPECT_TRUE(upb_MiniTable_SetSubMessage(
       mini_table, (upb_MiniTableField*)repeated_field,
-      &upb_test_ModelWithExtensions_msg_init));
-  const int decode_options = upb_DecodeOptions_MaxDepth(
-      kUpb_WireFormat_DefaultDepthLimit);  // UPB_DECODE_ALIAS disabled.
+      &upb_0test__ModelWithExtensions_msg_init));
+  const int decode_options =
+      upb_DecodeOptions_MaxDepth(0);  // UPB_DECODE_ALIAS disabled.
   upb_DecodeStatus promote_result =
-      upb_Array_PromoteMessages(array, &upb_test_ModelWithExtensions_msg_init,
+      upb_Array_PromoteMessages(array, &upb_0test__ModelWithExtensions_msg_init,
                                 decode_options, arena.ptr());
   EXPECT_EQ(promote_result, kUpb_DecodeStatus_Ok);
   const upb_Message* promoted_message = upb_Array_Get(array, 0).msg_val;
@@ -641,9 +614,9 @@ TEST(GeneratedCode, PromoteUnknownToMap) {
   upb_MiniTableField* entry_value = const_cast<upb_MiniTableField*>(
       upb_MiniTable_FindFieldByNumber(entry, 2));
   upb_MiniTable_SetSubMessage(entry, entry_value,
-                              &upb_test_ModelWithExtensions_msg_init);
+                              &upb_0test__ModelWithExtensions_msg_init);
   upb_DecodeStatus promote_result = upb_Map_PromoteMessages(
-      map, &upb_test_ModelWithExtensions_msg_init, 0, arena.ptr());
+      map, &upb_0test__ModelWithExtensions_msg_init, 0, arena.ptr());
   EXPECT_EQ(promote_result, kUpb_DecodeStatus_Ok);
 
   upb_MessageValue key;
@@ -745,19 +718,18 @@ TEST(GeneratedCode, PromoteUnknownMessageOld) {
   int32_t val = upb_Message_GetInt32(
       msg, upb_MiniTable_FindFieldByNumber(mini_table, 4), 0);
   EXPECT_EQ(val, 11);
-  upb_FindUnknownRet unknown =
-      upb_MiniTable_FindUnknown(msg, 5, kUpb_WireFormat_DefaultDepthLimit);
+  upb_FindUnknownRet unknown = upb_MiniTable_FindUnknown(msg, 5, 0);
   EXPECT_EQ(unknown.status, kUpb_FindUnknown_Ok);
   // Update mini table and promote unknown to a message.
   EXPECT_TRUE(upb_MiniTable_SetSubMessage(
       mini_table, (upb_MiniTableField*)&mini_table->fields[1],
-      &upb_test_ModelWithExtensions_msg_init));
-  const int decode_options = upb_DecodeOptions_MaxDepth(
-      kUpb_WireFormat_DefaultDepthLimit);  // UPB_DECODE_ALIAS disabled.
+      &upb_0test__ModelWithExtensions_msg_init));
+  const int decode_options =
+      upb_DecodeOptions_MaxDepth(0);  // UPB_DECODE_ALIAS disabled.
   upb_UnknownToMessageRet promote_result =
       upb_MiniTable_PromoteUnknownToMessage(
           msg, mini_table, &mini_table->fields[1],
-          &upb_test_ModelWithExtensions_msg_init, decode_options, arena);
+          &upb_0test__ModelWithExtensions_msg_init, decode_options, arena);
   EXPECT_EQ(promote_result.status, kUpb_UnknownToMessage_Ok);
   const upb_Message* promoted_message =
       upb_Message_GetMessage(msg, &mini_table->fields[1], nullptr);
@@ -794,19 +766,18 @@ TEST(GeneratedCode, PromoteUnknownRepeatedMessageOld) {
   EXPECT_EQ(val, 123);
 
   // Check that we have repeated field data in an unknown.
-  upb_FindUnknownRet unknown =
-      upb_MiniTable_FindUnknown(msg, 6, kUpb_WireFormat_DefaultDepthLimit);
+  upb_FindUnknownRet unknown = upb_MiniTable_FindUnknown(msg, 6, 0);
   EXPECT_EQ(unknown.status, kUpb_FindUnknown_Ok);
 
   // Update mini table and promote unknown to a message.
   EXPECT_TRUE(upb_MiniTable_SetSubMessage(
       mini_table, (upb_MiniTableField*)&mini_table->fields[2],
-      &upb_test_ModelWithExtensions_msg_init));
-  const int decode_options = upb_DecodeOptions_MaxDepth(
-      kUpb_WireFormat_DefaultDepthLimit);  // UPB_DECODE_ALIAS disabled.
+      &upb_0test__ModelWithExtensions_msg_init));
+  const int decode_options =
+      upb_DecodeOptions_MaxDepth(0);  // UPB_DECODE_ALIAS disabled.
   upb_UnknownToMessage_Status promote_result =
       upb_MiniTable_PromoteUnknownToMessageArray(
-          msg, &mini_table->fields[2], &upb_test_ModelWithExtensions_msg_init,
+          msg, &mini_table->fields[2], &upb_0test__ModelWithExtensions_msg_init,
           decode_options, arena);
   EXPECT_EQ(promote_result, kUpb_UnknownToMessage_Ok);
 
@@ -843,8 +814,7 @@ TEST(GeneratedCode, PromoteUnknownToMapOld) {
       CreateMiniTableWithEmptySubTablesForMapsOld(arena);
   upb_MiniTable* map_entry_mini_table = CreateMapEntryMiniTableOld(arena);
   upb_Message* msg = _upb_Message_New(mini_table, arena);
-  const int decode_options =
-      upb_DecodeOptions_MaxDepth(kUpb_WireFormat_DefaultDepthLimit);
+  const int decode_options = upb_DecodeOptions_MaxDepth(0);
   upb_DecodeStatus decode_status =
       upb_Decode(serialized, serialized_size, msg, mini_table, nullptr,
                  decode_options, arena);
@@ -854,8 +824,7 @@ TEST(GeneratedCode, PromoteUnknownToMapOld) {
   EXPECT_EQ(val, 123);
 
   // Check that we have map data in an unknown.
-  upb_FindUnknownRet unknown =
-      upb_MiniTable_FindUnknown(msg, 3, kUpb_WireFormat_DefaultDepthLimit);
+  upb_FindUnknownRet unknown = upb_MiniTable_FindUnknown(msg, 3, 0);
   EXPECT_EQ(unknown.status, kUpb_FindUnknown_Ok);
 
   // Update mini table and promote unknown to a message.
diff --git a/third_party/upb/upb/message/tagged_ptr.h b/third_party/upb/upb/message/tagged_ptr.h
index 64602923b0d33..2596cd74d5dc3 100644
--- a/third_party/upb/upb/message/tagged_ptr.h
+++ b/third_party/upb/upb/message/tagged_ptr.h
@@ -1,35 +1,17 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_TYPES_H_
 #define UPB_MINI_TABLE_TYPES_H_
 
 #include <stdint.h>
 
+#include "upb/message/types.h"  // IWYU pragma: export
+
 // Must be last.
 #include "upb/port/def.inc"
 
@@ -37,8 +19,6 @@
 extern "C" {
 #endif
 
-typedef void upb_Message;
-
 // When a upb_Message* is stored in a message, array, or map, it is stored in a
 // tagged form.  If the tag bit is set, the referenced upb_Message is of type
 // _kUpb_MiniTable_Empty (a sentinel message type with no fields) instead of
diff --git a/third_party/upb/upb/message/test.cc b/third_party/upb/upb/message/test.cc
index e40d9bd71c30e..97ebef04145fd 100644
--- a/third_party/upb/upb/message/test.cc
+++ b/third_party/upb/upb/message/test.cc
@@ -1,44 +1,38 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <string_view>
+#include <vector>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "google/protobuf/test_messages_proto3.upb.h"
+#include "upb/base/status.hpp"
+#include "upb/base/string_view.h"
 #include "upb/json/decode.h"
 #include "upb/json/encode.h"
+#include "upb/mem/arena.h"
+#include "upb/mem/arena.hpp"
+#include "upb/message/message.h"
 #include "upb/message/test.upb.h"
+#include "upb/message/test.upb_minitable.h"
 #include "upb/message/test.upbdefs.h"
+#include "upb/message/value.h"
+#include "upb/mini_table/extension_registry.h"
+#include "upb/mini_table/message.h"
+#include "upb/reflection/def.h"
 #include "upb/reflection/def.hpp"
+#include "upb/reflection/message.h"
 #include "upb/test/fuzz_util.h"
-#include "upb/upb.hpp"
 #include "upb/wire/decode.h"
+#include "upb/wire/encode.h"
 
 // begin:google_only
 // #include "testing/fuzzing/fuzztest.h"
@@ -319,7 +313,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) {
   // Fails, because required fields are missing.
   EXPECT_EQ(
       kUpb_DecodeStatus_MissingRequired,
-      upb_Decode(nullptr, 0, test_msg, &upb_test_TestRequiredFields_msg_init,
+      upb_Decode(nullptr, 0, test_msg, &upb_0test__TestRequiredFields_msg_init,
                  nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr()));
 
   upb_test_TestRequiredFields_set_required_int32(test_msg, 1);
@@ -333,7 +327,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) {
   // payload is not empty.
   EXPECT_EQ(kUpb_DecodeStatus_MissingRequired,
             upb_Decode(serialized, size, test_msg,
-                       &upb_test_TestRequiredFields_msg_init, nullptr,
+                       &upb_0test__TestRequiredFields_msg_init, nullptr,
                        kUpb_DecodeOption_CheckRequired, arena.ptr()));
 
   empty_msg = upb_test_EmptyMessage_new(arena.ptr());
@@ -344,7 +338,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) {
   // Succeeds, because required fields are present (though not in the input).
   EXPECT_EQ(
       kUpb_DecodeStatus_Ok,
-      upb_Decode(nullptr, 0, test_msg, &upb_test_TestRequiredFields_msg_init,
+      upb_Decode(nullptr, 0, test_msg, &upb_0test__TestRequiredFields_msg_init,
                  nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr()));
 
   // Serialize a complete payload.
@@ -363,7 +357,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) {
       test_msg2, upb_test_TestRequiredFields_new(arena.ptr()));
   EXPECT_EQ(kUpb_DecodeStatus_Ok,
             upb_Decode(serialized, size, test_msg2,
-                       &upb_test_TestRequiredFields_msg_init, nullptr,
+                       &upb_0test__TestRequiredFields_msg_init, nullptr,
                        kUpb_DecodeOption_CheckRequired, arena.ptr()));
 }
 
diff --git a/third_party/upb/upb/message/test.proto b/third_party/upb/upb/message/test.proto
index 3b45d13109ecc..da72ac365109b 100644
--- a/third_party/upb/upb/message/test.proto
+++ b/third_party/upb/upb/message/test.proto
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // LINT: ALLOW_GROUPS
 
diff --git a/third_party/upb/upb/message/types.h b/third_party/upb/upb/message/types.h
new file mode 100644
index 0000000000000..3059e682c1c9b
--- /dev/null
+++ b/third_party/upb/upb/message/types.h
@@ -0,0 +1,15 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MESSAGE_TYPES_H_
+#define UPB_MESSAGE_TYPES_H_
+
+// This typedef is in a leaf header to resolve a circular dependency between
+// messages and mini tables.
+typedef void upb_Message;
+
+#endif /* UPB_MESSAGE_TYPES_H_ */
diff --git a/third_party/upb/upb/message/utf8_test.cc b/third_party/upb/upb/message/utf8_test.cc
new file mode 100644
index 0000000000000..cba8953a400ef
--- /dev/null
+++ b/third_party/upb/upb/message/utf8_test.cc
@@ -0,0 +1,150 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <stdlib.h>
+
+#include <gtest/gtest.h>
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
+#include "upb/mem/arena.hpp"
+#include "upb/message/utf8_test.upb.h"
+#include "upb/message/utf8_test.upb_minitable.h"
+#include "upb/wire/decode.h"
+
+namespace {
+
+const char bad_utf8[] = "\xff";
+
+static char* GetBadUtf8Payload(upb_Arena* arena, size_t* size) {
+  upb_test_TestUtf8Bytes* msg = upb_test_TestUtf8Bytes_new(arena);
+  upb_test_TestUtf8Bytes_set_data(msg, upb_StringView_FromString(bad_utf8));
+  char* data = upb_test_TestUtf8Bytes_serialize(msg, arena, size);
+  EXPECT_TRUE(data != nullptr);
+  return data;
+}
+
+TEST(Utf8Test, BytesFieldDoesntValidate) {
+  upb::Arena arena;
+  size_t size;
+  char* data = GetBadUtf8Payload(arena.ptr(), &size);
+  upb_test_TestUtf8Bytes* msg2 =
+      upb_test_TestUtf8Bytes_parse(data, size, arena.ptr());
+
+  // Parse succeeds, because the bytes field does not validate UTF-8.
+  ASSERT_TRUE(msg2 != nullptr);
+}
+
+TEST(Utf8Test, Proto3FieldValidates) {
+  upb::Arena arena;
+  size_t size;
+  char* data = GetBadUtf8Payload(arena.ptr(), &size);
+
+  upb_test_TestUtf8Proto3String* msg =
+      upb_test_TestUtf8Proto3String_new(arena.ptr());
+
+  upb_DecodeStatus status =
+      upb_Decode(data, size, msg, &upb_0test__TestUtf8Proto3String_msg_init,
+                 nullptr, 0, arena.ptr());
+
+  // Parse fails, because proto3 string fields validate UTF-8.
+  ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
+}
+
+TEST(Utf8Test, RepeatedProto3FieldValidates) {
+  upb::Arena arena;
+  size_t size;
+  char* data = GetBadUtf8Payload(arena.ptr(), &size);
+
+  upb_test_TestUtf8RepeatedProto3String* msg =
+      upb_test_TestUtf8RepeatedProto3String_new(arena.ptr());
+
+  upb_DecodeStatus status = upb_Decode(
+      data, size, msg, &upb_0test__TestUtf8RepeatedProto3String_msg_init,
+      nullptr, 0, arena.ptr());
+
+  // Parse fails, because proto3 string fields validate UTF-8.
+  ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
+}
+
+// begin:google_only
+// TEST(Utf8Test, Proto3MixedFieldValidates) {
+//   upb::Arena arena;
+//   size_t size;
+//   char* data = GetBadUtf8Payload(arena.ptr(), &size);
+//
+//   upb_test_TestUtf8Proto3StringMixed* msg =
+//       upb_test_TestUtf8Proto3StringMixed_new(arena.ptr());
+//
+//   upb_DecodeStatus status = upb_Decode(
+//       data, size, msg, &upb_0test__TestUtf8Proto3StringMixed_msg_init, nullptr,
+//       0, arena.ptr());
+//
+//   // Parse fails, because proto3 string fields validate UTF-8.
+//   ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
+// }
+//
+// TEST(Utf8Test, EnforceUtf8Options) {
+//   upb::Arena arena;
+//   size_t size;
+//   char* data = GetBadUtf8Payload(arena.ptr(), &size);
+//   upb_test_TestUtf8Proto3StringEnforceUtf8False* msg2 =
+//       upb_test_TestUtf8Proto3StringEnforceUtf8False_parse(data, size,
+//                                                           arena.ptr());
+//
+//   // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
+//   ASSERT_TRUE(msg2 != nullptr);
+// }
+//
+// TEST(Utf8Test, RepeatedEnforceUtf8Options) {
+//   upb::Arena arena;
+//   size_t size;
+//   char* data = GetBadUtf8Payload(arena.ptr(), &size);
+//   upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False* msg2 =
+//       upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False_parse(data, size,
+//                                                                   arena.ptr());
+//
+//   // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
+//   ASSERT_TRUE(msg2 != nullptr);
+// }
+//
+// TEST(Utf8Test, EnforceUtf8OptionsMixed) {
+//   upb::Arena arena;
+//   size_t size;
+//   char* data = GetBadUtf8Payload(arena.ptr(), &size);
+//   upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed* msg2 =
+//       upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed_parse(data, size,
+//                                                                arena.ptr());
+//
+//   // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
+//   ASSERT_TRUE(msg2 != nullptr);
+// }
+// end:google_only
+
+}  // namespace
diff --git a/third_party/upb/upb/message/utf8_test.proto b/third_party/upb/upb/message/utf8_test.proto
new file mode 100644
index 0000000000000..9a3bd3a2e2a6c
--- /dev/null
+++ b/third_party/upb/upb/message/utf8_test.proto
@@ -0,0 +1,71 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package upb_test;
+
+message TestUtf8Bytes {
+  optional bytes data = 1;
+}
+
+message TestUtf8Proto3String {
+  optional string data = 1;
+}
+
+message TestUtf8RepeatedProto3String {
+  repeated string data = 1;
+}
+
+// begin:google_only
+message TestUtf8Proto3StringMixed {
+  optional string data = 1;
+
+  // Add other fields with different enforce_utf8 values, to ensure we can
+  // handle the mix.
+  optional string other_data = 2;
+}
+
+message TestUtf8Proto3StringEnforceUtf8False {
+  optional string data = 1;
+}
+
+message TestUtf8RepeatedProto3StringEnforceUtf8False {
+  optional string data = 1;
+}
+
+message TestUtf8Proto3StringEnforceUtf8FalseMixed {
+  optional string data = 1;
+
+  // Add other fields with different enforce_utf8 values, to ensure we can
+  // handle the mix.
+  optional string other_data = 2;
+}
+// end:google_only
diff --git a/third_party/upb/upb/message/value.h b/third_party/upb/upb/message/value.h
new file mode 100644
index 0000000000000..99df02597cb64
--- /dev/null
+++ b/third_party/upb/upb/message/value.h
@@ -0,0 +1,46 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Users should include array.h or map.h instead.
+// IWYU pragma: private, include "upb/message/array.h"
+
+#ifndef UPB_MESSAGE_VALUE_H_
+#define UPB_MESSAGE_VALUE_H_
+
+#include <stdint.h>
+
+#include "upb/base/string_view.h"
+#include "upb/message/tagged_ptr.h"
+#include "upb/message/types.h"
+
+typedef union {
+  bool bool_val;
+  float float_val;
+  double double_val;
+  int32_t int32_val;
+  int64_t int64_val;
+  uint32_t uint32_val;
+  uint64_t uint64_val;
+  const struct upb_Array* array_val;
+  const struct upb_Map* map_val;
+  const upb_Message* msg_val;
+  upb_StringView str_val;
+
+  // EXPERIMENTAL: A tagged upb_Message*.  Users must use this instead of
+  // msg_val if unlinked sub-messages may possibly be in use.  See the
+  // documentation in kUpb_DecodeOption_ExperimentalAllowUnlinked for more
+  // information.
+  upb_TaggedMessagePtr tagged_msg_val;
+} upb_MessageValue;
+
+typedef union {
+  struct upb_Array* array;
+  struct upb_Map* map;
+  upb_Message* msg;
+} upb_MutableMessageValue;
+
+#endif /* UPB_MESSAGE_VALUE_H_ */
diff --git a/third_party/upb/upb/mini_descriptor/BUILD b/third_party/upb/upb/mini_descriptor/BUILD
index 40eba6f3ef6c6..d64279197f737 100644
--- a/third_party/upb/upb/mini_descriptor/BUILD
+++ b/third_party/upb/upb/mini_descriptor/BUILD
@@ -4,29 +4,6 @@ load(
     "UPB_DEFAULT_CPPOPTS",
 )
 
-# begin:github_only
-load("@rules_pkg//:mappings.bzl", "pkg_files")
-# end:github_only
-
-cc_library(
-    name = "internal",
-    srcs = [
-        "internal/base92.c",
-    ],
-    hdrs = [
-        "internal/base92.h",
-        "internal/decoder.h",
-        "internal/modifiers.h",
-        "internal/wire_constants.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//:base",
-        "//:port",
-    ],
-)
-
 cc_library(
     name = "mini_descriptor",
     srcs = [
@@ -40,32 +17,37 @@ cc_library(
         "link.h",
     ],
     copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:friends"],
+    visibility = ["//visibility:public"],
     deps = [
         ":internal",
-        "//:base",
-        "//:mem",
-        "//:mini_table_internal",
-        "//:port",
-        "//upb/mini_table",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
     ],
 )
 
 cc_library(
-    name = "encode_internal",
+    name = "internal",
     srcs = [
+        "internal/base92.c",
         "internal/encode.c",
     ],
     hdrs = [
+        "internal/base92.h",
+        "internal/decoder.h",
         "internal/encode.h",
         "internal/encode.hpp",
+        "internal/modifiers.h",
+        "internal/wire_constants.h",
     ],
     copts = UPB_DEFAULT_COPTS,
-    visibility = ["//:__subpackages__"],
+    visibility = ["//visibility:public"],
     deps = [
-        ":internal",
-        "//:base",
-        "//:port",
+        "//upb:base",
+        "//upb:base_internal",
+        "//upb:port",
     ],
 )
 
@@ -74,53 +56,31 @@ cc_test(
     srcs = ["internal/encode_test.cc"],
     copts = UPB_DEFAULT_CPPOPTS,
     deps = [
-        ":encode_internal",
         ":internal",
         ":mini_descriptor",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "//:upb",
-        "//:message_accessors_internal",
-        "//:mini_table",
+        "//:protobuf",
         "@com_google_googletest//:gtest_main",
-        "@com_google_protobuf//:protobuf",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:message_accessors_internal",
+        "//upb:mini_table",
+        "//upb:wire",
+        "@com_google_absl//absl/container:flat_hash_set",
     ],
 )
 
 # begin:github_only
 filegroup(
-    name = "cmake_files",
-    srcs = glob(
-        [
-            "**/*.c",
-            "**/*.h",
-        ],
-    ),
-    visibility = ["//cmake:__pkg__"],
-)
-
-pkg_files(
     name = "source_files",
     srcs = glob(
         [
             "**/*.c",
             "**/*.h",
         ],
-        exclude = ["internal/**"],
-    ),
-    prefix = "upb/mini_descriptor",
-    visibility = ["//python/dist:__pkg__"],
-)
-
-pkg_files(
-    name = "internal_source_files",
-    srcs = glob(
-        [
-            "internal/*.c",
-            "internal/*.h",
-        ],
-        exclude = ["encode_test.cc"],
     ),
-    prefix = "upb/mini_descriptor/internal",
-    visibility = ["//python/dist:__pkg__"],
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
 )
 # end:github_only
diff --git a/third_party/upb/upb/mini_descriptor/build_enum.c b/third_party/upb/upb/mini_descriptor/build_enum.c
index 12ced411c097c..738c59126fa45 100644
--- a/third_party/upb/upb/mini_descriptor/build_enum.c
+++ b/third_party/upb/upb/mini_descriptor/build_enum.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/build_enum.h"
 
diff --git a/third_party/upb/upb/mini_descriptor/build_enum.h b/third_party/upb/upb/mini_descriptor/build_enum.h
index 79462bdd4186b..c4b95152c7bad 100644
--- a/third_party/upb/upb/mini_descriptor/build_enum.h
+++ b/third_party/upb/upb/mini_descriptor/build_enum.h
@@ -1,30 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 #ifndef UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_
 #define UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_
 
@@ -46,7 +25,7 @@ UPB_API upb_MiniTableEnum* upb_MiniDescriptor_BuildEnum(const char* data,
                                                         upb_Arena* arena,
                                                         upb_Status* status);
 
-// TODO(b/289057707): Deprecated name; update callers.
+// TODO: Deprecated name; update callers.
 UPB_API_INLINE upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data,
                                                           size_t len,
                                                           upb_Arena* arena,
diff --git a/third_party/upb/upb/mini_descriptor/decode.c b/third_party/upb/upb/mini_descriptor/decode.c
index c112634862394..6575e92e300e0 100644
--- a/third_party/upb/upb/mini_descriptor/decode.c
+++ b/third_party/upb/upb/mini_descriptor/decode.c
@@ -1,41 +1,23 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/decode.h"
 
 #include <inttypes.h>
 #include <stdlib.h>
 
+#include "upb/base/descriptor_constants.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/mini_descriptor/internal/base92.h"
 #include "upb/mini_descriptor/internal/decoder.h"
 #include "upb/mini_descriptor/internal/modifiers.h"
 #include "upb/mini_descriptor/internal/wire_constants.h"
+#include "upb/mini_table/internal/field.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -216,6 +198,19 @@ static void upb_MtDecoder_ModifyField(upb_MtDecoder* d,
     field->mode ^= kUpb_LabelFlags_IsPacked;
   }
 
+  if (field_modifiers & kUpb_EncodedFieldModifier_FlipValidateUtf8) {
+    if (field->UPB_PRIVATE(descriptortype) != kUpb_FieldType_Bytes ||
+        !(field->mode & kUpb_LabelFlags_IsAlternate)) {
+      upb_MdDecoder_ErrorJmp(
+          &d->base,
+          "Cannot flip ValidateUtf8 on field %" PRIu32 ", type=%d, mode=%d",
+          field->number, (int)field->UPB_PRIVATE(descriptortype),
+          (int)field->mode);
+    }
+    field->UPB_PRIVATE(descriptortype) = kUpb_FieldType_String;
+    field->mode &= ~kUpb_LabelFlags_IsAlternate;
+  }
+
   bool singular = field_modifiers & kUpb_EncodedFieldModifier_IsProto3Singular;
   bool required = field_modifiers & kUpb_EncodedFieldModifier_IsRequired;
 
diff --git a/third_party/upb/upb/mini_descriptor/decode.h b/third_party/upb/upb/mini_descriptor/decode.h
index 0c30853ae515d..ec7c12e9f03a2 100644
--- a/third_party/upb/upb/mini_descriptor/decode.h
+++ b/third_party/upb/upb/mini_descriptor/decode.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_DECODE_H_
 #define UPB_MINI_TABLE_DECODE_H_
diff --git a/third_party/upb/upb/mini_descriptor/internal/base92.c b/third_party/upb/upb/mini_descriptor/internal/base92.c
index ed7132f3cbabc..18783d92a6e0e 100644
--- a/third_party/upb/upb/mini_descriptor/internal/base92.c
+++ b/third_party/upb/upb/mini_descriptor/internal/base92.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/internal/base92.h"
 
diff --git a/third_party/upb/upb/mini_descriptor/internal/base92.h b/third_party/upb/upb/mini_descriptor/internal/base92.h
index 7628baccb1f1e..4201c25c5b362 100644
--- a/third_party/upb/upb/mini_descriptor/internal/base92.h
+++ b/third_party/upb/upb/mini_descriptor/internal/base92.h
@@ -1,34 +1,16 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_BASE92_H_
 #define UPB_MINI_DESCRIPTOR_INTERNAL_BASE92_H_
 
-#include "upb/base/log2.h"
+#include <stdint.h>
+
+#include "upb/base/internal/log2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/mini_descriptor/internal/decoder.h b/third_party/upb/upb/mini_descriptor/internal/decoder.h
index 7f94a5ea81084..9ac32820044dc 100644
--- a/third_party/upb/upb/mini_descriptor/internal/decoder.h
+++ b/third_party/upb/upb/mini_descriptor/internal/decoder.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_DECODER_H_
 #define UPB_MINI_DESCRIPTOR_INTERNAL_DECODER_H_
diff --git a/third_party/upb/upb/mini_descriptor/internal/encode.c b/third_party/upb/upb/mini_descriptor/internal/encode.c
index d7aeeddcc13d8..2193ffeb8f5b6 100644
--- a/third_party/upb/upb/mini_descriptor/internal/encode.c
+++ b/third_party/upb/upb/mini_descriptor/internal/encode.c
@@ -1,33 +1,17 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/internal/encode.h"
 
-#include "upb/base/log2.h"
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "upb/base/internal/log2.h"
 #include "upb/mini_descriptor/internal/base92.h"
 #include "upb/mini_descriptor/internal/modifiers.h"
 #include "upb/mini_descriptor/internal/wire_constants.h"
@@ -225,6 +209,19 @@ static char* _upb_MtDataEncoder_MaybePutModifiers(upb_MtDataEncoder* e,
     }
   }
 
+  if (type == kUpb_FieldType_String) {
+    bool field_validates_utf8 = field_mod & kUpb_FieldModifier_ValidateUtf8;
+    bool message_validates_utf8 =
+        in->state.msg_state.msg_modifiers & kUpb_MessageModifier_ValidateUtf8;
+    if (field_validates_utf8 != message_validates_utf8) {
+      // Old binaries do not recognize the field modifier.  We need the failure
+      // mode to be too lax rather than too strict.  Our caller should have
+      // handled this (see _upb_MessageDef_ValidateUtf8()).
+      assert(!message_validates_utf8);
+      encoded_modifiers |= kUpb_EncodedFieldModifier_FlipValidateUtf8;
+    }
+  }
+
   if (field_mod & kUpb_FieldModifier_IsProto3Singular) {
     encoded_modifiers |= kUpb_EncodedFieldModifier_IsProto3Singular;
   }
@@ -295,7 +292,7 @@ static char* upb_MtDataEncoder_FlushDenseEnumMask(upb_MtDataEncoder* e,
 
 char* upb_MtDataEncoder_PutEnumValue(upb_MtDataEncoder* e, char* ptr,
                                      uint32_t val) {
-  // TODO(b/229641772): optimize this encoding.
+  // TODO: optimize this encoding.
   upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
   UPB_ASSERT(val >= in->state.enum_state.last_written_value);
   uint32_t delta = val - in->state.enum_state.last_written_value;
diff --git a/third_party/upb/upb/mini_descriptor/internal/encode.h b/third_party/upb/upb/mini_descriptor/internal/encode.h
index 7d465289b2037..3180f0bdc5a2f 100644
--- a/third_party/upb/upb/mini_descriptor/internal/encode.h
+++ b/third_party/upb/upb/mini_descriptor/internal/encode.h
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_ENCODE_H_
 #define UPB_MINI_DESCRIPTOR_INTERNAL_ENCODE_H_
 
+#include <stdint.h>
+
 #include "upb/base/descriptor_constants.h"
 
 // Must be last.
diff --git a/third_party/upb/upb/mini_descriptor/internal/encode.hpp b/third_party/upb/upb/mini_descriptor/internal/encode.hpp
index 1d22a76469eeb..cfa3bed6cc00b 100644
--- a/third_party/upb/upb/mini_descriptor/internal/encode.hpp
+++ b/third_party/upb/upb/mini_descriptor/internal/encode.hpp
@@ -1,36 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_ENCODE_INTERNAL_HPP_
 #define UPB_MINI_TABLE_ENCODE_INTERNAL_HPP_
 
 #include <string>
 
-#include "upb/base/log2.h"
+#include "upb/base/internal/log2.h"
 #include "upb/mini_descriptor/internal/encode.h"
 
 namespace upb {
@@ -40,49 +20,51 @@ class MtDataEncoder {
   MtDataEncoder() : appender_(&encoder_) {}
 
   bool StartMessage(uint64_t msg_mod) {
-    return appender_([=](char* buf) {
+    return appender_([this, msg_mod](char* buf) {
       return upb_MtDataEncoder_StartMessage(&encoder_, buf, msg_mod);
     });
   }
 
   bool PutField(upb_FieldType type, uint32_t field_num, uint64_t field_mod) {
-    return appender_([=](char* buf) {
+    return appender_([this, type, field_num, field_mod](char* buf) {
       return upb_MtDataEncoder_PutField(&encoder_, buf, type, field_num,
                                         field_mod);
     });
   }
 
   bool StartOneof() {
-    return appender_([=](char* buf) {
+    return appender_([this](char* buf) {
       return upb_MtDataEncoder_StartOneof(&encoder_, buf);
     });
   }
 
   bool PutOneofField(uint32_t field_num) {
-    return appender_([=](char* buf) {
+    return appender_([this, field_num](char* buf) {
       return upb_MtDataEncoder_PutOneofField(&encoder_, buf, field_num);
     });
   }
 
   bool StartEnum() {
-    return appender_(
-        [=](char* buf) { return upb_MtDataEncoder_StartEnum(&encoder_, buf); });
+    return appender_([this](char* buf) {
+      return upb_MtDataEncoder_StartEnum(&encoder_, buf);
+    });
   }
 
   bool PutEnumValue(uint32_t enum_value) {
-    return appender_([=](char* buf) {
+    return appender_([this, enum_value](char* buf) {
       return upb_MtDataEncoder_PutEnumValue(&encoder_, buf, enum_value);
     });
   }
 
   bool EndEnum() {
-    return appender_(
-        [=](char* buf) { return upb_MtDataEncoder_EndEnum(&encoder_, buf); });
+    return appender_([this](char* buf) {
+      return upb_MtDataEncoder_EndEnum(&encoder_, buf);
+    });
   }
 
   bool EncodeExtension(upb_FieldType type, uint32_t field_num,
                        uint64_t field_mod) {
-    return appender_([=](char* buf) {
+    return appender_([this, type, field_num, field_mod](char* buf) {
       return upb_MtDataEncoder_EncodeExtension(&encoder_, buf, type, field_num,
                                                field_mod);
     });
@@ -90,14 +72,14 @@ class MtDataEncoder {
 
   bool EncodeMap(upb_FieldType key_type, upb_FieldType val_type,
                  uint64_t key_mod, uint64_t val_mod) {
-    return appender_([=](char* buf) {
+    return appender_([this, key_type, val_type, key_mod, val_mod](char* buf) {
       return upb_MtDataEncoder_EncodeMap(&encoder_, buf, key_type, val_type,
                                          key_mod, val_mod);
     });
   }
 
   bool EncodeMessageSet() {
-    return appender_([=](char* buf) {
+    return appender_([this](char* buf) {
       return upb_MtDataEncoder_EncodeMessageSet(&encoder_, buf);
     });
   }
diff --git a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
index 61127c5968059..dcb33b5aaed32 100644
--- a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
+++ b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
@@ -1,45 +1,26 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/internal/encode.hpp"
 
 #include <string_view>
 #include <vector>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "absl/container/flat_hash_set.h"
 #include "google/protobuf/descriptor.h"
-#include "upb/message/accessors_internal.h"
+#include "upb/base/status.hpp"
+#include "upb/mem/arena.hpp"
+#include "upb/message/internal/accessors.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_descriptor/internal/base92.h"
 #include "upb/mini_descriptor/internal/modifiers.h"
 #include "upb/mini_table/enum.h"
-#include "upb/upb.hpp"
 #include "upb/wire/decode.h"
 
 // begin:google_only
@@ -54,7 +35,7 @@ TEST_P(MiniTableTest, Empty) {
   upb::Arena arena;
   upb::Status status;
   upb_MiniTable* table =
-      _upb_MiniTable_Build(NULL, 0, GetParam(), arena.ptr(), status.ptr());
+      _upb_MiniTable_Build(nullptr, 0, GetParam(), arena.ptr(), status.ptr());
   ASSERT_NE(nullptr, table);
   EXPECT_EQ(0, table->field_count);
   EXPECT_EQ(0, table->required_count);
@@ -287,10 +268,8 @@ TEST_P(MiniTableTest, Extendible) {
   upb::Arena arena;
   upb::MtDataEncoder e;
   ASSERT_TRUE(e.StartMessage(kUpb_MessageModifier_IsExtendable));
-  int count = 0;
   for (int i = kUpb_FieldType_Double; i < kUpb_FieldType_SInt64; i++) {
     ASSERT_TRUE(e.PutField(static_cast<upb_FieldType>(i), i, 0));
-    count++;
   }
   upb::Status status;
   upb_MiniTable* table = _upb_MiniTable_Build(
diff --git a/third_party/upb/upb/mini_descriptor/internal/modifiers.h b/third_party/upb/upb/mini_descriptor/internal/modifiers.h
index 6f74344cdd959..103b279cb63e1 100644
--- a/third_party/upb/upb/mini_descriptor/internal/modifiers.h
+++ b/third_party/upb/upb/mini_descriptor/internal/modifiers.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_MODIFIERS_H_
 #define UPB_MINI_DESCRIPTOR_INTERNAL_MODIFIERS_H_
@@ -37,8 +17,10 @@ typedef enum {
   kUpb_FieldModifier_IsClosedEnum = 1 << 2,
   kUpb_FieldModifier_IsProto3Singular = 1 << 3,
   kUpb_FieldModifier_IsRequired = 1 << 4,
+  kUpb_FieldModifier_ValidateUtf8 = 1 << 5,
 } kUpb_FieldModifier;
 
+// These modifiers are also used on the wire.
 typedef enum {
   kUpb_MessageModifier_ValidateUtf8 = 1 << 0,
   kUpb_MessageModifier_DefaultIsPacked = 1 << 1,
diff --git a/third_party/upb/upb/mini_descriptor/internal/wire_constants.h b/third_party/upb/upb/mini_descriptor/internal/wire_constants.h
index b9dff4ea664be..569da57755a1b 100644
--- a/third_party/upb/upb/mini_descriptor/internal/wire_constants.h
+++ b/third_party/upb/upb/mini_descriptor/internal/wire_constants.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_WIRE_CONSTANTS_H_
 #define UPB_MINI_DESCRIPTOR_INTERNAL_WIRE_CONSTANTS_H_
@@ -61,6 +41,7 @@ typedef enum {
   kUpb_EncodedFieldModifier_FlipPacked = 1 << 0,
   kUpb_EncodedFieldModifier_IsRequired = 1 << 1,
   kUpb_EncodedFieldModifier_IsProto3Singular = 1 << 2,
+  kUpb_EncodedFieldModifier_FlipValidateUtf8 = 1 << 3,
 } upb_EncodedFieldModifier;
 
 enum {
diff --git a/third_party/upb/upb/mini_descriptor/link.c b/third_party/upb/upb/mini_descriptor/link.c
index 17c31cae6454d..39da601ce7366 100644
--- a/third_party/upb/upb/mini_descriptor/link.c
+++ b/third_party/upb/upb/mini_descriptor/link.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_descriptor/link.h"
 
@@ -60,7 +40,7 @@ bool upb_MiniTable_SetSubMessage(upb_MiniTable* table,
 
   upb_MiniTableSub* table_sub =
       (void*)&table->subs[field->UPB_PRIVATE(submsg_index)];
-  // TODO(haberman): Add this assert back once YouTube is updated to not call
+  // TODO: Add this assert back once YouTube is updated to not call
   // this function repeatedly.
   // UPB_ASSERT(table_sub->submsg == &_kUpb_MiniTable_Empty);
   table_sub->submsg = sub;
@@ -129,7 +109,7 @@ bool upb_MiniTable_Link(upb_MiniTable* mt, const upb_MiniTable** sub_tables,
 
   for (int i = 0; i < mt->field_count; i++) {
     upb_MiniTableField* f = (upb_MiniTableField*)&mt->fields[i];
-    if (upb_MiniTableField_CType(f) == kUpb_CType_Enum) {
+    if (upb_MiniTableField_IsClosedEnum(f)) {
       const upb_MiniTableEnum* sub = sub_enums[enum_count++];
       if (enum_count > sub_enum_count) return false;
       if (sub != NULL) {
diff --git a/third_party/upb/upb/mini_descriptor/link.h b/third_party/upb/upb/mini_descriptor/link.h
index 8dba44284cd8f..db3aac16271c4 100644
--- a/third_party/upb/upb/mini_descriptor/link.h
+++ b/third_party/upb/upb/mini_descriptor/link.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Functions for linking MiniTables together once they are built from a
 // MiniDescriptor.
diff --git a/third_party/upb/upb/mini_table.h b/third_party/upb/upb/mini_table.h
deleted file mode 100644
index ca8a324f607b5..0000000000000
--- a/third_party/upb/upb/mini_table.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use the header(s) below instead.
-// IWYU pragma: private, include "upb/mini_table/decode.h"
-
-#ifndef UPB_MINI_TABLE_H_
-#define UPB_MINI_TABLE_H_
-
-#include "upb/mini_table/decode.h"
-
-#endif /* UPB_MINI_TABLE_H_ */
diff --git a/third_party/upb/upb/mini_table/BUILD b/third_party/upb/upb/mini_table/BUILD
index 80139dc32b558..ecf2bbbb1cdfe 100644
--- a/third_party/upb/upb/mini_table/BUILD
+++ b/third_party/upb/upb/mini_table/BUILD
@@ -1,36 +1,33 @@
 # Copyright (c) 2009-2023, Google LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 load(
     "//bazel:build_defs.bzl",
     "UPB_DEFAULT_COPTS",
 )
 
-# begin:github_only
-load("@rules_pkg//:mappings.bzl", "pkg_files")
-# end:github_only
+cc_library(
+    name = "compat",
+    srcs = [
+        "compat.c",
+    ],
+    hdrs = [
+        "compat.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":mini_table",
+        "//upb:base",
+        "//upb:hash",
+        "//upb:mem",
+        "//upb:port",
+    ],
+)
 
 cc_library(
     name = "mini_table",
@@ -51,10 +48,11 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":internal",
-        "//:base",
-        "//:hash",
-        "//:mem",
-        "//:port",
+        "//upb:base",
+        "//upb:hash",
+        "//upb:mem",
+        "//upb:message_types",
+        "//upb:port",
     ],
 )
 
@@ -73,47 +71,36 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//:base",
-        "//:port",
+        "//upb:base",
+        "//upb:message_types",
+        "//upb:port",
     ],
 )
 
-# begin:github_only
-filegroup(
-    name = "cmake_files",
-    srcs = glob(
-        [
-            "**/*.c",
-            "**/*.h",
-        ],
-        exclude = ["encode_test.cc"],
-    ),
-    visibility = ["//cmake:__pkg__"],
+cc_test(
+    name = "compat_test",
+    srcs = ["compat_test.cc"],
+    deps = [
+        "@com_google_googletest//:gtest_main",
+        "//upb:mini_table_compat",
+        "//upb/test:test_messages_proto2_upb_minitable",
+        "//upb/test:test_messages_proto3_upb_minitable",
+        "//upb/test:test_upb_proto",
+    ],
 )
 
-pkg_files(
+# begin:github_only
+filegroup(
     name = "source_files",
     srcs = glob(
         [
             "**/*.c",
             "**/*.h",
         ],
-        exclude = ["internal/**", "encode_test.cc"],
-    ),
-    prefix = "upb/mini_table",
-    visibility = ["//python/dist:__pkg__"],
-)
-
-pkg_files(
-    name = "internal_source_files",
-    srcs = glob(
-        [
-            "internal/*.c",
-            "internal/*.h",
-        ],
-        exclude = ["encode_test.cc"],
     ),
-    prefix = "upb/mini_table/internal",
-    visibility = ["//python/dist:__pkg__"],
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
 )
 # end:github_only
diff --git a/third_party/upb/upb/mini_table/compat.c b/third_party/upb/upb/mini_table/compat.c
new file mode 100644
index 0000000000000..ad169ce2a0db7
--- /dev/null
+++ b/third_party/upb/upb/mini_table/compat.c
@@ -0,0 +1,109 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/mini_table/compat.h"
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/hash/common.h"
+#include "upb/hash/int_table.h"
+#include "upb/mem/arena.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/message.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// Checks if source and target mini table fields are identical.
+//
+// If the field is a sub message and sub messages are identical we record
+// the association in table.
+//
+// Hashing the source sub message mini table and it's equivalent in the table
+// stops recursing when a cycle is detected and instead just checks if the
+// destination table is equal.
+static upb_MiniTableEquals_Status upb_deep_check(const upb_MiniTable* src,
+                                                 const upb_MiniTable* dst,
+                                                 upb_inttable* table,
+                                                 upb_Arena** arena) {
+  if (src->field_count != dst->field_count)
+    return kUpb_MiniTableEquals_NotEqual;
+  bool marked_src = false;
+  for (int i = 0; i < src->field_count; i++) {
+    const upb_MiniTableField* src_field = &src->fields[i];
+    const upb_MiniTableField* dst_field =
+        upb_MiniTable_FindFieldByNumber(dst, src_field->number);
+
+    if (upb_MiniTableField_CType(src_field) !=
+        upb_MiniTableField_CType(dst_field))
+      return false;
+    if (src_field->mode != dst_field->mode) return false;
+    if (src_field->offset != dst_field->offset) return false;
+    if (src_field->presence != dst_field->presence) return false;
+    if (src_field->UPB_PRIVATE(submsg_index) !=
+        dst_field->UPB_PRIVATE(submsg_index))
+      return kUpb_MiniTableEquals_NotEqual;
+
+    // Go no further if we are only checking for compatibility.
+    if (!table) continue;
+
+    if (upb_MiniTableField_CType(src_field) == kUpb_CType_Message) {
+      if (!*arena) {
+        *arena = upb_Arena_New();
+        if (!upb_inttable_init(table, *arena)) {
+          return kUpb_MiniTableEquals_OutOfMemory;
+        }
+      }
+      if (!marked_src) {
+        marked_src = true;
+        upb_value val;
+        val.val = (uint64_t)dst;
+        if (!upb_inttable_insert(table, (uintptr_t)src, val, *arena)) {
+          return kUpb_MiniTableEquals_OutOfMemory;
+        }
+      }
+      const upb_MiniTable* sub_src =
+          upb_MiniTable_GetSubMessageTable(src, src_field);
+      const upb_MiniTable* sub_dst =
+          upb_MiniTable_GetSubMessageTable(dst, dst_field);
+      if (sub_src != NULL) {
+        upb_value cmp;
+        if (upb_inttable_lookup(table, (uintptr_t)sub_src, &cmp)) {
+          // We already compared this src before. Check if same dst.
+          if (cmp.val != (uint64_t)sub_dst) {
+            return kUpb_MiniTableEquals_NotEqual;
+          }
+        } else {
+          // Recurse if not already visited.
+          upb_MiniTableEquals_Status s =
+              upb_deep_check(sub_src, sub_dst, table, arena);
+          if (s != kUpb_MiniTableEquals_Equal) {
+            return s;
+          }
+        }
+      }
+    }
+  }
+  return kUpb_MiniTableEquals_Equal;
+}
+
+bool upb_MiniTable_Compatible(const upb_MiniTable* src,
+                              const upb_MiniTable* dst) {
+  return upb_deep_check(src, dst, NULL, NULL);
+}
+
+upb_MiniTableEquals_Status upb_MiniTable_Equals(const upb_MiniTable* src,
+                                                const upb_MiniTable* dst) {
+  // Arena allocated on demand for hash table.
+  upb_Arena* arena = NULL;
+  // Table to keep track of visited mini tables to guard against cycles.
+  upb_inttable table;
+  upb_MiniTableEquals_Status status = upb_deep_check(src, dst, &table, &arena);
+  if (arena) {
+    upb_Arena_Free(arena);
+  }
+  return status;
+}
diff --git a/third_party/upb/upb/mini_table/compat.h b/third_party/upb/upb/mini_table/compat.h
new file mode 100644
index 0000000000000..fd1670db33bb4
--- /dev/null
+++ b/third_party/upb/upb/mini_table/compat.h
@@ -0,0 +1,45 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_MINI_TABLE_COMPAT_H_
+#define UPB_MINI_TABLE_COMPAT_H_
+
+#include "upb/mini_table/message.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// upb does not support mixing minitables from different sources but these
+// functions are still used by some existing users so for now we make them
+// available here. This may or may not change in the future so do not add
+// them to new code.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Checks if memory layout of src is compatible with dst.
+bool upb_MiniTable_Compatible(const upb_MiniTable* src,
+                              const upb_MiniTable* dst);
+
+typedef enum {
+  kUpb_MiniTableEquals_NotEqual,
+  kUpb_MiniTableEquals_Equal,
+  kUpb_MiniTableEquals_OutOfMemory,
+} upb_MiniTableEquals_Status;
+
+// Checks equality of mini tables originating from different language runtimes.
+upb_MiniTableEquals_Status upb_MiniTable_Equals(const upb_MiniTable* src,
+                                                const upb_MiniTable* dst);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_MINI_TABLE_COMPAT_H_ */
diff --git a/third_party/upb/upb/mini_table/compat_test.cc b/third_party/upb/upb/mini_table/compat_test.cc
new file mode 100644
index 0000000000000..0a4606017ed5a
--- /dev/null
+++ b/third_party/upb/upb/mini_table/compat_test.cc
@@ -0,0 +1,34 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+/* Test of mini table accessors.
+ *
+ * Messages are created and mutated using generated code, and then
+ * accessed through reflective APIs exposed through mini table accessors.
+ */
+
+#include "upb/mini_table/compat.h"
+
+#include <gtest/gtest.h>
+#include "google/protobuf/test_messages_proto2.upb_minitable.h"
+#include "google/protobuf/test_messages_proto3.upb_minitable.h"
+
+namespace {
+
+TEST(GeneratedCode, EqualsTestProto2) {
+  EXPECT_TRUE(upb_MiniTable_Equals(
+      &protobuf_0test_0messages__proto2__ProtoWithKeywords_msg_init,
+      &protobuf_0test_0messages__proto2__ProtoWithKeywords_msg_init));
+}
+
+TEST(GeneratedCode, EqualsTestProto3) {
+  EXPECT_TRUE(upb_MiniTable_Equals(
+      &protobuf_0test_0messages__proto3__TestAllTypesProto3_msg_init,
+      &protobuf_0test_0messages__proto3__TestAllTypesProto3_msg_init));
+}
+
+}  // namespace
diff --git a/third_party/upb/upb/mini_table/enum.h b/third_party/upb/upb/mini_table/enum.h
index 21994ed2f73f1..c2810fbc63b4f 100644
--- a/third_party/upb/upb/mini_table/enum.h
+++ b/third_party/upb/upb/mini_table/enum.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_ENUM_H_
 #define UPB_MINI_TABLE_ENUM_H_
@@ -35,6 +15,10 @@
 
 typedef struct upb_MiniTableEnum upb_MiniTableEnum;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Validates enum value against range defined by enum mini table.
 UPB_INLINE bool upb_MiniTableEnum_CheckValue(const struct upb_MiniTableEnum* e,
                                              uint32_t val) {
@@ -45,6 +29,10 @@ UPB_INLINE bool upb_MiniTableEnum_CheckValue(const struct upb_MiniTableEnum* e,
   return status == _kUpb_FastEnumCheck_ValueIsInEnum ? true : false;
 }
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #include "upb/port/undef.inc"
 
 #endif /* UPB_MINI_TABLE_ENUM_H_ */
diff --git a/third_party/upb/upb/mini_table/extension.h b/third_party/upb/upb/mini_table/extension.h
index 7b4e6ac0de591..7fde3158c775a 100644
--- a/third_party/upb/upb/mini_table/extension.h
+++ b/third_party/upb/upb/mini_table/extension.h
@@ -1,40 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_EXTENSION_H_
 #define UPB_MINI_TABLE_EXTENSION_H_
 
 #include "upb/mini_table/internal/extension.h"
 
-// Must be last.
-#include "upb/port/def.inc"
-
 typedef struct upb_MiniTableExtension upb_MiniTableExtension;
 
-#include "upb/port/undef.inc"
-
 #endif /* UPB_MINI_TABLE_EXTENSION_H_ */
diff --git a/third_party/upb/upb/mini_table/extension_registry.c b/third_party/upb/upb/mini_table/extension_registry.c
index 32cc9b2eed320..3c3f58f58323f 100644
--- a/third_party/upb/upb/mini_table/extension_registry.c
+++ b/third_party/upb/upb/mini_table/extension_registry.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_table/extension_registry.h"
 
diff --git a/third_party/upb/upb/mini_table/extension_registry.h b/third_party/upb/upb/mini_table/extension_registry.h
index a3ac2dc7d23f6..0465140fdfd74 100644
--- a/third_party/upb/upb/mini_table/extension_registry.h
+++ b/third_party/upb/upb/mini_table/extension_registry.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_EXTENSION_REGISTRY_H_
 #define UPB_MINI_TABLE_EXTENSION_REGISTRY_H_
@@ -86,7 +66,7 @@ UPB_API bool upb_ExtensionRegistry_Add(upb_ExtensionRegistry* r,
 // registry. If there are any errors, the entire array is backed out.
 // The extensions must outlive the registry.
 // Possible errors include OOM or an extension number that already exists.
-// TODO(salo): There is currently no way to know the exact reason for failure.
+// TODO: There is currently no way to know the exact reason for failure.
 bool upb_ExtensionRegistry_AddArray(upb_ExtensionRegistry* r,
                                     const upb_MiniTableExtension** e,
                                     size_t count);
diff --git a/third_party/upb/upb/mini_table/field.h b/third_party/upb/upb/mini_table/field.h
index 8967927819a2b..7f382c4e591e2 100644
--- a/third_party/upb/upb/mini_table/field.h
+++ b/third_party/upb/upb/mini_table/field.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_FIELD_H_
 #define UPB_MINI_TABLE_FIELD_H_
diff --git a/third_party/upb/upb/mini_table/file.h b/third_party/upb/upb/mini_table/file.h
index 089ca6f412893..590164f72f021 100644
--- a/third_party/upb/upb/mini_table/file.h
+++ b/third_party/upb/upb/mini_table/file.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_FILE_H_
 #define UPB_MINI_TABLE_FILE_H_
diff --git a/third_party/upb/upb/mini_table/internal/enum.h b/third_party/upb/upb/mini_table/internal/enum.h
index 21548c310ae59..bbc353adac7d7 100644
--- a/third_party/upb/upb/mini_table/internal/enum.h
+++ b/third_party/upb/upb/mini_table/internal/enum.h
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_INTERNAL_ENUM_H_
 #define UPB_MINI_TABLE_INTERNAL_ENUM_H_
 
+#include <stdint.h>
+
 // Must be last.
 #include "upb/port/def.inc"
 
diff --git a/third_party/upb/upb/mini_table/internal/extension.h b/third_party/upb/upb/mini_table/internal/extension.h
index d1ed67a6632b8..f052fe6d20d65 100644
--- a/third_party/upb/upb/mini_table/internal/extension.h
+++ b/third_party/upb/upb/mini_table/internal/extension.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_INTERNAL_EXTENSION_H_
 #define UPB_MINI_TABLE_INTERNAL_EXTENSION_H_
diff --git a/third_party/upb/upb/mini_table/internal/field.h b/third_party/upb/upb/mini_table/internal/field.h
index 175c935f450f0..3ed8afec76355 100644
--- a/third_party/upb/upb/mini_table/internal/field.h
+++ b/third_party/upb/upb/mini_table/internal/field.h
@@ -1,40 +1,20 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_INTERNAL_FIELD_H_
 #define UPB_MINI_TABLE_INTERNAL_FIELD_H_
 
+#include <stdint.h>
+
 #include "upb/base/descriptor_constants.h"
 
 // Must be last.
 #include "upb/port/def.inc"
 
-// LINT.IfChange(mini_table_field_layout)
-
 struct upb_MiniTableField {
   uint32_t number;
   uint16_t offset;
@@ -87,8 +67,6 @@ typedef enum {
 
 #define kUpb_FieldRep_Shift 6
 
-// LINT.ThenChange(//depot/google3/third_party/upb/js/impl/upb_bits/mini_table_field.ts:mini_table_field_layout)
-
 UPB_INLINE upb_FieldRep
 _upb_MiniTableField_GetRep(const struct upb_MiniTableField* field) {
   return (upb_FieldRep)(field->mode >> kUpb_FieldRep_Shift);
diff --git a/third_party/upb/upb/mini_table/internal/file.h b/third_party/upb/upb/mini_table/internal/file.h
index a08676f4a894e..c8f069f8556dc 100644
--- a/third_party/upb/upb/mini_table/internal/file.h
+++ b/third_party/upb/upb/mini_table/internal/file.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_INTERNAL_FILE_H_
 #define UPB_MINI_TABLE_INTERNAL_FILE_H_
@@ -36,9 +16,9 @@
 #include "upb/port/def.inc"
 
 struct upb_MiniTableFile {
-  const upb_MiniTable** msgs;
-  const upb_MiniTableEnum** enums;
-  const upb_MiniTableExtension** exts;
+  const struct upb_MiniTable** msgs;
+  const struct upb_MiniTableEnum** enums;
+  const struct upb_MiniTableExtension** exts;
   int msg_count;
   int enum_count;
   int ext_count;
diff --git a/third_party/upb/upb/mini_table/internal/message.c b/third_party/upb/upb/mini_table/internal/message.c
index 7123d2fe00fc1..b25edacca7024 100644
--- a/third_party/upb/upb/mini_table/internal/message.c
+++ b/third_party/upb/upb/mini_table/internal/message.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_table/internal/message.h"
 
diff --git a/third_party/upb/upb/mini_table/internal/message.h b/third_party/upb/upb/mini_table/internal/message.h
index e8138ae5bfdb2..3457ea2cd6349 100644
--- a/third_party/upb/upb/mini_table/internal/message.h
+++ b/third_party/upb/upb/mini_table/internal/message.h
@@ -1,40 +1,19 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_INTERNAL_MESSAGE_H_
 #define UPB_MINI_TABLE_INTERNAL_MESSAGE_H_
 
+#include "upb/message/types.h"
 #include "upb/mini_table/internal/field.h"
 
 // Must be last.
 #include "upb/port/def.inc"
 
-typedef void upb_Message;
-
 struct upb_Decoder;
 typedef const char* _upb_FieldParser(struct upb_Decoder* d, const char* ptr,
                                      upb_Message* msg, intptr_t table,
@@ -56,8 +35,6 @@ typedef enum {
   kUpb_ExtMode_IsMapEntry = 4,
 } upb_ExtMode;
 
-// LINT.IfChange(mini_table_layout)
-
 union upb_MiniTableSub;
 
 // upb_MiniTable represents the memory layout of a given upb_MessageDef.
@@ -83,8 +60,6 @@ struct upb_MiniTable {
   _upb_FastTable_Entry fasttable[];
 };
 
-// LINT.ThenChange(//depot/google3/third_party/upb/js/impl/upb_bits/mini_table.ts:presence_logic)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/third_party/upb/upb/mini_table/internal/sub.h b/third_party/upb/upb/mini_table/internal/sub.h
index 60264eff4d5ce..7887dbada3cd7 100644
--- a/third_party/upb/upb/mini_table/internal/sub.h
+++ b/third_party/upb/upb/mini_table/internal/sub.h
@@ -1,30 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 #ifndef UPB_MINI_TABLE_INTERNAL_SUB_H_
 #define UPB_MINI_TABLE_INTERNAL_SUB_H_
 
diff --git a/third_party/upb/upb/mini_table/message.c b/third_party/upb/upb/mini_table/message.c
index f7e1402b4abc6..56f23014a3ab0 100644
--- a/third_party/upb/upb/mini_table/message.c
+++ b/third_party/upb/upb/mini_table/message.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/mini_table/message.h"
 
diff --git a/third_party/upb/upb/mini_table/message.h b/third_party/upb/upb/mini_table/message.h
index 4ebc66e9e660b..b53e87eae9c50 100644
--- a/third_party/upb/upb/mini_table/message.h
+++ b/third_party/upb/upb/mini_table/message.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_MESSAGE_H_
 #define UPB_MINI_TABLE_MESSAGE_H_
diff --git a/third_party/upb/upb/mini_table/sub.h b/third_party/upb/upb/mini_table/sub.h
index 6d6fe86d82ddf..1c5d67e1ebc6b 100644
--- a/third_party/upb/upb/mini_table/sub.h
+++ b/third_party/upb/upb/mini_table/sub.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_MINI_TABLE_SUB_H_
 #define UPB_MINI_TABLE_SUB_H_
diff --git a/third_party/upb/upb/msg.h b/third_party/upb/upb/msg.h
deleted file mode 100644
index 5443a79e56e51..0000000000000
--- a/third_party/upb/upb/msg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/message/message.h instead
-// IWYU pragma: private, include "upb/message/message.h"
-
-#ifndef UPB_MSG_H_
-#define UPB_MSG_H_
-
-#include "upb/message/message.h"
-
-#endif /* UPB_MSG_INT_H_ */
diff --git a/third_party/upb/upb/msg_internal.h b/third_party/upb/upb/msg_internal.h
deleted file mode 100644
index 2cfdae87a3d26..0000000000000
--- a/third_party/upb/upb/msg_internal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/message/internal.h instead
-// IWYU pragma: private, include "upb/message/internal.h"
-
-#ifndef UPB_MSG_INT_H_
-#define UPB_MSG_INT_H_
-
-#include "upb/message/internal.h"
-
-#endif /* UPB_MSG_INT_H_ */
diff --git a/third_party/upb/upb/port/BUILD b/third_party/upb/upb/port/BUILD
new file mode 100644
index 0000000000000..fe20c085e5cd4
--- /dev/null
+++ b/third_party/upb/upb/port/BUILD
@@ -0,0 +1,52 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "port",
+    hdrs = [
+        "atomic.h",
+        "vsnprintf_compat.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    textual_hdrs = [
+        # We must list the headers explicitly here instead of relying on the
+        # :inc filegroup below. gRPC auto-generates various build configs from
+        # the Bazel graph, and this logic does not know how to handle
+        # filegroups. We might be able to replace these headers with just
+        # ":inc" after gRPC starts using upb's CMake build.
+        "def.inc",
+        "undef.inc",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "inc",
+    srcs = [
+        "def.inc",
+        "undef.inc",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.h",
+            "**/*.inc",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/port/atomic.h b/third_party/upb/upb/port/atomic.h
index 510a246c41cb9..f13caa86cc333 100644
--- a/third_party/upb/upb/port/atomic.h
+++ b/third_party/upb/upb/port/atomic.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2023, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_PORT_ATOMIC_H_
 #define UPB_PORT_ATOMIC_H_
@@ -32,8 +12,10 @@
 
 #ifdef UPB_USE_C11_ATOMICS
 
+// IWYU pragma: begin_exports
 #include <stdatomic.h>
 #include <stdbool.h>
+// IWYU pragma: end_exports
 
 #define upb_Atomic_Init(addr, val) atomic_init(addr, val)
 #define upb_Atomic_Load(addr, order) atomic_load_explicit(addr, order)
diff --git a/third_party/upb/upb/port/def.inc b/third_party/upb/upb/port/def.inc
index c1cf36f28716c..f32082138463a 100644
--- a/third_party/upb/upb/port/def.inc
+++ b/third_party/upb/upb/port/def.inc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /*
  * This is where we define internal portability macros used across upb.
@@ -65,10 +45,13 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
+#ifndef UINTPTR_MAX
+Error, UINTPTR_MAX is undefined
+#endif
+
 #if UINTPTR_MAX == 0xffffffff
 #define UPB_SIZE(size32, size64) size32
 #else
@@ -273,10 +256,25 @@
  * expected behavior.
  */
 
-#if defined(__SANITIZE_ADDRESS__)
+/* Due to preprocessor limitations, the conditional logic for setting
+ * UPN_CLANG_ASAN below cannot be consolidated into a portable one-liner.
+ * See https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html.
+ */
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
+#define UPB_CLANG_ASAN 1
+#else
+#define UPB_CLANG_ASAN 0
+#endif
+#else
+#define UPB_CLANG_ASAN 0
+#endif
+
+#if defined(__SANITIZE_ADDRESS__) || UPB_CLANG_ASAN
 #define UPB_ASAN 1
+#define UPB_ASAN_GUARD_SIZE 32
 #ifdef __cplusplus
-extern "C" {
+    extern "C" {
 #endif
 void __asan_poison_memory_region(void const volatile *addr, size_t size);
 void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
@@ -289,6 +287,7 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
   __asan_unpoison_memory_region((addr), (size))
 #else
 #define UPB_ASAN 0
+#define UPB_ASAN_GUARD_SIZE 0
 #define UPB_POISON_MEMORY_REGION(addr, size) \
   ((void)(addr), (void)(size))
 #define UPB_UNPOISON_MEMORY_REGION(addr, size) \
diff --git a/third_party/upb/upb/port/undef.inc b/third_party/upb/upb/port/undef.inc
index e1752f72f68f3..eb0e1654f8fb7 100644
--- a/third_party/upb/upb/port/undef.inc
+++ b/third_party/upb/upb/port/undef.inc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // This should #undef all macros #defined in def.inc
 
@@ -62,6 +42,8 @@
 #undef UPB_POISON_MEMORY_REGION
 #undef UPB_UNPOISON_MEMORY_REGION
 #undef UPB_ASAN
+#undef UPB_ASAN_GUARD_SIZE
+#undef UPB_CLANG_ASAN
 #undef UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3
 #undef UPB_DEPRECATED
 #undef UPB_GNUC_MIN
diff --git a/third_party/upb/upb/port/vsnprintf_compat.h b/third_party/upb/upb/port/vsnprintf_compat.h
index f895060162e20..1f6c6449cccef 100644
--- a/third_party/upb/upb/port/vsnprintf_compat.h
+++ b/third_party/upb/upb/port/vsnprintf_compat.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_PORT_VSNPRINTF_COMPAT_H_
 #define UPB_PORT_VSNPRINTF_COMPAT_H_
diff --git a/third_party/upb/upb/reflection.h b/third_party/upb/upb/reflection.h
deleted file mode 100644
index 12f0762cc75ec..0000000000000
--- a/third_party/upb/upb/reflection.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/reflection/message.h instead
-// IWYU pragma: private, include "upb/reflection/message.h"
-
-#ifndef UPB_REFLECTION_H_
-#define UPB_REFLECTION_H_
-
-#include "upb/reflection/message.h"
-
-#endif /* UPB_REFLECTION_H_ */
diff --git a/third_party/upb/upb/reflection.hpp b/third_party/upb/upb/reflection.hpp
deleted file mode 100644
index a2443fb6d452d..0000000000000
--- a/third_party/upb/upb/reflection.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is deprecated, use upb/reflection/message.hpp instead
-
-#ifndef UPB_REFLECTION_HPP_
-#define UPB_REFLECTION_HPP_
-
-#include "upb/reflection/message.hpp"
-
-#endif  // UPB_REFLECTION_HPP_
diff --git a/third_party/upb/upb/reflection/common.h b/third_party/upb/upb/reflection/common.h
index 797fbb223ef03..ebe32828536a9 100644
--- a/third_party/upb/upb/reflection/common.h
+++ b/third_party/upb/upb/reflection/common.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -44,7 +24,11 @@
 #include "google/protobuf/descriptor.upb.h"
 // end:github_only
 
-typedef enum { kUpb_Syntax_Proto2 = 2, kUpb_Syntax_Proto3 = 3 } upb_Syntax;
+typedef enum {
+  kUpb_Syntax_Proto2 = 2,
+  kUpb_Syntax_Proto3 = 3,
+  kUpb_Syntax_Editions = 99
+} upb_Syntax;
 
 // Forward declarations for circular references.
 typedef struct upb_DefPool upb_DefPool;
diff --git a/third_party/upb/upb/reflection/def.h b/third_party/upb/upb/reflection/def.h
index be04a9a596bd0..ba8e8390c82e0 100644
--- a/third_party/upb/upb/reflection/def.h
+++ b/third_party/upb/upb/reflection/def.h
@@ -1,33 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_REFLECTION_DEF_H_
 #define UPB_REFLECTION_DEF_H_
 
+// IWYU pragma: begin_exports
 #include "upb/reflection/def_pool.h"
 #include "upb/reflection/enum_def.h"
 #include "upb/reflection/enum_value_def.h"
@@ -38,5 +19,6 @@
 #include "upb/reflection/method_def.h"
 #include "upb/reflection/oneof_def.h"
 #include "upb/reflection/service_def.h"
+// IWYU pragma: end_exports
 
 #endif /* UPB_REFLECTION_DEF_H_ */
diff --git a/third_party/upb/upb/reflection/def.hpp b/third_party/upb/upb/reflection/def.hpp
index 38a40282bcc2b..855ef3dc9a859 100644
--- a/third_party/upb/upb/reflection/def.hpp
+++ b/third_party/upb/upb/reflection/def.hpp
@@ -1,27 +1,9 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_REFLECTION_DEF_HPP_
 #define UPB_REFLECTION_DEF_HPP_
@@ -31,11 +13,12 @@
 #include <string>
 #include <vector>
 
+#include "upb/base/status.hpp"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/reflection/enum_def_internal.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/reflection/internal/enum_def.h"
 #include "upb/reflection/message.h"
-#include "upb/upb.hpp"
 
 // Must be last
 #include "upb/port/def.inc"
@@ -572,7 +555,7 @@ class DefPool {
   std::unique_ptr<upb_DefPool, decltype(&upb_DefPool_Free)> ptr_;
 };
 
-// TODO(b/236632406): This typedef is deprecated. Delete it.
+// TODO: This typedef is deprecated. Delete it.
 using SymbolTable = DefPool;
 
 inline FileDefPtr FieldDefPtr::file() const {
diff --git a/third_party/upb/upb/reflection/def_builder_internal.h b/third_party/upb/upb/reflection/def_builder_internal.h
deleted file mode 100644
index a4725c38cde08..0000000000000
--- a/third_party/upb/upb/reflection/def_builder_internal.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_
-#define UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_
-
-#include "upb/reflection/common.h"
-#include "upb/reflection/def_pool_internal.h"
-#include "upb/reflection/def_type.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-// We want to copy the options verbatim into the destination options proto.
-// We use serialize+parse as our deep copy.
-#define UPB_DEF_SET_OPTIONS(target, desc_type, options_type, proto)           \
-  if (UPB_DESC(desc_type##_has_options)(proto)) {                             \
-    size_t size;                                                              \
-    char* pb = UPB_DESC(options_type##_serialize)(                            \
-        UPB_DESC(desc_type##_options)(proto), ctx->tmp_arena, &size);         \
-    if (!pb) _upb_DefBuilder_OomErr(ctx);                                     \
-    target =                                                                  \
-        UPB_DESC(options_type##_parse)(pb, size, _upb_DefBuilder_Arena(ctx)); \
-    if (!target) _upb_DefBuilder_OomErr(ctx);                                 \
-  } else {                                                                    \
-    target = (const UPB_DESC(options_type)*)kUpbDefOptDefault;                \
-  }
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct upb_DefBuilder {
-  upb_DefPool* symtab;
-  upb_FileDef* file;                 // File we are building.
-  upb_Arena* arena;                  // Allocate defs here.
-  upb_Arena* tmp_arena;              // For temporary allocations.
-  upb_Status* status;                // Record errors here.
-  const upb_MiniTableFile* layout;   // NULL if we should build layouts.
-  upb_MiniTablePlatform platform;    // Platform we are targeting.
-  int enum_count;                    // Count of enums built so far.
-  int msg_count;                     // Count of messages built so far.
-  int ext_count;                     // Count of extensions built so far.
-  jmp_buf err;                       // longjmp() on error.
-};
-
-extern const char* kUpbDefOptDefault;
-
-// ctx->status has already been set elsewhere so just fail/longjmp()
-UPB_NORETURN void _upb_DefBuilder_FailJmp(upb_DefBuilder* ctx);
-
-UPB_NORETURN void _upb_DefBuilder_Errf(upb_DefBuilder* ctx, const char* fmt,
-                                       ...) UPB_PRINTF(2, 3);
-UPB_NORETURN void _upb_DefBuilder_OomErr(upb_DefBuilder* ctx);
-
-const char* _upb_DefBuilder_MakeFullName(upb_DefBuilder* ctx,
-                                         const char* prefix,
-                                         upb_StringView name);
-
-// Given a symbol and the base symbol inside which it is defined,
-// find the symbol's definition.
-const void* _upb_DefBuilder_ResolveAny(upb_DefBuilder* ctx,
-                                       const char* from_name_dbg,
-                                       const char* base, upb_StringView sym,
-                                       upb_deftype_t* type);
-
-const void* _upb_DefBuilder_Resolve(upb_DefBuilder* ctx,
-                                    const char* from_name_dbg, const char* base,
-                                    upb_StringView sym, upb_deftype_t type);
-
-char _upb_DefBuilder_ParseEscape(upb_DefBuilder* ctx, const upb_FieldDef* f,
-                                 const char** src, const char* end);
-
-const char* _upb_DefBuilder_FullToShort(const char* fullname);
-
-UPB_INLINE void* _upb_DefBuilder_Alloc(upb_DefBuilder* ctx, size_t bytes) {
-  if (bytes == 0) return NULL;
-  void* ret = upb_Arena_Malloc(ctx->arena, bytes);
-  if (!ret) _upb_DefBuilder_OomErr(ctx);
-  return ret;
-}
-
-// Adds a symbol |v| to the symtab, which must be a def pointer previously
-// packed with pack_def(). The def's pointer to upb_FileDef* must be set before
-// adding, so we know which entries to remove if building this file fails.
-UPB_INLINE void _upb_DefBuilder_Add(upb_DefBuilder* ctx, const char* name,
-                                    upb_value v) {
-  upb_StringView sym = {.data = name, .size = strlen(name)};
-  bool ok = _upb_DefPool_InsertSym(ctx->symtab, sym, v, ctx->status);
-  if (!ok) _upb_DefBuilder_FailJmp(ctx);
-}
-
-UPB_INLINE upb_Arena* _upb_DefBuilder_Arena(const upb_DefBuilder* ctx) {
-  return ctx->arena;
-}
-
-UPB_INLINE upb_FileDef* _upb_DefBuilder_File(const upb_DefBuilder* ctx) {
-  return ctx->file;
-}
-
-// This version of CheckIdent() is only called by other, faster versions after
-// they detect a parsing error.
-void _upb_DefBuilder_CheckIdentSlow(upb_DefBuilder* ctx, upb_StringView name,
-                                    bool full);
-
-// Verify a full identifier string. This is slightly more complicated than
-// verifying a relative identifier string because we must track '.' chars.
-UPB_INLINE void _upb_DefBuilder_CheckIdentFull(upb_DefBuilder* ctx,
-                                               upb_StringView name) {
-  bool good = name.size > 0;
-  bool start = true;
-
-  for (size_t i = 0; i < name.size; i++) {
-    const char c = name.data[i];
-    const char d = c | 0x20;  // force lowercase
-    const bool is_alpha = (('a' <= d) & (d <= 'z')) | (c == '_');
-    const bool is_numer = ('0' <= c) & (c <= '9') & !start;
-    const bool is_dot = (c == '.') & !start;
-
-    good &= is_alpha | is_numer | is_dot;
-    start = is_dot;
-  }
-
-  if (!good) _upb_DefBuilder_CheckIdentSlow(ctx, name, true);
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/def_builder_test.cc b/third_party/upb/upb/reflection/def_builder_test.cc
deleted file mode 100644
index 1166dd2929f74..0000000000000
--- a/third_party/upb/upb/reflection/def_builder_test.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
-#include "upb/reflection/def_builder_internal.h"
-#include "upb/upb.hpp"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-struct IdentTestData {
-  absl::string_view text;
-  bool ok;
-};
-
-class FullIdentTestBase : public testing::TestWithParam<IdentTestData> {};
-
-TEST_P(FullIdentTestBase, CheckFullIdent) {
-  upb_Status status;
-  upb_DefBuilder ctx;
-  upb::Arena arena;
-  ctx.status = &status;
-  ctx.arena = arena.ptr();
-  upb_Status_Clear(&status);
-
-  if (UPB_SETJMP(ctx.err)) {
-    EXPECT_FALSE(GetParam().ok);
-  } else {
-    _upb_DefBuilder_CheckIdentFull(
-        &ctx, upb_StringView_FromDataAndSize(GetParam().text.data(),
-                                             GetParam().text.size()));
-    EXPECT_TRUE(GetParam().ok);
-  }
-}
-
-INSTANTIATE_TEST_SUITE_P(FullIdentTest, FullIdentTestBase,
-                         testing::ValuesIn(std::vector<IdentTestData>{
-                             {"foo.bar", true},
-                             {"foo.", true},
-                             {"foo", true},
-
-                             {"foo.7bar", false},
-                             {".foo", false},
-                             {"#", false},
-                             {".", false},
-                             {"", false}}));
-
-class PartIdentTestBase : public testing::TestWithParam<IdentTestData> {};
-
-TEST_P(PartIdentTestBase, TestNotFullIdent) {
-  upb_Status status;
-  upb_DefBuilder ctx;
-  upb::Arena arena;
-  ctx.status = &status;
-  ctx.arena = arena.ptr();
-  upb_Status_Clear(&status);
-
-  if (UPB_SETJMP(ctx.err)) {
-    EXPECT_FALSE(GetParam().ok);
-  } else {
-    _upb_DefBuilder_MakeFullName(
-        &ctx, "abc",
-        upb_StringView_FromDataAndSize(GetParam().text.data(),
-                                       GetParam().text.size()));
-    EXPECT_TRUE(GetParam().ok);
-  }
-}
-
-INSTANTIATE_TEST_SUITE_P(PartIdentTest, PartIdentTestBase,
-                         testing::ValuesIn(std::vector<IdentTestData>{
-                             {"foo", true},
-                             {"foo1", true},
-
-                             {"foo.bar", false},
-                             {"1foo", false},
-                             {"#", false},
-                             {".", false},
-                             {"", false}}));
diff --git a/third_party/upb/upb/reflection/def_pool.c b/third_party/upb/upb/reflection/def_pool.c
index da8838c20cf31..90d3beadf57e6 100644
--- a/third_party/upb/upb/reflection/def_pool.c
+++ b/third_party/upb/upb/reflection/def_pool.c
@@ -1,41 +1,22 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/def_pool.h"
 
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
-#include "upb/reflection/def_builder_internal.h"
-#include "upb/reflection/def_pool_internal.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/enum_value_def_internal.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
-#include "upb/reflection/service_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/enum_def.h"
+#include "upb/reflection/internal/enum_value_def.h"
+#include "upb/reflection/internal/field_def.h"
+#include "upb/reflection/internal/file_def.h"
+#include "upb/reflection/internal/message_def.h"
+#include "upb/reflection/internal/service_def.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -211,7 +192,7 @@ const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
 const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
                                                         const char* name) {
   upb_value v;
-  // TODO(haberman): non-extension fields and oneofs.
+  // TODO: non-extension fields and oneofs.
   if (upb_strtable_lookup(&s->syms, name, &v)) {
     switch (_upb_DefType_Type(v)) {
       case UPB_DEFTYPE_EXT: {
diff --git a/third_party/upb/upb/reflection/def_pool.h b/third_party/upb/upb/reflection/def_pool.h
index 157ff3aa83369..f21a0dbd2db72 100644
--- a/third_party/upb/upb/reflection/def_pool.h
+++ b/third_party/upb/upb/reflection/def_pool.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -42,18 +22,18 @@
 extern "C" {
 #endif
 
-void upb_DefPool_Free(upb_DefPool* s);
+UPB_API void upb_DefPool_Free(upb_DefPool* s);
 
-upb_DefPool* upb_DefPool_New(void);
+UPB_API upb_DefPool* upb_DefPool_New(void);
 
-const upb_MessageDef* upb_DefPool_FindMessageByName(const upb_DefPool* s,
-                                                    const char* sym);
+UPB_API const upb_MessageDef* upb_DefPool_FindMessageByName(
+    const upb_DefPool* s, const char* sym);
 
 const upb_MessageDef* upb_DefPool_FindMessageByNameWithSize(
     const upb_DefPool* s, const char* sym, size_t len);
 
-const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
-                                              const char* sym);
+UPB_API const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
+                                                      const char* sym);
 
 const upb_EnumValueDef* upb_DefPool_FindEnumByNameval(const upb_DefPool* s,
                                                       const char* sym);
@@ -87,10 +67,9 @@ const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
 const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
                                                         const char* name);
 
-const upb_FileDef* upb_DefPool_AddFile(upb_DefPool* s,
-                                       const UPB_DESC(FileDescriptorProto) *
-                                           file_proto,
-                                       upb_Status* status);
+UPB_API const upb_FileDef* upb_DefPool_AddFile(
+    upb_DefPool* s, const UPB_DESC(FileDescriptorProto) * file_proto,
+    upb_Status* status);
 
 const upb_ExtensionRegistry* upb_DefPool_ExtensionRegistry(
     const upb_DefPool* s);
diff --git a/third_party/upb/upb/reflection/def_pool_internal.h b/third_party/upb/upb/reflection/def_pool_internal.h
deleted file mode 100644
index c55e7eabba613..0000000000000
--- a/third_party/upb/upb/reflection/def_pool_internal.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_DEF_POOL_INTERNAL_H_
-#define UPB_REFLECTION_DEF_POOL_INTERNAL_H_
-
-#include "upb/mini_descriptor/decode.h"
-#include "upb/reflection/def_pool.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s);
-size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s);
-upb_ExtensionRegistry* _upb_DefPool_ExtReg(const upb_DefPool* s);
-
-bool _upb_DefPool_InsertExt(upb_DefPool* s, const upb_MiniTableExtension* ext,
-                            const upb_FieldDef* f);
-bool _upb_DefPool_InsertSym(upb_DefPool* s, upb_StringView sym, upb_value v,
-                            upb_Status* status);
-bool _upb_DefPool_LookupSym(const upb_DefPool* s, const char* sym, size_t size,
-                            upb_value* v);
-
-void** _upb_DefPool_ScratchData(const upb_DefPool* s);
-size_t* _upb_DefPool_ScratchSize(const upb_DefPool* s);
-void _upb_DefPool_SetPlatform(upb_DefPool* s, upb_MiniTablePlatform platform);
-
-// For generated code only: loads a generated descriptor.
-typedef struct _upb_DefPool_Init {
-  struct _upb_DefPool_Init** deps;  // Dependencies of this file.
-  const upb_MiniTableFile* layout;
-  const char* filename;
-  upb_StringView descriptor;  // Serialized descriptor.
-} _upb_DefPool_Init;
-
-bool _upb_DefPool_LoadDefInit(upb_DefPool* s, const _upb_DefPool_Init* init);
-
-// Should only be directly called by tests. This variant lets us suppress
-// the use of compiled-in tables, forcing a rebuild of the tables at runtime.
-bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
-                                bool rebuild_minitable);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_DEF_POOL_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/def_type.c b/third_party/upb/upb/reflection/def_type.c
index 110cc35d98a92..cd4ae15cdf7af 100644
--- a/third_party/upb/upb/reflection/def_type.c
+++ b/third_party/upb/upb/reflection/def_type.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/reflection/def_type.h"
 
diff --git a/third_party/upb/upb/reflection/def_type.h b/third_party/upb/upb/reflection/def_type.h
index a6d5341d39ffb..976963e6c567e 100644
--- a/third_party/upb/upb/reflection/def_type.h
+++ b/third_party/upb/upb/reflection/def_type.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_REFLECTION_DEF_TYPE_H_
 #define UPB_REFLECTION_DEF_TYPE_H_
@@ -47,7 +27,6 @@ typedef enum {
   // Only inside message table.
   UPB_DEFTYPE_FIELD = 0,
   UPB_DEFTYPE_ONEOF = 1,
-  UPB_DEFTYPE_FIELD_JSONNAME = 2,
 } upb_deftype_t;
 
 #ifdef __cplusplus
diff --git a/third_party/upb/upb/reflection/desc_state.c b/third_party/upb/upb/reflection/desc_state.c
index 09f4c2af0e8ae..075314c95d91c 100644
--- a/third_party/upb/upb/reflection/desc_state.c
+++ b/third_party/upb/upb/reflection/desc_state.c
@@ -1,31 +1,11 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-#include "upb/reflection/desc_state_internal.h"
+#include "upb/reflection/internal/desc_state.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/reflection/desc_state_internal.h b/third_party/upb/upb/reflection/desc_state_internal.h
deleted file mode 100644
index 86426d33037f2..0000000000000
--- a/third_party/upb/upb/reflection/desc_state_internal.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_DESC_STATE_INTERNAL_H_
-#define UPB_REFLECTION_DESC_STATE_INTERNAL_H_
-
-#include "upb/mem/arena.h"
-#include "upb/mini_descriptor/internal/encode.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-// Manages the storage for mini descriptor strings as they are being encoded.
-// TODO(b/234740652): Move some of this state directly into the encoder, maybe.
-typedef struct {
-  upb_MtDataEncoder e;
-  size_t bufsize;
-  char* buf;
-  char* ptr;
-} upb_DescState;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-UPB_INLINE void _upb_DescState_Init(upb_DescState* d) {
-  d->bufsize = kUpb_MtDataEncoder_MinSize * 2;
-  d->buf = NULL;
-  d->ptr = NULL;
-}
-
-bool _upb_DescState_Grow(upb_DescState* d, upb_Arena* a);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_DESC_STATE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/enum_def.c b/third_party/upb/upb/reflection/enum_def.c
index 060ebce5a5a28..97fc63e9aceaa 100644
--- a/third_party/upb/upb/reflection/enum_def.c
+++ b/third_party/upb/upb/reflection/enum_def.c
@@ -1,41 +1,23 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/enum_def.h"
 
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
 #include "upb/mini_descriptor/decode.h"
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/desc_state_internal.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/enum_reserved_range_internal.h"
-#include "upb/reflection/enum_value_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/desc_state.h"
+#include "upb/reflection/internal/enum_reserved_range.h"
+#include "upb/reflection/internal/enum_value_def.h"
+#include "upb/reflection/internal/file_def.h"
+#include "upb/reflection/internal/message_def.h"
+#include "upb/reflection/internal/strdup2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -177,7 +159,7 @@ bool upb_EnumDef_MiniDescriptorEncode(const upb_EnumDef* e, upb_Arena* a,
   // Duplicate values are allowed but we only encode each value once.
   uint32_t previous = 0;
 
-  for (size_t i = 0; i < e->value_count; i++) {
+  for (int i = 0; i < e->value_count; i++) {
     const uint32_t current =
         upb_EnumValueDef_Number(sorted ? sorted[i] : upb_EnumDef_Value(e, i));
     if (i != 0 && previous == current) continue;
@@ -217,7 +199,7 @@ static upb_MiniTableEnum* create_enumlayout(upb_DefBuilder* ctx,
 static upb_StringView* _upb_EnumReservedNames_New(
     upb_DefBuilder* ctx, int n, const upb_StringView* protos) {
   upb_StringView* sv = _upb_DefBuilder_Alloc(ctx, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
+  for (int i = 0; i < n; i++) {
     sv[i].data =
         upb_strdup2(protos[i].data, protos[i].size, _upb_DefBuilder_Arena(ctx));
     sv[i].size = protos[i].size;
@@ -302,7 +284,7 @@ upb_EnumDef* _upb_EnumDefs_New(
                                      : _upb_FileDef_RawPackage(ctx->file);
 
   upb_EnumDef* e = _upb_DefBuilder_Alloc(ctx, sizeof(upb_EnumDef) * n);
-  for (size_t i = 0; i < n; i++) {
+  for (int i = 0; i < n; i++) {
     create_enumdef(ctx, name, protos[i], &e[i]);
     e[i].containing_type = containing_type;
   }
diff --git a/third_party/upb/upb/reflection/enum_def.h b/third_party/upb/upb/reflection/enum_def.h
index f115e88923e9d..6f406f54bb07d 100644
--- a/third_party/upb/upb/reflection/enum_def.h
+++ b/third_party/upb/upb/reflection/enum_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -43,14 +23,14 @@ extern "C" {
 bool upb_EnumDef_CheckNumber(const upb_EnumDef* e, int32_t num);
 const upb_MessageDef* upb_EnumDef_ContainingType(const upb_EnumDef* e);
 int32_t upb_EnumDef_Default(const upb_EnumDef* e);
-const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e);
+UPB_API const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e);
 const upb_EnumValueDef* upb_EnumDef_FindValueByName(const upb_EnumDef* e,
                                                     const char* name);
-const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
+UPB_API const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
     const upb_EnumDef* e, const char* name, size_t size);
-const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(const upb_EnumDef* e,
-                                                      int32_t num);
-const char* upb_EnumDef_FullName(const upb_EnumDef* e);
+UPB_API const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(
+    const upb_EnumDef* e, int32_t num);
+UPB_API const char* upb_EnumDef_FullName(const upb_EnumDef* e);
 bool upb_EnumDef_HasOptions(const upb_EnumDef* e);
 bool upb_EnumDef_IsClosed(const upb_EnumDef* e);
 
@@ -68,8 +48,8 @@ const upb_EnumReservedRange* upb_EnumDef_ReservedRange(const upb_EnumDef* e,
                                                        int i);
 int upb_EnumDef_ReservedRangeCount(const upb_EnumDef* e);
 
-const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i);
-int upb_EnumDef_ValueCount(const upb_EnumDef* e);
+UPB_API const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i);
+UPB_API int upb_EnumDef_ValueCount(const upb_EnumDef* e);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/reflection/enum_def_internal.h b/third_party/upb/upb/reflection/enum_def_internal.h
deleted file mode 100644
index 41f9958683531..0000000000000
--- a/third_party/upb/upb/reflection/enum_def_internal.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_ENUM_DEF_INTERNAL_H_
-#define UPB_REFLECTION_ENUM_DEF_INTERNAL_H_
-
-#include "upb/reflection/enum_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_EnumDef* _upb_EnumDef_At(const upb_EnumDef* e, int i);
-bool _upb_EnumDef_Insert(upb_EnumDef* e, upb_EnumValueDef* v, upb_Arena* a);
-const upb_MiniTableEnum* _upb_EnumDef_MiniTable(const upb_EnumDef* e);
-
-// Allocate and initialize an array of |n| enum defs.
-upb_EnumDef* _upb_EnumDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(EnumDescriptorProto) * const* protos,
-    const upb_MessageDef* containing_type);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_ENUM_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/enum_reserved_range.c b/third_party/upb/upb/reflection/enum_reserved_range.c
index f6e226866897b..f138846298b09 100644
--- a/third_party/upb/upb/reflection/enum_reserved_range.c
+++ b/third_party/upb/upb/reflection/enum_reserved_range.c
@@ -1,36 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/enum_reserved_range.h"
 
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/enum_def.h"
-#include "upb/reflection/enum_reserved_range_internal.h"
-// #include "upb/reflection/extension_range_internal.h"
 #include "upb/reflection/field_def.h"
-// #include "upb/reflection/message_def.h"
+#include "upb/reflection/internal/def_builder.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/reflection/enum_reserved_range.h b/third_party/upb/upb/reflection/enum_reserved_range.h
index 7276bf69d7615..124d4c75148a5 100644
--- a/third_party/upb/upb/reflection/enum_reserved_range.h
+++ b/third_party/upb/upb/reflection/enum_reserved_range.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
diff --git a/third_party/upb/upb/reflection/enum_reserved_range_internal.h b/third_party/upb/upb/reflection/enum_reserved_range_internal.h
deleted file mode 100644
index 869f3b60ca772..0000000000000
--- a/third_party/upb/upb/reflection/enum_reserved_range_internal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
-#define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
-
-#include "upb/reflection/enum_reserved_range.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r,
-                                                 int i);
-
-// Allocate and initialize an array of |n| reserved ranges owned by |e|.
-upb_EnumReservedRange* _upb_EnumReservedRanges_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(EnumDescriptorProto_EnumReservedRange) * const* protos,
-    const upb_EnumDef* e);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/enum_value_def.c b/third_party/upb/upb/reflection/enum_value_def.c
index 70d2f1a45abd3..d06c9331075c9 100644
--- a/third_party/upb/upb/reflection/enum_value_def.c
+++ b/third_party/upb/upb/reflection/enum_value_def.c
@@ -1,35 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/reflection/def_builder_internal.h"
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/enum_value_def.h"
+
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/enum_value_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/enum_def.h"
+#include "upb/reflection/internal/file_def.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -125,7 +106,7 @@ upb_EnumValueDef* _upb_EnumValueDefs_New(
 
   *is_sorted = true;
   uint32_t previous = 0;
-  for (size_t i = 0; i < n; i++) {
+  for (int i = 0; i < n; i++) {
     create_enumvaldef(ctx, prefix, protos[i], e, &v[i]);
 
     const uint32_t current = v[i].number;
diff --git a/third_party/upb/upb/reflection/enum_value_def.h b/third_party/upb/upb/reflection/enum_value_def.h
index 9f01edbff0e01..e95232847a167 100644
--- a/third_party/upb/upb/reflection/enum_value_def.h
+++ b/third_party/upb/upb/reflection/enum_value_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -43,8 +23,8 @@ const upb_EnumDef* upb_EnumValueDef_Enum(const upb_EnumValueDef* v);
 const char* upb_EnumValueDef_FullName(const upb_EnumValueDef* v);
 bool upb_EnumValueDef_HasOptions(const upb_EnumValueDef* v);
 uint32_t upb_EnumValueDef_Index(const upb_EnumValueDef* v);
-const char* upb_EnumValueDef_Name(const upb_EnumValueDef* v);
-int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* v);
+UPB_API const char* upb_EnumValueDef_Name(const upb_EnumValueDef* v);
+UPB_API int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* v);
 const UPB_DESC(EnumValueOptions) *
     upb_EnumValueDef_Options(const upb_EnumValueDef* v);
 
diff --git a/third_party/upb/upb/reflection/enum_value_def_internal.h b/third_party/upb/upb/reflection/enum_value_def_internal.h
deleted file mode 100644
index 09f0644da0fcf..0000000000000
--- a/third_party/upb/upb/reflection/enum_value_def_internal.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_
-#define UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_
-
-#include "upb/reflection/enum_value_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_EnumValueDef* _upb_EnumValueDef_At(const upb_EnumValueDef* v, int i);
-
-// Allocate and initialize an array of |n| enum value defs owned by |e|.
-upb_EnumValueDef* _upb_EnumValueDefs_New(
-    upb_DefBuilder* ctx, const char* prefix, int n,
-    const UPB_DESC(EnumValueDescriptorProto) * const* protos, upb_EnumDef* e,
-    bool* is_sorted);
-
-const upb_EnumValueDef** _upb_EnumValueDefs_Sorted(const upb_EnumValueDef* v,
-                                                   int n, upb_Arena* a);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/extension_range.c b/third_party/upb/upb/reflection/extension_range.c
index d7dfebdd62fab..b088ba92ede6a 100644
--- a/third_party/upb/upb/reflection/extension_range.c
+++ b/third_party/upb/upb/reflection/extension_range.c
@@ -1,33 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/extension_range.h"
 
-#include "upb/reflection/def_builder_internal.h"
-#include "upb/reflection/extension_range_internal.h"
 #include "upb/reflection/field_def.h"
+#include "upb/reflection/internal/def_builder.h"
 #include "upb/reflection/message_def.h"
 
 // Must be last.
diff --git a/third_party/upb/upb/reflection/extension_range.h b/third_party/upb/upb/reflection/extension_range.h
index c8d56be50402f..7c3e19f005b17 100644
--- a/third_party/upb/upb/reflection/extension_range.h
+++ b/third_party/upb/upb/reflection/extension_range.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
diff --git a/third_party/upb/upb/reflection/extension_range_internal.h b/third_party/upb/upb/reflection/extension_range_internal.h
deleted file mode 100644
index fde3d941f34b5..0000000000000
--- a/third_party/upb/upb/reflection/extension_range_internal.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_
-#define UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_
-
-#include "upb/reflection/extension_range.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_ExtensionRange* _upb_ExtensionRange_At(const upb_ExtensionRange* r, int i);
-
-// Allocate and initialize an array of |n| extension ranges owned by |m|.
-upb_ExtensionRange* _upb_ExtensionRanges_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(DescriptorProto_ExtensionRange) * const* protos,
-    const upb_MessageDef* m);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/field_def.c b/third_party/upb/upb/reflection/field_def.c
index 06851cf08729b..537d05ef85a75 100644
--- a/third_party/upb/upb/reflection/field_def.c
+++ b/third_party/upb/upb/reflection/field_def.c
@@ -1,46 +1,28 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/field_def.h"
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdbool.h>
 
+#include "upb/base/descriptor_constants.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_descriptor/internal/modifiers.h"
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_builder_internal.h"
-#include "upb/reflection/def_pool.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/desc_state_internal.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/enum_value_def_internal.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
-#include "upb/reflection/oneof_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/desc_state.h"
+#include "upb/reflection/internal/enum_def.h"
+#include "upb/reflection/internal/file_def.h"
+#include "upb/reflection/internal/message_def.h"
+#include "upb/reflection/internal/oneof_def.h"
+#include "upb/reflection/internal/strdup2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -153,7 +135,13 @@ uint32_t upb_FieldDef_Number(const upb_FieldDef* f) { return f->number_; }
 
 bool upb_FieldDef_IsExtension(const upb_FieldDef* f) { return f->is_extension; }
 
-bool upb_FieldDef_IsPacked(const upb_FieldDef* f) { return f->is_packed; }
+bool _upb_FieldDef_IsPackable(const upb_FieldDef* f) {
+  return upb_FieldDef_IsRepeated(f) && upb_FieldDef_IsPrimitive(f);
+}
+
+bool upb_FieldDef_IsPacked(const upb_FieldDef* f) {
+  return _upb_FieldDef_IsPackable(f) && f->is_packed;
+}
 
 const char* upb_FieldDef_Name(const upb_FieldDef* f) {
   return _upb_DefBuilder_FullToShort(f->full_name);
@@ -265,8 +253,31 @@ bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f) {
 
 int _upb_FieldDef_LayoutIndex(const upb_FieldDef* f) { return f->layout_index; }
 
+// begin:google_only
+// static bool _upb_FieldDef_EnforceUtf8Option(const upb_FieldDef* f) {
+// #if defined(UPB_BOOTSTRAP_STAGE0)
+//   return true;
+// #else
+//   return UPB_DESC(FieldOptions_enforce_utf8)(f->opts);
+// #endif
+// }
+// end:google_only
+
+// begin:github_only
+static bool _upb_FieldDef_EnforceUtf8Option(const upb_FieldDef* f) {
+  return true;
+}
+// end:github_only
+
+bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) {
+  if (upb_FieldDef_Type(f) != kUpb_FieldType_String) return false;
+  return upb_FileDef_Syntax(upb_FieldDef_File(f)) == kUpb_Syntax_Proto3
+             ? _upb_FieldDef_EnforceUtf8Option(f)
+             : false;
+}
+
 uint64_t _upb_FieldDef_Modifiers(const upb_FieldDef* f) {
-  uint64_t out = f->is_packed ? kUpb_FieldModifier_IsPacked : 0;
+  uint64_t out = upb_FieldDef_IsPacked(f) ? kUpb_FieldModifier_IsPacked : 0;
 
   switch (f->label_) {
     case kUpb_Label_Optional:
@@ -285,6 +296,11 @@ uint64_t _upb_FieldDef_Modifiers(const upb_FieldDef* f) {
   if (_upb_FieldDef_IsClosedEnum(f)) {
     out |= kUpb_FieldModifier_IsClosedEnum;
   }
+
+  if (_upb_FieldDef_ValidateUtf8(f)) {
+    out |= kUpb_FieldModifier_ValidateUtf8;
+  }
+
   return out;
 }
 
@@ -592,14 +608,16 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
               f->full_name, (int)f->type_);
         }
     }
-  } else if (has_type_name) {
-    f->type_ =
-        UPB_FIELD_TYPE_UNSPECIFIED;  // We'll assign this in resolve_fielddef()
   }
 
-  if (f->type_ < kUpb_FieldType_Double || f->type_ > kUpb_FieldType_SInt64) {
-    _upb_DefBuilder_Errf(ctx, "invalid type for field %s (%d)", f->full_name,
-                         f->type_);
+  if (!has_type && has_type_name) {
+    f->type_ =
+        UPB_FIELD_TYPE_UNSPECIFIED;  // We'll assign this in resolve_subdef()
+  } else {
+    if (f->type_ < kUpb_FieldType_Double || f->type_ > kUpb_FieldType_SInt64) {
+      _upb_DefBuilder_Errf(ctx, "invalid type for field %s (%d)", f->full_name,
+                           f->type_);
+    }
   }
 
   if (f->label_ < kUpb_Label_Optional || f->label_ > kUpb_Label_Repeated) {
@@ -619,8 +637,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
   }
 
   if (UPB_DESC(FieldDescriptorProto_has_oneof_index)(field_proto)) {
-    uint32_t oneof_index =
-        UPB_DESC(FieldDescriptorProto_oneof_index)(field_proto);
+    int oneof_index = UPB_DESC(FieldDescriptorProto_oneof_index)(field_proto);
 
     if (upb_FieldDef_Label(f) != kUpb_Label_Optional) {
       _upb_DefBuilder_Errf(ctx, "fields in oneof must have OPTIONAL label (%s)",
@@ -647,15 +664,13 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
   if (UPB_DESC(FieldOptions_has_packed)(f->opts)) {
     f->is_packed = UPB_DESC(FieldOptions_packed)(f->opts);
   } else {
-    // Repeated fields default to packed for proto3 only.
-    f->is_packed = upb_FieldDef_IsPrimitive(f) &&
-                   f->label_ == kUpb_Label_Repeated &&
-                   upb_FileDef_Syntax(f->file) == kUpb_Syntax_Proto3;
+    f->is_packed = upb_FileDef_Syntax(f->file) == kUpb_Syntax_Proto3;
   }
 
   f->has_presence =
       (!upb_FieldDef_IsRepeated(f)) &&
-      (upb_FieldDef_IsSubMessage(f) || upb_FieldDef_ContainingOneof(f) ||
+      (f->type_ == kUpb_FieldType_Message || f->type_ == kUpb_FieldType_Group ||
+       upb_FieldDef_ContainingOneof(f) ||
        (upb_FileDef_Syntax(f->file) == kUpb_Syntax_Proto2));
 }
 
@@ -768,11 +783,13 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix,
           f->sub.msgdef = def;
           f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
                                               // this being a group.
+          f->has_presence = !upb_FieldDef_IsRepeated(f);
           break;
         default:
           _upb_DefBuilder_Errf(ctx, "Couldn't resolve type name for field %s",
                                f->full_name);
       }
+      break;
     }
     case kUpb_FieldType_Message:
     case kUpb_FieldType_Group:
@@ -802,7 +819,7 @@ static int _upb_FieldDef_Compare(const void* p1, const void* p2) {
 // for non-sorted lists of fields.
 const upb_FieldDef** _upb_FieldDefs_Sorted(const upb_FieldDef* f, int n,
                                            upb_Arena* a) {
-  // TODO(salo): Replace this arena alloc with a persistent scratch buffer.
+  // TODO: Replace this arena alloc with a persistent scratch buffer.
   upb_FieldDef** out = (upb_FieldDef**)upb_Arena_Malloc(a, n * sizeof(void*));
   if (!out) return NULL;
 
diff --git a/third_party/upb/upb/reflection/field_def.h b/third_party/upb/upb/reflection/field_def.h
index 4502162f32920..b3305bc1f29d7 100644
--- a/third_party/upb/upb/reflection/field_def.h
+++ b/third_party/upb/upb/reflection/field_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -45,42 +25,45 @@ extern "C" {
 #endif
 
 const upb_OneofDef* upb_FieldDef_ContainingOneof(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_ContainingType(const upb_FieldDef* f);
-upb_CType upb_FieldDef_CType(const upb_FieldDef* f);
-upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f);
-const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f);
+UPB_API const upb_MessageDef* upb_FieldDef_ContainingType(
+    const upb_FieldDef* f);
+UPB_API upb_CType upb_FieldDef_CType(const upb_FieldDef* f);
+UPB_API upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f);
+UPB_API const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f);
 const upb_MessageDef* upb_FieldDef_ExtensionScope(const upb_FieldDef* f);
-const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f);
+UPB_API const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f);
 const char* upb_FieldDef_FullName(const upb_FieldDef* f);
 bool upb_FieldDef_HasDefault(const upb_FieldDef* f);
 bool upb_FieldDef_HasJsonName(const upb_FieldDef* f);
 bool upb_FieldDef_HasOptions(const upb_FieldDef* f);
-bool upb_FieldDef_HasPresence(const upb_FieldDef* f);
+UPB_API bool upb_FieldDef_HasPresence(const upb_FieldDef* f);
 bool upb_FieldDef_HasSubDef(const upb_FieldDef* f);
 uint32_t upb_FieldDef_Index(const upb_FieldDef* f);
 bool upb_FieldDef_IsExtension(const upb_FieldDef* f);
-bool upb_FieldDef_IsMap(const upb_FieldDef* f);
+UPB_API bool upb_FieldDef_IsMap(const upb_FieldDef* f);
 bool upb_FieldDef_IsOptional(const upb_FieldDef* f);
 bool upb_FieldDef_IsPacked(const upb_FieldDef* f);
 bool upb_FieldDef_IsPrimitive(const upb_FieldDef* f);
-bool upb_FieldDef_IsRepeated(const upb_FieldDef* f);
+UPB_API bool upb_FieldDef_IsRepeated(const upb_FieldDef* f);
 bool upb_FieldDef_IsRequired(const upb_FieldDef* f);
 bool upb_FieldDef_IsString(const upb_FieldDef* f);
-bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f);
-const char* upb_FieldDef_JsonName(const upb_FieldDef* f);
-upb_Label upb_FieldDef_Label(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f);
+UPB_API bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f);
+UPB_API const char* upb_FieldDef_JsonName(const upb_FieldDef* f);
+UPB_API upb_Label upb_FieldDef_Label(const upb_FieldDef* f);
+UPB_API const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f);
+bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f);
 
 // Creates a mini descriptor string for a field, returns true on success.
 bool upb_FieldDef_MiniDescriptorEncode(const upb_FieldDef* f, upb_Arena* a,
                                        upb_StringView* out);
 
 const upb_MiniTableField* upb_FieldDef_MiniTable(const upb_FieldDef* f);
-const char* upb_FieldDef_Name(const upb_FieldDef* f);
-uint32_t upb_FieldDef_Number(const upb_FieldDef* f);
+UPB_API const char* upb_FieldDef_Name(const upb_FieldDef* f);
+UPB_API uint32_t upb_FieldDef_Number(const upb_FieldDef* f);
 const UPB_DESC(FieldOptions) * upb_FieldDef_Options(const upb_FieldDef* f);
-const upb_OneofDef* upb_FieldDef_RealContainingOneof(const upb_FieldDef* f);
-upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
+UPB_API const upb_OneofDef* upb_FieldDef_RealContainingOneof(
+    const upb_FieldDef* f);
+UPB_API upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/reflection/field_def_internal.h b/third_party/upb/upb/reflection/field_def_internal.h
deleted file mode 100644
index 63acf64fa3227..0000000000000
--- a/third_party/upb/upb/reflection/field_def_internal.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_FIELD_DEF_INTERNAL_H_
-#define UPB_REFLECTION_FIELD_DEF_INTERNAL_H_
-
-#include "upb/reflection/field_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_FieldDef* _upb_FieldDef_At(const upb_FieldDef* f, int i);
-
-const upb_MiniTableExtension* _upb_FieldDef_ExtensionMiniTable(
-    const upb_FieldDef* f);
-bool _upb_FieldDef_IsClosedEnum(const upb_FieldDef* f);
-bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f);
-int _upb_FieldDef_LayoutIndex(const upb_FieldDef* f);
-uint64_t _upb_FieldDef_Modifiers(const upb_FieldDef* f);
-void _upb_FieldDef_Resolve(upb_DefBuilder* ctx, const char* prefix,
-                           upb_FieldDef* f);
-void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
-                                           const upb_FieldDef* f);
-
-// Allocate and initialize an array of |n| extensions (field defs).
-upb_FieldDef* _upb_Extensions_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(FieldDescriptorProto) * const* protos, const char* prefix,
-    upb_MessageDef* m);
-
-// Allocate and initialize an array of |n| field defs.
-upb_FieldDef* _upb_FieldDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(FieldDescriptorProto) * const* protos, const char* prefix,
-    upb_MessageDef* m, bool* is_sorted);
-
-// Allocate and return a list of pointers to the |n| field defs in |ff|,
-// sorted by field number.
-const upb_FieldDef** _upb_FieldDefs_Sorted(const upb_FieldDef* f, int n,
-                                           upb_Arena* a);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_FIELD_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/file_def.c b/third_party/upb/upb/reflection/file_def.c
index a448377d9238d..bd4b254cac438 100644
--- a/third_party/upb/upb/reflection/file_def.c
+++ b/third_party/upb/upb/reflection/file_def.c
@@ -1,37 +1,19 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/reflection/def_builder_internal.h"
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/file_def.h"
+
 #include "upb/reflection/def_pool.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
-#include "upb/reflection/service_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/enum_def.h"
+#include "upb/reflection/internal/field_def.h"
+#include "upb/reflection/internal/message_def.h"
+#include "upb/reflection/internal/service_def.h"
+#include "upb/reflection/internal/strdup2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -40,7 +22,7 @@ struct upb_FileDef {
   const UPB_DESC(FileOptions) * opts;
   const char* name;
   const char* package;
-  const char* edition;
+  UPB_DESC(Edition) edition;
 
   const upb_FileDef** deps;
   const int32_t* public_deps;
@@ -77,8 +59,8 @@ const char* upb_FileDef_Package(const upb_FileDef* f) {
   return f->package ? f->package : "";
 }
 
-const char* upb_FileDef_Edition(const upb_FileDef* f) {
-  return f->edition ? f->edition : "";
+UPB_DESC(Edition) upb_FileDef_Edition(const upb_FileDef* f) {
+  return f->edition;
 }
 
 const char* _upb_FileDef_RawPackage(const upb_FileDef* f) { return f->package; }
@@ -204,7 +186,7 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx,
   UPB_DESC(FileDescriptorProto_extension)(file_proto, &n);
   int ext_count = n;
   msgs = UPB_DESC(FileDescriptorProto_message_type)(file_proto, &n);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     ext_count += count_exts_in_msg(msgs[i]);
   }
   file->ext_count = ext_count;
@@ -243,17 +225,8 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx,
     file->package = NULL;
   }
 
-  upb_StringView edition = UPB_DESC(FileDescriptorProto_edition)(file_proto);
-
-  if (edition.size == 0) {
-    file->edition = NULL;
-  } else {
-    // TODO(b/267770604): How should we validate this?
-    file->edition = strviewdup(ctx, edition);
-    if (strlen(file->edition) != edition.size) {
-      _upb_DefBuilder_Errf(ctx, "Edition name contained embedded NULL");
-    }
-  }
+  // TODO: How should we validate this?
+  file->edition = UPB_DESC(FileDescriptorProto_edition)(file_proto);
 
   if (UPB_DESC(FileDescriptorProto_has_syntax)(file_proto)) {
     upb_StringView syntax = UPB_DESC(FileDescriptorProto_syntax)(file_proto);
@@ -262,6 +235,8 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx,
       file->syntax = kUpb_Syntax_Proto2;
     } else if (streql_view(syntax, "proto3")) {
       file->syntax = kUpb_Syntax_Proto3;
+    } else if (streql_view(syntax, "editions")) {
+      file->syntax = kUpb_Syntax_Editions;
     } else {
       _upb_DefBuilder_Errf(ctx, "Invalid syntax '" UPB_STRINGVIEW_FORMAT "'",
                            UPB_STRINGVIEW_ARGS(syntax));
diff --git a/third_party/upb/upb/reflection/file_def.h b/third_party/upb/upb/reflection/file_def.h
index a8557cb902476..f338c25f92e59 100644
--- a/third_party/upb/upb/reflection/file_def.h
+++ b/third_party/upb/upb/reflection/file_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -42,11 +22,11 @@ extern "C" {
 const upb_FileDef* upb_FileDef_Dependency(const upb_FileDef* f, int i);
 int upb_FileDef_DependencyCount(const upb_FileDef* f);
 bool upb_FileDef_HasOptions(const upb_FileDef* f);
-const char* upb_FileDef_Name(const upb_FileDef* f);
+UPB_API const char* upb_FileDef_Name(const upb_FileDef* f);
 const UPB_DESC(FileOptions) * upb_FileDef_Options(const upb_FileDef* f);
 const char* upb_FileDef_Package(const upb_FileDef* f);
-const char* upb_FileDef_Edition(const upb_FileDef* f);
-const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f);
+UPB_DESC(Edition) upb_FileDef_Edition(const upb_FileDef* f);
+UPB_API const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f);
 
 const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i);
 int upb_FileDef_PublicDependencyCount(const upb_FileDef* f);
@@ -54,7 +34,7 @@ int upb_FileDef_PublicDependencyCount(const upb_FileDef* f);
 const upb_ServiceDef* upb_FileDef_Service(const upb_FileDef* f, int i);
 int upb_FileDef_ServiceCount(const upb_FileDef* f);
 
-upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f);
+UPB_API upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f);
 
 const upb_EnumDef* upb_FileDef_TopLevelEnum(const upb_FileDef* f, int i);
 int upb_FileDef_TopLevelEnumCount(const upb_FileDef* f);
diff --git a/third_party/upb/upb/reflection/file_def_internal.h b/third_party/upb/upb/reflection/file_def_internal.h
deleted file mode 100644
index 1d29bb6fabe61..0000000000000
--- a/third_party/upb/upb/reflection/file_def_internal.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_FILE_DEF_INTERNAL_H_
-#define UPB_REFLECTION_FILE_DEF_INTERNAL_H_
-
-#include "upb/reflection/file_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const upb_MiniTableExtension* _upb_FileDef_ExtensionMiniTable(
-    const upb_FileDef* f, int i);
-const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f);
-const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f);
-
-// upb_FileDef_Package() returns "" if f->package is NULL, this does not.
-const char* _upb_FileDef_RawPackage(const upb_FileDef* f);
-
-void _upb_FileDef_Create(upb_DefBuilder* ctx,
-                         const UPB_DESC(FileDescriptorProto) * file_proto);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_FILE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/def_builder.c b/third_party/upb/upb/reflection/internal/def_builder.c
similarity index 85%
rename from third_party/upb/upb/reflection/def_builder.c
rename to third_party/upb/upb/reflection/internal/def_builder.c
index a23a8721e0f04..2ab16f27deefe 100644
--- a/third_party/upb/upb/reflection/def_builder.c
+++ b/third_party/upb/upb/reflection/internal/def_builder.c
@@ -1,36 +1,18 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/def_builder.h"
 
 #include <string.h>
 
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/def_pool.h"
 #include "upb/reflection/def_type.h"
 #include "upb/reflection/field_def.h"
+#include "upb/reflection/internal/strdup2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/reflection/internal/def_builder.h b/third_party/upb/upb/reflection/internal/def_builder.h
new file mode 100644
index 0000000000000..584553214dea3
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/def_builder.h
@@ -0,0 +1,137 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_
+#define UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_
+
+#include "upb/reflection/common.h"
+#include "upb/reflection/def_type.h"
+#include "upb/reflection/internal/def_pool.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// We want to copy the options verbatim into the destination options proto.
+// We use serialize+parse as our deep copy.
+#define UPB_DEF_SET_OPTIONS(target, desc_type, options_type, proto)           \
+  if (UPB_DESC(desc_type##_has_options)(proto)) {                             \
+    size_t size;                                                              \
+    char* pb = UPB_DESC(options_type##_serialize)(                            \
+        UPB_DESC(desc_type##_options)(proto), ctx->tmp_arena, &size);         \
+    if (!pb) _upb_DefBuilder_OomErr(ctx);                                     \
+    target =                                                                  \
+        UPB_DESC(options_type##_parse)(pb, size, _upb_DefBuilder_Arena(ctx)); \
+    if (!target) _upb_DefBuilder_OomErr(ctx);                                 \
+  } else {                                                                    \
+    target = (const UPB_DESC(options_type)*)kUpbDefOptDefault;                \
+  }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct upb_DefBuilder {
+  upb_DefPool* symtab;
+  upb_FileDef* file;                 // File we are building.
+  upb_Arena* arena;                  // Allocate defs here.
+  upb_Arena* tmp_arena;              // For temporary allocations.
+  upb_Status* status;                // Record errors here.
+  const upb_MiniTableFile* layout;   // NULL if we should build layouts.
+  upb_MiniTablePlatform platform;    // Platform we are targeting.
+  int enum_count;                    // Count of enums built so far.
+  int msg_count;                     // Count of messages built so far.
+  int ext_count;                     // Count of extensions built so far.
+  jmp_buf err;                       // longjmp() on error.
+};
+
+extern const char* kUpbDefOptDefault;
+
+// ctx->status has already been set elsewhere so just fail/longjmp()
+UPB_NORETURN void _upb_DefBuilder_FailJmp(upb_DefBuilder* ctx);
+
+UPB_NORETURN void _upb_DefBuilder_Errf(upb_DefBuilder* ctx, const char* fmt,
+                                       ...) UPB_PRINTF(2, 3);
+UPB_NORETURN void _upb_DefBuilder_OomErr(upb_DefBuilder* ctx);
+
+const char* _upb_DefBuilder_MakeFullName(upb_DefBuilder* ctx,
+                                         const char* prefix,
+                                         upb_StringView name);
+
+// Given a symbol and the base symbol inside which it is defined,
+// find the symbol's definition.
+const void* _upb_DefBuilder_ResolveAny(upb_DefBuilder* ctx,
+                                       const char* from_name_dbg,
+                                       const char* base, upb_StringView sym,
+                                       upb_deftype_t* type);
+
+const void* _upb_DefBuilder_Resolve(upb_DefBuilder* ctx,
+                                    const char* from_name_dbg, const char* base,
+                                    upb_StringView sym, upb_deftype_t type);
+
+char _upb_DefBuilder_ParseEscape(upb_DefBuilder* ctx, const upb_FieldDef* f,
+                                 const char** src, const char* end);
+
+const char* _upb_DefBuilder_FullToShort(const char* fullname);
+
+UPB_INLINE void* _upb_DefBuilder_Alloc(upb_DefBuilder* ctx, size_t bytes) {
+  if (bytes == 0) return NULL;
+  void* ret = upb_Arena_Malloc(ctx->arena, bytes);
+  if (!ret) _upb_DefBuilder_OomErr(ctx);
+  return ret;
+}
+
+// Adds a symbol |v| to the symtab, which must be a def pointer previously
+// packed with pack_def(). The def's pointer to upb_FileDef* must be set before
+// adding, so we know which entries to remove if building this file fails.
+UPB_INLINE void _upb_DefBuilder_Add(upb_DefBuilder* ctx, const char* name,
+                                    upb_value v) {
+  upb_StringView sym = {.data = name, .size = strlen(name)};
+  bool ok = _upb_DefPool_InsertSym(ctx->symtab, sym, v, ctx->status);
+  if (!ok) _upb_DefBuilder_FailJmp(ctx);
+}
+
+UPB_INLINE upb_Arena* _upb_DefBuilder_Arena(const upb_DefBuilder* ctx) {
+  return ctx->arena;
+}
+
+UPB_INLINE upb_FileDef* _upb_DefBuilder_File(const upb_DefBuilder* ctx) {
+  return ctx->file;
+}
+
+// This version of CheckIdent() is only called by other, faster versions after
+// they detect a parsing error.
+void _upb_DefBuilder_CheckIdentSlow(upb_DefBuilder* ctx, upb_StringView name,
+                                    bool full);
+
+// Verify a full identifier string. This is slightly more complicated than
+// verifying a relative identifier string because we must track '.' chars.
+UPB_INLINE void _upb_DefBuilder_CheckIdentFull(upb_DefBuilder* ctx,
+                                               upb_StringView name) {
+  bool good = name.size > 0;
+  bool start = true;
+
+  for (size_t i = 0; i < name.size; i++) {
+    const char c = name.data[i];
+    const char d = c | 0x20;  // force lowercase
+    const bool is_alpha = (('a' <= d) & (d <= 'z')) | (c == '_');
+    const bool is_numer = ('0' <= c) & (c <= '9') & !start;
+    const bool is_dot = (c == '.') & !start;
+
+    good &= is_alpha | is_numer | is_dot;
+    start = is_dot;
+  }
+
+  if (!good) _upb_DefBuilder_CheckIdentSlow(ctx, name, true);
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_DEF_BUILDER_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/def_builder_test.cc b/third_party/upb/upb/reflection/internal/def_builder_test.cc
new file mode 100644
index 0000000000000..b624ffc25f469
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/def_builder_test.cc
@@ -0,0 +1,84 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/def_builder.h"
+
+#include <gtest/gtest.h>
+#include "absl/strings/string_view.h"
+#include "upb/mem/arena.hpp"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+struct IdentTestData {
+  absl::string_view text;
+  bool ok;
+};
+
+class FullIdentTestBase : public testing::TestWithParam<IdentTestData> {};
+
+TEST_P(FullIdentTestBase, CheckFullIdent) {
+  upb_Status status;
+  upb_DefBuilder ctx;
+  upb::Arena arena;
+  ctx.status = &status;
+  ctx.arena = arena.ptr();
+  upb_Status_Clear(&status);
+
+  if (UPB_SETJMP(ctx.err)) {
+    EXPECT_FALSE(GetParam().ok);
+  } else {
+    _upb_DefBuilder_CheckIdentFull(
+        &ctx, upb_StringView_FromDataAndSize(GetParam().text.data(),
+                                             GetParam().text.size()));
+    EXPECT_TRUE(GetParam().ok);
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(FullIdentTest, FullIdentTestBase,
+                         testing::ValuesIn(std::vector<IdentTestData>{
+                             {"foo.bar", true},
+                             {"foo.", true},
+                             {"foo", true},
+
+                             {"foo.7bar", false},
+                             {".foo", false},
+                             {"#", false},
+                             {".", false},
+                             {"", false}}));
+
+class PartIdentTestBase : public testing::TestWithParam<IdentTestData> {};
+
+TEST_P(PartIdentTestBase, TestNotFullIdent) {
+  upb_Status status;
+  upb_DefBuilder ctx;
+  upb::Arena arena;
+  ctx.status = &status;
+  ctx.arena = arena.ptr();
+  upb_Status_Clear(&status);
+
+  if (UPB_SETJMP(ctx.err)) {
+    EXPECT_FALSE(GetParam().ok);
+  } else {
+    _upb_DefBuilder_MakeFullName(
+        &ctx, "abc",
+        upb_StringView_FromDataAndSize(GetParam().text.data(),
+                                       GetParam().text.size()));
+    EXPECT_TRUE(GetParam().ok);
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(PartIdentTest, PartIdentTestBase,
+                         testing::ValuesIn(std::vector<IdentTestData>{
+                             {"foo", true},
+                             {"foo1", true},
+
+                             {"foo.bar", false},
+                             {"1foo", false},
+                             {"#", false},
+                             {".", false},
+                             {"", false}}));
diff --git a/third_party/upb/upb/reflection/internal/def_pool.h b/third_party/upb/upb/reflection/internal/def_pool.h
new file mode 100644
index 0000000000000..f94d7ef193979
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/def_pool.h
@@ -0,0 +1,57 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_DEF_POOL_INTERNAL_H_
+#define UPB_REFLECTION_DEF_POOL_INTERNAL_H_
+
+#include "upb/mini_descriptor/decode.h"
+#include "upb/reflection/def_pool.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s);
+size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s);
+upb_ExtensionRegistry* _upb_DefPool_ExtReg(const upb_DefPool* s);
+
+bool _upb_DefPool_InsertExt(upb_DefPool* s, const upb_MiniTableExtension* ext,
+                            const upb_FieldDef* f);
+bool _upb_DefPool_InsertSym(upb_DefPool* s, upb_StringView sym, upb_value v,
+                            upb_Status* status);
+bool _upb_DefPool_LookupSym(const upb_DefPool* s, const char* sym, size_t size,
+                            upb_value* v);
+
+void** _upb_DefPool_ScratchData(const upb_DefPool* s);
+size_t* _upb_DefPool_ScratchSize(const upb_DefPool* s);
+void _upb_DefPool_SetPlatform(upb_DefPool* s, upb_MiniTablePlatform platform);
+
+// For generated code only: loads a generated descriptor.
+typedef struct _upb_DefPool_Init {
+  struct _upb_DefPool_Init** deps;  // Dependencies of this file.
+  const upb_MiniTableFile* layout;
+  const char* filename;
+  upb_StringView descriptor;  // Serialized descriptor.
+} _upb_DefPool_Init;
+
+bool _upb_DefPool_LoadDefInit(upb_DefPool* s, const _upb_DefPool_Init* init);
+
+// Should only be directly called by tests. This variant lets us suppress
+// the use of compiled-in tables, forcing a rebuild of the tables at runtime.
+bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
+                                bool rebuild_minitable);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_DEF_POOL_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/desc_state.h b/third_party/upb/upb/reflection/internal/desc_state.h
new file mode 100644
index 0000000000000..20436d6db2e0b
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/desc_state.h
@@ -0,0 +1,44 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_DESC_STATE_INTERNAL_H_
+#define UPB_REFLECTION_DESC_STATE_INTERNAL_H_
+
+#include "upb/mem/arena.h"
+#include "upb/mini_descriptor/internal/encode.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+// Manages the storage for mini descriptor strings as they are being encoded.
+// TODO: Move some of this state directly into the encoder, maybe.
+typedef struct {
+  upb_MtDataEncoder e;
+  size_t bufsize;
+  char* buf;
+  char* ptr;
+} upb_DescState;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+UPB_INLINE void _upb_DescState_Init(upb_DescState* d) {
+  d->bufsize = kUpb_MtDataEncoder_MinSize * 2;
+  d->buf = NULL;
+  d->ptr = NULL;
+}
+
+bool _upb_DescState_Grow(upb_DescState* d, upb_Arena* a);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_DESC_STATE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/enum_def.h b/third_party/upb/upb/reflection/internal/enum_def.h
new file mode 100644
index 0000000000000..8f6b220112033
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/enum_def.h
@@ -0,0 +1,36 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_ENUM_DEF_INTERNAL_H_
+#define UPB_REFLECTION_ENUM_DEF_INTERNAL_H_
+
+#include "upb/reflection/enum_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_EnumDef* _upb_EnumDef_At(const upb_EnumDef* e, int i);
+bool _upb_EnumDef_Insert(upb_EnumDef* e, upb_EnumValueDef* v, upb_Arena* a);
+const upb_MiniTableEnum* _upb_EnumDef_MiniTable(const upb_EnumDef* e);
+
+// Allocate and initialize an array of |n| enum defs.
+upb_EnumDef* _upb_EnumDefs_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(EnumDescriptorProto) * const* protos,
+    const upb_MessageDef* containing_type);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_ENUM_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/enum_reserved_range.h b/third_party/upb/upb/reflection/internal/enum_reserved_range.h
new file mode 100644
index 0000000000000..fe30604a1a86b
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/enum_reserved_range.h
@@ -0,0 +1,35 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
+#define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
+
+#include "upb/reflection/enum_reserved_range.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r,
+                                                 int i);
+
+// Allocate and initialize an array of |n| reserved ranges owned by |e|.
+upb_EnumReservedRange* _upb_EnumReservedRanges_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(EnumDescriptorProto_EnumReservedRange) * const* protos,
+    const upb_EnumDef* e);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/enum_value_def.h b/third_party/upb/upb/reflection/internal/enum_value_def.h
new file mode 100644
index 0000000000000..2484567febac8
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/enum_value_def.h
@@ -0,0 +1,37 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_
+#define UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_
+
+#include "upb/reflection/enum_value_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_EnumValueDef* _upb_EnumValueDef_At(const upb_EnumValueDef* v, int i);
+
+// Allocate and initialize an array of |n| enum value defs owned by |e|.
+upb_EnumValueDef* _upb_EnumValueDefs_New(
+    upb_DefBuilder* ctx, const char* prefix, int n,
+    const UPB_DESC(EnumValueDescriptorProto) * const* protos, upb_EnumDef* e,
+    bool* is_sorted);
+
+const upb_EnumValueDef** _upb_EnumValueDefs_Sorted(const upb_EnumValueDef* v,
+                                                   int n, upb_Arena* a);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_ENUM_VALUE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/extension_range.h b/third_party/upb/upb/reflection/internal/extension_range.h
new file mode 100644
index 0000000000000..09901b41ff816
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/extension_range.h
@@ -0,0 +1,34 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_
+#define UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_
+
+#include "upb/reflection/extension_range.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_ExtensionRange* _upb_ExtensionRange_At(const upb_ExtensionRange* r, int i);
+
+// Allocate and initialize an array of |n| extension ranges owned by |m|.
+upb_ExtensionRange* _upb_ExtensionRanges_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(DescriptorProto_ExtensionRange) * const* protos,
+    const upb_MessageDef* m);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_EXTENSION_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/field_def.h b/third_party/upb/upb/reflection/internal/field_def.h
new file mode 100644
index 0000000000000..838f3b6070284
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/field_def.h
@@ -0,0 +1,56 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_FIELD_DEF_INTERNAL_H_
+#define UPB_REFLECTION_FIELD_DEF_INTERNAL_H_
+
+#include "upb/reflection/field_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_FieldDef* _upb_FieldDef_At(const upb_FieldDef* f, int i);
+
+const upb_MiniTableExtension* _upb_FieldDef_ExtensionMiniTable(
+    const upb_FieldDef* f);
+bool _upb_FieldDef_IsClosedEnum(const upb_FieldDef* f);
+bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f);
+int _upb_FieldDef_LayoutIndex(const upb_FieldDef* f);
+uint64_t _upb_FieldDef_Modifiers(const upb_FieldDef* f);
+void _upb_FieldDef_Resolve(upb_DefBuilder* ctx, const char* prefix,
+                           upb_FieldDef* f);
+void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
+                                           const upb_FieldDef* f);
+
+// Allocate and initialize an array of |n| extensions (field defs).
+upb_FieldDef* _upb_Extensions_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(FieldDescriptorProto) * const* protos, const char* prefix,
+    upb_MessageDef* m);
+
+// Allocate and initialize an array of |n| field defs.
+upb_FieldDef* _upb_FieldDefs_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(FieldDescriptorProto) * const* protos, const char* prefix,
+    upb_MessageDef* m, bool* is_sorted);
+
+// Allocate and return a list of pointers to the |n| field defs in |ff|,
+// sorted by field number.
+const upb_FieldDef** _upb_FieldDefs_Sorted(const upb_FieldDef* f, int n,
+                                           upb_Arena* a);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_FIELD_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/file_def.h b/third_party/upb/upb/reflection/internal/file_def.h
new file mode 100644
index 0000000000000..9afaa045625d5
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/file_def.h
@@ -0,0 +1,37 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_FILE_DEF_INTERNAL_H_
+#define UPB_REFLECTION_FILE_DEF_INTERNAL_H_
+
+#include "upb/reflection/file_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const upb_MiniTableExtension* _upb_FileDef_ExtensionMiniTable(
+    const upb_FileDef* f, int i);
+const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f);
+const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f);
+
+// upb_FileDef_Package() returns "" if f->package is NULL, this does not.
+const char* _upb_FileDef_RawPackage(const upb_FileDef* f);
+
+void _upb_FileDef_Create(upb_DefBuilder* ctx,
+                         const UPB_DESC(FileDescriptorProto) * file_proto);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_FILE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/message_def.h b/third_party/upb/upb/reflection/internal/message_def.h
new file mode 100644
index 0000000000000..6cc9686a7415a
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/message_def.h
@@ -0,0 +1,43 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_
+#define UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_
+
+#include "upb/reflection/message_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_MessageDef* _upb_MessageDef_At(const upb_MessageDef* m, int i);
+bool _upb_MessageDef_InMessageSet(const upb_MessageDef* m);
+bool _upb_MessageDef_Insert(upb_MessageDef* m, const char* name, size_t size,
+                            upb_value v, upb_Arena* a);
+void _upb_MessageDef_InsertField(upb_DefBuilder* ctx, upb_MessageDef* m,
+                                 const upb_FieldDef* f);
+bool _upb_MessageDef_IsValidExtensionNumber(const upb_MessageDef* m, int n);
+void _upb_MessageDef_CreateMiniTable(upb_DefBuilder* ctx, upb_MessageDef* m);
+void _upb_MessageDef_LinkMiniTable(upb_DefBuilder* ctx,
+                                   const upb_MessageDef* m);
+void _upb_MessageDef_Resolve(upb_DefBuilder* ctx, upb_MessageDef* m);
+
+// Allocate and initialize an array of |n| message defs.
+upb_MessageDef* _upb_MessageDefs_New(
+    upb_DefBuilder* ctx, int n, const UPB_DESC(DescriptorProto) * const* protos,
+    const upb_MessageDef* containing_type);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/message_reserved_range.h b/third_party/upb/upb/reflection/internal/message_reserved_range.h
new file mode 100644
index 0000000000000..88227ac3ae801
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/message_reserved_range.h
@@ -0,0 +1,35 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
+#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
+
+#include "upb/reflection/message_reserved_range.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_MessageReservedRange* _upb_MessageReservedRange_At(
+    const upb_MessageReservedRange* r, int i);
+
+// Allocate and initialize an array of |n| reserved ranges owned by |m|.
+upb_MessageReservedRange* _upb_MessageReservedRanges_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(DescriptorProto_ReservedRange) * const* protos,
+    const upb_MessageDef* m);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/method_def.h b/third_party/upb/upb/reflection/internal/method_def.h
new file mode 100644
index 0000000000000..a7e8ef8a37a1c
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/method_def.h
@@ -0,0 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_METHOD_DEF_INTERNAL_H_
+#define UPB_REFLECTION_METHOD_DEF_INTERNAL_H_
+
+#include "upb/reflection/method_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_MethodDef* _upb_MethodDef_At(const upb_MethodDef* m, int i);
+
+// Allocate and initialize an array of |n| method defs owned by |s|.
+upb_MethodDef* _upb_MethodDefs_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(MethodDescriptorProto) * const* protos, upb_ServiceDef* s);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_METHOD_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/oneof_def.h b/third_party/upb/upb/reflection/internal/oneof_def.h
new file mode 100644
index 0000000000000..9cd6713efd32a
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/oneof_def.h
@@ -0,0 +1,37 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_
+#define UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_
+
+#include "upb/reflection/oneof_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_OneofDef* _upb_OneofDef_At(const upb_OneofDef* o, int i);
+void _upb_OneofDef_Insert(upb_DefBuilder* ctx, upb_OneofDef* o,
+                          const upb_FieldDef* f, const char* name, size_t size);
+
+// Allocate and initialize an array of |n| oneof defs owned by |m|.
+upb_OneofDef* _upb_OneofDefs_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(OneofDescriptorProto) * const* protos, upb_MessageDef* m);
+
+size_t _upb_OneofDefs_Finalize(upb_DefBuilder* ctx, upb_MessageDef* m);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/service_def.h b/third_party/upb/upb/reflection/internal/service_def.h
new file mode 100644
index 0000000000000..2845b879070c2
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/service_def.h
@@ -0,0 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_
+#define UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_
+
+#include "upb/reflection/service_def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+upb_ServiceDef* _upb_ServiceDef_At(const upb_ServiceDef* s, int i);
+
+// Allocate and initialize an array of |n| service defs.
+upb_ServiceDef* _upb_ServiceDefs_New(
+    upb_DefBuilder* ctx, int n,
+    const UPB_DESC(ServiceDescriptorProto) * const* protos);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/internal/strdup2.c b/third_party/upb/upb/reflection/internal/strdup2.c
new file mode 100644
index 0000000000000..2c8f76ff3d4e2
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/strdup2.c
@@ -0,0 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/strdup2.h"
+
+#include <string.h>
+
+#include "upb/mem/arena.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+char* upb_strdup2(const char* s, size_t len, upb_Arena* a) {
+  size_t n;
+  char* p;
+
+  // Prevent overflow errors.
+  if (len == SIZE_MAX) return NULL;
+
+  // Always null-terminate, even if binary data; but don't rely on the input to
+  // have a null-terminating byte since it may be a raw binary buffer.
+  n = len + 1;
+  p = upb_Arena_Malloc(a, n);
+  if (p) {
+    if (len != 0) memcpy(p, s, len);
+    p[len] = 0;
+  }
+  return p;
+}
diff --git a/third_party/upb/upb/reflection/internal/strdup2.h b/third_party/upb/upb/reflection/internal/strdup2.h
new file mode 100644
index 0000000000000..0d4cadbe91a27
--- /dev/null
+++ b/third_party/upb/upb/reflection/internal/strdup2.h
@@ -0,0 +1,32 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_REFLECTION_INTERNAL_STRDUP2_H_
+#define UPB_REFLECTION_INTERNAL_STRDUP2_H_
+
+#include <stddef.h>
+
+#include "upb/mem/arena.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Variant that works with a length-delimited rather than NULL-delimited string,
+// as supported by strtable.
+char* upb_strdup2(const char* s, size_t len, upb_Arena* a);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_REFLECTION_INTERNAL_STRDUP2_H_ */
diff --git a/third_party/upb/upb/reflection/message.c b/third_party/upb/upb/reflection/message.c
index 80a0d585754c5..dc014ae11c76e 100644
--- a/third_party/upb/upb/reflection/message.c
+++ b/third_party/upb/upb/reflection/message.c
@@ -1,43 +1,23 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/reflection/message.h"
 
 #include <string.h>
 
-#include "upb/collections/map.h"
 #include "upb/hash/common.h"
 #include "upb/message/accessors.h"
+#include "upb/message/map.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/field.h"
 #include "upb/reflection/def.h"
 #include "upb/reflection/def_pool.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/field_def_internal.h"
+#include "upb/reflection/internal/field_def.h"
 #include "upb/reflection/message_def.h"
 #include "upb/reflection/oneof_def.h"
 
diff --git a/third_party/upb/upb/reflection/message.h b/third_party/upb/upb/reflection/message.h
index 8dfc5f46c888b..9e57c1a16e985 100644
--- a/third_party/upb/upb/reflection/message.h
+++ b/third_party/upb/upb/reflection/message.h
@@ -1,34 +1,19 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_REFLECTION_MESSAGE_H_
 #define UPB_REFLECTION_MESSAGE_H_
 
-#include "upb/collections/map.h"
+#include <stddef.h>
+
+#include "upb/mem/arena.h"
+#include "upb/message/map.h"
+#include "upb/message/types.h"
+#include "upb/message/value.h"  // IWYU pragma: export
 #include "upb/reflection/common.h"
 
 // Must be last.
@@ -41,34 +26,36 @@ extern "C" {
 // Returns a mutable pointer to a map, array, or submessage value. If the given
 // arena is non-NULL this will construct a new object if it was not previously
 // present. May not be called for primitive fields.
-upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
-                                            const upb_FieldDef* f,
-                                            upb_Arena* a);
+UPB_API upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
+                                                    const upb_FieldDef* f,
+                                                    upb_Arena* a);
 
 // Returns the field that is set in the oneof, or NULL if none are set.
-const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
-                                           const upb_OneofDef* o);
+UPB_API const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
+                                                   const upb_OneofDef* o);
 
 // Clear all data and unknown fields.
 void upb_Message_ClearByDef(upb_Message* msg, const upb_MessageDef* m);
 
 // Clears any field presence and sets the value back to its default.
-void upb_Message_ClearFieldByDef(upb_Message* msg, const upb_FieldDef* f);
+UPB_API void upb_Message_ClearFieldByDef(upb_Message* msg,
+                                         const upb_FieldDef* f);
 
 // May only be called for fields where upb_FieldDef_HasPresence(f) == true.
-bool upb_Message_HasFieldByDef(const upb_Message* msg, const upb_FieldDef* f);
+UPB_API bool upb_Message_HasFieldByDef(const upb_Message* msg,
+                                       const upb_FieldDef* f);
 
 // Returns the value in the message associated with this field def.
-upb_MessageValue upb_Message_GetFieldByDef(const upb_Message* msg,
-                                           const upb_FieldDef* f);
+UPB_API upb_MessageValue upb_Message_GetFieldByDef(const upb_Message* msg,
+                                                   const upb_FieldDef* f);
 
 // Sets the given field to the given value. For a msg/array/map/string, the
 // caller must ensure that the target data outlives |msg| (by living either in
 // the same arena or a different arena that outlives it).
 //
 // Returns false if allocation fails.
-bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f,
-                               upb_MessageValue val, upb_Arena* a);
+UPB_API bool upb_Message_SetFieldByDef(upb_Message* msg, const upb_FieldDef* f,
+                                       upb_MessageValue val, upb_Arena* a);
 
 // Iterate over present fields.
 //
@@ -90,8 +77,8 @@ bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
                       upb_MessageValue* val, size_t* iter);
 
 // Clears all unknown field data from this message and all submessages.
-bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                int maxdepth);
+UPB_API bool upb_Message_DiscardUnknown(upb_Message* msg,
+                                        const upb_MessageDef* m, int maxdepth);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/reflection/message.hpp b/third_party/upb/upb/reflection/message.hpp
index 425be98d2d512..6d5bc9834a957 100644
--- a/third_party/upb/upb/reflection/message.hpp
+++ b/third_party/upb/upb/reflection/message.hpp
@@ -1,27 +1,9 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_REFLECTION_MESSAGE_HPP_
 #define UPB_REFLECTION_MESSAGE_HPP_
diff --git a/third_party/upb/upb/reflection/message_def.c b/third_party/upb/upb/reflection/message_def.c
index 4cade9e7f145a..9e55d612a4ca8 100644
--- a/third_party/upb/upb/reflection/message_def.c
+++ b/third_party/upb/upb/reflection/message_def.c
@@ -1,45 +1,28 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
+#include "upb/reflection/internal/message_def.h"
+
+#include "upb/base/descriptor_constants.h"
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_descriptor/internal/modifiers.h"
 #include "upb/reflection/def.h"
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/desc_state_internal.h"
-#include "upb/reflection/enum_def_internal.h"
-#include "upb/reflection/extension_range_internal.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
-#include "upb/reflection/message_reserved_range_internal.h"
-#include "upb/reflection/oneof_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/desc_state.h"
+#include "upb/reflection/internal/enum_def.h"
+#include "upb/reflection/internal/extension_range.h"
+#include "upb/reflection/internal/field_def.h"
+#include "upb/reflection/internal/file_def.h"
+#include "upb/reflection/internal/message_reserved_range.h"
+#include "upb/reflection/internal/oneof_def.h"
+#include "upb/reflection/internal/strdup2.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -55,6 +38,9 @@ struct upb_MessageDef {
   upb_inttable itof;
   upb_strtable ntof;
 
+  // Looking up fields by json name.
+  upb_strtable jtof;
+
   /* All nested defs.
    * MEM: We could save some space here by putting nested defs in a contiguous
    * region and calculating counts from offsets or vice-versa. */
@@ -67,7 +53,7 @@ struct upb_MessageDef {
   const upb_EnumDef* nested_enums;
   const upb_FieldDef* nested_exts;
 
-  // TODO(salo): These counters don't need anywhere near 32 bits.
+  // TODO: These counters don't need anywhere near 32 bits.
   int field_count;
   int real_oneof_count;
   int oneof_count;
@@ -80,9 +66,6 @@ struct upb_MessageDef {
   bool in_message_set;
   bool is_sorted;
   upb_WellKnown well_known_type;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
 };
 
 static void assign_msg_wellknowntype(upb_MessageDef* m) {
@@ -225,16 +208,16 @@ bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
 const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
     const upb_MessageDef* m, const char* name, size_t size) {
   upb_value val;
-  const upb_FieldDef* f;
+
+  if (upb_strtable_lookup2(&m->jtof, name, size, &val)) {
+    return upb_value_getconstptr(val);
+  }
 
   if (!upb_strtable_lookup2(&m->ntof, name, size, &val)) {
     return NULL;
   }
 
-  f = _upb_DefType_Unpack(val, UPB_DEFTYPE_FIELD);
-  if (!f) f = _upb_DefType_Unpack(val, UPB_DEFTYPE_FIELD_JSONNAME);
-
-  return f;
+  return _upb_DefType_Unpack(val, UPB_DEFTYPE_FIELD);
 }
 
 int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m) {
@@ -414,17 +397,25 @@ void _upb_MessageDef_InsertField(upb_DefBuilder* ctx, upb_MessageDef* m,
       _upb_MessageDef_Insert(m, shortname, shortnamelen, field_v, ctx->arena);
   if (!ok) _upb_DefBuilder_OomErr(ctx);
 
-  if (strcmp(shortname, json_name) != 0) {
-    if (upb_strtable_lookup(&m->ntof, json_name, &v)) {
-      _upb_DefBuilder_Errf(ctx, "duplicate json_name (%s)", json_name);
-    }
+  // TODO: Once editions is supported this should turn into a
+  // check on LEGACY_BEST_EFFORT
+  if (strcmp(shortname, json_name) != 0 &&
+      upb_FileDef_Syntax(m->file) == kUpb_Syntax_Proto3 &&
+      upb_strtable_lookup(&m->ntof, json_name, &v)) {
+    _upb_DefBuilder_Errf(
+        ctx, "duplicate json_name for (%s) with original field name (%s)",
+        shortname, json_name);
+  }
 
-    const size_t json_size = strlen(json_name);
-    const upb_value json_v = _upb_DefType_Pack(f, UPB_DEFTYPE_FIELD_JSONNAME);
-    ok = _upb_MessageDef_Insert(m, json_name, json_size, json_v, ctx->arena);
-    if (!ok) _upb_DefBuilder_OomErr(ctx);
+  if (upb_strtable_lookup(&m->jtof, json_name, &v)) {
+    _upb_DefBuilder_Errf(ctx, "duplicate json_name (%s)", json_name);
   }
 
+  const size_t json_size = strlen(json_name);
+  ok = upb_strtable_insert(&m->jtof, json_name, json_size,
+                           upb_value_constptr(f), ctx->arena);
+  if (!ok) _upb_DefBuilder_OomErr(ctx);
+
   if (upb_inttable_lookup(&m->itof, field_number, NULL)) {
     _upb_DefBuilder_Errf(ctx, "duplicate field number (%u)", field_number);
   }
@@ -507,15 +498,37 @@ void _upb_MessageDef_LinkMiniTable(upb_DefBuilder* ctx,
 #endif
 }
 
+static bool _upb_MessageDef_ValidateUtf8(const upb_MessageDef* m) {
+  bool has_string = false;
+  for (int i = 0; i < m->field_count; i++) {
+    const upb_FieldDef* f = upb_MessageDef_Field(m, i);
+    // Old binaries do not recognize the field-level "FlipValidateUtf8" wire
+    // modifier, so we do not actually have field-level control for old
+    // binaries.  Given this, we judge that the better failure mode is to be
+    // more lax than intended, rather than more strict.  To achieve this, we
+    // only mark the message with the ValidateUtf8 modifier if *all* fields
+    // validate UTF-8.
+    if (!_upb_FieldDef_ValidateUtf8(f)) return false;
+    if (upb_FieldDef_Type(f) == kUpb_FieldType_String) has_string = true;
+  }
+  return has_string;
+}
+
 static uint64_t _upb_MessageDef_Modifiers(const upb_MessageDef* m) {
   uint64_t out = 0;
+
   if (upb_FileDef_Syntax(m->file) == kUpb_Syntax_Proto3) {
-    out |= kUpb_MessageModifier_ValidateUtf8;
     out |= kUpb_MessageModifier_DefaultIsPacked;
   }
+
+  if (_upb_MessageDef_ValidateUtf8(m)) {
+    out |= kUpb_MessageModifier_ValidateUtf8;
+  }
+
   if (m->ext_range_count) {
     out |= kUpb_MessageModifier_IsExtendable;
   }
+
   return out;
 }
 
@@ -609,7 +622,7 @@ bool upb_MessageDef_MiniDescriptorEncode(const upb_MessageDef* m, upb_Arena* a,
 static upb_StringView* _upb_ReservedNames_New(upb_DefBuilder* ctx, int n,
                                               const upb_StringView* protos) {
   upb_StringView* sv = _upb_DefBuilder_Alloc(ctx, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
+  for (int i = 0; i < n; i++) {
     sv[i].data =
         upb_strdup2(protos[i].data, protos[i].size, _upb_DefBuilder_Arena(ctx));
     sv[i].size = protos[i].size;
@@ -655,6 +668,9 @@ static void create_msgdef(upb_DefBuilder* ctx, const char* prefix,
   ok = upb_strtable_init(&m->ntof, n_oneof + n_field, ctx->arena);
   if (!ok) _upb_DefBuilder_OomErr(ctx);
 
+  ok = upb_strtable_init(&m->jtof, n_field, ctx->arena);
+  if (!ok) _upb_DefBuilder_OomErr(ctx);
+
   UPB_DEF_SET_OPTIONS(m->opts, DescriptorProto, MessageOptions, msg_proto);
 
   m->oneof_count = n_oneof;
diff --git a/third_party/upb/upb/reflection/message_def.h b/third_party/upb/upb/reflection/message_def.h
index d1d9891c01f40..a5c85efe23c65 100644
--- a/third_party/upb/upb/reflection/message_def.h
+++ b/third_party/upb/upb/reflection/message_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -89,10 +69,11 @@ const upb_ExtensionRange* upb_MessageDef_ExtensionRange(const upb_MessageDef* m,
                                                         int i);
 int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m);
 
-const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m, int i);
-int upb_MessageDef_FieldCount(const upb_MessageDef* m);
+UPB_API const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m,
+                                                 int i);
+UPB_API int upb_MessageDef_FieldCount(const upb_MessageDef* m);
 
-const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m);
+UPB_API const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m);
 
 // Returns a field by either JSON name or regular proto name.
 const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
@@ -105,10 +86,10 @@ UPB_INLINE const upb_FieldDef* upb_MessageDef_FindByJsonName(
 // Lookup of either field or oneof by name. Returns whether either was found.
 // If the return is true, then the found def will be set, and the non-found
 // one set to NULL.
-bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
-                                       const char* name, size_t size,
-                                       const upb_FieldDef** f,
-                                       const upb_OneofDef** o);
+UPB_API bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
+                                               const char* name, size_t size,
+                                               const upb_FieldDef** f,
+                                               const upb_OneofDef** o);
 UPB_INLINE bool upb_MessageDef_FindByName(const upb_MessageDef* m,
                                           const char* name,
                                           const upb_FieldDef** f,
@@ -118,15 +99,15 @@ UPB_INLINE bool upb_MessageDef_FindByName(const upb_MessageDef* m,
 
 const upb_FieldDef* upb_MessageDef_FindFieldByName(const upb_MessageDef* m,
                                                    const char* name);
-const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
+UPB_API const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
     const upb_MessageDef* m, const char* name, size_t size);
-const upb_FieldDef* upb_MessageDef_FindFieldByNumber(const upb_MessageDef* m,
-                                                     uint32_t i);
+UPB_API const upb_FieldDef* upb_MessageDef_FindFieldByNumber(
+    const upb_MessageDef* m, uint32_t i);
 const upb_OneofDef* upb_MessageDef_FindOneofByName(const upb_MessageDef* m,
                                                    const char* name);
-const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
+UPB_API const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
     const upb_MessageDef* m, const char* name, size_t size);
-const char* upb_MessageDef_FullName(const upb_MessageDef* m);
+UPB_API const char* upb_MessageDef_FullName(const upb_MessageDef* m);
 bool upb_MessageDef_HasOptions(const upb_MessageDef* m);
 bool upb_MessageDef_IsMapEntry(const upb_MessageDef* m);
 bool upb_MessageDef_IsMessageSet(const upb_MessageDef* m);
@@ -135,7 +116,7 @@ bool upb_MessageDef_IsMessageSet(const upb_MessageDef* m);
 bool upb_MessageDef_MiniDescriptorEncode(const upb_MessageDef* m, upb_Arena* a,
                                          upb_StringView* out);
 
-const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
+UPB_API const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
 const char* upb_MessageDef_Name(const upb_MessageDef* m);
 
 const upb_EnumDef* upb_MessageDef_NestedEnum(const upb_MessageDef* m, int i);
@@ -148,8 +129,9 @@ int upb_MessageDef_NestedEnumCount(const upb_MessageDef* m);
 int upb_MessageDef_NestedExtensionCount(const upb_MessageDef* m);
 int upb_MessageDef_NestedMessageCount(const upb_MessageDef* m);
 
-const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m, int i);
-int upb_MessageDef_OneofCount(const upb_MessageDef* m);
+UPB_API const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m,
+                                                 int i);
+UPB_API int upb_MessageDef_OneofCount(const upb_MessageDef* m);
 int upb_MessageDef_RealOneofCount(const upb_MessageDef* m);
 
 const UPB_DESC(MessageOptions) *
@@ -162,8 +144,8 @@ const upb_MessageReservedRange* upb_MessageDef_ReservedRange(
     const upb_MessageDef* m, int i);
 int upb_MessageDef_ReservedRangeCount(const upb_MessageDef* m);
 
-upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m);
-upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
+UPB_API upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m);
+UPB_API upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/reflection/message_def_internal.h b/third_party/upb/upb/reflection/message_def_internal.h
deleted file mode 100644
index af90c4e160913..0000000000000
--- a/third_party/upb/upb/reflection/message_def_internal.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_
-#define UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_
-
-#include "upb/reflection/message_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_MessageDef* _upb_MessageDef_At(const upb_MessageDef* m, int i);
-bool _upb_MessageDef_InMessageSet(const upb_MessageDef* m);
-bool _upb_MessageDef_Insert(upb_MessageDef* m, const char* name, size_t size,
-                            upb_value v, upb_Arena* a);
-void _upb_MessageDef_InsertField(upb_DefBuilder* ctx, upb_MessageDef* m,
-                                 const upb_FieldDef* f);
-bool _upb_MessageDef_IsValidExtensionNumber(const upb_MessageDef* m, int n);
-void _upb_MessageDef_CreateMiniTable(upb_DefBuilder* ctx, upb_MessageDef* m);
-void _upb_MessageDef_LinkMiniTable(upb_DefBuilder* ctx,
-                                   const upb_MessageDef* m);
-void _upb_MessageDef_Resolve(upb_DefBuilder* ctx, upb_MessageDef* m);
-
-// Allocate and initialize an array of |n| message defs.
-upb_MessageDef* _upb_MessageDefs_New(
-    upb_DefBuilder* ctx, int n, const UPB_DESC(DescriptorProto) * const* protos,
-    const upb_MessageDef* containing_type);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_MESSAGE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/message_reserved_range.c b/third_party/upb/upb/reflection/message_reserved_range.c
index 5b6bf006647f8..bb274e15a8967 100644
--- a/third_party/upb/upb/reflection/message_reserved_range.c
+++ b/third_party/upb/upb/reflection/message_reserved_range.c
@@ -1,34 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/enum_def.h"
-#include "upb/reflection/extension_range_internal.h"
 #include "upb/reflection/field_def.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/extension_range.h"
 #include "upb/reflection/message_def.h"
 
 // Must be last.
diff --git a/third_party/upb/upb/reflection/message_reserved_range.h b/third_party/upb/upb/reflection/message_reserved_range.h
index dcdf4e3ae4f05..9854f521df03a 100644
--- a/third_party/upb/upb/reflection/message_reserved_range.h
+++ b/third_party/upb/upb/reflection/message_reserved_range.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
diff --git a/third_party/upb/upb/reflection/message_reserved_range_internal.h b/third_party/upb/upb/reflection/message_reserved_range_internal.h
deleted file mode 100644
index 37b10be24ca4c..0000000000000
--- a/third_party/upb/upb/reflection/message_reserved_range_internal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
-#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
-
-#include "upb/reflection/message_reserved_range.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_MessageReservedRange* _upb_MessageReservedRange_At(
-    const upb_MessageReservedRange* r, int i);
-
-// Allocate and initialize an array of |n| reserved ranges owned by |m|.
-upb_MessageReservedRange* _upb_MessageReservedRanges_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(DescriptorProto_ReservedRange) * const* protos,
-    const upb_MessageDef* m);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/method_def.c b/third_party/upb/upb/reflection/method_def.c
index 7c4fd30d41e68..049ef4a81d179 100644
--- a/third_party/upb/upb/reflection/method_def.c
+++ b/third_party/upb/upb/reflection/method_def.c
@@ -1,33 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/reflection/def_builder_internal.h"
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/method_def.h"
+
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/method_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
 #include "upb/reflection/service_def.h"
 
 // Must be last.
diff --git a/third_party/upb/upb/reflection/method_def.h b/third_party/upb/upb/reflection/method_def.h
index fdf0534db0028..64b88a66832e9 100644
--- a/third_party/upb/upb/reflection/method_def.h
+++ b/third_party/upb/upb/reflection/method_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
diff --git a/third_party/upb/upb/reflection/method_def_internal.h b/third_party/upb/upb/reflection/method_def_internal.h
deleted file mode 100644
index c6629ff9f2902..0000000000000
--- a/third_party/upb/upb/reflection/method_def_internal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_METHOD_DEF_INTERNAL_H_
-#define UPB_REFLECTION_METHOD_DEF_INTERNAL_H_
-
-#include "upb/reflection/method_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_MethodDef* _upb_MethodDef_At(const upb_MethodDef* m, int i);
-
-// Allocate and initialize an array of |n| method defs owned by |s|.
-upb_MethodDef* _upb_MethodDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(MethodDescriptorProto) * const* protos, upb_ServiceDef* s);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_METHOD_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/oneof_def.c b/third_party/upb/upb/reflection/oneof_def.c
index e33dba953fa2d..869ca16b96c49 100644
--- a/third_party/upb/upb/reflection/oneof_def.c
+++ b/third_party/upb/upb/reflection/oneof_def.c
@@ -1,29 +1,11 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/oneof_def.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -31,11 +13,10 @@
 
 #include "upb/hash/int_table.h"
 #include "upb/hash/str_table.h"
-#include "upb/reflection/def_builder_internal.h"
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/message_def_internal.h"
-#include "upb/reflection/oneof_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/field_def.h"
+#include "upb/reflection/internal/message_def.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -124,7 +105,7 @@ void _upb_OneofDef_Insert(upb_DefBuilder* ctx, upb_OneofDef* o,
   const int number = upb_FieldDef_Number(f);
   const upb_value v = upb_value_constptr(f);
 
-  // TODO(salo): This lookup is unfortunate because we also perform it when
+  // TODO: This lookup is unfortunate because we also perform it when
   // inserting into the message's table. Unfortunately that step occurs after
   // this one and moving things around could be tricky so let's leave it for
   // a future refactoring.
@@ -133,10 +114,11 @@ void _upb_OneofDef_Insert(upb_DefBuilder* ctx, upb_OneofDef* o,
     _upb_DefBuilder_Errf(ctx, "oneof fields have the same number (%d)", number);
   }
 
-  // TODO(salo): More redundant work happening here.
+  // TODO: More redundant work happening here.
   const bool name_exists = upb_strtable_lookup2(&o->ntof, name, size, NULL);
   if (UPB_UNLIKELY(name_exists)) {
-    _upb_DefBuilder_Errf(ctx, "oneof fields have the same name (%s)", name);
+    _upb_DefBuilder_Errf(ctx, "oneof fields have the same name (%.*s)",
+                         (int)size, name);
   }
 
   const bool ok = upb_inttable_insert(&o->itof, number, v, ctx->arena) &&
diff --git a/third_party/upb/upb/reflection/oneof_def.h b/third_party/upb/upb/reflection/oneof_def.h
index 691b40e0fa1d8..38c7a7002f32e 100644
--- a/third_party/upb/upb/reflection/oneof_def.h
+++ b/third_party/upb/upb/reflection/oneof_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
@@ -39,9 +19,10 @@
 extern "C" {
 #endif
 
-const upb_MessageDef* upb_OneofDef_ContainingType(const upb_OneofDef* o);
-const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i);
-int upb_OneofDef_FieldCount(const upb_OneofDef* o);
+UPB_API const upb_MessageDef* upb_OneofDef_ContainingType(
+    const upb_OneofDef* o);
+UPB_API const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i);
+UPB_API int upb_OneofDef_FieldCount(const upb_OneofDef* o);
 const char* upb_OneofDef_FullName(const upb_OneofDef* o);
 bool upb_OneofDef_HasOptions(const upb_OneofDef* o);
 uint32_t upb_OneofDef_Index(const upb_OneofDef* o);
@@ -53,7 +34,7 @@ const upb_FieldDef* upb_OneofDef_LookupNameWithSize(const upb_OneofDef* o,
                                                     size_t size);
 const upb_FieldDef* upb_OneofDef_LookupNumber(const upb_OneofDef* o,
                                               uint32_t num);
-const char* upb_OneofDef_Name(const upb_OneofDef* o);
+UPB_API const char* upb_OneofDef_Name(const upb_OneofDef* o);
 int upb_OneofDef_numfields(const upb_OneofDef* o);
 const UPB_DESC(OneofOptions) * upb_OneofDef_Options(const upb_OneofDef* o);
 
diff --git a/third_party/upb/upb/reflection/oneof_def_internal.h b/third_party/upb/upb/reflection/oneof_def_internal.h
deleted file mode 100644
index 029f1abf37340..0000000000000
--- a/third_party/upb/upb/reflection/oneof_def_internal.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_
-#define UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_
-
-#include "upb/reflection/oneof_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_OneofDef* _upb_OneofDef_At(const upb_OneofDef* o, int i);
-void _upb_OneofDef_Insert(upb_DefBuilder* ctx, upb_OneofDef* o,
-                          const upb_FieldDef* f, const char* name, size_t size);
-
-// Allocate and initialize an array of |n| oneof defs owned by |m|.
-upb_OneofDef* _upb_OneofDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(OneofDescriptorProto) * const* protos, upb_MessageDef* m);
-
-size_t _upb_OneofDefs_Finalize(upb_DefBuilder* ctx, upb_MessageDef* m);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_ONEOF_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/service_def.c b/third_party/upb/upb/reflection/service_def.c
index 453100f1b816f..7a0cbc7a09b8b 100644
--- a/third_party/upb/upb/reflection/service_def.c
+++ b/third_party/upb/upb/reflection/service_def.c
@@ -1,35 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upb/reflection/def_builder_internal.h"
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/reflection/internal/service_def.h"
+
 #include "upb/reflection/def_type.h"
-#include "upb/reflection/file_def_internal.h"
-#include "upb/reflection/method_def_internal.h"
-#include "upb/reflection/service_def_internal.h"
+#include "upb/reflection/internal/def_builder.h"
+#include "upb/reflection/internal/file_def.h"
+#include "upb/reflection/internal/method_def.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/reflection/service_def.h b/third_party/upb/upb/reflection/service_def.h
index 7a8f25809fff9..98cd993b4d72b 100644
--- a/third_party/upb/upb/reflection/service_def.h
+++ b/third_party/upb/upb/reflection/service_def.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // IWYU pragma: private, include "upb/reflection/def.h"
 
diff --git a/third_party/upb/upb/reflection/service_def_internal.h b/third_party/upb/upb/reflection/service_def_internal.h
deleted file mode 100644
index e79a93c1902ba..0000000000000
--- a/third_party/upb/upb/reflection/service_def_internal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_
-#define UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_
-
-#include "upb/reflection/service_def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_ServiceDef* _upb_ServiceDef_At(const upb_ServiceDef* s, int i);
-
-// Allocate and initialize an array of |n| service defs.
-upb_ServiceDef* _upb_ServiceDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(ServiceDescriptorProto) * const* protos);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_REFLECTION_SERVICE_DEF_INTERNAL_H_ */
diff --git a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
index cc200d8ee6f0f..a3c69be56948f 100644
--- a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
+++ b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
@@ -8,63 +8,64 @@ static upb_Arena* upb_BootstrapArena() {
   return arena;
 }
 
-const upb_MiniTable* google_protobuf_FileDescriptorSet_msg_init() {
+const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_FileDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FileDescriptorProto_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_FileDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$11EGGGG33<<11";
+  static const char* mini_descriptor = "$11EGGGG33<<1a4";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_DescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_EnumDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_ServiceDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google_protobuf_FieldDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google_protobuf_FileOptions_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google_protobuf_SourceCodeInfo_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__DescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__EnumDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google__protobuf__ServiceDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google__protobuf__FieldDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google__protobuf__FileOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google__protobuf__SourceCodeInfo_msg_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 14), google_protobuf_Edition_enum_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_DescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__DescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1GGGGG3GGE";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_FieldDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_FieldDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_DescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_EnumDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_DescriptorProto_ExtensionRange_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google_protobuf_OneofDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google_protobuf_MessageOptions_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google_protobuf_DescriptorProto_ReservedRange_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__FieldDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google__protobuf__FieldDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__DescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__EnumDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__DescriptorProto__ExtensionRange_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google__protobuf__OneofDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google__protobuf__MessageOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google__protobuf__DescriptorProto__ReservedRange_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_DescriptorProto_ExtensionRange_msg_init() {
+const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$((3";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_ExtensionRangeOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__ExtensionRangeOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_DescriptorProto_ReservedRange_msg_init() {
+const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$((";
   if (mini_table) return mini_table;
@@ -74,18 +75,31 @@ const upb_MiniTable* google_protobuf_DescriptorProto_ReservedRange_msg_init() {
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_ExtensionRangeOptions_msg_init() {
+const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$Pf~G";
+  static const char* mini_descriptor = "$PaG4n`3t|G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__ExtensionRangeOptions__Declaration_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 50), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_ExtensionRangeOptions_VerificationState_enum_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_FieldDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init() {
+  static upb_MiniTable* mini_table = NULL;
+  static const char* mini_descriptor = "$(11a//";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
+                          upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$11(44113(1f/";
   if (mini_table) return mini_table;
@@ -94,35 +108,35 @@ const upb_MiniTable* google_protobuf_FieldDescriptorProto_msg_init() {
                           upb_BootstrapArena(), NULL);
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_FieldDescriptorProto_Label_enum_init());
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_FieldDescriptorProto_Type_enum_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google_protobuf_FieldOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google__protobuf__FieldOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_OneofDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$13";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_OneofOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__OneofOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_EnumDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1G3GE";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_EnumValueDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_EnumOptions_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__EnumValueDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__EnumOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init() {
+const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$((";
   if (mini_table) return mini_table;
@@ -132,144 +146,166 @@ const upb_MiniTable* google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_i
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_EnumValueDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1(3";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_EnumValueOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__EnumValueOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_ServiceDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1G3";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_MethodDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_ServiceOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__MethodDescriptorProto_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__ServiceOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_MethodDescriptorProto_msg_init() {
+const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1113//";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_MethodOptions_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__MethodOptions_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_FileOptions_msg_init() {
+const upb_MiniTable* google__protobuf__FileOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P1f14/1d///a/b/c/c/d11a111/a11y|G";
+  static const char* mini_descriptor = "$P1f14/1d///a/b/c/c/d11a111/a11d3t|G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google_protobuf_FileOptions_OptimizeMode_enum_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 50), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_MessageOptions_msg_init() {
+const upb_MiniTable* google__protobuf__MessageOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P///c/c/{}G";
+  static const char* mini_descriptor = "$P///c/c/3z}G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 12), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_FieldOptions_msg_init() {
+const upb_MiniTable* google__protobuf__FieldOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P4//a/4c/d//v}G";
+  static const char* mini_descriptor = "$P4//a/4c/d//4aHG3q}G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_FieldOptions_CType_enum_init());
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_FieldOptions_JSType_enum_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 17), google_protobuf_FieldOptions_OptionRetention_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 19), google_protobuf_FieldOptions_OptionTargetType_enum_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 20), google__protobuf__FieldOptions__EditionDefault_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 21), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
+  return mini_table;
+}
+
+const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init() {
+  static upb_MiniTable* mini_table = NULL;
+  static const char* mini_descriptor = "$a14";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
+                          upb_BootstrapArena(), NULL);
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_Edition_enum_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_OneofOptions_msg_init() {
+const upb_MiniTable* google__protobuf__OneofOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$Pf~G";
+  static const char* mini_descriptor = "$P3e~G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_EnumOptions_msg_init() {
+const upb_MiniTable* google__protobuf__EnumOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$Pa//b/`~G";
+  static const char* mini_descriptor = "$Pa//b/3_~G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_EnumValueOptions_msg_init() {
+const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P/e~G";
+  static const char* mini_descriptor = "$P/3/c~G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_ServiceOptions_msg_init() {
+const upb_MiniTable* google__protobuf__ServiceOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P``/e}G";
+  static const char* mini_descriptor = "$P``/3d}G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 34), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_MethodOptions_msg_init() {
+const upb_MiniTable* google__protobuf__MethodOptions_msg_init() {
   static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$P``/4d}G";
+  static const char* mini_descriptor = "$P``/43c}G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
   upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 34), google_protobuf_MethodOptions_IdempotencyLevel_enum_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google_protobuf_UninterpretedOption_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 35), google__protobuf__FeatureSet_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_UninterpretedOption_msg_init() {
+const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$aG1,+ 01";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_UninterpretedOption_NamePart_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__UninterpretedOption__NamePart_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_UninterpretedOption_NamePart_msg_init() {
+const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$1N/N";
   if (mini_table) return mini_table;
@@ -279,18 +315,59 @@ const upb_MiniTable* google_protobuf_UninterpretedOption_NamePart_msg_init() {
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_SourceCodeInfo_msg_init() {
+const upb_MiniTable* google__protobuf__FeatureSet_msg_init() {
+  static upb_MiniTable* mini_table = NULL;
+  static const char* mini_descriptor = "$P444444";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
+                          upb_BootstrapArena(), NULL);
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_FeatureSet_FieldPresence_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_FeatureSet_EnumType_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_FeatureSet_Utf8Validation_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_FeatureSet_MessageEncoding_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_FeatureSet_JsonFormat_enum_init());
+  return mini_table;
+}
+
+const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init() {
+  static upb_MiniTable* mini_table = NULL;
+  static const char* mini_descriptor = "$Gb44";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
+                          upb_BootstrapArena(), NULL);
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_Edition_enum_init());
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_Edition_enum_init());
+  return mini_table;
+}
+
+const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init() {
+  static upb_MiniTable* mini_table = NULL;
+  static const char* mini_descriptor = "$a34";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
+                          upb_BootstrapArena(), NULL);
+  upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_Edition_enum_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__FeatureSet_msg_init());
+  return mini_table;
+}
+
+const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_SourceCodeInfo_Location_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__SourceCodeInfo__Location_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_SourceCodeInfo_Location_msg_init() {
+const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$<M<M11aE";
   if (mini_table) return mini_table;
@@ -300,18 +377,18 @@ const upb_MiniTable* google_protobuf_SourceCodeInfo_Location_msg_init() {
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_GeneratedCodeInfo_msg_init() {
+const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$G";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
                           upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_GeneratedCodeInfo_Annotation_msg_init());
+  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__GeneratedCodeInfo__Annotation_msg_init());
   return mini_table;
 }
 
-const upb_MiniTable* google_protobuf_GeneratedCodeInfo_Annotation_msg_init() {
+const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init() {
   static upb_MiniTable* mini_table = NULL;
   static const char* mini_descriptor = "$<M1((4";
   if (mini_table) return mini_table;
@@ -322,6 +399,86 @@ const upb_MiniTable* google_protobuf_GeneratedCodeInfo_Annotation_msg_init() {
   return mini_table;
 }
 
+const upb_MiniTableEnum* google_protobuf_Edition_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)`~)qt_b)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_ExtensionRangeOptions_VerificationState_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!$";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_EnumType_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_FieldPresence_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!1";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_JsonFormat_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_MessageEncoding_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
+const upb_MiniTableEnum* google_protobuf_FeatureSet_Utf8Validation_enum_init() {
+  static const upb_MiniTableEnum* mini_table = NULL;
+  static const char* mini_descriptor = "!)";
+  if (mini_table) return mini_table;
+  mini_table =
+      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
+                              upb_BootstrapArena(), NULL);
+  return mini_table;
+}
+
 const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init() {
   static const upb_MiniTableEnum* mini_table = NULL;
   static const char* mini_descriptor = "!0";
@@ -411,3 +568,4 @@ const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_ini
                               upb_BootstrapArena(), NULL);
   return mini_table;
 }
+
diff --git a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
index a5e04909c31ea..064a821d7d413 100644
--- a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
+++ b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
@@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
  *
  *     google/protobuf/descriptor.proto
  *
@@ -11,19 +10,70 @@
 
 #include "upb/generated_code_support.h"
 
-// Must be last. 
+// Must be last.
 #include "upb/port/def.inc"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init();
+extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init();
+extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init();
+extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init();
+extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init();
+extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init();
+extern const upb_MiniTable* google__protobuf__FileOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init();
+extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init();
+extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init();
+extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init();
+extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init();
+extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init();
+extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init();
+extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init();
+extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init();
+extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init();
+extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init();
+extern const upb_MiniTableEnum* google_protobuf_Edition_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_ExtensionRangeOptions_VerificationState_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_EnumType_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_FieldPresence_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_JsonFormat_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_MessageEncoding_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FeatureSet_Utf8Validation_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init();
+extern const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init();
+
 typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
 typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
 typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
 typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
 typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
 typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
+typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration;
 typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
 typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
 typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
@@ -34,6 +84,7 @@ typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescr
 typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
 typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
 typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
+typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault;
 typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
 typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
 typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
@@ -41,37 +92,73 @@ typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
 typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
 typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
 typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
+typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet;
+typedef struct google_protobuf_FeatureSetDefaults google_protobuf_FeatureSetDefaults;
+typedef struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault;
 typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
 typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
 typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
 typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
-extern const upb_MiniTable* google_protobuf_FileDescriptorSet_msg_init();
-extern const upb_MiniTable* google_protobuf_FileDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_DescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_DescriptorProto_ExtensionRange_msg_init();
-extern const upb_MiniTable* google_protobuf_DescriptorProto_ReservedRange_msg_init();
-extern const upb_MiniTable* google_protobuf_ExtensionRangeOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_FieldDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_OneofDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_EnumDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init();
-extern const upb_MiniTable* google_protobuf_EnumValueDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_ServiceDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_MethodDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_FileOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_MessageOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_FieldOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_OneofOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_EnumOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_EnumValueOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_ServiceOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_MethodOptions_msg_init();
-extern const upb_MiniTable* google_protobuf_UninterpretedOption_msg_init();
-extern const upb_MiniTable* google_protobuf_UninterpretedOption_NamePart_msg_init();
-extern const upb_MiniTable* google_protobuf_SourceCodeInfo_msg_init();
-extern const upb_MiniTable* google_protobuf_SourceCodeInfo_Location_msg_init();
-extern const upb_MiniTable* google_protobuf_GeneratedCodeInfo_msg_init();
-extern const upb_MiniTable* google_protobuf_GeneratedCodeInfo_Annotation_msg_init();
+
+typedef enum {
+  google_protobuf_EDITION_UNKNOWN = 0,
+  google_protobuf_EDITION_1_TEST_ONLY = 1,
+  google_protobuf_EDITION_2_TEST_ONLY = 2,
+  google_protobuf_EDITION_PROTO2 = 998,
+  google_protobuf_EDITION_PROTO3 = 999,
+  google_protobuf_EDITION_2023 = 1000,
+  google_protobuf_EDITION_99997_TEST_ONLY = 99997,
+  google_protobuf_EDITION_99998_TEST_ONLY = 99998,
+  google_protobuf_EDITION_99999_TEST_ONLY = 99999
+} google_protobuf_Edition;
+
+typedef enum {
+  google_protobuf_ExtensionRangeOptions_DECLARATION = 0,
+  google_protobuf_ExtensionRangeOptions_UNVERIFIED = 1
+} google_protobuf_ExtensionRangeOptions_VerificationState;
+
+typedef enum {
+  google_protobuf_FeatureSet_ENUM_TYPE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_OPEN = 1,
+  google_protobuf_FeatureSet_CLOSED = 2
+} google_protobuf_FeatureSet_EnumType;
+
+typedef enum {
+  google_protobuf_FeatureSet_FIELD_PRESENCE_UNKNOWN = 0,
+  google_protobuf_FeatureSet_EXPLICIT = 1,
+  google_protobuf_FeatureSet_IMPLICIT = 2,
+  google_protobuf_FeatureSet_LEGACY_REQUIRED = 3
+} google_protobuf_FeatureSet_FieldPresence;
+
+typedef enum {
+  google_protobuf_FeatureSet_JSON_FORMAT_UNKNOWN = 0,
+  google_protobuf_FeatureSet_ALLOW = 1,
+  google_protobuf_FeatureSet_LEGACY_BEST_EFFORT = 2
+} google_protobuf_FeatureSet_JsonFormat;
+
+typedef enum {
+  google_protobuf_FeatureSet_MESSAGE_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_LENGTH_PREFIXED = 1,
+  google_protobuf_FeatureSet_DELIMITED = 2
+} google_protobuf_FeatureSet_MessageEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_REPEATED_FIELD_ENCODING_UNKNOWN = 0,
+  google_protobuf_FeatureSet_PACKED = 1,
+  google_protobuf_FeatureSet_EXPANDED = 2
+} google_protobuf_FeatureSet_RepeatedFieldEncoding;
+
+typedef enum {
+  google_protobuf_FeatureSet_UTF8_VALIDATION_UNKNOWN = 0,
+  google_protobuf_FeatureSet_NONE = 1,
+  google_protobuf_FeatureSet_VERIFY = 2
+} google_protobuf_FeatureSet_Utf8Validation;
+
+typedef enum {
+  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
+  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
+  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
+} google_protobuf_FieldDescriptorProto_Label;
 
 typedef enum {
   google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
@@ -94,18 +181,6 @@ typedef enum {
   google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
 } google_protobuf_FieldDescriptorProto_Type;
 
-typedef enum {
-  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
-  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
-  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
-} google_protobuf_FieldDescriptorProto_Label;
-
-typedef enum {
-  google_protobuf_FileOptions_SPEED = 1,
-  google_protobuf_FileOptions_CODE_SIZE = 2,
-  google_protobuf_FileOptions_LITE_RUNTIME = 3
-} google_protobuf_FileOptions_OptimizeMode;
-
 typedef enum {
   google_protobuf_FieldOptions_STRING = 0,
   google_protobuf_FieldOptions_CORD = 1,
@@ -138,10 +213,10 @@ typedef enum {
 } google_protobuf_FieldOptions_OptionTargetType;
 
 typedef enum {
-  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
-  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
-  google_protobuf_MethodOptions_IDEMPOTENT = 2
-} google_protobuf_MethodOptions_IdempotencyLevel;
+  google_protobuf_FileOptions_SPEED = 1,
+  google_protobuf_FileOptions_CODE_SIZE = 2,
+  google_protobuf_FileOptions_LITE_RUNTIME = 3
+} google_protobuf_FileOptions_OptimizeMode;
 
 typedef enum {
   google_protobuf_GeneratedCodeInfo_Annotation_NONE = 0,
@@ -149,26 +224,23 @@ typedef enum {
   google_protobuf_GeneratedCodeInfo_Annotation_ALIAS = 2
 } google_protobuf_GeneratedCodeInfo_Annotation_Semantic;
 
+typedef enum {
+  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
+  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
+  google_protobuf_MethodOptions_IDEMPOTENT = 2
+} google_protobuf_MethodOptions_IdempotencyLevel;
+
 
-extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init();
 
 /* google.protobuf.FileDescriptorSet */
 
 UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(google_protobuf_FileDescriptorSet_msg_init(), arena);
+  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(google__protobuf__FileDescriptorSet_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileDescriptorSet_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorSet_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -178,7 +250,7 @@ UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_
                            int options, upb_Arena* arena) {
   google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileDescriptorSet_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorSet_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -186,21 +258,21 @@ UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_
 }
 UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileDescriptorSet_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileDescriptorSet_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileDescriptorSet_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileDescriptorSet_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorSet_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorSet_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -210,6 +282,23 @@ UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_Fil
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
   size_t size;
   google_protobuf_FileDescriptorSet_file(msg, &size);
@@ -217,7 +306,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf
 }
 
 UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorSet_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -228,16 +317,16 @@ UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorS
   }
 }
 UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorSet_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
   return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorSet_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(google_protobuf_FileDescriptorProto_msg_init(), arena);
+  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(google__protobuf__FileDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -246,12 +335,12 @@ UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescr
 /* google.protobuf.FileDescriptorProto */
 
 UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(google_protobuf_FileDescriptorProto_msg_init(), arena);
+  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(google__protobuf__FileDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -261,7 +350,7 @@ UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorPr
                            int options, upb_Arena* arena) {
   google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -269,51 +358,51 @@ UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorPr
 }
 UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -323,17 +412,34 @@ UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_dependency(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_dependency(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -343,17 +449,34 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDes
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_message_type(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -363,17 +486,34 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Fil
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_enum_type(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -383,17 +523,34 @@ UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_service(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -403,47 +560,64 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_Fi
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_extension(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
   const google_protobuf_FileOptions* default_val = NULL;
   const google_protobuf_FileOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
   const google_protobuf_SourceCodeInfo* default_val = NULL;
   const google_protobuf_SourceCodeInfo* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -453,17 +627,34 @@ UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_public_dependency(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -473,52 +664,69 @@ UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(co
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
   size_t size;
   google_protobuf_FileDescriptorProto_weak_dependency(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 12);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 12);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 12);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 13);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 13);
+UPB_INLINE int32_t google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 13);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -529,11 +737,11 @@ UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependenc
   }
 }
 UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
   return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -542,7 +750,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protob
   return true;
 }
 UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -553,22 +761,22 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto
   }
 }
 UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
   return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(google_protobuf_DescriptorProto_msg_init(), arena);
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(google__protobuf__DescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -579,22 +787,22 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorP
   }
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
   return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(google_protobuf_EnumDescriptorProto_msg_init(), arena);
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(google__protobuf__EnumDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -605,22 +813,22 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescript
   }
 }
 UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
   return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(google_protobuf_ServiceDescriptorProto_msg_init(), arena);
+  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(google__protobuf__ServiceDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 7);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -631,46 +839,46 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptor
   }
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 7);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
   return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 7);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google_protobuf_FieldDescriptorProto_msg_init(), arena);
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google__protobuf__FieldDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(google_protobuf_FileOptions_msg_init(), arena);
+    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(google__protobuf__FileOptions_msg_init(), arena);
     if (sub) google_protobuf_FileDescriptorProto_set_options(msg, sub);
   }
   return sub;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(google_protobuf_SourceCodeInfo_msg_init(), arena);
+    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(google__protobuf__SourceCodeInfo_msg_init(), arena);
     if (sub) google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
   }
   return sub;
 }
 UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -681,11 +889,11 @@ UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependenc
   }
 }
 UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
   return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -694,7 +902,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google
   return true;
 }
 UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 11);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -705,11 +913,11 @@ UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(
   }
 }
 UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 11);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
   return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 11);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -718,23 +926,23 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_p
   return true;
 }
 UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 12);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileDescriptorProto_msg_init(), 13);
+UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.DescriptorProto */
 
 UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto*)_upb_Message_New(google_protobuf_DescriptorProto_msg_init(), arena);
+  return (google_protobuf_DescriptorProto*)_upb_Message_New(google__protobuf__DescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -744,7 +952,7 @@ UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_pars
                            int options, upb_Arena* arena) {
   google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -752,36 +960,36 @@ UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_pars
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -791,17 +999,34 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_field(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -811,17 +1036,34 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_Descrip
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_nested_type(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -831,17 +1073,34 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Des
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_enum_type(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -851,17 +1110,34 @@ UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_p
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_extension_range(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -871,32 +1147,49 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_extension(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
   const google_protobuf_MessageOptions* default_val = NULL;
   const google_protobuf_MessageOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -906,17 +1199,34 @@ UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_De
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_oneof_decl(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -926,17 +1236,34 @@ UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_pr
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_reserved_range(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -946,6 +1273,23 @@ UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(c
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_protobuf_DescriptorProto* msg) {
   size_t size;
   google_protobuf_DescriptorProto_reserved_name(msg, &size);
@@ -953,11 +1297,11 @@ UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_name(const google_p
 }
 
 UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -968,22 +1312,22 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt
   }
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
   return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google_protobuf_FieldDescriptorProto_msg_init(), arena);
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google__protobuf__FieldDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -994,22 +1338,22 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mut
   }
 }
 UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
   return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 3);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(google_protobuf_DescriptorProto_msg_init(), arena);
+  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(google__protobuf__DescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1020,22 +1364,22 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto
   }
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
   return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(google_protobuf_EnumDescriptorProto_msg_init(), arena);
+  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(google__protobuf__EnumDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1046,22 +1390,22 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_Desc
   }
 }
 UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
   return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), arena);
+  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1072,34 +1416,34 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt
   }
 }
 UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
   return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google_protobuf_FieldDescriptorProto_msg_init(), arena);
+  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(google__protobuf__FieldDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(google_protobuf_MessageOptions_msg_init(), arena);
+    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(google__protobuf__MessageOptions_msg_init(), arena);
     if (sub) google_protobuf_DescriptorProto_set_options(msg, sub);
   }
   return sub;
 }
 UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 8);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1110,22 +1454,22 @@ UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProt
   }
 }
 UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 8);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
   return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 8);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(google_protobuf_OneofDescriptorProto_msg_init(), arena);
+  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(google__protobuf__OneofDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 9);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1136,22 +1480,22 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_Descr
   }
 }
 UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 9);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
   return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 9);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(google_protobuf_DescriptorProto_ReservedRange_msg_init(), arena);
+  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(google__protobuf__DescriptorProto__ReservedRange_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1162,11 +1506,11 @@ UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name
   }
 }
 UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
   return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_msg_init(), 10);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -1178,12 +1522,12 @@ UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobu
 /* google.protobuf.DescriptorProto.ExtensionRange */
 
 UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), arena);
+  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_ExtensionRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1193,7 +1537,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_Descr
                            int options, upb_Arena* arena) {
   google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_ExtensionRange_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1201,77 +1545,77 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_Descr
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_ExtensionRange_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
   const google_protobuf_ExtensionRangeOptions* default_val = NULL;
   const google_protobuf_ExtensionRangeOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ExtensionRange_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
   struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(google_protobuf_ExtensionRangeOptions_msg_init(), arena);
+    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(google__protobuf__ExtensionRangeOptions_msg_init(), arena);
     if (sub) google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
   }
   return sub;
@@ -1280,12 +1624,12 @@ UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_Descrip
 /* google.protobuf.DescriptorProto.ReservedRange */
 
 UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(google_protobuf_DescriptorProto_ReservedRange_msg_init(), arena);
+  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(google__protobuf__DescriptorProto__ReservedRange_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_ReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1295,7 +1639,7 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_Descri
                            int options, upb_Arena* arena) {
   google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_DescriptorProto_ReservedRange_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ReservedRange_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1303,64 +1647,64 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_Descri
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_ReservedRange_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto__ReservedRange_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_DescriptorProto_ReservedRange_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__DescriptorProto__ReservedRange_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_DescriptorProto_ReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.ExtensionRangeOptions */
 
 UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(google_protobuf_ExtensionRangeOptions_msg_init(), arena);
+  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(google__protobuf__ExtensionRangeOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ExtensionRangeOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1370,7 +1714,7 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRange
                            int options, upb_Arena* arena) {
   google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ExtensionRangeOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1378,21 +1722,88 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRange
 }
 UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ExtensionRangeOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ExtensionRangeOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_declaration(const google_protobuf_ExtensionRangeOptions* msg) {
+  size_t size;
+  google_protobuf_ExtensionRangeOptions_declaration(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
 UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ExtensionRangeOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ExtensionRangeOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1402,14 +1813,73 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ext
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
   size_t size;
   google_protobuf_ExtensionRangeOptions_uninterpreted_option(msg, &size);
   return size != 0;
 }
 
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_ExtensionRangeOptions_Declaration* sub = (struct google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_ExtensionRangeOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ExtensionRangeOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1420,284 +1890,416 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeO
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ExtensionRangeOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ExtensionRangeOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 
-/* google.protobuf.FieldDescriptorProto */
+/* google.protobuf.ExtensionRangeOptions.Declaration */
 
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(google_protobuf_FieldDescriptorProto_msg_init(), arena);
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_new(upb_Arena* arena) {
+  return (google_protobuf_ExtensionRangeOptions_Declaration*)_upb_Message_New(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), arena);
 }
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FieldDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
+UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse_ex(const char* buf, size_t size,
                            const upb_ExtensionRegistry* extreg,
                            int options, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FieldDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FieldDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
+UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FieldDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 1);
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 1);
+UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 1);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 2);
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 2);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 3);
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 3);
+UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 3);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 4);
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 4);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 4);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 5);
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
-  int32_t default_val = 1;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 5);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 5);
+UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 6);
-  _upb_Message_ClearNonExtensionField(msg, &field);
+
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FieldDescriptorProto */
+
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
+  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(google__protobuf__FieldDescriptorProto_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldDescriptorProto_msg_init(), extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FieldDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FieldDescriptorProto_msg_init(), options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = (int32_t)0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
+  int32_t default_val = 1;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6);
+  _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
   const google_protobuf_FieldOptions* default_val = NULL;
   const google_protobuf_FieldOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(google_protobuf_FieldOptions_msg_init(), arena);
+    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(google__protobuf__FieldOptions_msg_init(), arena);
     if (sub) google_protobuf_FieldDescriptorProto_set_options(msg, sub);
   }
   return sub;
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldDescriptorProto_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.OneofDescriptorProto */
 
 UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(google_protobuf_OneofDescriptorProto_msg_init(), arena);
+  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(google__protobuf__OneofDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_OneofDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__OneofDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1707,7 +2309,7 @@ UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptor
                            int options, upb_Arena* arena) {
   google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_OneofDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__OneofDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1715,58 +2317,58 @@ UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptor
 }
 UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_OneofDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__OneofDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_OneofDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__OneofDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
   const google_protobuf_OneofOptions* default_val = NULL;
   const google_protobuf_OneofOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(google_protobuf_OneofOptions_msg_init(), arena);
+    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(google__protobuf__OneofOptions_msg_init(), arena);
     if (sub) google_protobuf_OneofDescriptorProto_set_options(msg, sub);
   }
   return sub;
@@ -1775,12 +2377,12 @@ UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorP
 /* google.protobuf.EnumDescriptorProto */
 
 UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(google_protobuf_EnumDescriptorProto_msg_init(), arena);
+  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(google__protobuf__EnumDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -1790,7 +2392,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorPr
                            int options, upb_Arena* arena) {
   google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -1798,36 +2400,36 @@ UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorPr
 }
 UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1837,32 +2439,49 @@ UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobu
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
   size_t size;
   google_protobuf_EnumDescriptorProto_value(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
   const google_protobuf_EnumOptions* default_val = NULL;
   const google_protobuf_EnumOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1872,17 +2491,34 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* g
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
   size_t size;
   google_protobuf_EnumDescriptorProto_reserved_range(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1892,6 +2528,23 @@ UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_na
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
   size_t size;
   google_protobuf_EnumDescriptorProto_reserved_name(msg, &size);
@@ -1899,11 +2552,11 @@ UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_name(const goog
 }
 
 UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1914,34 +2567,34 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescri
   }
 }
 UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
   return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(google_protobuf_EnumValueDescriptorProto_msg_init(), arena);
+  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(google__protobuf__EnumValueDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(google_protobuf_EnumOptions_msg_init(), arena);
+    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(google__protobuf__EnumOptions_msg_init(), arena);
     if (sub) google_protobuf_EnumDescriptorProto_set_options(msg, sub);
   }
   return sub;
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1952,22 +2605,22 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protob
   }
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
   return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 4);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), arena);
+  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -1978,11 +2631,11 @@ UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_
   }
 }
 UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
   return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_msg_init(), 5);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -1994,12 +2647,12 @@ UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_pro
 /* google.protobuf.EnumDescriptorProto.EnumReservedRange */
 
 UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), arena);
+  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2009,7 +2662,7 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobu
                            int options, upb_Arena* arena) {
   google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2017,64 +2670,64 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobu
 }
 UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.EnumValueDescriptorProto */
 
 UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(google_protobuf_EnumValueDescriptorProto_msg_init(), arena);
+  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(google__protobuf__EnumValueDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumValueDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumValueDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2084,7 +2737,7 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDe
                            int options, upb_Arena* arena) {
   google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumValueDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumValueDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2092,77 +2745,77 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDe
 }
 UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumValueDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumValueDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumValueDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumValueDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
   const google_protobuf_EnumValueOptions* default_val = NULL;
   const google_protobuf_EnumValueOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(google_protobuf_EnumValueOptions_msg_init(), arena);
+    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(google__protobuf__EnumValueOptions_msg_init(), arena);
     if (sub) google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
   }
   return sub;
@@ -2171,12 +2824,12 @@ UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDes
 /* google.protobuf.ServiceDescriptorProto */
 
 UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(google_protobuf_ServiceDescriptorProto_msg_init(), arena);
+  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(google__protobuf__ServiceDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ServiceDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__ServiceDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2186,7 +2839,7 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescri
                            int options, upb_Arena* arena) {
   google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ServiceDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__ServiceDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2194,36 +2847,36 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescri
 }
 UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ServiceDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ServiceDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ServiceDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ServiceDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -2233,33 +2886,50 @@ UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_S
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
   size_t size;
   google_protobuf_ServiceDescriptorProto_method(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
   const google_protobuf_ServiceOptions* default_val = NULL;
   const google_protobuf_ServiceOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -2270,28 +2940,28 @@ UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescri
   }
 }
 UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
   return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(google_protobuf_MethodDescriptorProto_msg_init(), arena);
+  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(google__protobuf__MethodDescriptorProto_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(google_protobuf_ServiceOptions_msg_init(), arena);
+    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(google__protobuf__ServiceOptions_msg_init(), arena);
     if (sub) google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
   }
   return sub;
@@ -2300,12 +2970,12 @@ UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescrip
 /* google.protobuf.MethodDescriptorProto */
 
 UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(google_protobuf_MethodDescriptorProto_msg_init(), arena);
+  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(google__protobuf__MethodDescriptorProto_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MethodDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__MethodDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2315,7 +2985,7 @@ UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescript
                            int options, upb_Arena* arena) {
   google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MethodDescriptorProto_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__MethodDescriptorProto_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2323,148 +2993,148 @@ UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescript
 }
 UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MethodDescriptorProto_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MethodDescriptorProto_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MethodDescriptorProto_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MethodDescriptorProto_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
   const google_protobuf_MethodOptions* default_val = NULL;
   const google_protobuf_MethodOptions* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
   struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
   if (sub == NULL) {
-    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(google_protobuf_MethodOptions_msg_init(), arena);
+    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(google__protobuf__MethodOptions_msg_init(), arena);
     if (sub) google_protobuf_MethodDescriptorProto_set_options(msg, sub);
   }
   return sub;
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodDescriptorProto_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.FileOptions */
 
 UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FileOptions*)_upb_Message_New(google_protobuf_FileOptions_msg_init(), arena);
+  return (google_protobuf_FileOptions*)_upb_Message_New(google__protobuf__FileOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__FileOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2474,7 +3144,7 @@ UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FileOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__FileOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2482,321 +3152,336 @@ UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FileOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FileOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
   int32_t default_val = 1;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 18);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 18);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 18);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 20);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 20);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 20);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 23);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 23);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 23);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 27);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 27);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 27);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 31);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
   bool default_val = true;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 31);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 31);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 36);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 36);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 36);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 37);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 37);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 37);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 39);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 39);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 39);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 40);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 40);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 40);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 41);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 41);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 41);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 42);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 42);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 42);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 44);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 44);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 44);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 45);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 45);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 45);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -2806,6 +3491,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fil
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
   size_t size;
   google_protobuf_FileOptions_uninterpreted_option(msg, &size);
@@ -2813,87 +3515,99 @@ UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const googl
 }
 
 UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 9);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 17);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 18);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 20);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 23);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 27);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 31);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 36);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 37);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 39);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 40);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 41);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 42);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 44);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 45);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
+UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_FileOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -2904,16 +3618,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mut
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FileOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -2922,12 +3636,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptio
 /* google.protobuf.MessageOptions */
 
 UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MessageOptions*)_upb_Message_New(google_protobuf_MessageOptions_msg_init(), arena);
+  return (google_protobuf_MessageOptions*)_upb_Message_New(google__protobuf__MessageOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MessageOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__MessageOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -2937,7 +3651,7 @@ UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_
                            int options, upb_Arena* arena) {
   google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MessageOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__MessageOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -2945,96 +3659,111 @@ UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_
 }
 UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MessageOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MessageOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MessageOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MessageOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3044,6 +3773,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Mes
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
   size_t size;
   google_protobuf_MessageOptions_uninterpreted_option(msg, &size);
@@ -3051,27 +3797,39 @@ UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const go
 }
 
 UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 11);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_MessageOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3082,16 +3840,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MessageOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3100,12 +3858,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOp
 /* google.protobuf.FieldOptions */
 
 UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions*)_upb_Message_New(google_protobuf_FieldOptions_msg_init(), arena);
+  return (google_protobuf_FieldOptions*)_upb_Message_New(google__protobuf__FieldOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FieldOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3115,7 +3873,7 @@ UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(c
                            int options, upb_Arena* arena) {
   google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_FieldOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3123,141 +3881,245 @@ UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(c
 }
 UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FieldOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FieldOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_FieldOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__FieldOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
   int32_t default_val = 0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
   int32_t default_val = 0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 15);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 15);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 15);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (int32_t const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_targets(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_targets(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_edition_defaults(const google_protobuf_FieldOptions* msg) {
+  size_t size;
+  google_protobuf_FieldOptions_edition_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3267,6 +4129,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fie
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
   size_t size;
   google_protobuf_FieldOptions_uninterpreted_option(msg, &size);
@@ -3274,83 +4153,224 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const goog
 }
 
 UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 10);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 15);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 16);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 999);
+UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
-    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+    return (int32_t*)_upb_array_ptr(arr);
   } else {
     if (size) *size = 0;
     return NULL;
   }
 }
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 999);
-  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_FieldOptions_msg_init(), 999);
+UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return false;
+  }
+  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
+  return true;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
+  return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_FieldOptions_EditionDefault* sub = (struct google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(google__protobuf__FieldOptions__EditionDefault_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
-
-/* google.protobuf.OneofOptions */
-
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
-  return (google_protobuf_OneofOptions*)_upb_Message_New(google_protobuf_OneofOptions_msg_init(), arena);
+UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_OneofOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_FieldOptions_set_features(msg, sub);
   }
-  return ret;
+  return sub;
 }
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
+  return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+
+/* google.protobuf.FieldOptions.EditionDefault */
+
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FieldOptions_EditionDefault*)_upb_Message_New(google__protobuf__FieldOptions__EditionDefault_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions__EditionDefault_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions__EditionDefault_msg_init(), extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FieldOptions__EditionDefault_msg_init(), 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FieldOptions__EditionDefault_msg_init(), options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  upb_StringView default_val = upb_StringView_FromString("");
+  upb_StringView ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.OneofOptions */
+
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
+  return (google_protobuf_OneofOptions*)_upb_Message_New(google__protobuf__OneofOptions_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__OneofOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
                            const upb_ExtensionRegistry* extreg,
                            int options, upb_Arena* arena) {
   google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_OneofOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__OneofOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3358,21 +4378,36 @@ UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(c
 }
 UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_OneofOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__OneofOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_OneofOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__OneofOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
+UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
 UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3382,14 +4417,43 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_One
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
   size_t size;
   google_protobuf_OneofOptions_uninterpreted_option(msg, &size);
   return size != 0;
 }
 
+UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_OneofOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3400,16 +4464,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mu
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_OneofOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3418,12 +4482,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOpti
 /* google.protobuf.EnumOptions */
 
 UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumOptions*)_upb_Message_New(google_protobuf_EnumOptions_msg_init(), arena);
+  return (google_protobuf_EnumOptions*)_upb_Message_New(google__protobuf__EnumOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3433,7 +4497,7 @@ UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(con
                            int options, upb_Arena* arena) {
   google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3441,66 +4505,81 @@ UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(con
 }
 UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3510,6 +4589,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
   size_t size;
   google_protobuf_EnumOptions_uninterpreted_option(msg, &size);
@@ -3517,19 +4613,31 @@ UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const googl
 }
 
 UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_EnumOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3540,16 +4648,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mut
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3558,12 +4666,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptio
 /* google.protobuf.EnumValueOptions */
 
 UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueOptions*)_upb_Message_New(google_protobuf_EnumValueOptions_msg_init(), arena);
+  return (google_protobuf_EnumValueOptions*)_upb_Message_New(google__protobuf__EnumValueOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumValueOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumValueOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3573,7 +4681,7 @@ UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_pa
                            int options, upb_Arena* arena) {
   google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_EnumValueOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__EnumValueOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3581,36 +4689,66 @@ UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_pa
 }
 UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumValueOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumValueOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_EnumValueOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__EnumValueOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  bool default_val = false;
+  bool ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3620,6 +4758,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
   size_t size;
   google_protobuf_EnumValueOptions_uninterpreted_option(msg, &size);
@@ -3627,11 +4782,27 @@ UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const
 }
 
 UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_EnumValueOptions_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3642,16 +4813,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_EnumValueOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3660,12 +4831,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValue
 /* google.protobuf.ServiceOptions */
 
 UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceOptions*)_upb_Message_New(google_protobuf_ServiceOptions_msg_init(), arena);
+  return (google_protobuf_ServiceOptions*)_upb_Message_New(google__protobuf__ServiceOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ServiceOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__ServiceOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3675,7 +4846,7 @@ UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_
                            int options, upb_Arena* arena) {
   google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_ServiceOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__ServiceOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3683,36 +4854,51 @@ UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_
 }
 UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ServiceOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ServiceOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_ServiceOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__ServiceOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3722,6 +4908,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ser
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
   size_t size;
   google_protobuf_ServiceOptions_uninterpreted_option(msg, &size);
@@ -3729,11 +4932,23 @@ UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const go
 }
 
 UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
+UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_ServiceOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3744,16 +4959,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_ServiceOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3762,12 +4977,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOp
 /* google.protobuf.MethodOptions */
 
 UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MethodOptions*)_upb_Message_New(google_protobuf_MethodOptions_msg_init(), arena);
+  return (google_protobuf_MethodOptions*)_upb_Message_New(google__protobuf__MethodOptions_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MethodOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__MethodOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3777,7 +4992,7 @@ UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex
                            int options, upb_Arena* arena) {
   google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_MethodOptions_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__MethodOptions_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3785,51 +5000,66 @@ UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex
 }
 UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MethodOptions_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MethodOptions_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_MethodOptions_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__MethodOptions_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 34);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
   int32_t default_val = 0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 34);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 34);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 999);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3839,6 +5069,23 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Met
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
   size_t size;
   google_protobuf_MethodOptions_uninterpreted_option(msg, &size);
@@ -3846,15 +5093,27 @@ UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const goo
 }
 
 UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 33);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 34);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
+UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_MethodOptions_set_features(msg, sub);
+  }
+  return sub;
+}
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3865,16 +5124,16 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_m
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
   return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_MethodOptions_msg_init(), 999);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -3883,12 +5142,12 @@ UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOpt
 /* google.protobuf.UninterpretedOption */
 
 UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption*)_upb_Message_New(google_protobuf_UninterpretedOption_msg_init(), arena);
+  return (google_protobuf_UninterpretedOption*)_upb_Message_New(google__protobuf__UninterpretedOption_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_UninterpretedOption_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -3898,7 +5157,7 @@ UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOpt
                            int options, upb_Arena* arena) {
   google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_UninterpretedOption_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -3906,21 +5165,21 @@ UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOpt
 }
 UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_UninterpretedOption_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__UninterpretedOption_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_UninterpretedOption_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__UninterpretedOption_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -3930,104 +5189,121 @@ UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_pro
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
   size_t size;
   google_protobuf_UninterpretedOption_name(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
   uint64_t default_val = (uint64_t)0ull;
   uint64_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
   int64_t default_val = (int64_t)0ll;
   int64_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
   double default_val = 0;
   double ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4038,54 +5314,54 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_Uninte
   }
 }
 UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
   return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(google_protobuf_UninterpretedOption_NamePart_msg_init(), arena);
+  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(google__protobuf__UninterpretedOption__NamePart_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 7);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_msg_init(), 8);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.UninterpretedOption.NamePart */
 
 UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(google_protobuf_UninterpretedOption_NamePart_msg_init(), arena);
+  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(google__protobuf__UninterpretedOption__NamePart_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_UninterpretedOption_NamePart_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption__NamePart_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4095,7 +5371,7 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_Uninter
                            int options, upb_Arena* arena) {
   google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_UninterpretedOption_NamePart_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption__NamePart_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4103,64 +5379,436 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_Uninter
 }
 UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_UninterpretedOption_NamePart_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__UninterpretedOption__NamePart_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_UninterpretedOption_NamePart_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__UninterpretedOption__NamePart_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
   bool default_val = false;
   bool ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_UninterpretedOption_NamePart_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSet */
+
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSet_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSet_msg_init(), extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSet_msg_init(), 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSet_msg_init(), options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_utf8_validation(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_utf8_validation(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults*)_upb_Message_New(google__protobuf__FeatureSetDefaults_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults_msg_init(), extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize(const google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults_msg_init(), 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize_ex(const google_protobuf_FeatureSetDefaults* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults_msg_init(), options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const*)_upb_array_constptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_defaults(const google_protobuf_FeatureSetDefaults* msg) {
+  size_t size;
+  google_protobuf_FeatureSetDefaults_defaults(msg, &size);
+  return size != 0;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_minimum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_maximum_edition(google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
+  if (arr) {
+    if (size) *size = arr->size;
+    return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)_upb_array_ptr(arr);
+  } else {
+    if (size) *size = 0;
+    return NULL;
+  }
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_resize_defaults(google_protobuf_FeatureSetDefaults* msg, size_t size, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
+}
+UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) {
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
+  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
+    return NULL;
+  }
+  struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* sub = (struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), arena);
+  if (!arr || !sub) return NULL;
+  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+
+/* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */
+
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(upb_Arena* arena) {
+  return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault*)_upb_Message_New(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), arena);
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), extreg, options, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize_ex(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const google_protobuf_FeatureSet* default_val = NULL;
+  const google_protobuf_FeatureSet* ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3);
+  _upb_Message_ClearNonExtensionField(msg, &field);
+}
+UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  int32_t default_val = 0;
+  int32_t ret;
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3);
+  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3);
+  return _upb_Message_HasNonExtensionField(msg, &field);
+}
+
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2);
+  _upb_Message_SetNonExtensionField(msg, &field, &value);
+}
+UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) {
+  struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg);
+  if (sub == NULL) {
+    sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(google__protobuf__FeatureSet_msg_init(), arena);
+    if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(msg, sub);
+  }
+  return sub;
+}
+UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
 /* google.protobuf.SourceCodeInfo */
 
 UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(google_protobuf_SourceCodeInfo_msg_init(), arena);
+  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(google__protobuf__SourceCodeInfo_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_SourceCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4170,7 +5818,7 @@ UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_
                            int options, upb_Arena* arena) {
   google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_SourceCodeInfo_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4178,21 +5826,21 @@ UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_
 }
 UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_SourceCodeInfo_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__SourceCodeInfo_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_SourceCodeInfo_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__SourceCodeInfo_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4202,6 +5850,23 @@ UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
   size_t size;
   google_protobuf_SourceCodeInfo_location(msg, &size);
@@ -4209,7 +5874,7 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobu
 }
 
 UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4220,16 +5885,16 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeI
   }
 }
 UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
   return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(google_protobuf_SourceCodeInfo_Location_msg_init(), arena);
+  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(google__protobuf__SourceCodeInfo__Location_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4238,12 +5903,12 @@ UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_Sourc
 /* google.protobuf.SourceCodeInfo.Location */
 
 UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(google_protobuf_SourceCodeInfo_Location_msg_init(), arena);
+  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(google__protobuf__SourceCodeInfo__Location_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_SourceCodeInfo_Location_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo__Location_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4253,7 +5918,7 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeIn
                            int options, upb_Arena* arena) {
   google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_SourceCodeInfo_Location_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo__Location_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4261,21 +5926,21 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeIn
 }
 UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_SourceCodeInfo_Location_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__SourceCodeInfo__Location_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_SourceCodeInfo_Location_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__SourceCodeInfo__Location_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4285,17 +5950,34 @@ UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const goo
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_path(const google_protobuf_SourceCodeInfo_Location* msg) {
   size_t size;
   google_protobuf_SourceCodeInfo_Location_path(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4305,47 +5987,64 @@ UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const goo
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_span(const google_protobuf_SourceCodeInfo_Location* msg) {
   size_t size;
   google_protobuf_SourceCodeInfo_Location_span(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 6);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4355,6 +6054,23 @@ UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
   size_t size;
   google_protobuf_SourceCodeInfo_Location_leading_detached_comments(msg, &size);
@@ -4362,7 +6078,7 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_detached_com
 }
 
 UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4373,11 +6089,11 @@ UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_
   }
 }
 UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
   return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -4386,7 +6102,7 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf
   return true;
 }
 UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4397,11 +6113,11 @@ UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_
   }
 }
 UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
   return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 2);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -4410,15 +6126,15 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf
   return true;
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4429,11 +6145,11 @@ UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leadi
   }
 }
 UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
   return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_SourceCodeInfo_Location_msg_init(), 6);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -4445,12 +6161,12 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_com
 /* google.protobuf.GeneratedCodeInfo */
 
 UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(google_protobuf_GeneratedCodeInfo_msg_init(), arena);
+  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(google__protobuf__GeneratedCodeInfo_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_GeneratedCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4460,7 +6176,7 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_
                            int options, upb_Arena* arena) {
   google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_GeneratedCodeInfo_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4468,21 +6184,21 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_
 }
 UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_GeneratedCodeInfo_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_GeneratedCodeInfo_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4492,6 +6208,23 @@ UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_pro
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
   size_t size;
   google_protobuf_GeneratedCodeInfo_annotation(msg, &size);
@@ -4499,7 +6232,7 @@ UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_pr
 }
 
 UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4510,16 +6243,16 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_Genera
   }
 }
 UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
   return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return NULL;
   }
-  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), arena);
+  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), arena);
   if (!arr || !sub) return NULL;
   _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
   return sub;
@@ -4528,12 +6261,12 @@ UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_
 /* google.protobuf.GeneratedCodeInfo.Annotation */
 
 UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), arena);
+  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), arena);
 }
 UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
   google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
@@ -4543,7 +6276,7 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_Generat
                            int options, upb_Arena* arena) {
   google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), extreg, options, arena) !=
       kUpb_DecodeStatus_Ok) {
     return NULL;
   }
@@ -4551,21 +6284,21 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_Generat
 }
 UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 0, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 0, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
                                  upb_Arena* arena, size_t* len) {
   char* ptr;
-  (void)upb_Encode(msg, google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), options, arena, &ptr, len);
+  (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 1);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
   const upb_Array* arr = upb_Message_GetArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4575,74 +6308,91 @@ UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(cons
     return NULL;
   }
 }
+UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
+  const upb_Array* arr = upb_Message_GetArray(msg, &field);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
+UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
+  upb_Array* arr = upb_Message_GetOrCreateMutableArray(
+      (upb_Message*)msg, &field, arena);
+  if (size) {
+    *size = arr ? arr->size : 0;
+  }
+  return arr;
+}
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
   size_t size;
   google_protobuf_GeneratedCodeInfo_Annotation_path(msg, &size);
   return size != 0;
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
   upb_StringView default_val = upb_StringView_FromString("");
   upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
   int32_t default_val = (int32_t)0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5);
   _upb_Message_ClearNonExtensionField(msg, &field);
 }
 UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
   int32_t default_val = 0;
   int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5);
   _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5);
   return _upb_Message_HasNonExtensionField(msg, &field);
 }
 
 UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
   upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
   if (arr) {
     if (size) *size = arr->size;
@@ -4653,11 +6403,11 @@ UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(go
   }
 }
 UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
   return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
 }
 UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 1);
+  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
   if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
     return false;
@@ -4666,27 +6416,25 @@ UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_pro
   return true;
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 2);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 3);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 4);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_GeneratedCodeInfo_Annotation_msg_init(), 5);
+  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5);
   _upb_Message_SetNonExtensionField(msg, &field, &value);
 }
 
-extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
-
 /* Max size 32 is google.protobuf.FileOptions */
 /* Max size 64 is google.protobuf.FileOptions */
-#define _UPB_MAXOPT_SIZE UPB_SIZE(104, 192)
+#define _UPB_MAXOPT_SIZE UPB_SIZE(112, 200)
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/third_party/upb/upb/status.h b/third_party/upb/upb/status.h
deleted file mode 100644
index fcd2bf73eea9e..0000000000000
--- a/third_party/upb/upb/status.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/base/status.h instead
-// IWYU pragma: private, include "upb/base/status.h"
-
-#ifndef UPB_STATUS_H_
-#define UPB_STATUS_H_
-
-#include "upb/base/status.h"
-
-#endif /* UPB_STATUS_H_ */
diff --git a/third_party/upb/upb/string_view.h b/third_party/upb/upb/string_view.h
deleted file mode 100644
index add8275281c02..0000000000000
--- a/third_party/upb/upb/string_view.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/base/string_view.h instead
-// IWYU pragma: private, include "upb/base/string_view.h"
-
-#ifndef UPB_STRING_VIEW_H_
-#define UPB_STRING_VIEW_H_
-
-#include "upb/base/string_view.h"
-
-#endif /* UPB_STRING_VIEW_H_ */
diff --git a/third_party/upb/upb/test/BUILD b/third_party/upb/upb/test/BUILD
index 0d1fd7b7242f7..b147e06c08411 100644
--- a/third_party/upb/upb/test/BUILD
+++ b/third_party/upb/upb/test/BUILD
@@ -1,32 +1,18 @@
 # Copyright (c) 2009-2021, Google LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
 
 load(
     "//bazel:build_defs.bzl",
     "UPB_DEFAULT_CPPOPTS",
 )
+load(
+    "//bazel:upb_minitable_proto_library.bzl",
+    "upb_minitable_proto_library",
+)
 load(
     "//bazel:upb_proto_library.bzl",
     "upb_proto_library",
@@ -34,17 +20,17 @@ load(
 )
 
 # begin:google_only
-# package(default_applicable_licenses = ["//:license"])
+# package(default_applicable_licenses = ["//upb:license"])
 # end:google_only
 
 cc_library(
     name = "parse_text_proto",
     testonly = 1,
     hdrs = ["parse_text_proto.h"],
-    visibility = ["//:__subpackages__"],
+    visibility = ["//upb:__subpackages__"],
     deps = [
+        "//:protobuf",
         "@com_google_googletest//:gtest",
-        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -63,7 +49,7 @@ proto_library(
     name = "proto3_test_proto",
     testonly = 1,
     srcs = ["proto3_test.proto"],
-    deps = ["@com_google_protobuf//:descriptor_proto"],
+    deps = ["//:descriptor_proto"],
 )
 
 upb_proto_library(
@@ -84,17 +70,24 @@ proto_library(
     srcs = ["test.proto"],
 )
 
+upb_minitable_proto_library(
+    name = "test_proto_upb_minitable",
+    testonly = 1,
+    visibility = ["//upb:__subpackages__"],
+    deps = [":test_proto"],
+)
+
 upb_proto_library(
     name = "test_upb_proto",
     testonly = 1,
-    visibility = ["//:__subpackages__"],
+    visibility = ["//upb:__subpackages__"],
     deps = [":test_proto"],
 )
 
 proto_library(
     name = "test_cpp_proto",
     srcs = ["test_cpp.proto"],
-    deps = ["@com_google_protobuf//:timestamp_proto"],
+    deps = ["//:timestamp_proto"],
 )
 
 upb_proto_library(
@@ -107,28 +100,42 @@ upb_proto_reflection_library(
     deps = ["test_cpp_proto"],
 )
 
+upb_minitable_proto_library(
+    name = "test_messages_proto2_upb_minitable",
+    testonly = 1,
+    visibility = ["//upb:__subpackages__"],
+    deps = ["//src/google/protobuf:test_messages_proto2_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "test_messages_proto3_upb_minitable",
+    testonly = 1,
+    visibility = ["//upb:__subpackages__"],
+    deps = ["//src/google/protobuf:test_messages_proto3_proto"],
+)
+
 upb_proto_library(
     name = "test_messages_proto2_upb_proto",
     testonly = 1,
-    visibility = ["//:__subpackages__"],
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto2_proto"],
+    visibility = ["//upb:__subpackages__"],
+    deps = ["//src/google/protobuf:test_messages_proto2_proto"],
 )
 
 upb_proto_library(
     name = "test_messages_proto3_upb_proto",
     testonly = 1,
-    visibility = ["//:__subpackages__"],
-    deps = ["@com_google_protobuf//src/google/protobuf:test_messages_proto3_proto"],
+    visibility = ["//upb:__subpackages__"],
+    deps = ["//src/google/protobuf:test_messages_proto3_proto"],
 )
 
 upb_proto_library(
     name = "timestamp_upb_proto",
-    deps = ["@com_google_protobuf//:timestamp_proto"],
+    deps = ["//:timestamp_proto"],
 )
 
 upb_proto_reflection_library(
     name = "timestamp_upb_proto_reflection",
-    deps = ["@com_google_protobuf//:timestamp_proto"],
+    deps = ["//:timestamp_proto"],
 )
 
 cc_library(
@@ -136,13 +143,14 @@ cc_library(
     testonly = 1,
     srcs = ["fuzz_util.cc"],
     hdrs = ["fuzz_util.h"],
-    visibility = ["//:__subpackages__"],
+    visibility = ["//upb:__subpackages__"],
     deps = [
-        "//:upb",
-        "//:mini_table",
-        "//:mini_table_internal",
-        "//:port",
-        "//upb/mini_descriptor",
+        "//upb:base",
+        "//upb:message",
+        "//upb:mini_descriptor",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
     ],
 )
 
@@ -153,8 +161,8 @@ cc_test(
     deps = [
         ":proto3_test_upb_proto",
         ":proto3_test_upb_proto_reflection",
-        "//:reflection",
         "@com_google_googletest//:gtest_main",
+        "//upb:reflection",
     ],
 )
 
@@ -167,12 +175,10 @@ cc_test(
         ":test_cpp_upb_proto_reflection",
         ":timestamp_upb_proto",
         ":timestamp_upb_proto_reflection",
-        "//:upb",
-        "//:json",
-        "//:port",
-        "//:reflection",
-        "//upb/json",
         "@com_google_googletest//:gtest_main",
+        "//upb:json",
+        "//upb:port",
+        "//upb:reflection",
     ],
 )
 
@@ -186,9 +192,11 @@ cc_test(
         ":test_messages_proto2_upb_proto",
         ":test_messages_proto3_upb_proto",
         ":test_upb_proto",
-        "//:upb",
-        "//:port",
         "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:mem",
+        "//upb:message",
+        "//upb:port",
     ],
 )
 
@@ -199,14 +207,11 @@ cc_test(
     ],
     deps = [
         ":empty_upb_proto_reflection",
-        ":test_messages_proto2_upb_proto",
-        ":test_messages_proto3_upb_proto",
+        ":test_messages_proto2_upb_minitable",
         ":test_upb_proto",
-        "//:upb",
-        "//:mini_table",
-        "//:mini_table_internal",
-        "//:port",
         "@com_google_googletest//:gtest_main",
+        "//upb:mini_table",
+        "//upb:port",
     ],
 )
 
@@ -241,6 +246,12 @@ proto_library(
     deps = [":empty_srcs_3_proto"],
 )
 
+upb_minitable_proto_library(
+    name = "test_import_empty_srcs_upb_minitable_proto",
+    testonly = 1,
+    deps = [":test_import_empty_srcs_proto"],
+)
+
 upb_proto_library(
     name = "test_import_empty_srcs_upb_proto",
     testonly = 1,
@@ -251,7 +262,7 @@ cc_test(
     name = "test_import_empty_srcs",
     srcs = ["test_import_empty_srcs.cc"],
     deps = [
-        ":test_import_empty_srcs_upb_proto",
+        ":test_import_empty_srcs_upb_minitable_proto",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/third_party/upb/upb/test/empty.proto b/third_party/upb/upb/test/empty.proto
index 7e54f1bd46b48..dc4e3de4bc318 100644
--- a/third_party/upb/upb/test/empty.proto
+++ b/third_party/upb/upb/test/empty.proto
@@ -1,2 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 syntax = "proto2";
+
 package upb_test;
diff --git a/third_party/upb/upb/test/fuzz_util.cc b/third_party/upb/upb/test/fuzz_util.cc
index 0c2037dfe19e3..714fcac00646e 100644
--- a/third_party/upb/upb/test/fuzz_util.cc
+++ b/third_party/upb/upb/test/fuzz_util.cc
@@ -1,37 +1,17 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/test/fuzz_util.h"
 
+#include "upb/base/status.hpp"
 #include "upb/message/message.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_table/extension.h"
 #include "upb/mini_table/extension_registry.h"
-#include "upb/upb.hpp"
 
 // Must be last
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/test/fuzz_util.h b/third_party/upb/upb/test/fuzz_util.h
index 0df6d1a0e7ed0..72bf31ec82454 100644
--- a/third_party/upb/upb/test/fuzz_util.h
+++ b/third_party/upb/upb/test/fuzz_util.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_TEST_FUZZ_UTIL_H_
 #define UPB_TEST_FUZZ_UTIL_H_
diff --git a/third_party/upb/upb/test/parse_text_proto.h b/third_party/upb/upb/test/parse_text_proto.h
index 96137c13eb928..e8b3fcbfb8be6 100644
--- a/third_party/upb/upb/test/parse_text_proto.h
+++ b/third_party/upb/upb/test/parse_text_proto.h
@@ -1,9 +1,16 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #ifndef UPB_UPB_TEST_PARSE_TEXT_PROTO_H_
 #define UPB_UPB_TEST_PARSE_TEXT_PROTO_H_
 
 #include <string>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
 
diff --git a/third_party/upb/upb/test/proto3_test.cc b/third_party/upb/upb/test/proto3_test.cc
index 9c202a9139daf..d1af6996941fc 100644
--- a/third_party/upb/upb/test/proto3_test.cc
+++ b/third_party/upb/upb/test/proto3_test.cc
@@ -1,31 +1,11 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "upb/reflection/def.hpp"
 #include "upb/test/proto3_test.upb.h"
 #include "upb/test/proto3_test.upbdefs.h"
diff --git a/third_party/upb/upb/test/proto3_test.proto b/third_party/upb/upb/test/proto3_test.proto
index f83a8b8c4b2d5..28bc4d347da6e 100644
--- a/third_party/upb/upb/test/proto3_test.proto
+++ b/third_party/upb/upb/test/proto3_test.proto
@@ -1,3 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 syntax = "proto3";
 
 package upb.test;
diff --git a/third_party/upb/upb/test/test.proto b/third_party/upb/upb/test/test.proto
index 89cb6a83c7bc9..8ec0a948fbe8d 100644
--- a/third_party/upb/upb/test/test.proto
+++ b/third_party/upb/upb/test/test.proto
@@ -1,3 +1,9 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto2";
 
diff --git a/third_party/upb/upb/test/test_cpp.cc b/third_party/upb/upb/test/test_cpp.cc
index 6e8bb1df86794..bd917c1d9bfbc 100644
--- a/third_party/upb/upb/test/test_cpp.cc
+++ b/third_party/upb/upb/test/test_cpp.cc
@@ -1,27 +1,9 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Tests for C++ wrappers.
 
@@ -34,7 +16,7 @@
 
 #include "google/protobuf/timestamp.upb.h"
 #include "google/protobuf/timestamp.upbdefs.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "upb/json/decode.h"
 #include "upb/json/encode.h"
 #include "upb/reflection/def.h"
diff --git a/third_party/upb/upb/test/test_cpp.proto b/third_party/upb/upb/test/test_cpp.proto
index 4992b8c55c3df..737c7931b9575 100644
--- a/third_party/upb/upb/test/test_cpp.proto
+++ b/third_party/upb/upb/test/test_cpp.proto
@@ -1,3 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 syntax = "proto2";
 
 package upb.test;
diff --git a/third_party/upb/upb/test/test_generated_code.cc b/third_party/upb/upb/test/test_generated_code.cc
index a2479a65ee565..2a2d72365414d 100644
--- a/third_party/upb/upb/test/test_generated_code.cc
+++ b/third_party/upb/upb/test/test_generated_code.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 /* Test of generated code, with a special focus on features that are not used in
  * descriptor.proto or conformance.proto (since these get some testing from
@@ -33,15 +13,14 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "google/protobuf/test_messages_proto2.upb.h"
 #include "google/protobuf/test_messages_proto3.upb.h"
 #include "upb/base/status.h"
 #include "upb/base/string_view.h"
-#include "upb/collections/array.h"
-#include "upb/mem/arena.h"
+#include "upb/mem/arena.hpp"
+#include "upb/message/array.h"
 #include "upb/test/test.upb.h"
-#include "upb/upb.hpp"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/test/test_import_empty_srcs.cc b/third_party/upb/upb/test/test_import_empty_srcs.cc
index 60190b48a24f0..59995ae6eb23f 100644
--- a/third_party/upb/upb/test/test_import_empty_srcs.cc
+++ b/third_party/upb/upb/test/test_import_empty_srcs.cc
@@ -1,34 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-#include "gtest/gtest.h"
-#include "upb/test/test_import_empty_srcs.upb.h"
+#include <gtest/gtest.h>
+#include "upb/test/test_import_empty_srcs.upb_minitable.h"
 
 TEST(Test, Reexport) {
   // This test really just ensures that compilation succeeds.
-  ASSERT_GT(sizeof(upb_test_ContainsImported_msg_init), 0);
+  ASSERT_GT(sizeof(upb_0test__ContainsImported_msg_init), 0);
 }
diff --git a/third_party/upb/upb/test/test_import_empty_srcs.proto b/third_party/upb/upb/test/test_import_empty_srcs.proto
index a1830bb94d1c1..eca7d9389de78 100644
--- a/third_party/upb/upb/test/test_import_empty_srcs.proto
+++ b/third_party/upb/upb/test/test_import_empty_srcs.proto
@@ -1,3 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 syntax = "proto2";
 
 package upb_test;
diff --git a/third_party/upb/upb/test/test_mini_table_oneof.cc b/third_party/upb/upb/test/test_mini_table_oneof.cc
index 21483b1dbcf75..3c0ecae0f590f 100644
--- a/third_party/upb/upb/test/test_mini_table_oneof.cc
+++ b/third_party/upb/upb/test/test_mini_table_oneof.cc
@@ -1,37 +1,14 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
-#include "gtest/gtest.h"
-#include "google/protobuf/test_messages_proto2.upb.h"
-#include "google/protobuf/test_messages_proto3.upb.h"
+#include <gtest/gtest.h>
+#include "google/protobuf/test_messages_proto2.upb_minitable.h"
 #include "upb/mini_table/field.h"
 #include "upb/mini_table/message.h"
-#include "upb/test/test.upb.h"
-#include "upb/upb.hpp"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -41,7 +18,7 @@ TEST(MiniTableOneofTest, OneOfIteratorProto2) {
   constexpr int oneof_test_field_number = 116;
 
   const upb_MiniTable* google_protobuf_table =
-      &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init;
+      &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init;
   const upb_MiniTableField* field =
       upb_MiniTable_FindFieldByNumber(google_protobuf_table, oneof_test_field_number);
   ASSERT_TRUE(field != nullptr);
@@ -55,7 +32,7 @@ TEST(MiniTableOneofTest, OneOfIteratorProto2) {
 TEST(MiniTableOneofTest, InitialFieldNotOneOf) {
   constexpr int test_field_number = 1;  // optional int that is not a oneof
   const upb_MiniTable* google_protobuf_table =
-      &protobuf_test_messages_proto2_TestAllTypesProto2_msg_init;
+      &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init;
   const upb_MiniTableField* field =
       upb_MiniTable_FindFieldByNumber(google_protobuf_table, test_field_number);
   ASSERT_TRUE(field != nullptr);
diff --git a/third_party/upb/upb/text/BUILD b/third_party/upb/upb/text/BUILD
new file mode 100644
index 0000000000000..575dda3bc3f84
--- /dev/null
+++ b/third_party/upb/upb/text/BUILD
@@ -0,0 +1,47 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "text",
+    srcs = [
+        "encode.c",
+    ],
+    hdrs = [
+        "encode.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//upb:eps_copy_input_stream",
+        "//upb:lex",
+        "//upb:message",
+        "//upb:message_internal",
+        "//upb:port",
+        "//upb:reflection",
+        "//upb:wire",
+        "//upb:wire_reader",
+        "//upb:wire_types",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/text/encode.c b/third_party/upb/upb/text/encode.c
index c694088fc2d2e..6d26faca064f1 100644
--- a/third_party/upb/upb/text/encode.c
+++ b/third_party/upb/upb/text/encode.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/text/encode.h"
 
@@ -33,9 +13,9 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "upb/collections/map.h"
-#include "upb/collections/map_sorter_internal.h"
 #include "upb/lex/round_trip.h"
+#include "upb/message/internal/map_sorter.h"
+#include "upb/message/map.h"
 #include "upb/port/vsnprintf_compat.h"
 #include "upb/reflection/message.h"
 #include "upb/wire/eps_copy_input_stream.h"
diff --git a/third_party/upb/upb/text/encode.h b/third_party/upb/upb/text/encode.h
index 3e3d1d528e2f5..9374dc3d30a11 100644
--- a/third_party/upb/upb/text/encode.h
+++ b/third_party/upb/upb/text/encode.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_TEXT_ENCODE_H_
 #define UPB_TEXT_ENCODE_H_
diff --git a/third_party/upb/upb/text_encode.h b/third_party/upb/upb/text_encode.h
deleted file mode 100644
index b0f5792bdac0e..0000000000000
--- a/third_party/upb/upb/text_encode.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use upb/text/encode.h instead
-// IWYU pragma: private, include "upb/text/encode.h"
-
-#ifndef UPB_TEXTENCODE_H_
-#define UPB_TEXTENCODE_H_
-
-#include "upb/text/encode.h"
-
-#endif /* UPB_TEXTENCODE_H_ */
diff --git a/third_party/upb/upb/upb.h b/third_party/upb/upb/upb.h
deleted file mode 100644
index 829c99c4ce41c..0000000000000
--- a/third_party/upb/upb/upb.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This header is deprecated, use the individual #includes below as needed.
-// IWYU pragma: private, include "upb/base/status.h"
-
-#ifndef UPB_H_
-#define UPB_H_
-
-#include "upb/base/descriptor_constants.h"
-#include "upb/base/status.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-
-#endif /* UPB_H_ */
diff --git a/third_party/upb/upb/upb.hpp b/third_party/upb/upb/upb.hpp
index 78f1c77e67fd5..9276c16b55126 100644
--- a/third_party/upb/upb/upb.hpp
+++ b/third_party/upb/upb/upb.hpp
@@ -1,107 +1,18 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Temporary hack to fix gRPC. Do not use.
 
 #ifndef UPB_HPP_
 #define UPB_HPP_
 
-#include <memory>
-
-#include "upb/base/descriptor_constants.h"
-#include "upb/base/status.h"
-#include "upb/mem/arena.h"
-
-namespace upb {
-
-class Status {
- public:
-  Status() { upb_Status_Clear(&status_); }
-
-  upb_Status* ptr() { return &status_; }
-
-  // Returns true if there is no error.
-  bool ok() const { return upb_Status_IsOk(&status_); }
-
-  // Guaranteed to be NULL-terminated.
-  const char* error_message() const {
-    return upb_Status_ErrorMessage(&status_);
-  }
-
-  // The error message will be truncated if it is longer than
-  // _kUpb_Status_MaxMessage-4.
-  void SetErrorMessage(const char* msg) {
-    upb_Status_SetErrorMessage(&status_, msg);
-  }
-  void SetFormattedErrorMessage(const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    upb_Status_VSetErrorFormat(&status_, fmt, args);
-    va_end(args);
-  }
-
-  // Resets the status to a successful state with no message.
-  void Clear() { upb_Status_Clear(&status_); }
-
- private:
-  upb_Status status_;
-};
-
-class Arena {
- public:
-  // A simple arena with no initial memory block and the default allocator.
-  Arena() : ptr_(upb_Arena_New(), upb_Arena_Free) {}
-  Arena(char* initial_block, size_t size)
-      : ptr_(upb_Arena_Init(initial_block, size, &upb_alloc_global),
-             upb_Arena_Free) {}
-
-  upb_Arena* ptr() const { return ptr_.get(); }
-
-  void Fuse(Arena& other) { upb_Arena_Fuse(ptr(), other.ptr()); }
-
- protected:
-  std::unique_ptr<upb_Arena, decltype(&upb_Arena_Free)> ptr_;
-};
-
-// InlinedArena seeds the arenas with a predefined amount of memory.  No
-// heap memory will be allocated until the initial block is exceeded.
-template <int N>
-class InlinedArena : public Arena {
- public:
-  InlinedArena() : Arena(initial_block_, N) {}
-  ~InlinedArena() {
-    // Explicitly destroy the arena now so that it does not outlive
-    // initial_block_.
-    ptr_.reset();
-  }
-
- private:
-  InlinedArena(const InlinedArena*) = delete;
-  InlinedArena& operator=(const InlinedArena*) = delete;
-
-  char initial_block_[N];
-};
-
-}  // namespace upb
+// IWYU pragma: begin_exports
+#include "upb/base/status.hpp"
+#include "upb/mem/arena.hpp"
+// IWYU pragma: end_exports
 
 #endif  // UPB_HPP_
diff --git a/third_party/upb/upb/upb_so.c b/third_party/upb/upb/upb_so.c
index 64403cfc16b28..a7bb3e7ffc812 100644
--- a/third_party/upb/upb/upb_so.c
+++ b/third_party/upb/upb/upb_so.c
@@ -1,34 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // These headers form a spanning tree for the upb defs needed by FFI layers.
 
-#include "upb/collections/array_split64.h"
-#include "upb/collections/map.h"
+// IWYU pragma: begin_exports
 #include "upb/message/accessors_split64.h"
+#include "upb/message/array_split64.h"
+#include "upb/message/map.h"
 #include "upb/message/message.h"
 #include "upb/mini_descriptor/decode.h"
+// IWYU pragma: end_exports
diff --git a/third_party/upb/upb/util/BUILD b/third_party/upb/upb/util/BUILD
index bdace2282b4b6..1abbaf070f244 100644
--- a/third_party/upb/upb/util/BUILD
+++ b/third_party/upb/upb/util/BUILD
@@ -4,12 +4,8 @@ load(
     "upb_proto_reflection_library",
 )
 
-# begin:github_only
-load("@rules_pkg//:mappings.bzl", "pkg_files")
-# end:github_only
-
 # begin:google_only
-# package(default_applicable_licenses = ["//:license"])
+# package(default_applicable_licenses = ["//upb:license"])
 # end:google_only
 
 licenses(["notice"])
@@ -22,9 +18,9 @@ cc_library(
     hdrs = ["def_to_proto.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:port",
-        "//:reflection",
-        "//:reflection_internal",
+        "//upb:port",
+        "//upb:reflection",
+        "//upb:reflection_internal",
     ],
 )
 
@@ -53,11 +49,12 @@ cc_library(
     hdrs = ["def_to_proto_test.h"],
     deps = [
         ":def_to_proto",
-        "//:descriptor_upb_proto",
-        "//:reflection_internal",
-        "//:upb",
+        "//:protobuf",
+        "//upb:base",
+        "//upb:descriptor_upb_proto",
+        "//upb:mem",
+        "//upb:reflection_internal",
         "@com_google_googletest//:gtest",
-        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -69,13 +66,13 @@ cc_test(
         ":def_to_proto_test_lib",
         ":def_to_proto_test_upb_proto",
         ":def_to_proto_test_upb_proto_reflection",
-        "//:descriptor_upb_proto_reflection",
-        "//:reflection",
-        "//:upb",
+        "//:protobuf",
+        "@com_google_googletest//:gtest_main",
+        "//upb:descriptor_upb_proto_reflection",
+        "//upb:mem",
+        "//upb:reflection",
         "//upb/test:parse_text_proto",
         "@com_google_absl//absl/strings",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -86,8 +83,8 @@ cc_test(
 #     tags = ["clang_only"],
 #     deps = [
 #         ":def_to_proto_test_lib",
-#         "//testing/fuzzing:fuzztest",
 #         "@com_google_googletest//:gtest_main",
+#         "//testing/fuzzing:fuzztest",
 #     ],
 # )
 # end:google_only
@@ -100,9 +97,11 @@ cc_library(
     hdrs = ["required_fields.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:collections",
-        "//:port",
-        "//:reflection",
+        "//upb:base",
+        "//upb:message",
+        "//upb:message_types",
+        "//upb:port",
+        "//upb:reflection",
     ],
 )
 
@@ -128,11 +127,12 @@ cc_test(
         ":required_fields",
         ":required_fields_test_upb_proto",
         ":required_fields_test_upb_proto_reflection",
-        "//:json",
-        "//:reflection",
-        "//:upb",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
+        "//upb:base",
+        "//upb:json",
+        "//upb:mem",
+        "//upb:reflection",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -144,11 +144,11 @@ cc_library(
     hdrs = ["compare.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:eps_copy_input_stream",
-        "//:port",
-        "//:upb",
-        "//:wire_reader",
-        "//:wire_types",
+        "//upb:base",
+        "//upb:eps_copy_input_stream",
+        "//upb:port",
+        "//upb:wire_reader",
+        "//upb:wire_types",
     ],
 )
 
@@ -157,16 +157,16 @@ cc_test(
     srcs = ["compare_test.cc"],
     deps = [
         ":compare",
-        "//:wire_internal",
-        "//:wire_types",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
+        "//upb:wire_internal",
+        "//upb:wire_types",
+        "@com_google_absl//absl/strings",
     ],
 )
 
 # begin:github_only
-pkg_files(
-    name = "util_source_files",
+filegroup(
+    name = "source_files",
     srcs = [
         "compare.c",
         "compare.h",
@@ -175,7 +175,6 @@ pkg_files(
         "required_fields.c",
         "required_fields.h",
     ],
-    prefix = "upb/util",
     visibility = ["//python/dist:__pkg__"],
 )
 # end:github_only
diff --git a/third_party/upb/upb/util/compare.c b/third_party/upb/upb/util/compare.c
index 3fbc8f61bf4c3..2a774d04e3e41 100644
--- a/third_party/upb/upb/util/compare.c
+++ b/third_party/upb/upb/util/compare.c
@@ -1,35 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/compare.h"
 
 #include <stdlib.h>
 
-#include "upb/upb.h"
+#include "upb/base/string_view.h"
 #include "upb/wire/eps_copy_input_stream.h"
 #include "upb/wire/reader.h"
 #include "upb/wire/types.h"
@@ -215,7 +195,7 @@ static upb_UnknownFields* upb_UnknownFields_Build(upb_UnknownField_Context* ctx,
   return fields;
 }
 
-// Compares two sorted upb_UnknwonFields structures for equality.
+// Compares two sorted upb_UnknownFields structures for equality.
 static bool upb_UnknownFields_IsEqual(const upb_UnknownFields* uf1,
                                       const upb_UnknownFields* uf2) {
   if (uf1->size != uf2->size) return false;
diff --git a/third_party/upb/upb/util/compare.h b/third_party/upb/upb/util/compare.h
index 82acd50361180..b54ef2fc4035d 100644
--- a/third_party/upb/upb/util/compare.h
+++ b/third_party/upb/upb/util/compare.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_UTIL_COMPARE_H_
 #define UPB_UTIL_COMPARE_H_
diff --git a/third_party/upb/upb/util/compare_test.cc b/third_party/upb/upb/util/compare_test.cc
index 634f4737b48f5..f9b34da7aa29b 100644
--- a/third_party/upb/upb/util/compare_test.cc
+++ b/third_party/upb/upb/util/compare_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/compare.h"
 
@@ -34,8 +14,8 @@
 #include <variant>
 #include <vector>
 
-#include "gtest/gtest.h"
-#include "upb/wire/swap_internal.h"
+#include <gtest/gtest.h>
+#include "upb/wire/internal/swap.h"
 #include "upb/wire/types.h"
 
 struct UnknownField;
diff --git a/third_party/upb/upb/util/def_to_proto.c b/third_party/upb/upb/util/def_to_proto.c
index 2067bb5b3a874..29331d59bbb24 100644
--- a/third_party/upb/upb/util/def_to_proto.c
+++ b/third_party/upb/upb/util/def_to_proto.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/def_to_proto.h"
 
@@ -33,8 +13,8 @@
 #include "upb/port/vsnprintf_compat.h"
 #include "upb/reflection/enum_reserved_range.h"
 #include "upb/reflection/extension_range.h"
-#include "upb/reflection/field_def_internal.h"
-#include "upb/reflection/file_def_internal.h"
+#include "upb/reflection/internal/field_def.h"
+#include "upb/reflection/internal/file_def.h"
 #include "upb/reflection/message.h"
 #include "upb/reflection/message_reserved_range.h"
 
@@ -496,7 +476,7 @@ static google_protobuf_ServiceDescriptorProto* servicedef_toproto(
   size_t n = upb_ServiceDef_MethodCount(s);
   google_protobuf_MethodDescriptorProto** methods =
       google_protobuf_ServiceDescriptorProto_resize_method(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     methods[i] = methoddef_toproto(ctx, upb_ServiceDef_Method(s, i));
   }
 
@@ -525,12 +505,8 @@ static google_protobuf_FileDescriptorProto* filedef_toproto(upb_ToProto_Context*
     }
   }
 
-  const char* edition = upb_FileDef_Edition(f);
-  if (edition != NULL) {
-    size_t n = strlen(edition);
-    if (n != 0) {
-      google_protobuf_FileDescriptorProto_set_edition(proto, strviewdup(ctx, edition));
-    }
+  if (upb_FileDef_Syntax(f) == kUpb_Syntax_Editions) {
+    google_protobuf_FileDescriptorProto_set_edition(proto, upb_FileDef_Edition(f));
   }
 
   if (upb_FileDef_Syntax(f) == kUpb_Syntax_Proto3) {
@@ -541,7 +517,7 @@ static google_protobuf_FileDescriptorProto* filedef_toproto(upb_ToProto_Context*
   n = upb_FileDef_DependencyCount(f);
   upb_StringView* deps =
       google_protobuf_FileDescriptorProto_resize_dependency(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     deps[i] = strviewdup(ctx, upb_FileDef_Name(upb_FileDef_Dependency(f, i)));
   }
 
@@ -560,28 +536,28 @@ static google_protobuf_FileDescriptorProto* filedef_toproto(upb_ToProto_Context*
   n = upb_FileDef_TopLevelMessageCount(f);
   google_protobuf_DescriptorProto** msgs =
       google_protobuf_FileDescriptorProto_resize_message_type(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     msgs[i] = msgdef_toproto(ctx, upb_FileDef_TopLevelMessage(f, i));
   }
 
   n = upb_FileDef_TopLevelEnumCount(f);
   google_protobuf_EnumDescriptorProto** enums =
       google_protobuf_FileDescriptorProto_resize_enum_type(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     enums[i] = enumdef_toproto(ctx, upb_FileDef_TopLevelEnum(f, i));
   }
 
   n = upb_FileDef_ServiceCount(f);
   google_protobuf_ServiceDescriptorProto** services =
       google_protobuf_FileDescriptorProto_resize_service(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     services[i] = servicedef_toproto(ctx, upb_FileDef_Service(f, i));
   }
 
   n = upb_FileDef_TopLevelExtensionCount(f);
   google_protobuf_FieldDescriptorProto** exts =
       google_protobuf_FileDescriptorProto_resize_extension(proto, n, ctx->arena);
-  for (int i = 0; i < n; i++) {
+  for (size_t i = 0; i < n; i++) {
     exts[i] = fielddef_toproto(ctx, upb_FileDef_TopLevelExtension(f, i));
   }
 
diff --git a/third_party/upb/upb/util/def_to_proto.h b/third_party/upb/upb/util/def_to_proto.h
index 08c64532e9044..a8dd70bf0dbcb 100644
--- a/third_party/upb/upb/util/def_to_proto.h
+++ b/third_party/upb/upb/util/def_to_proto.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_UTIL_DEF_TO_PROTO_H_
 #define UPB_UTIL_DEF_TO_PROTO_H_
diff --git a/third_party/upb/upb/util/def_to_proto_fuzz_test.cc b/third_party/upb/upb/util/def_to_proto_fuzz_test.cc
index a2177c8cd6254..e2ba440d8c60c 100644
--- a/third_party/upb/upb/util/def_to_proto_fuzz_test.cc
+++ b/third_party/upb/upb/util/def_to_proto_fuzz_test.cc
@@ -1,8 +1,14 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include <string>
 
-#include "google/protobuf/descriptor.proto.h"
-#include "gtest/gtest.h"
+#include "google/protobuf/descriptor.pb.h"
+#include <gtest/gtest.h>
 #include "testing/fuzzing/fuzztest.h"
 #include "upb/util/def_to_proto_test.h"
 
diff --git a/third_party/upb/upb/util/def_to_proto_public_import_test.proto b/third_party/upb/upb/util/def_to_proto_public_import_test.proto
index 0c3eddbaf3e98..646118c95ea14 100644
--- a/third_party/upb/upb/util/def_to_proto_public_import_test.proto
+++ b/third_party/upb/upb/util/def_to_proto_public_import_test.proto
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto3";
 
diff --git a/third_party/upb/upb/util/def_to_proto_regular_import_test.proto b/third_party/upb/upb/util/def_to_proto_regular_import_test.proto
index 341f771eb72f0..7bf9e04a74402 100644
--- a/third_party/upb/upb/util/def_to_proto_regular_import_test.proto
+++ b/third_party/upb/upb/util/def_to_proto_regular_import_test.proto
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto3";
 
diff --git a/third_party/upb/upb/util/def_to_proto_test.cc b/third_party/upb/upb/util/def_to_proto_test.cc
index 5bf6ddffb334d..cad9abf53541a 100644
--- a/third_party/upb/upb/util/def_to_proto_test.cc
+++ b/third_party/upb/upb/util/def_to_proto_test.cc
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/def_to_proto.h"
 
@@ -32,13 +12,13 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.upbdefs.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/util/message_differencer.h"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
 #include "upb/test/parse_text_proto.h"
-#include "upb/upb.hpp"
 #include "upb/util/def_to_proto_test.h"
 #include "upb/util/def_to_proto_test.upbdefs.h"
 
@@ -171,11 +151,6 @@ TEST(FuzzTest, FileNameEmbeddedNull) {
   RoundTripDescriptor(ParseTextProtoOrDie(R"pb(file { name: "\000" })pb"));
 }
 
-TEST(FuzzTest, EditionEmbeddedNull) {
-  RoundTripDescriptor(
-      ParseTextProtoOrDie(R"pb(file { name: "n" edition: "\000" })pb"));
-}
-
 TEST(FuzzTest, DuplicateOneofIndex) {
   RoundTripDescriptor(ParseTextProtoOrDie(
       R"pb(file {
diff --git a/third_party/upb/upb/util/def_to_proto_test.h b/third_party/upb/upb/util/def_to_proto_test.h
index 7668223858087..fdd102ad05346 100644
--- a/third_party/upb/upb/util/def_to_proto_test.h
+++ b/third_party/upb/upb/util/def_to_proto_test.h
@@ -1,3 +1,10 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #ifndef UPB_UTIL_DEF_TO_PROTO_TEST_H_
 #define UPB_UTIL_DEF_TO_PROTO_TEST_H_
 
@@ -5,13 +12,14 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.upb.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/util/field_comparator.h"
+#include "upb/base/status.hpp"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
-#include "upb/upb.hpp"
 #include "upb/util/def_to_proto.h"
 
 namespace upb_test {
diff --git a/third_party/upb/upb/util/def_to_proto_test.proto b/third_party/upb/upb/util/def_to_proto_test.proto
index 862c6083142b8..e71c33ad53e9f 100644
--- a/third_party/upb/upb/util/def_to_proto_test.proto
+++ b/third_party/upb/upb/util/def_to_proto_test.proto
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto2";
 
diff --git a/third_party/upb/upb/util/def_to_proto_weak_import_test.proto b/third_party/upb/upb/util/def_to_proto_weak_import_test.proto
index 36cb66b252502..bc82f4a145c94 100644
--- a/third_party/upb/upb/util/def_to_proto_weak_import_test.proto
+++ b/third_party/upb/upb/util/def_to_proto_weak_import_test.proto
@@ -1,28 +1,8 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto3";
diff --git a/third_party/upb/upb/util/def_to_proto_wweak_import_test.proto b/third_party/upb/upb/util/def_to_proto_wweak_import_test.proto
index 36cb66b252502..bc82f4a145c94 100644
--- a/third_party/upb/upb/util/def_to_proto_wweak_import_test.proto
+++ b/third_party/upb/upb/util/def_to_proto_wweak_import_test.proto
@@ -1,28 +1,8 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto3";
diff --git a/third_party/upb/upb/util/required_fields.c b/third_party/upb/upb/util/required_fields.c
index 7715fd79502fd..4e66cdd9e6dd4 100644
--- a/third_party/upb/upb/util/required_fields.c
+++ b/third_party/upb/upb/util/required_fields.c
@@ -1,37 +1,27 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/required_fields.h"
 
+#include <assert.h>
 #include <inttypes.h>
+#include <setjmp.h>
 #include <stdarg.h>
-
-#include "upb/collections/map.h"
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "upb/base/descriptor_constants.h"
+#include "upb/message/array.h"
+#include "upb/message/map.h"
+#include "upb/message/types.h"
 #include "upb/port/vsnprintf_compat.h"
+#include "upb/reflection/def.h"
 #include "upb/reflection/message.h"
 
 // Must be last.
@@ -245,7 +235,7 @@ static void upb_util_FindUnsetRequiredInternal(upb_FindContext* ctx,
   // in the previous loop.  We do this separately because this loop will also
   // find present extensions, which the previous loop will not.
   //
-  // TODO(haberman): consider changing upb_Message_Next() to be capable of
+  // TODO: consider changing upb_Message_Next() to be capable of
   // visiting extensions only, for example with a kUpb_Message_BeginEXT
   // constant.
   size_t iter = kUpb_Message_Begin;
diff --git a/third_party/upb/upb/util/required_fields.h b/third_party/upb/upb/util/required_fields.h
index c415215ec5918..1e6bb9a0053df 100644
--- a/third_party/upb/upb/util/required_fields.h
+++ b/third_party/upb/upb/util/required_fields.h
@@ -1,33 +1,15 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_UTIL_REQUIRED_FIELDS_H_
 #define UPB_UTIL_REQUIRED_FIELDS_H_
 
+#include <stddef.h>
+
 #include "upb/reflection/def.h"
 #include "upb/reflection/message.h"
 
diff --git a/third_party/upb/upb/util/required_fields_test.cc b/third_party/upb/upb/util/required_fields_test.cc
index b6cdcdf02ec8f..167fa7e71c4c8 100644
--- a/third_party/upb/upb/util/required_fields_test.cc
+++ b/third_party/upb/upb/util/required_fields_test.cc
@@ -1,40 +1,21 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/util/required_fields.h"
 
 #include <stdlib.h>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "absl/strings/string_view.h"
+#include "upb/base/status.hpp"
 #include "upb/json/decode.h"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.hpp"
-#include "upb/upb.hpp"
 #include "upb/util/required_fields_test.upb.h"
 #include "upb/util/required_fields_test.upbdefs.h"
 
@@ -81,8 +62,8 @@ void CheckRequired(absl::string_view json,
 
   // Verify that we can pass a NULL pointer to entries when we don't care about
   // them.
-  EXPECT_EQ(!missing.empty(),
-            upb_util_HasUnsetRequired(test_msg, m.ptr(), defpool.ptr(), NULL));
+  EXPECT_EQ(!missing.empty(), upb_util_HasUnsetRequired(
+                                  test_msg, m.ptr(), defpool.ptr(), nullptr));
 }
 
 // message HasRequiredField {
diff --git a/third_party/upb/upb/util/required_fields_test.proto b/third_party/upb/upb/util/required_fields_test.proto
index a1fc3f3d1e92f..082802fe350a4 100644
--- a/third_party/upb/upb/util/required_fields_test.proto
+++ b/third_party/upb/upb/util/required_fields_test.proto
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 syntax = "proto2";
 
diff --git a/third_party/upb/upb/wire/BUILD b/third_party/upb/upb/wire/BUILD
new file mode 100644
index 0000000000000..20b421a3fccba
--- /dev/null
+++ b/third_party/upb/upb/wire/BUILD
@@ -0,0 +1,123 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+
+cc_library(
+    name = "wire",
+    srcs = [
+    ],
+    hdrs = [
+        "decode.h",
+        "encode.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        ":types",
+        "//upb:mem",
+        "//upb:message",
+        "//upb:mini_table",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    srcs = [
+        "decode.c",
+        "decode.h",
+        "decode_fast.c",
+        "encode.c",
+        "encode.h",
+    ],
+    hdrs = [
+        "decode_fast.h",
+        "internal/constants.h",
+        "internal/decode.h",
+        "internal/swap.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":eps_copy_input_stream",
+        ":reader",
+        ":types",
+        "//upb:base",
+        "//upb:hash",
+        "//upb:mem",
+        "//upb:mem_internal",
+        "//upb:message",
+        "//upb:message_accessors_internal",
+        "//upb:message_internal",
+        "//upb:message_internal_types",
+        "//upb:message_tagged_ptr",
+        "//upb:mini_table",
+        "//upb:mini_table_internal",
+        "//upb:port",
+        "@utf8_range",
+    ],
+)
+
+cc_library(
+    name = "reader",
+    srcs = [
+        "internal/swap.h",
+        "reader.c",
+    ],
+    hdrs = ["reader.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":eps_copy_input_stream",
+        ":types",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "types",
+    hdrs = ["types.h"],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "eps_copy_input_stream",
+    srcs = ["eps_copy_input_stream.c"],
+    hdrs = ["eps_copy_input_stream.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//upb:mem",
+        "//upb:port",
+    ],
+)
+
+cc_test(
+    name = "eps_copy_input_stream_test",
+    srcs = ["eps_copy_input_stream_test.cc"],
+    deps = [
+        ":eps_copy_input_stream",
+        "@com_google_googletest//:gtest_main",
+        "//upb:mem",
+    ],
+)
+
+# begin:github_only
+filegroup(
+    name = "source_files",
+    srcs = glob(
+        [
+            "**/*.c",
+            "**/*.h",
+        ],
+    ),
+    visibility = [
+        "//upb/cmake:__pkg__",
+        "//python/dist:__pkg__",
+    ]
+)
+# end:github_only
diff --git a/third_party/upb/upb/wire/common.h b/third_party/upb/upb/wire/common.h
deleted file mode 100644
index c35b57544c7bd..0000000000000
--- a/third_party/upb/upb/wire/common.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_WIRE_COMMON_H_
-#define UPB_WIRE_COMMON_H_
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define kUpb_WireFormat_DefaultDepthLimit 100
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // UPB_WIRE_COMMON_H_
diff --git a/third_party/upb/upb/wire/common_internal.h b/third_party/upb/upb/wire/common_internal.h
deleted file mode 100644
index 93e6d99b67969..0000000000000
--- a/third_party/upb/upb/wire/common_internal.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_WIRE_COMMON_INTERNAL_H_
-#define UPB_WIRE_COMMON_INTERNAL_H_
-
-// Must be last.
-#include "upb/port/def.inc"
-
-// MessageSet wire format is:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required bytes message = 3;
-//     }
-//   }
-
-enum {
-  kUpb_MsgSet_Item = 1,
-  kUpb_MsgSet_TypeId = 2,
-  kUpb_MsgSet_Message = 3,
-};
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_WIRE_COMMON_INTERNAL_H_ */
diff --git a/third_party/upb/upb/wire/decode.c b/third_party/upb/upb/wire/decode.c
index a99932d20e72b..c528c912f270c 100644
--- a/third_party/upb/upb/wire/decode.c
+++ b/third_party/upb/upb/wire/decode.c
@@ -1,50 +1,49 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/wire/decode.h"
 
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 #include "upb/base/descriptor_constants.h"
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map_internal.h"
-#include "upb/mem/arena_internal.h"
-#include "upb/message/accessors_internal.h"
+#include "upb/base/string_view.h"
+#include "upb/hash/common.h"
+#include "upb/mem/arena.h"
+#include "upb/mem/internal/arena.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/accessors.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/map.h"
 #include "upb/message/internal/map_entry.h"
+#include "upb/message/internal/message.h"
+#include "upb/message/map.h"
+#include "upb/message/message.h"
+#include "upb/message/tagged_ptr.h"
+#include "upb/mini_table/enum.h"
+#include "upb/mini_table/extension.h"
+#include "upb/mini_table/extension_registry.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/internal/enum.h"
+#include "upb/mini_table/internal/field.h"
+#include "upb/mini_table/internal/message.h"
+#include "upb/mini_table/message.h"
 #include "upb/mini_table/sub.h"
 #include "upb/port/atomic.h"
-#include "upb/wire/common.h"
-#include "upb/wire/common_internal.h"
-#include "upb/wire/decode_internal.h"
 #include "upb/wire/encode.h"
 #include "upb/wire/eps_copy_input_stream.h"
+#include "upb/wire/internal/constants.h"
+#include "upb/wire/internal/decode.h"
+#include "upb/wire/internal/swap.h"
 #include "upb/wire/reader.h"
-#include "upb/wire/swap_internal.h"
-#include "upb/wire/types.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -94,13 +93,13 @@ static const char* _upb_Decoder_DecodeMessage(upb_Decoder* d, const char* ptr,
 
 UPB_NORETURN static void* _upb_Decoder_ErrorJmp(upb_Decoder* d,
                                                 upb_DecodeStatus status) {
-  assert(status != kUpb_DecodeStatus_Ok);
+  UPB_ASSERT(status != kUpb_DecodeStatus_Ok);
   d->status = status;
   UPB_LONGJMP(d->err, 1);
 }
 
 const char* _upb_FastDecoder_ErrorJmp(upb_Decoder* d, int status) {
-  assert(status != kUpb_DecodeStatus_Ok);
+  UPB_ASSERT(status != kUpb_DecodeStatus_Ok);
   d->status = status;
   UPB_LONGJMP(d->err, 1);
   return NULL;
@@ -747,7 +746,7 @@ UPB_NOINLINE
 const char* _upb_Decoder_CheckRequired(upb_Decoder* d, const char* ptr,
                                        const upb_Message* msg,
                                        const upb_MiniTable* l) {
-  assert(l->required_count);
+  UPB_ASSERT(l->required_count);
   if (UPB_LIKELY((d->options & kUpb_DecodeOption_CheckRequired) == 0)) {
     return ptr;
   }
@@ -1013,10 +1012,10 @@ static void _upb_Decoder_CheckUnlinked(upb_Decoder* d, const upb_MiniTable* mt,
     // All other members of the oneof must be message fields that are also
     // unlinked.
     do {
-      assert(upb_MiniTableField_CType(oneof) == kUpb_CType_Message);
+      UPB_ASSERT(upb_MiniTableField_CType(oneof) == kUpb_CType_Message);
       const upb_MiniTableSub* oneof_sub =
           &mt->subs[oneof->UPB_PRIVATE(submsg_index)];
-      assert(!oneof_sub);
+      UPB_ASSERT(!oneof_sub);
     } while (upb_MiniTable_NextOneofField(mt, &oneof));
   }
 #endif  // NDEBUG
diff --git a/third_party/upb/upb/wire/decode.h b/third_party/upb/upb/wire/decode.h
index d8b8d755ed62e..7f2eafddca8f7 100644
--- a/third_party/upb/upb/wire/decode.h
+++ b/third_party/upb/upb/wire/decode.h
@@ -1,38 +1,22 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // upb_decode: parsing into a upb_Message using a upb_MiniTable.
 
 #ifndef UPB_WIRE_DECODE_H_
 #define UPB_WIRE_DECODE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "upb/mem/arena.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/extension_registry.h"
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/wire/decode_fast.c b/third_party/upb/upb/wire/decode_fast.c
index 6b048a0937fb2..8e2860a76b471 100644
--- a/third_party/upb/upb/wire/decode_fast.c
+++ b/third_party/upb/upb/wire/decode_fast.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // Fast decoder: ~3x the speed of decode.c, but requires x86-64/ARM64.
 // Also the table size grows by 2x.
@@ -37,8 +17,10 @@
 
 #include "upb/wire/decode_fast.h"
 
-#include "upb/collections/array_internal.h"
-#include "upb/wire/decode_internal.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/types.h"
+#include "upb/wire/internal/decode.h"
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/wire/decode_fast.h b/third_party/upb/upb/wire/decode_fast.h
index da606a832aed5..395342a2d6efc 100644
--- a/third_party/upb/upb/wire/decode_fast.h
+++ b/third_party/upb/upb/wire/decode_fast.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // These are the specialized field parser functions for the fast parser.
 // Generated tables will refer to these by name.
diff --git a/third_party/upb/upb/wire/decode_internal.h b/third_party/upb/upb/wire/decode_internal.h
deleted file mode 100644
index 68677363978d6..0000000000000
--- a/third_party/upb/upb/wire/decode_internal.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Internal implementation details of the decoder that are shared between
- * decode.c and decode_fast.c.
- */
-
-#ifndef UPB_WIRE_DECODE_INTERNAL_H_
-#define UPB_WIRE_DECODE_INTERNAL_H_
-
-#include "upb/mem/arena_internal.h"
-#include "upb/message/internal.h"
-#include "upb/wire/decode.h"
-#include "upb/wire/eps_copy_input_stream.h"
-#include "utf8_range.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#define DECODE_NOGROUP (uint32_t) - 1
-
-typedef struct upb_Decoder {
-  upb_EpsCopyInputStream input;
-  const upb_ExtensionRegistry* extreg;
-  const char* unknown;       // Start of unknown data, preserve at buffer flip
-  upb_Message* unknown_msg;  // Pointer to preserve data to
-  int depth;                 // Tracks recursion depth to bound stack usage.
-  uint32_t end_group;  // field number of END_GROUP tag, else DECODE_NOGROUP.
-  uint16_t options;
-  bool missing_required;
-  upb_Arena arena;
-  upb_DecodeStatus status;
-  jmp_buf err;
-
-#ifndef NDEBUG
-  const char* debug_tagstart;
-  const char* debug_valstart;
-#endif
-} upb_Decoder;
-
-/* Error function that will abort decoding with longjmp(). We can't declare this
- * UPB_NORETURN, even though it is appropriate, because if we do then compilers
- * will "helpfully" refuse to tailcall to it
- * (see: https://stackoverflow.com/a/55657013), which will defeat a major goal
- * of our optimizations. That is also why we must declare it in a separate file,
- * otherwise the compiler will see that it calls longjmp() and deduce that it is
- * noreturn. */
-const char* _upb_FastDecoder_ErrorJmp(upb_Decoder* d, int status);
-
-extern const uint8_t upb_utf8_offsets[];
-
-UPB_INLINE
-bool _upb_Decoder_VerifyUtf8Inline(const char* ptr, int len) {
-  const char* end = ptr + len;
-
-  // Check 8 bytes at a time for any non-ASCII char.
-  while (end - ptr >= 8) {
-    uint64_t data;
-    memcpy(&data, ptr, 8);
-    if (data & 0x8080808080808080) goto non_ascii;
-    ptr += 8;
-  }
-
-  // Check one byte at a time for non-ASCII.
-  while (ptr < end) {
-    if (*ptr & 0x80) goto non_ascii;
-    ptr++;
-  }
-
-  return true;
-
-non_ascii:
-  return utf8_range2((const unsigned char*)ptr, end - ptr) == 0;
-}
-
-const char* _upb_Decoder_CheckRequired(upb_Decoder* d, const char* ptr,
-                                       const upb_Message* msg,
-                                       const upb_MiniTable* l);
-
-/* x86-64 pointers always have the high 16 bits matching. So we can shift
- * left 8 and right 8 without loss of information. */
-UPB_INLINE intptr_t decode_totable(const upb_MiniTable* tablep) {
-  return ((intptr_t)tablep << 8) | tablep->table_mask;
-}
-
-UPB_INLINE const upb_MiniTable* decode_totablep(intptr_t table) {
-  return (const upb_MiniTable*)(table >> 8);
-}
-
-const char* _upb_Decoder_IsDoneFallback(upb_EpsCopyInputStream* e,
-                                        const char* ptr, int overrun);
-
-UPB_INLINE bool _upb_Decoder_IsDone(upb_Decoder* d, const char** ptr) {
-  return upb_EpsCopyInputStream_IsDoneWithCallback(
-      &d->input, ptr, &_upb_Decoder_IsDoneFallback);
-}
-
-UPB_INLINE const char* _upb_Decoder_BufferFlipCallback(
-    upb_EpsCopyInputStream* e, const char* old_end, const char* new_start) {
-  upb_Decoder* d = (upb_Decoder*)e;
-  if (!old_end) _upb_FastDecoder_ErrorJmp(d, kUpb_DecodeStatus_Malformed);
-
-  if (d->unknown) {
-    if (!_upb_Message_AddUnknown(d->unknown_msg, d->unknown,
-                                 old_end - d->unknown, &d->arena)) {
-      _upb_FastDecoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-    d->unknown = new_start;
-  }
-  return new_start;
-}
-
-#if UPB_FASTTABLE
-UPB_INLINE
-const char* _upb_FastDecoder_TagDispatch(upb_Decoder* d, const char* ptr,
-                                         upb_Message* msg, intptr_t table,
-                                         uint64_t hasbits, uint64_t tag) {
-  const upb_MiniTable* table_p = decode_totablep(table);
-  uint8_t mask = table;
-  uint64_t data;
-  size_t idx = tag & mask;
-  UPB_ASSUME((idx & 7) == 0);
-  idx >>= 3;
-  data = table_p->fasttable[idx].field_data ^ tag;
-  UPB_MUSTTAIL return table_p->fasttable[idx].field_parser(d, ptr, msg, table,
-                                                           hasbits, data);
-}
-#endif
-
-UPB_INLINE uint32_t _upb_FastDecoder_LoadTag(const char* ptr) {
-  uint16_t tag;
-  memcpy(&tag, ptr, 2);
-  return tag;
-}
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_WIRE_DECODE_INTERNAL_H_ */
diff --git a/third_party/upb/upb/wire/encode.c b/third_party/upb/upb/wire/encode.c
index 702350ab90c7a..774c6ff50a7dc 100644
--- a/third_party/upb/upb/wire/encode.c
+++ b/third_party/upb/upb/wire/encode.c
@@ -1,44 +1,40 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // We encode backwards, to avoid pre-computing lengths (one-pass encode).
 
 #include "upb/wire/encode.h"
 
+#include <setjmp.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 
-#include "upb/collections/array_internal.h"
-#include "upb/collections/map_sorter_internal.h"
-#include "upb/message/accessors_internal.h"
-#include "upb/message/extension_internal.h"
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/string_view.h"
+#include "upb/hash/common.h"
+#include "upb/hash/str_table.h"
+#include "upb/mem/arena.h"
+#include "upb/message/array.h"
+#include "upb/message/internal/accessors.h"
+#include "upb/message/internal/array.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/map.h"
+#include "upb/message/internal/map_entry.h"
+#include "upb/message/internal/map_sorter.h"
+#include "upb/message/message.h"
+#include "upb/message/tagged_ptr.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/internal/field.h"
+#include "upb/mini_table/internal/message.h"
+#include "upb/mini_table/message.h"
 #include "upb/mini_table/sub.h"
-#include "upb/wire/common.h"
-#include "upb/wire/common_internal.h"
-#include "upb/wire/swap_internal.h"
+#include "upb/wire/internal/constants.h"
+#include "upb/wire/internal/swap.h"
 #include "upb/wire/types.h"
 
 // Must be last.
@@ -98,7 +94,7 @@ static void encode_growbuffer(upb_encstate* e, size_t bytes) {
   if (!new_buf) encode_err(e, kUpb_EncodeStatus_OutOfMemory);
 
   // We want previous data at the end, realloc() put it at the beginning.
-  // TODO(salo): This is somewhat inefficient since we are copying twice.
+  // TODO: This is somewhat inefficient since we are copying twice.
   // Maybe create a realloc() that copies to the end of the new buffer?
   if (old_size > 0) {
     memmove(new_buf + new_size - old_size, e->buf, old_size);
diff --git a/third_party/upb/upb/wire/encode.h b/third_party/upb/upb/wire/encode.h
index f7e456ad363df..6fb5553143be1 100644
--- a/third_party/upb/upb/wire/encode.h
+++ b/third_party/upb/upb/wire/encode.h
@@ -1,36 +1,20 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 // upb_Encode: parsing from a upb_Message using a upb_MiniTable.
 
 #ifndef UPB_WIRE_ENCODE_H_
 #define UPB_WIRE_ENCODE_H_
 
-#include "upb/message/message.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "upb/mem/arena.h"
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -79,9 +63,9 @@ UPB_INLINE int upb_Encode_LimitDepth(uint32_t encode_options, uint32_t limit) {
   return upb_EncodeOptions_MaxDepth(max_depth) | (encode_options & 0xffff);
 }
 
-upb_EncodeStatus upb_Encode(const void* msg, const upb_MiniTable* l,
-                            int options, upb_Arena* arena, char** buf,
-                            size_t* size);
+UPB_API upb_EncodeStatus upb_Encode(const void* msg, const upb_MiniTable* l,
+                                    int options, upb_Arena* arena, char** buf,
+                                    size_t* size);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/third_party/upb/upb/wire/eps_copy_input_stream.c b/third_party/upb/upb/wire/eps_copy_input_stream.c
index ebbe40adf8d18..150cde8cec43e 100644
--- a/third_party/upb/upb/wire/eps_copy_input_stream.c
+++ b/third_party/upb/upb/wire/eps_copy_input_stream.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/wire/eps_copy_input_stream.h"
 
diff --git a/third_party/upb/upb/wire/eps_copy_input_stream.h b/third_party/upb/upb/wire/eps_copy_input_stream.h
index 9528649a3fc99..3d04f1ed453d8 100644
--- a/third_party/upb/upb/wire/eps_copy_input_stream.h
+++ b/third_party/upb/upb/wire/eps_copy_input_stream.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_WIRE_EPS_COPY_INPUT_STREAM_H_
 #define UPB_WIRE_EPS_COPY_INPUT_STREAM_H_
diff --git a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
index 3b900642292a1..7a3caa2df0754 100644
--- a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
+++ b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
@@ -1,11 +1,18 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include "upb/wire/eps_copy_input_stream.h"
 
 #include <string.h>
 
 #include <string>
 
-#include "gtest/gtest.h"
-#include "upb/upb.hpp"
+#include <gtest/gtest.h>
+#include "upb/mem/arena.hpp"
 // begin:google_only
 // #include "testing/fuzzing/fuzztest.h"
 // end:google_only
@@ -14,9 +21,10 @@ namespace {
 
 TEST(EpsCopyInputStreamTest, ZeroSize) {
   upb_EpsCopyInputStream stream;
-  const char* ptr = NULL;
+  const char* ptr = nullptr;
   upb_EpsCopyInputStream_Init(&stream, &ptr, 0, false);
-  EXPECT_TRUE(upb_EpsCopyInputStream_IsDoneWithCallback(&stream, &ptr, NULL));
+  EXPECT_TRUE(
+      upb_EpsCopyInputStream_IsDoneWithCallback(&stream, &ptr, nullptr));
 }
 
 // begin:google_only
diff --git a/third_party/upb/upb/wire/internal/constants.h b/third_party/upb/upb/wire/internal/constants.h
new file mode 100644
index 0000000000000..8c6ef9ffbdac5
--- /dev/null
+++ b/third_party/upb/upb/wire/internal/constants.h
@@ -0,0 +1,27 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_WIRE_INTERNAL_CONSTANTS_H_
+#define UPB_WIRE_INTERNAL_CONSTANTS_H_
+
+#define kUpb_WireFormat_DefaultDepthLimit 100
+
+// MessageSet wire format is:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required bytes message = 3;
+//     }
+//   }
+
+enum {
+  kUpb_MsgSet_Item = 1,
+  kUpb_MsgSet_TypeId = 2,
+  kUpb_MsgSet_Message = 3,
+};
+
+#endif /* UPB_WIRE_INTERNAL_CONSTANTS_H_ */
diff --git a/third_party/upb/upb/wire/internal/decode.h b/third_party/upb/upb/wire/internal/decode.h
new file mode 100644
index 0000000000000..a058ecb64378d
--- /dev/null
+++ b/third_party/upb/upb/wire/internal/decode.h
@@ -0,0 +1,143 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+/*
+ * Internal implementation details of the decoder that are shared between
+ * decode.c and decode_fast.c.
+ */
+
+#ifndef UPB_WIRE_INTERNAL_DECODE_H_
+#define UPB_WIRE_INTERNAL_DECODE_H_
+
+#include "upb/mem/internal/arena.h"
+#include "upb/message/internal/message.h"
+#include "upb/wire/decode.h"
+#include "upb/wire/eps_copy_input_stream.h"
+#include "utf8_range.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#define DECODE_NOGROUP (uint32_t) - 1
+
+typedef struct upb_Decoder {
+  upb_EpsCopyInputStream input;
+  const upb_ExtensionRegistry* extreg;
+  const char* unknown;       // Start of unknown data, preserve at buffer flip
+  upb_Message* unknown_msg;  // Pointer to preserve data to
+  int depth;                 // Tracks recursion depth to bound stack usage.
+  uint32_t end_group;  // field number of END_GROUP tag, else DECODE_NOGROUP.
+  uint16_t options;
+  bool missing_required;
+  upb_Arena arena;
+  upb_DecodeStatus status;
+  jmp_buf err;
+
+#ifndef NDEBUG
+  const char* debug_tagstart;
+  const char* debug_valstart;
+#endif
+} upb_Decoder;
+
+/* Error function that will abort decoding with longjmp(). We can't declare this
+ * UPB_NORETURN, even though it is appropriate, because if we do then compilers
+ * will "helpfully" refuse to tailcall to it
+ * (see: https://stackoverflow.com/a/55657013), which will defeat a major goal
+ * of our optimizations. That is also why we must declare it in a separate file,
+ * otherwise the compiler will see that it calls longjmp() and deduce that it is
+ * noreturn. */
+const char* _upb_FastDecoder_ErrorJmp(upb_Decoder* d, int status);
+
+extern const uint8_t upb_utf8_offsets[];
+
+UPB_INLINE
+bool _upb_Decoder_VerifyUtf8Inline(const char* ptr, int len) {
+  const char* end = ptr + len;
+
+  // Check 8 bytes at a time for any non-ASCII char.
+  while (end - ptr >= 8) {
+    uint64_t data;
+    memcpy(&data, ptr, 8);
+    if (data & 0x8080808080808080) goto non_ascii;
+    ptr += 8;
+  }
+
+  // Check one byte at a time for non-ASCII.
+  while (ptr < end) {
+    if (*ptr & 0x80) goto non_ascii;
+    ptr++;
+  }
+
+  return true;
+
+non_ascii:
+  return utf8_range2((const unsigned char*)ptr, end - ptr) == 0;
+}
+
+const char* _upb_Decoder_CheckRequired(upb_Decoder* d, const char* ptr,
+                                       const upb_Message* msg,
+                                       const upb_MiniTable* l);
+
+/* x86-64 pointers always have the high 16 bits matching. So we can shift
+ * left 8 and right 8 without loss of information. */
+UPB_INLINE intptr_t decode_totable(const upb_MiniTable* tablep) {
+  return ((intptr_t)tablep << 8) | tablep->table_mask;
+}
+
+UPB_INLINE const upb_MiniTable* decode_totablep(intptr_t table) {
+  return (const upb_MiniTable*)(table >> 8);
+}
+
+const char* _upb_Decoder_IsDoneFallback(upb_EpsCopyInputStream* e,
+                                        const char* ptr, int overrun);
+
+UPB_INLINE bool _upb_Decoder_IsDone(upb_Decoder* d, const char** ptr) {
+  return upb_EpsCopyInputStream_IsDoneWithCallback(
+      &d->input, ptr, &_upb_Decoder_IsDoneFallback);
+}
+
+UPB_INLINE const char* _upb_Decoder_BufferFlipCallback(
+    upb_EpsCopyInputStream* e, const char* old_end, const char* new_start) {
+  upb_Decoder* d = (upb_Decoder*)e;
+  if (!old_end) _upb_FastDecoder_ErrorJmp(d, kUpb_DecodeStatus_Malformed);
+
+  if (d->unknown) {
+    if (!_upb_Message_AddUnknown(d->unknown_msg, d->unknown,
+                                 old_end - d->unknown, &d->arena)) {
+      _upb_FastDecoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory);
+    }
+    d->unknown = new_start;
+  }
+  return new_start;
+}
+
+#if UPB_FASTTABLE
+UPB_INLINE
+const char* _upb_FastDecoder_TagDispatch(upb_Decoder* d, const char* ptr,
+                                         upb_Message* msg, intptr_t table,
+                                         uint64_t hasbits, uint64_t tag) {
+  const upb_MiniTable* table_p = decode_totablep(table);
+  uint8_t mask = table;
+  uint64_t data;
+  size_t idx = tag & mask;
+  UPB_ASSUME((idx & 7) == 0);
+  idx >>= 3;
+  data = table_p->fasttable[idx].field_data ^ tag;
+  UPB_MUSTTAIL return table_p->fasttable[idx].field_parser(d, ptr, msg, table,
+                                                           hasbits, data);
+}
+#endif
+
+UPB_INLINE uint32_t _upb_FastDecoder_LoadTag(const char* ptr) {
+  uint16_t tag;
+  memcpy(&tag, ptr, 2);
+  return tag;
+}
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_WIRE_INTERNAL_DECODE_H_ */
diff --git a/third_party/upb/upb/wire/internal/swap.h b/third_party/upb/upb/wire/internal/swap.h
new file mode 100644
index 0000000000000..a203e45c43236
--- /dev/null
+++ b/third_party/upb/upb/wire/internal/swap.h
@@ -0,0 +1,45 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_WIRE_INTERNAL_SWAP_H_
+#define UPB_WIRE_INTERNAL_SWAP_H_
+
+#include <stdint.h>
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+UPB_INLINE bool _upb_IsLittleEndian(void) {
+  int x = 1;
+  return *(char*)&x == 1;
+}
+
+UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
+  if (_upb_IsLittleEndian()) return val;
+
+  return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
+         ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
+}
+
+UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
+  if (_upb_IsLittleEndian()) return val;
+
+  return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
+         _upb_BigEndian_Swap32((uint32_t)(val >> 32));
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_WIRE_INTERNAL_SWAP_H_ */
diff --git a/third_party/upb/upb/wire/reader.c b/third_party/upb/upb/wire/reader.c
index a84fb0b912988..de6cde4fe7432 100644
--- a/third_party/upb/upb/wire/reader.c
+++ b/third_party/upb/upb/wire/reader.c
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include "upb/wire/reader.h"
 
diff --git a/third_party/upb/upb/wire/reader.h b/third_party/upb/upb/wire/reader.h
index b9597440276dc..2181aa6a5e9ce 100644
--- a/third_party/upb/upb/wire/reader.h
+++ b/third_party/upb/upb/wire/reader.h
@@ -1,36 +1,16 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_WIRE_READER_H_
 #define UPB_WIRE_READER_H_
 
 #include "upb/wire/eps_copy_input_stream.h"
-#include "upb/wire/swap_internal.h"
-#include "upb/wire/types.h"
+#include "upb/wire/internal/swap.h"
+#include "upb/wire/types.h"  // IWYU pragma: export
 
 // Must be last.
 #include "upb/port/def.inc"
diff --git a/third_party/upb/upb/wire/swap_internal.h b/third_party/upb/upb/wire/swap_internal.h
deleted file mode 100644
index d79d4c3c59369..0000000000000
--- a/third_party/upb/upb/wire/swap_internal.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_WIRE_SWAP_INTERNAL_H_
-#define UPB_WIRE_SWAP_INTERNAL_H_
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-UPB_INLINE bool _upb_IsLittleEndian(void) {
-  int x = 1;
-  return *(char*)&x == 1;
-}
-
-UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
-  if (_upb_IsLittleEndian()) return val;
-
-  return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
-         ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
-}
-
-UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
-  if (_upb_IsLittleEndian()) return val;
-
-  return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
-         _upb_BigEndian_Swap32((uint32_t)(val >> 32));
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPB_WIRE_SWAP_INTERNAL_H_ */
diff --git a/third_party/upb/upb/wire/types.h b/third_party/upb/upb/wire/types.h
index f719d7d776ec3..459f0dd199c19 100644
--- a/third_party/upb/upb/wire/types.h
+++ b/third_party/upb/upb/wire/types.h
@@ -1,29 +1,9 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Protocol Buffers - Google's data interchange format
+// Copyright 2023 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #ifndef UPB_WIRE_TYPES_H_
 #define UPB_WIRE_TYPES_H_
diff --git a/third_party/upb/upbc/BUILD b/third_party/upb/upbc/BUILD
deleted file mode 100644
index 3ba463b8a3cd1..0000000000000
--- a/third_party/upb/upbc/BUILD
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Google LLC nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-load(
-    "//bazel:build_defs.bzl",
-    "UPB_DEFAULT_COPTS",
-    "UPB_DEFAULT_CPPOPTS",
-)
-load(
-    "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
-    "upb_proto_reflection_library",
-)
-load(
-    "//upbc:bootstrap_compiler.bzl",
-    "bootstrap_cc_binary",
-    "bootstrap_cc_library",
-    "bootstrap_upb_proto_library",
-)
-
-# begin:google_only
-# package(default_applicable_licenses = ["//:license"])
-# end:google_only
-
-licenses(["notice"])
-
-proto_library(
-    name = "code_generator_request",
-    srcs = ["code_generator_request.proto"],
-    visibility = ["//:friends"],
-    deps = ["@com_google_protobuf//:compiler_plugin_proto"],
-)
-
-upb_proto_library(
-    name = "code_generator_request_upb_proto",
-    visibility = ["//:friends"],
-    deps = [":code_generator_request"],
-)
-
-upb_proto_reflection_library(
-    name = "code_generator_request_upb_proto_reflection",
-    visibility = ["//:friends"],
-    deps = [":code_generator_request"],
-)
-
-bootstrap_upb_proto_library(
-    name = "plugin_upb_proto",
-    base_dir = "",
-    # TODO(b/289127200): Export 'net/proto2/proto/descriptor.upb.h' and remove "-layering_check".
-    features = ["-layering_check"],
-    google3_src_files = [
-        "net/proto2/compiler/proto/profile.proto",
-        "third_party/protobuf/compiler/plugin.proto",
-    ],
-    google3_src_rules = [
-        "//net/proto2/proto:descriptor_proto_source",
-        "//net/proto2/compiler/proto:profile.proto",
-        "//third_party/protobuf/compiler:plugin_proto_source",
-    ],
-    oss_src_files = ["google/protobuf/compiler/plugin.proto"],
-    oss_src_rules = [
-        "@com_google_protobuf//:descriptor_proto_srcs",
-        "@com_google_protobuf//src/google/protobuf/compiler:plugin_proto_src",
-    ],
-    oss_strip_prefix = "third_party/protobuf/github/bootstrap/src",
-    proto_lib_deps = ["@com_google_protobuf//:compiler_plugin_proto"],
-    visibility = ["//:friends"],
-    deps = ["//:descriptor_upb_proto"],
-)
-
-upb_proto_reflection_library(
-    name = "plugin_upb_proto_reflection",
-    visibility = ["//:friends"],
-    deps = ["@com_google_protobuf//:compiler_plugin_proto"],
-)
-
-bootstrap_cc_library(
-    name = "common",
-    srcs = [
-        "common.cc",
-    ],
-    hdrs = [
-        "common.h",
-    ],
-    bootstrap_deps = [
-        "//:reflection",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
-    deps = [
-        "@com_google_absl//absl/strings",
-    ],
-)
-
-bootstrap_cc_library(
-    name = "file_layout",
-    srcs = [
-        "file_layout.cc",
-    ],
-    hdrs = [
-        "file_layout.h",
-    ],
-    bootstrap_deps = [
-        ":common",
-        "//:reflection",
-        "//:descriptor_upb_proto",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
-    deps = [
-        "//:mini_table",
-        "//:mini_table_internal",
-        "//:port",
-        "//:upb",
-        "//upb/mini_descriptor",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
-cc_library(
-    name = "keywords",
-    srcs = [
-        "keywords.cc",
-    ],
-    hdrs = [
-        "keywords.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
-)
-
-bootstrap_cc_library(
-    name = "plugin",
-    hdrs = [
-        "plugin.h",
-    ],
-    bootstrap_deps = [
-        ":plugin_upb_proto",
-        "//:descriptor_upb_proto",
-        "//:reflection",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
-    deps = [
-        "//:port",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
-bootstrap_cc_library(
-    name = "names",
-    srcs = [
-        "names.cc",
-    ],
-    hdrs = [
-        "names.h",
-    ],
-    bootstrap_deps = [
-        "//:reflection",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
-    deps = [
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/strings",
-        "@com_google_protobuf//:protobuf",
-        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
-    ],
-)
-
-cc_binary(
-    name = "libupbc.so",
-    srcs = ["upbc_so.c"],
-    copts = UPB_DEFAULT_COPTS + ["-DUPB_BUILD_API"],
-    linkshared = 1,
-    linkstatic = 1,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":upbdev",
-        "//:port",
-    ],
-)
-
-cc_library(
-    name = "upbdev",
-    srcs = [
-        "code_generator_request.c",
-        "code_generator_request.h",
-        "upbdev.c",
-    ],
-    hdrs = [
-        "upbdev.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:private"],
-    deps = [
-        ":code_generator_request_upb_proto",
-        ":code_generator_request_upb_proto_reflection",
-        ":plugin_upb_proto",
-        ":plugin_upb_proto_reflection",
-        "//:base",
-        "//:json",
-        "//:mem",
-        "//:mini_table",
-        "//:port",
-        "//:reflection",
-        "//upb/json",
-        "//upb/mini_descriptor",
-    ],
-)
-
-bootstrap_cc_binary(
-    name = "protoc-gen-upb",
-    srcs = ["protoc-gen-upb.cc"],
-    bootstrap_deps = [
-        ":common",
-        ":file_layout",
-        ":names",
-        ":plugin",
-        ":plugin_upb_proto",
-        "//:descriptor_upb_proto",
-        "//:reflection",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:base",
-        "//:mem",
-        "//:mini_table_internal",
-        "//:port",
-        "//:wire_types",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
-cc_binary(
-    name = "protoc-gen-upbdefs",
-    srcs = [
-        "protoc-gen-upbdefs.cc",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    # To work around the following link error from ABSL:
-    # /usr/bin/x86_64-linux-gnu-ld: bazel-out/k8-opt-exec-2B5CBBC6-ST-c1776f9924ec/bin/external/com_google_absl/absl/time/libtime.a(duration.o): undefined reference to symbol 'floor@@GLIBC_2.2.5'
-    # /usr/bin/x86_64-linux-gnu-ld: /opt/manylinux/2014/x86_64/lib64/libm.so.6: error adding symbols: DSO missing from command line
-    # clang-14: error: linker command failed with exit code 1 (use -v to see invocation)
-    linkopts = ["-lm"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":common",
-        ":file_layout",
-        ":plugin",
-        "//:descriptor_upb_proto",
-        "//:reflection",
-        "//upb/util:def_to_proto",
-    ],
-)
-
-cc_binary(
-    name = "protoc-gen-upbdev",
-    srcs = [
-        "protoc-gen-upbdev.cc",
-        "subprocess.cc",
-        "subprocess.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-    target_compatible_with = select({
-        "@platforms//os:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":plugin_upb_proto",
-        ":upbdev",
-        "//:port",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings",
-    ],
-)
diff --git a/third_party/upb/upbc/bootstrap_compiler.bzl b/third_party/upb/upbc/bootstrap_compiler.bzl
deleted file mode 100644
index 3a9e645bd86c0..0000000000000
--- a/third_party/upb/upbc/bootstrap_compiler.bzl
+++ /dev/null
@@ -1,166 +0,0 @@
-"""Macros that implement bootstrapping for the upb code generator."""
-
-load(
-    "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
-)
-load(
-    "//cmake:build_defs.bzl",
-    "staleness_test",
-)
-
-_stages = ["_stage0", "_stage1", ""]
-_protoc = "@com_google_protobuf//:protoc"
-_upbc_base = "//upbc:protoc-gen-upb"
-
-# begin:google_only
-# _is_google3 = True
-# _extra_proto_path = ""
-# end:google_only
-
-# begin:github_only
-_is_google3 = False
-_extra_proto_path = "-Iexternal/com_google_protobuf/src "
-# end:github_only
-
-def _upbc(stage):
-    return _upbc_base + _stages[stage]
-
-def bootstrap_cc_library(name, visibility, deps, bootstrap_deps, **kwargs):
-    for stage in _stages:
-        stage_visibility = visibility if stage == "" else ["//upbc:__pkg__"]
-        native.cc_library(
-            name = name + stage,
-            deps = deps + [dep + stage for dep in bootstrap_deps],
-            visibility = stage_visibility,
-            **kwargs
-        )
-
-def bootstrap_cc_binary(name, deps, bootstrap_deps, **kwargs):
-    for stage in _stages:
-        native.cc_binary(
-            name = name + stage,
-            deps = deps + [dep + stage for dep in bootstrap_deps],
-            **kwargs
-        )
-
-def _generated_srcs_for_suffix(prefix, srcs, suffix):
-    return [prefix + "/" + src[:-len(".proto")] + suffix for src in srcs]
-
-def _generated_srcs(prefix, srcs):
-    return _generated_srcs_for_suffix(prefix, srcs, ".upb.h") + _generated_srcs_for_suffix(prefix, srcs, ".upb.c")
-
-def _stage0_proto_staleness_test(name, base_dir, src_files, src_rules, strip_prefix):
-    native.genrule(
-        name = name + "_generate_bootstrap",
-        srcs = src_rules,
-        outs = _generated_srcs("bootstrap_generated_sources/" + base_dir + "stage0", src_files),
-        tools = [_protoc, _upbc(0)],
-        cmd =
-            "$(location " + _protoc + ") " +
-            "-I$(GENDIR)/" + strip_prefix + " " + _extra_proto_path +
-            "--plugin=protoc-gen-upb=$(location " + _upbc(0) + ") " +
-            "--upb_out=bootstrap_upb:$(@D)/bootstrap_generated_sources/" + base_dir + "stage0 " +
-            " ".join(src_files),
-    )
-
-    staleness_test(
-        name = name + "_staleness_test",
-        outs = _generated_srcs(base_dir + "stage0", src_files),
-        generated_pattern = "bootstrap_generated_sources/%s",
-        target_files = native.glob([base_dir + "stage0/**"]),
-        # To avoid skew problems for descriptor.proto/pluging.proto between
-        # GitHub repos.  It's not critical that the checked-in protos are up to
-        # date for every change, they just needs to be complete enough to have
-        # everything needed by the code generator itself.
-        tags = ["manual"],
-    )
-
-def bootstrap_upb_proto_library(
-        name,
-        base_dir,
-        google3_src_files,
-        google3_src_rules,
-        oss_src_files,
-        oss_src_rules,
-        oss_strip_prefix,
-        proto_lib_deps,
-        visibility,
-        deps = [],
-        **kwargs):
-    """A version of upb_proto_library() that is augmented to allow for bootstrapping the compiler.
-
-    Args:
-        name: Name of this rule.  This name will resolve to a upb_proto_library().
-        base_dir: The directory that all generated files should be placed under.
-        google3_src_files: Google3 filenames of .proto files that should be built by this rule.
-          The names should be relative to the depot base.
-        google3_src_rules: Target names of the Blaze rules that will provide these filenames.
-        oss_src_files: OSS filenames of .proto files that should be built by this rule.
-        oss_src_rules: Target names of the Bazel rules that will provide these filenames.
-        oss_strip_prefix: Prefix that should be stripped from OSS file names.
-        proto_lib_deps: proto_library() rules that we will use to build the protos when we are
-          not bootstrapping.
-        visibility: Visibility list for the final upb_proto_library() rule.  Bootstrapping rules
-          will always be hidden, and will not honor the visibility parameter passed here.
-        deps: other bootstrap_upb_proto_library() rules that this one depends on.
-        **kwargs: Other arguments that will be passed through to cc_library(), genrule(), and
-          upb_proto_library().
-    """
-    _stage0_proto_staleness_test(name, base_dir, oss_src_files, oss_src_rules, oss_strip_prefix)
-
-    # stage0 uses checked-in protos.
-    native.cc_library(
-        name = name + "_stage0",
-        srcs = _generated_srcs_for_suffix(base_dir + "stage0", oss_src_files, ".upb.c"),
-        hdrs = _generated_srcs_for_suffix(base_dir + "stage0", oss_src_files, ".upb.h"),
-        includes = [base_dir + "stage0"],
-        visibility = ["//upbc:__pkg__"],
-        # This macro signals to the runtime that it must use OSS APIs for descriptor.proto/plugin.proto.
-        defines = ["UPB_BOOTSTRAP_STAGE0"],
-        deps = [
-            "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-            "//:mini_table",
-        ] + [dep + "_stage0" for dep in deps],
-        **kwargs
-    )
-
-    src_files = google3_src_files if _is_google3 else oss_src_files
-    src_rules = google3_src_rules if _is_google3 else oss_src_rules
-
-    # Generate stage1 protos using stage0 compiler.
-    native.genrule(
-        name = "gen_" + name + "_stage1",
-        srcs = src_rules,
-        outs = _generated_srcs(base_dir + "stage1", src_files),
-        cmd = "$(location " + _protoc + ") " +
-              "--plugin=protoc-gen-upb=$(location " + _upbc(0) + ") " + _extra_proto_path +
-              "--upb_out=$(@D)/" + base_dir + "stage1 " +
-              " ".join(src_files),
-        visibility = ["//upbc:__pkg__"],
-        tools = [
-            _protoc,
-            _upbc(0),
-        ],
-        **kwargs
-    )
-
-    native.cc_library(
-        name = name + "_stage1",
-        srcs = _generated_srcs_for_suffix(base_dir + "stage1", src_files, ".upb.c"),
-        hdrs = _generated_srcs_for_suffix(base_dir + "stage1", src_files, ".upb.h"),
-        includes = [base_dir + "stage1"],
-        visibility = ["//upbc:__pkg__"],
-        deps = [
-            "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        ] + [dep + "_stage1" for dep in deps],
-        **kwargs
-    )
-
-    # The final protos are generated via normal upb_proto_library().
-    upb_proto_library(
-        name = name,
-        deps = proto_lib_deps,
-        visibility = visibility,
-        **kwargs
-    )
diff --git a/third_party/upb/upbc/code_generator_request.c b/third_party/upb/upbc/code_generator_request.c
deleted file mode 100644
index 836b41438bb0e..0000000000000
--- a/third_party/upb/upbc/code_generator_request.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upbc/code_generator_request.h"
-
-#include <inttypes.h>
-
-#include "google/protobuf/compiler/plugin.upb.h"
-#include "upb/mini_descriptor/decode.h"
-#include "upb/reflection/def.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-/******************************************************************************/
-
-// Kitchen sink storage for all of our state as we build the mini descriptors.
-
-typedef struct {
-  upb_Arena* arena;
-  upb_Status* status;
-  upb_DefPool* symtab;
-
-  upbc_CodeGeneratorRequest* out;
-
-  jmp_buf jmp;
-} upbc_State;
-
-static void upbc_State_Fini(upbc_State* s) {
-  if (s->symtab) upb_DefPool_Free(s->symtab);
-}
-
-UPB_NORETURN static void upbc_Error(upbc_State* s, const char* fn,
-                                    const char* msg) {
-  upb_Status_SetErrorFormat(s->status, "%s(): %s", fn, msg);
-  upbc_State_Fini(s);
-  UPB_LONGJMP(s->jmp, -1);
-}
-
-static void upbc_State_Init(upbc_State* s) {
-  s->symtab = upb_DefPool_New();
-  if (!s->symtab) upbc_Error(s, __func__, "could not allocate def pool");
-
-  s->out = upbc_CodeGeneratorRequest_new(s->arena);
-  if (!s->out) upbc_Error(s, __func__, "could not allocate request");
-}
-
-static upb_StringView upbc_State_StrDup(upbc_State* s, const char* str) {
-  upb_StringView from = upb_StringView_FromString(str);
-  char* to = upb_Arena_Malloc(s->arena, from.size);
-  if (!to) upbc_Error(s, __func__, "Out of memory");
-  memcpy(to, from.data, from.size);
-  return upb_StringView_FromDataAndSize(to, from.size);
-}
-
-static void upbc_State_AddMiniDescriptor(upbc_State* s, const char* name,
-                                         upb_StringView encoding) {
-  const upb_StringView key = upb_StringView_FromString(name);
-  upbc_CodeGeneratorRequest_UpbInfo* info =
-      upbc_CodeGeneratorRequest_UpbInfo_new(s->arena);
-  if (!info) upbc_Error(s, __func__, "Out of memory");
-  upbc_CodeGeneratorRequest_UpbInfo_set_mini_descriptor(info, encoding);
-  bool ok = upbc_CodeGeneratorRequest_upb_info_set(s->out, key, info, s->arena);
-  if (!ok) upbc_Error(s, __func__, "could not set mini descriptor in map");
-}
-
-/******************************************************************************/
-
-// Forward declaration.
-static void upbc_Scrape_Message(upbc_State*, const upb_MessageDef*);
-
-static void upbc_Scrape_Enum(upbc_State* s, const upb_EnumDef* e) {
-  upb_StringView desc;
-  bool ok = upb_EnumDef_MiniDescriptorEncode(e, s->arena, &desc);
-  if (!ok) upbc_Error(s, __func__, "could not encode enum");
-
-  upbc_State_AddMiniDescriptor(s, upb_EnumDef_FullName(e), desc);
-}
-
-static void upbc_Scrape_Extension(upbc_State* s, const upb_FieldDef* f) {
-  upb_StringView desc;
-  bool ok = upb_FieldDef_MiniDescriptorEncode(f, s->arena, &desc);
-  if (!ok) upbc_Error(s, __func__, "could not encode extension");
-
-  upbc_State_AddMiniDescriptor(s, upb_FieldDef_FullName(f), desc);
-}
-
-static void upbc_Scrape_FileEnums(upbc_State* s, const upb_FileDef* f) {
-  const size_t len = upb_FileDef_TopLevelEnumCount(f);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Enum(s, upb_FileDef_TopLevelEnum(f, i));
-  }
-}
-
-static void upbc_Scrape_FileExtensions(upbc_State* s, const upb_FileDef* f) {
-  const size_t len = upb_FileDef_TopLevelExtensionCount(f);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Extension(s, upb_FileDef_TopLevelExtension(f, i));
-  }
-}
-
-static void upbc_Scrape_FileMessages(upbc_State* s, const upb_FileDef* f) {
-  const size_t len = upb_FileDef_TopLevelMessageCount(f);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Message(s, upb_FileDef_TopLevelMessage(f, i));
-  }
-}
-
-static void upbc_Scrape_File(upbc_State* s, const upb_FileDef* f) {
-  upbc_Scrape_FileEnums(s, f);
-  upbc_Scrape_FileExtensions(s, f);
-  upbc_Scrape_FileMessages(s, f);
-}
-
-static void upbc_Scrape_Files(upbc_State* s) {
-  const google_protobuf_compiler_CodeGeneratorRequest* request =
-      upbc_CodeGeneratorRequest_request(s->out);
-
-  size_t len = 0;
-  const google_protobuf_FileDescriptorProto* const* files =
-      google_protobuf_compiler_CodeGeneratorRequest_proto_file(request, &len);
-
-  for (size_t i = 0; i < len; i++) {
-    const upb_FileDef* f = upb_DefPool_AddFile(s->symtab, files[i], s->status);
-    if (!f) upbc_Error(s, __func__, "could not add file to def pool");
-
-    upbc_Scrape_File(s, f);
-  }
-}
-
-static void upbc_Scrape_NestedEnums(upbc_State* s, const upb_MessageDef* m) {
-  const size_t len = upb_MessageDef_NestedEnumCount(m);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Enum(s, upb_MessageDef_NestedEnum(m, i));
-  }
-}
-
-static void upbc_Scrape_NestedExtensions(upbc_State* s,
-                                         const upb_MessageDef* m) {
-  const size_t len = upb_MessageDef_NestedExtensionCount(m);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Extension(s, upb_MessageDef_NestedExtension(m, i));
-  }
-}
-
-static void upbc_Scrape_NestedMessages(upbc_State* s, const upb_MessageDef* m) {
-  const size_t len = upb_MessageDef_NestedMessageCount(m);
-
-  for (size_t i = 0; i < len; i++) {
-    upbc_Scrape_Message(s, upb_MessageDef_NestedMessage(m, i));
-  }
-}
-
-static void upbc_Scrape_MessageSubs(upbc_State* s,
-                                    upbc_CodeGeneratorRequest_UpbInfo* info,
-                                    const upb_MessageDef* m) {
-  const upb_MiniTableField** fields =
-      malloc(upb_MessageDef_FieldCount(m) * sizeof(*fields));
-  const upb_MiniTable* mt = upb_MessageDef_MiniTable(m);
-  uint32_t counts = upb_MiniTable_GetSubList(mt, fields);
-  uint32_t msg_count = counts >> 16;
-  uint32_t enum_count = counts & 0xffff;
-
-  for (uint32_t i = 0; i < msg_count; i++) {
-    const upb_FieldDef* f =
-        upb_MessageDef_FindFieldByNumber(m, fields[i]->number);
-    if (!f) upbc_Error(s, __func__, "Missing f");
-    const upb_MessageDef* sub = upb_FieldDef_MessageSubDef(f);
-    if (!sub) upbc_Error(s, __func__, "Missing sub");
-    upb_StringView name = upbc_State_StrDup(s, upb_MessageDef_FullName(sub));
-    upbc_CodeGeneratorRequest_UpbInfo_add_sub_message(info, name, s->arena);
-  }
-
-  for (uint32_t i = 0; i < enum_count; i++) {
-    const upb_FieldDef* f =
-        upb_MessageDef_FindFieldByNumber(m, fields[msg_count + i]->number);
-    if (!f) upbc_Error(s, __func__, "Missing f (2)");
-    const upb_EnumDef* sub = upb_FieldDef_EnumSubDef(f);
-    if (!sub) upbc_Error(s, __func__, "Missing sub (2)");
-    upb_StringView name = upbc_State_StrDup(s, upb_EnumDef_FullName(sub));
-    upbc_CodeGeneratorRequest_UpbInfo_add_sub_enum(info, name, s->arena);
-  }
-
-  free(fields);
-}
-
-static void upbc_Scrape_Message(upbc_State* s, const upb_MessageDef* m) {
-  upb_StringView desc;
-  bool ok = upb_MessageDef_MiniDescriptorEncode(m, s->arena, &desc);
-  if (!ok) upbc_Error(s, __func__, "could not encode message");
-
-  upbc_CodeGeneratorRequest_UpbInfo* info =
-      upbc_CodeGeneratorRequest_UpbInfo_new(s->arena);
-  if (!info) upbc_Error(s, __func__, "Out of memory");
-  upbc_CodeGeneratorRequest_UpbInfo_set_mini_descriptor(info, desc);
-
-  upbc_Scrape_MessageSubs(s, info, m);
-
-  const upb_StringView key = upbc_State_StrDup(s, upb_MessageDef_FullName(m));
-  ok = upbc_CodeGeneratorRequest_upb_info_set(s->out, key, info, s->arena);
-  if (!ok) upbc_Error(s, __func__, "could not set mini descriptor in map");
-
-  upbc_Scrape_NestedEnums(s, m);
-  upbc_Scrape_NestedExtensions(s, m);
-  upbc_Scrape_NestedMessages(s, m);
-}
-
-static upbc_CodeGeneratorRequest* upbc_State_MakeCodeGeneratorRequest(
-    upbc_State* const s, google_protobuf_compiler_CodeGeneratorRequest* const request) {
-  if (UPB_SETJMP(s->jmp)) return NULL;
-  upbc_State_Init(s);
-
-  upbc_CodeGeneratorRequest_set_request(s->out, request);
-  upbc_Scrape_Files(s);
-  upbc_State_Fini(s);
-  return s->out;
-}
-
-upbc_CodeGeneratorRequest* upbc_MakeCodeGeneratorRequest(
-    google_protobuf_compiler_CodeGeneratorRequest* request, upb_Arena* arena,
-    upb_Status* status) {
-  upbc_State s = {
-      .arena = arena,
-      .status = status,
-      .symtab = NULL,
-      .out = NULL,
-  };
-
-  return upbc_State_MakeCodeGeneratorRequest(&s, request);
-}
diff --git a/third_party/upb/upbc/code_generator_request.h b/third_party/upb/upbc/code_generator_request.h
deleted file mode 100644
index fc10e8a9e0a10..0000000000000
--- a/third_party/upb/upbc/code_generator_request.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPBC_CODE_GENERATOR_REQUEST_H_
-#define UPBC_CODE_GENERATOR_REQUEST_H_
-
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-#include "upbc/code_generator_request.upb.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upbc_CodeGeneratorRequest* upbc_MakeCodeGeneratorRequest(
-    struct google_protobuf_compiler_CodeGeneratorRequest* request, upb_Arena* a,
-    upb_Status* s);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif /* UPBC_CODE_GENERATOR_REQUEST_H_ */
diff --git a/third_party/upb/upbc/code_generator_request.proto b/third_party/upb/upbc/code_generator_request.proto
deleted file mode 100644
index 4d10376de7380..0000000000000
--- a/third_party/upb/upbc/code_generator_request.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto2";
-
-package upbc;
-
-import "google/protobuf/compiler/plugin.proto";
-
-message CodeGeneratorRequest {
-  message UpbInfo {
-    optional string mini_descriptor = 1;
-
-    // An ordered list of fully qualified sub-message names whose upb_MiniTable
-    // should be passed to upb_MiniTable_Link().
-    repeated string sub_message = 3;
-
-    // An ordered list of fully qualified sub-enum names whose upb_MiniTableEnum
-    // should be passed to upb_MiniTable_Link().
-    repeated string sub_enum = 4;
-  }
-
-  // The pb sent by protoc to its plugins.
-  optional google.protobuf.compiler.CodeGeneratorRequest request = 1;
-
-  // upb-specific info for the messages/enums/extensions in the request, keyed
-  // by the fully qualified names.
-  map<string, UpbInfo> upb_info = 2;
-}
diff --git a/third_party/upb/upbc/common.cc b/third_party/upb/upbc/common.cc
deleted file mode 100644
index b4942e6d7fe79..0000000000000
--- a/third_party/upb/upbc/common.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "upbc/common.h"
-
-#include "absl/strings/str_replace.h"
-#include "upb/reflection/def.hpp"
-
-namespace upbc {
-
-std::string StripExtension(absl::string_view fname) {
-  size_t lastdot = fname.find_last_of('.');
-  if (lastdot == std::string::npos) {
-    return std::string(fname);
-  }
-  return std::string(fname.substr(0, lastdot));
-}
-
-std::string ToCIdent(absl::string_view str) {
-  return absl::StrReplaceAll(str, {{".", "_"}, {"/", "_"}, {"-", "_"}});
-}
-
-std::string ToPreproc(absl::string_view str) {
-  return absl::AsciiStrToUpper(ToCIdent(str));
-}
-
-void EmitFileWarning(absl::string_view name, Output& output) {
-  output(
-      "/* This file was generated by upbc (the upb compiler) from the input\n"
-      " * file:\n"
-      " *\n"
-      " *     $0\n"
-      " *\n"
-      " * Do not edit -- your changes will be discarded when the file is\n"
-      " * regenerated. */\n\n",
-      name);
-}
-
-std::string MessageName(upb::MessageDefPtr descriptor) {
-  return ToCIdent(descriptor.full_name());
-}
-
-std::string FileLayoutName(upb::FileDefPtr file) {
-  return ToCIdent(file.name()) + "_upb_file_layout";
-}
-
-std::string HeaderFilename(upb::FileDefPtr file) {
-  return StripExtension(file.name()) + ".upb.h";
-}
-
-std::string MessageInit(absl::string_view full_name) {
-  return ToCIdent(full_name) + "_msg_init";
-}
-
-std::string EnumInit(upb::EnumDefPtr descriptor) {
-  return ToCIdent(descriptor.full_name()) + "_enum_init";
-}
-
-}  // namespace upbc
diff --git a/third_party/upb/upbc/common.h b/third_party/upb/upbc/common.h
deleted file mode 100644
index aaa43a6c4d422..0000000000000
--- a/third_party/upb/upbc/common.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPBC_COMMON_H
-#define UPBC_COMMON_H
-
-#include <vector>
-
-#include "absl/strings/str_replace.h"
-#include "absl/strings/substitute.h"
-#include "upb/reflection/def.hpp"
-
-namespace upbc {
-
-class Output {
- public:
-  template <class... Arg>
-  void operator()(absl::string_view format, const Arg&... arg) {
-    Write(absl::Substitute(format, arg...));
-  }
-
-  absl::string_view output() const { return output_; }
-
- private:
-  void Write(absl::string_view data) {
-    std::string stripped;
-    if (absl::StartsWith(data, "\n ")) {
-      size_t indent = data.substr(1).find_first_not_of(' ');
-      if (indent != absl::string_view::npos) {
-        // Remove indentation from all lines.
-        auto line_prefix = data.substr(0, indent + 1);
-        // The final line has an extra newline and is indented two less, eg.
-        //    R"cc(
-        //      UPB_INLINE $0 $1_$2(const $1 *msg) {
-        //        return $1_has_$2(msg) ? *UPB_PTR_AT(msg, $3, $0) : $4;
-        //      }
-        //    )cc",
-        std::string last_line_prefix = std::string(line_prefix);
-        last_line_prefix.resize(last_line_prefix.size() - 2);
-        data.remove_prefix(line_prefix.size());
-        stripped = absl::StrReplaceAll(
-            data, {{line_prefix, "\n"}, {last_line_prefix, "\n"}});
-        data = stripped;
-      }
-    }
-    absl::StrAppend(&output_, data);
-  }
-
-  std::string output_;
-};
-
-std::string StripExtension(absl::string_view fname);
-std::string ToCIdent(absl::string_view str);
-std::string ToPreproc(absl::string_view str);
-void EmitFileWarning(absl::string_view name, Output& output);
-std::string MessageName(upb::MessageDefPtr descriptor);
-std::string FileLayoutName(upb::FileDefPtr file);
-std::string HeaderFilename(upb::FileDefPtr file);
-
-std::string MessageInit(absl::string_view full_name);
-std::string EnumInit(upb::EnumDefPtr descriptor);
-
-}  // namespace upbc
-
-#endif  // UPBC_COMMON_H
diff --git a/third_party/upb/upbc/file_layout.cc b/third_party/upb/upbc/file_layout.cc
deleted file mode 100644
index 012aa088732e3..0000000000000
--- a/third_party/upb/upbc/file_layout.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "upbc/file_layout.h"
-
-#include <string>
-#include <unordered_set>
-
-#include "upb/mini_table/internal/extension.h"
-#include "upbc/common.h"
-
-namespace upbc {
-
-const char* kEnumsInit = "enums_layout";
-const char* kExtensionsInit = "extensions_layout";
-const char* kMessagesInit = "messages_layout";
-
-void AddEnums(upb::MessageDefPtr message, std::vector<upb::EnumDefPtr>* enums) {
-  enums->reserve(enums->size() + message.enum_type_count());
-  for (int i = 0; i < message.enum_type_count(); i++) {
-    enums->push_back(message.enum_type(i));
-  }
-  for (int i = 0; i < message.nested_message_count(); i++) {
-    AddEnums(message.nested_message(i), enums);
-  }
-}
-
-std::vector<upb::EnumDefPtr> SortedEnums(upb::FileDefPtr file) {
-  std::vector<upb::EnumDefPtr> enums;
-  enums.reserve(file.toplevel_enum_count());
-  for (int i = 0; i < file.toplevel_enum_count(); i++) {
-    enums.push_back(file.toplevel_enum(i));
-  }
-  for (int i = 0; i < file.toplevel_message_count(); i++) {
-    AddEnums(file.toplevel_message(i), &enums);
-  }
-  std::sort(enums.begin(), enums.end(),
-            [](upb::EnumDefPtr a, upb::EnumDefPtr b) {
-              return strcmp(a.full_name(), b.full_name()) < 0;
-            });
-  return enums;
-}
-
-std::vector<uint32_t> SortedUniqueEnumNumbers(upb::EnumDefPtr e) {
-  std::vector<uint32_t> values;
-  values.reserve(e.value_count());
-  for (int i = 0; i < e.value_count(); i++) {
-    values.push_back(static_cast<uint32_t>(e.value(i).number()));
-  }
-  std::sort(values.begin(), values.end());
-  auto last = std::unique(values.begin(), values.end());
-  values.erase(last, values.end());
-  return values;
-}
-
-void AddMessages(upb::MessageDefPtr message,
-                 std::vector<upb::MessageDefPtr>* messages) {
-  messages->push_back(message);
-  for (int i = 0; i < message.nested_message_count(); i++) {
-    AddMessages(message.nested_message(i), messages);
-  }
-}
-
-// Ordering must match upb/def.c!
-//
-// The ordering is significant because each upb_MessageDef* will point at the
-// corresponding upb_MiniTable and we just iterate through the list without
-// any search or lookup.
-std::vector<upb::MessageDefPtr> SortedMessages(upb::FileDefPtr file) {
-  std::vector<upb::MessageDefPtr> messages;
-  for (int i = 0; i < file.toplevel_message_count(); i++) {
-    AddMessages(file.toplevel_message(i), &messages);
-  }
-  return messages;
-}
-
-void AddExtensionsFromMessage(upb::MessageDefPtr message,
-                              std::vector<upb::FieldDefPtr>* exts) {
-  for (int i = 0; i < message.nested_extension_count(); i++) {
-    exts->push_back(message.nested_extension(i));
-  }
-  for (int i = 0; i < message.nested_message_count(); i++) {
-    AddExtensionsFromMessage(message.nested_message(i), exts);
-  }
-}
-
-// Ordering must match upb/def.c!
-//
-// The ordering is significant because each upb_FieldDef* will point at the
-// corresponding upb_MiniTableExtension and we just iterate through the list
-// without any search or lookup.
-std::vector<upb::FieldDefPtr> SortedExtensions(upb::FileDefPtr file) {
-  std::vector<upb::FieldDefPtr> ret;
-  ret.reserve(file.toplevel_extension_count());
-  for (int i = 0; i < file.toplevel_extension_count(); i++) {
-    ret.push_back(file.toplevel_extension(i));
-  }
-  for (int i = 0; i < file.toplevel_message_count(); i++) {
-    AddExtensionsFromMessage(file.toplevel_message(i), &ret);
-  }
-  return ret;
-}
-
-std::vector<upb::FieldDefPtr> FieldNumberOrder(upb::MessageDefPtr message) {
-  std::vector<upb::FieldDefPtr> fields;
-  fields.reserve(message.field_count());
-  for (int i = 0; i < message.field_count(); i++) {
-    fields.push_back(message.field(i));
-  }
-  std::sort(fields.begin(), fields.end(),
-            [](upb::FieldDefPtr a, upb::FieldDefPtr b) {
-              return a.number() < b.number();
-            });
-  return fields;
-}
-
-}  // namespace upbc
diff --git a/third_party/upb/upbc/file_layout.h b/third_party/upb/upbc/file_layout.h
deleted file mode 100644
index dbde0f814c842..0000000000000
--- a/third_party/upb/upbc/file_layout.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef UPBC_FILE_LAYOUT_H
-#define UPBC_FILE_LAYOUT_H
-
-#include <string>
-
-// begin:google_only
-// #ifndef UPB_BOOTSTRAP_STAGE0
-// #include "net/proto2/proto/descriptor.upb.h"
-// #else
-// #include "google/protobuf/descriptor.upb.h"
-// #endif
-// end:google_only
-
-// begin:github_only
-#include "google/protobuf/descriptor.upb.h"
-// end:github_only
-
-#include "absl/container/flat_hash_map.h"
-#include "upb/mini_descriptor/decode.h"
-#include "upb/reflection/def.h"
-#include "upb/reflection/def.hpp"
-#include "upb/upb.hpp"
-
-// Must be last
-#include "upb/port/def.inc"
-
-namespace upbc {
-
-std::vector<upb::EnumDefPtr> SortedEnums(upb::FileDefPtr file);
-
-// Ordering must match upb/def.c!
-//
-// The ordering is significant because each upb_MessageDef* will point at the
-// corresponding upb_MiniTable and we just iterate through the list without
-// any search or lookup.
-std::vector<upb::MessageDefPtr> SortedMessages(upb::FileDefPtr file);
-
-// Ordering must match upb/def.c!
-//
-// The ordering is significant because each upb_FieldDef* will point at the
-// corresponding upb_MiniTableExtension and we just iterate through the list
-// without any search or lookup.
-std::vector<upb::FieldDefPtr> SortedExtensions(upb::FileDefPtr file);
-
-std::vector<upb::FieldDefPtr> FieldNumberOrder(upb::MessageDefPtr message);
-
-// DefPoolPair is a pair of DefPools: one for 32-bit and one for 64-bit.
-class DefPoolPair {
- public:
-  DefPoolPair() {
-    pool32_._SetPlatform(kUpb_MiniTablePlatform_32Bit);
-    pool64_._SetPlatform(kUpb_MiniTablePlatform_64Bit);
-  }
-
-  upb::FileDefPtr AddFile(const UPB_DESC(FileDescriptorProto) * file_proto,
-                          upb::Status* status) {
-    upb::FileDefPtr file32 = pool32_.AddFile(file_proto, status);
-    upb::FileDefPtr file64 = pool64_.AddFile(file_proto, status);
-    if (!file32) return file32;
-    return file64;
-  }
-
-  const upb_MiniTable* GetMiniTable32(upb::MessageDefPtr m) const {
-    return pool32_.FindMessageByName(m.full_name()).mini_table();
-  }
-
-  const upb_MiniTable* GetMiniTable64(upb::MessageDefPtr m) const {
-    return pool64_.FindMessageByName(m.full_name()).mini_table();
-  }
-
-  const upb_MiniTableField* GetField32(upb::FieldDefPtr f) const {
-    return GetFieldFromPool(&pool32_, f);
-  }
-
-  const upb_MiniTableField* GetField64(upb::FieldDefPtr f) const {
-    return GetFieldFromPool(&pool64_, f);
-  }
-
- private:
-  static const upb_MiniTableField* GetFieldFromPool(const upb::DefPool* pool,
-                                                    upb::FieldDefPtr f) {
-    if (f.is_extension()) {
-      return pool->FindExtensionByName(f.full_name()).mini_table();
-    } else {
-      return pool->FindMessageByName(f.containing_type().full_name())
-          .FindFieldByNumber(f.number())
-          .mini_table();
-    }
-  }
-
-  upb::DefPool pool32_;
-  upb::DefPool pool64_;
-};
-
-}  // namespace upbc
-
-#include "upb/port/undef.inc"
-
-#endif  // UPBC_FILE_LAYOUT_H
diff --git a/third_party/upb/upbc/keywords.cc b/third_party/upb/upbc/keywords.cc
deleted file mode 100644
index ed3a71341cc85..0000000000000
--- a/third_party/upb/upbc/keywords.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2007-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upbc/keywords.h"
-
-#include <string>
-#include <unordered_set>
-
-namespace upbc {
-
-static const char* const kKeywordList[] = {
-    //
-    "NULL",
-    "alignas",
-    "alignof",
-    "and",
-    "and_eq",
-    "asm",
-    "auto",
-    "bitand",
-    "bitor",
-    "bool",
-    "break",
-    "case",
-    "catch",
-    "char",
-    "class",
-    "compl",
-    "const",
-    "constexpr",
-    "const_cast",
-    "continue",
-    "decltype",
-    "default",
-    "delete",
-    "do",
-    "double",
-    "dynamic_cast",
-    "else",
-    "enum",
-    "explicit",
-    "export",
-    "extern",
-    "false",
-    "float",
-    "for",
-    "friend",
-    "goto",
-    "if",
-    "inline",
-    "int",
-    "long",
-    "mutable",
-    "namespace",
-    "new",
-    "noexcept",
-    "not",
-    "not_eq",
-    "nullptr",
-    "operator",
-    "or",
-    "or_eq",
-    "private",
-    "protected",
-    "public",
-    "register",
-    "reinterpret_cast",
-    "return",
-    "short",
-    "signed",
-    "sizeof",
-    "static",
-    "static_assert",
-    "static_cast",
-    "struct",
-    "switch",
-    "template",
-    "this",
-    "thread_local",
-    "throw",
-    "true",
-    "try",
-    "typedef",
-    "typeid",
-    "typename",
-    "union",
-    "unsigned",
-    "using",
-    "virtual",
-    "void",
-    "volatile",
-    "wchar_t",
-    "while",
-    "xor",
-    "xor_eq",
-    "char8_t",
-    "char16_t",
-    "char32_t",
-    "concept",
-    "consteval",
-    "constinit",
-    "co_await",
-    "co_return",
-    "co_yield",
-    "requires",
-};
-
-static std::unordered_set<std::string>* MakeKeywordsMap() {
-  auto* result = new std::unordered_set<std::string>();
-  for (const auto keyword : kKeywordList) {
-    result->emplace(keyword);
-  }
-  return result;
-}
-
-static std::unordered_set<std::string>& kKeywords = *MakeKeywordsMap();
-
-std::string ResolveKeywordConflict(const std::string& name) {
-  if (kKeywords.count(name) > 0) {
-    return name + "_";
-  }
-  return name;
-}
-
-}  // namespace upbc
diff --git a/third_party/upb/upbc/keywords.h b/third_party/upb/upbc/keywords.h
deleted file mode 100644
index 767c220f7404d..0000000000000
--- a/third_party/upb/upbc/keywords.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_KEYWORDS_H
-#define UPB_PROTOS_GENERATOR_KEYWORDS_H
-
-#include <string>
-
-namespace upbc {
-
-// Resolves proto field name conflict with C++ reserved keywords.
-std::string ResolveKeywordConflict(const std::string& name);
-
-}  // namespace upbc
-
-#endif  // UPB_PROTOS_GENERATOR_KEYWORDS_H
diff --git a/third_party/upb/upbc/names.cc b/third_party/upb/upbc/names.cc
deleted file mode 100644
index d61655a68c501..0000000000000
--- a/third_party/upb/upbc/names.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2007-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "upbc/names.h"
-
-#include <string>
-
-#include "absl/strings/match.h"
-#include "absl/strings/string_view.h"
-#include "google/protobuf/descriptor.h"
-#include "upb/reflection/def.hpp"
-
-namespace upbc {
-
-namespace protobuf = ::google::protobuf;
-
-// Prefixes used by C code generator for field access.
-static constexpr absl::string_view kClearMethodPrefix = "clear_";
-static constexpr absl::string_view kSetMethodPrefix = "set_";
-static constexpr absl::string_view kHasMethodPrefix = "has_";
-static constexpr absl::string_view kDeleteMethodPrefix = "delete_";
-static constexpr absl::string_view kAddToRepeatedMethodPrefix = "add_";
-static constexpr absl::string_view kResizeArrayMethodPrefix = "resize_";
-
-ABSL_CONST_INIT const absl::string_view kRepeatedFieldArrayGetterPostfix =
-    "upb_array";
-ABSL_CONST_INIT const absl::string_view
-    kRepeatedFieldMutableArrayGetterPostfix = "mutable_upb_array";
-
-// List of generated accessor prefixes to check against.
-// Example:
-//     optional repeated string phase = 236;
-//     optional bool clear_phase = 237;
-static constexpr absl::string_view kAccessorPrefixes[] = {
-    kClearMethodPrefix,       kDeleteMethodPrefix, kAddToRepeatedMethodPrefix,
-    kResizeArrayMethodPrefix, kSetMethodPrefix,    kHasMethodPrefix};
-
-std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
-                             const NameToFieldDescriptorMap& field_names) {
-  absl::string_view field_name = field->name();
-  for (const auto prefix : kAccessorPrefixes) {
-    // If field name starts with a prefix such as clear_ and the proto
-    // contains a field name with trailing end, depending on type of field
-    // (repeated, map, message) we have a conflict to resolve.
-    if (absl::StartsWith(field_name, prefix)) {
-      auto match = field_names.find(field_name.substr(prefix.size()));
-      if (match != field_names.end()) {
-        const auto* candidate = match->second;
-        if (candidate->is_repeated() || candidate->is_map() ||
-            (candidate->cpp_type() ==
-                 protobuf::FieldDescriptor::CPPTYPE_STRING &&
-             prefix == kClearMethodPrefix) ||
-            prefix == kSetMethodPrefix || prefix == kHasMethodPrefix) {
-          return absl::StrCat(field_name, "_");
-        }
-      }
-    }
-  }
-  return std::string(field_name);
-}
-
-// Returns field map by name to use for conflict checks.
-NameToFieldDescriptorMap CreateFieldNameMap(
-    const protobuf::Descriptor* message) {
-  NameToFieldDescriptorMap field_names;
-  for (int i = 0; i < message->field_count(); i++) {
-    const protobuf::FieldDescriptor* field = message->field(i);
-    field_names.emplace(field->name(), field);
-  }
-  return field_names;
-}
-
-NameToFieldDefMap CreateFieldNameMap(upb::MessageDefPtr message) {
-  NameToFieldDefMap field_names;
-  field_names.reserve(message.field_count());
-  for (const auto& field : message.fields()) {
-    field_names.emplace(field.name(), field);
-  }
-  return field_names;
-}
-
-std::string ResolveFieldName(upb::FieldDefPtr field,
-                             const NameToFieldDefMap& field_names) {
-  absl::string_view field_name(field.name());
-  for (absl::string_view prefix : kAccessorPrefixes) {
-    // If field name starts with a prefix such as clear_ and the proto
-    // contains a field name with trailing end, depending on type of field
-    // (repeated, map, message) we have a conflict to resolve.
-    if (absl::StartsWith(field_name, prefix)) {
-      auto match = field_names.find(field_name.substr(prefix.size()));
-      if (match != field_names.end()) {
-        const auto candidate = match->second;
-        if (candidate.IsSequence() || candidate.IsMap() ||
-            (candidate.ctype() == kUpb_CType_String &&
-             prefix == kClearMethodPrefix) ||
-            prefix == kSetMethodPrefix || prefix == kHasMethodPrefix) {
-          return absl::StrCat(field_name, "_");
-        }
-      }
-    }
-  }
-  return std::string(field_name);
-}
-
-}  // namespace upbc
diff --git a/third_party/upb/upbc/names.h b/third_party/upb/upbc/names.h
deleted file mode 100644
index 8658e1ecdbf32..0000000000000
--- a/third_party/upb/upbc/names.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPB_PROTOS_GENERATOR_NAMES_H
-#define UPB_PROTOS_GENERATOR_NAMES_H
-
-#include <string>
-
-#include "absl/base/attributes.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/strings/string_view.h"
-#include "google/protobuf/descriptor.h"
-#include "upb/reflection/def.hpp"
-
-namespace upbc {
-
-using NameToFieldDescriptorMap =
-    absl::flat_hash_map<absl::string_view, const google::protobuf::FieldDescriptor*>;
-
-// Returns field name by resolving naming conflicts across
-// proto field names (such as clear_ prefixes).
-std::string ResolveFieldName(const google::protobuf::FieldDescriptor* field,
-                             const NameToFieldDescriptorMap& field_names);
-
-// Returns field map by name to use for conflict checks.
-NameToFieldDescriptorMap CreateFieldNameMap(const google::protobuf::Descriptor* message);
-
-using NameToFieldDefMap =
-    absl::flat_hash_map<absl::string_view, upb::FieldDefPtr>;
-
-// Returns field name by resolving naming conflicts across
-// proto field names (such as clear_ prefixes).
-std::string ResolveFieldName(upb::FieldDefPtr field,
-                             const NameToFieldDefMap& field_names);
-
-// Returns field map by name to use for conflict checks.
-NameToFieldDefMap CreateFieldNameMap(upb::MessageDefPtr message);
-
-// Private array getter name postfix for repeated fields.
-ABSL_CONST_INIT extern const absl::string_view kRepeatedFieldArrayGetterPostfix;
-ABSL_CONST_INIT extern const absl::string_view
-    kRepeatedFieldMutableArrayGetterPostfix;
-
-}  // namespace upbc
-
-#endif  // UPB_PROTOS_GENERATOR_NAMES_H
diff --git a/third_party/upb/upbc/plugin.h b/third_party/upb/upbc/plugin.h
deleted file mode 100644
index 522a731aff067..0000000000000
--- a/third_party/upb/upbc/plugin.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef UPB_UPBC_PLUGIN_H_
-#define UPB_UPBC_PLUGIN_H_
-
-#include <stdio.h>
-
-#include <string>
-#include <vector>
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-// begin:google_only
-// #ifndef UPB_BOOTSTRAP_STAGE0
-// #include "net/proto2/proto/descriptor.upb.h"
-// #include "third_party/protobuf/compiler/plugin.upb.h"
-// #else
-// #include "google/protobuf/compiler/plugin.upb.h"
-// #include "google/protobuf/descriptor.upb.h"
-// #endif
-// end:google_only
-
-// begin:github_only
-#include "google/protobuf/compiler/plugin.upb.h"
-#include "google/protobuf/descriptor.upb.h"
-// end:github_only
-
-#include "absl/container/flat_hash_set.h"
-#include "absl/log/absl_log.h"
-#include "absl/strings/str_split.h"
-#include "absl/strings/string_view.h"
-#include "upb/reflection/def.hpp"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-namespace upbc {
-
-inline std::vector<std::pair<std::string, std::string>> ParseGeneratorParameter(
-    const absl::string_view text) {
-  std::vector<std::pair<std::string, std::string>> ret;
-  for (absl::string_view sp : absl::StrSplit(text, ',', absl::SkipEmpty())) {
-    std::string::size_type equals_pos = sp.find_first_of('=');
-    std::pair<std::string, std::string> value;
-    if (equals_pos == std::string::npos) {
-      value.first = std::string(sp);
-    } else {
-      value.first = std::string(sp.substr(0, equals_pos));
-      value.second = std::string(sp.substr(equals_pos + 1));
-    }
-    ret.push_back(std::move(value));
-  }
-  return ret;
-}
-
-class Plugin {
- public:
-  Plugin() { ReadRequest(); }
-  ~Plugin() { WriteResponse(); }
-
-  absl::string_view parameter() const {
-    return ToStringView(
-        UPB_DESC(compiler_CodeGeneratorRequest_parameter)(request_));
-  }
-
-  template <class T>
-  void GenerateFilesRaw(T&& func) {
-    absl::flat_hash_set<absl::string_view> files_to_generate;
-    size_t size;
-    const upb_StringView* file_to_generate = UPB_DESC(
-        compiler_CodeGeneratorRequest_file_to_generate)(request_, &size);
-    for (size_t i = 0; i < size; i++) {
-      files_to_generate.insert(
-          {file_to_generate[i].data, file_to_generate[i].size});
-    }
-
-    const UPB_DESC(FileDescriptorProto)* const* files =
-        UPB_DESC(compiler_CodeGeneratorRequest_proto_file)(request_, &size);
-    for (size_t i = 0; i < size; i++) {
-      upb::Status status;
-      absl::string_view name =
-          ToStringView(UPB_DESC(FileDescriptorProto_name)(files[i]));
-      func(files[i], files_to_generate.contains(name));
-    }
-  }
-
-  template <class T>
-  void GenerateFiles(T&& func) {
-    GenerateFilesRaw(
-        [this, &func](const UPB_DESC(FileDescriptorProto) * file_proto,
-                      bool generate) {
-          upb::Status status;
-          upb::FileDefPtr file = pool_.AddFile(file_proto, &status);
-          if (!file) {
-            absl::string_view name =
-                ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto));
-            ABSL_LOG(FATAL) << "Couldn't add file " << name
-                            << " to DefPool: " << status.error_message();
-          }
-          if (generate) func(file);
-        });
-  }
-
-  void SetError(absl::string_view error) {
-    char* data =
-        static_cast<char*>(upb_Arena_Malloc(arena_.ptr(), error.size()));
-    memcpy(data, error.data(), error.size());
-    UPB_DESC(compiler_CodeGeneratorResponse_set_error)
-    (response_, upb_StringView_FromDataAndSize(data, error.size()));
-  }
-
-  void AddOutputFile(absl::string_view filename, absl::string_view content) {
-    UPB_DESC(compiler_CodeGeneratorResponse_File)* file = UPB_DESC(
-        compiler_CodeGeneratorResponse_add_file)(response_, arena_.ptr());
-    UPB_DESC(compiler_CodeGeneratorResponse_File_set_name)
-    (file, StringDup(filename));
-    UPB_DESC(compiler_CodeGeneratorResponse_File_set_content)
-    (file, StringDup(content));
-  }
-
- private:
-  upb::Arena arena_;
-  upb::DefPool pool_;
-  UPB_DESC(compiler_CodeGeneratorRequest) * request_;
-  UPB_DESC(compiler_CodeGeneratorResponse) * response_;
-
-  static absl::string_view ToStringView(upb_StringView sv) {
-    return absl::string_view(sv.data, sv.size);
-  }
-
-  upb_StringView StringDup(absl::string_view s) {
-    char* data =
-        reinterpret_cast<char*>(upb_Arena_Malloc(arena_.ptr(), s.size()));
-    memcpy(data, s.data(), s.size());
-    return upb_StringView_FromDataAndSize(data, s.size());
-  }
-
-  std::string ReadAllStdinBinary() {
-    std::string data;
-#ifdef _WIN32
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
-#endif
-    char buf[4096];
-    while (size_t len = fread(buf, 1, sizeof(buf), stdin)) {
-      data.append(buf, len);
-    }
-    return data;
-  }
-
-  void ReadRequest() {
-    std::string data = ReadAllStdinBinary();
-    request_ = UPB_DESC(compiler_CodeGeneratorRequest_parse)(
-        data.data(), data.size(), arena_.ptr());
-    if (!request_) {
-      ABSL_LOG(FATAL) << "Failed to parse CodeGeneratorRequest";
-    }
-    response_ = UPB_DESC(compiler_CodeGeneratorResponse_new)(arena_.ptr());
-    UPB_DESC(compiler_CodeGeneratorResponse_set_supported_features)
-    (response_,
-     UPB_DESC(compiler_CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL));
-  }
-
-  void WriteResponse() {
-    size_t size;
-    char* serialized = UPB_DESC(compiler_CodeGeneratorResponse_serialize)(
-        response_, arena_.ptr(), &size);
-    if (!serialized) {
-      ABSL_LOG(FATAL) << "Failed to serialize CodeGeneratorResponse";
-    }
-
-    if (fwrite(serialized, 1, size, stdout) != size) {
-      ABSL_LOG(FATAL) << "Failed to write response to stdout";
-    }
-  }
-};
-
-}  // namespace upbc
-
-#include "upb/port/undef.inc"
-
-#endif  // UPB_UPBC_PLUGIN_H_
diff --git a/third_party/upb/upbc/protoc-gen-upb.cc b/third_party/upb/upbc/protoc-gen-upb.cc
deleted file mode 100644
index 045581d3459c8..0000000000000
--- a/third_party/upb/upbc/protoc-gen-upb.cc
+++ /dev/null
@@ -1,1719 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <limits>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/log/absl_check.h"
-#include "absl/log/absl_log.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/string_view.h"
-#include "absl/strings/substitute.h"
-#include "upb/base/descriptor_constants.h"
-#include "upb/base/string_view.h"
-#include "upb/reflection/def.hpp"
-#include "upb/wire/types.h"
-#include "upbc/common.h"
-#include "upbc/file_layout.h"
-#include "upbc/names.h"
-#include "upbc/plugin.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-namespace upbc {
-namespace {
-
-struct Options {
-  bool bootstrap = false;
-};
-
-// Returns fields in order of "hotness", eg. how frequently they appear in
-// serialized payloads. Ideally this will use a profile. When we don't have
-// that, we assume that fields with smaller numbers are used more frequently.
-inline std::vector<upb::FieldDefPtr> FieldHotnessOrder(
-    upb::MessageDefPtr message) {
-  std::vector<upb::FieldDefPtr> fields;
-  size_t field_count = message.field_count();
-  fields.reserve(field_count);
-  for (size_t i = 0; i < field_count; i++) {
-    fields.push_back(message.field(i));
-  }
-  std::sort(fields.begin(), fields.end(),
-            [](upb::FieldDefPtr a, upb::FieldDefPtr b) {
-              return std::make_pair(!a.is_required(), a.number()) <
-                     std::make_pair(!b.is_required(), b.number());
-            });
-  return fields;
-}
-
-std::string SourceFilename(upb::FileDefPtr file) {
-  return StripExtension(file.name()) + ".upb.c";
-}
-
-std::string MessageInitName(upb::MessageDefPtr descriptor) {
-  return absl::StrCat(MessageName(descriptor), "_msg_init");
-}
-
-std::string MessageMiniTableRef(upb::MessageDefPtr descriptor,
-                                const Options& options) {
-  if (options.bootstrap) {
-    return absl::StrCat(MessageInitName(descriptor), "()");
-  } else {
-    return absl::StrCat("&", MessageInitName(descriptor));
-  }
-}
-
-std::string EnumInitName(upb::EnumDefPtr descriptor) {
-  return ToCIdent(descriptor.full_name()) + "_enum_init";
-}
-
-std::string EnumMiniTableRef(upb::EnumDefPtr descriptor,
-                             const Options& options) {
-  if (options.bootstrap) {
-    return absl::StrCat(EnumInitName(descriptor), "()");
-  } else {
-    return absl::StrCat("&", EnumInitName(descriptor));
-  }
-}
-
-std::string ExtensionIdentBase(upb::FieldDefPtr ext) {
-  assert(ext.is_extension());
-  std::string ext_scope;
-  if (ext.extension_scope()) {
-    return MessageName(ext.extension_scope());
-  } else {
-    return ToCIdent(ext.file().package());
-  }
-}
-
-std::string ExtensionLayout(upb::FieldDefPtr ext) {
-  return absl::StrCat(ExtensionIdentBase(ext), "_", ext.name(), "_ext");
-}
-
-const char* kEnumsInit = "enums_layout";
-const char* kExtensionsInit = "extensions_layout";
-const char* kMessagesInit = "messages_layout";
-
-std::string EnumValueSymbol(upb::EnumValDefPtr value) {
-  return ToCIdent(value.full_name());
-}
-
-std::string CTypeInternal(upb::FieldDefPtr field, bool is_const) {
-  std::string maybe_const = is_const ? "const " : "";
-  switch (field.ctype()) {
-    case kUpb_CType_Message: {
-      std::string maybe_struct =
-          field.file() != field.message_type().file() ? "struct " : "";
-      return maybe_const + maybe_struct + MessageName(field.message_type()) +
-             "*";
-    }
-    case kUpb_CType_Bool:
-      return "bool";
-    case kUpb_CType_Float:
-      return "float";
-    case kUpb_CType_Int32:
-    case kUpb_CType_Enum:
-      return "int32_t";
-    case kUpb_CType_UInt32:
-      return "uint32_t";
-    case kUpb_CType_Double:
-      return "double";
-    case kUpb_CType_Int64:
-      return "int64_t";
-    case kUpb_CType_UInt64:
-      return "uint64_t";
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return "upb_StringView";
-    default:
-      abort();
-  }
-}
-
-std::string FloatToCLiteral(float value) {
-  if (value == std::numeric_limits<float>::infinity()) {
-    return "kUpb_FltInfinity";
-  } else if (value == -std::numeric_limits<float>::infinity()) {
-    return "-kUpb_FltInfinity";
-  } else if (std::isnan(value)) {
-    return "kUpb_NaN";
-  } else {
-    return absl::StrCat(value);
-  }
-}
-
-std::string DoubleToCLiteral(double value) {
-  if (value == std::numeric_limits<double>::infinity()) {
-    return "kUpb_Infinity";
-  } else if (value == -std::numeric_limits<double>::infinity()) {
-    return "-kUpb_Infinity";
-  } else if (std::isnan(value)) {
-    return "kUpb_NaN";
-  } else {
-    return absl::StrCat(value);
-  }
-}
-
-std::string FieldDefault(upb::FieldDefPtr field) {
-  switch (field.ctype()) {
-    case kUpb_CType_Message:
-      return "NULL";
-    case kUpb_CType_Bytes:
-    case kUpb_CType_String: {
-      upb_StringView str = field.default_value().str_val;
-      return absl::Substitute(
-          "upb_StringView_FromString(\"$0\")",
-          absl::CEscape(absl::string_view(str.data, str.size)));
-    }
-    case kUpb_CType_Int32:
-      return absl::Substitute("(int32_t)$0", field.default_value().int32_val);
-    case kUpb_CType_Int64:
-      if (field.default_value().int64_val == INT64_MIN) {
-        // Special-case to avoid:
-        //   integer literal is too large to be represented in a signed integer
-        //   type, interpreting as unsigned
-        //   [-Werror,-Wimplicitly-unsigned-literal]
-        //   int64_t default_val = (int64_t)-9223372036854775808ll;
-        //
-        // More info here: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52661
-        return "INT64_MIN";
-      } else {
-        return absl::Substitute("(int64_t)$0ll",
-                                field.default_value().int64_val);
-      }
-    case kUpb_CType_UInt32:
-      return absl::Substitute("(uint32_t)$0u",
-                              field.default_value().uint32_val);
-    case kUpb_CType_UInt64:
-      return absl::Substitute("(uint64_t)$0ull",
-                              field.default_value().uint64_val);
-    case kUpb_CType_Float:
-      return FloatToCLiteral(field.default_value().float_val);
-    case kUpb_CType_Double:
-      return DoubleToCLiteral(field.default_value().double_val);
-    case kUpb_CType_Bool:
-      return field.default_value().bool_val ? "true" : "false";
-    case kUpb_CType_Enum:
-      // Use a number instead of a symbolic name so that we don't require
-      // this enum's header to be included.
-      return absl::StrCat(field.default_value().int32_val);
-  }
-  ABSL_ASSERT(false);
-  return "XXX";
-}
-
-std::string CType(upb::FieldDefPtr field) {
-  return CTypeInternal(field, false);
-}
-
-std::string CTypeConst(upb::FieldDefPtr field) {
-  return CTypeInternal(field, true);
-}
-
-std::string MapKeyCType(upb::FieldDefPtr map_field) {
-  return CType(map_field.message_type().map_key());
-}
-
-std::string MapValueCType(upb::FieldDefPtr map_field) {
-  return CType(map_field.message_type().map_value());
-}
-
-std::string MapKeySize(upb::FieldDefPtr map_field, absl::string_view expr) {
-  return map_field.message_type().map_key().ctype() == kUpb_CType_String
-             ? "0"
-             : absl::StrCat("sizeof(", expr, ")");
-}
-
-std::string MapValueSize(upb::FieldDefPtr map_field, absl::string_view expr) {
-  return map_field.message_type().map_value().ctype() == kUpb_CType_String
-             ? "0"
-             : absl::StrCat("sizeof(", expr, ")");
-}
-
-std::string FieldInitializer(const DefPoolPair& pools, upb::FieldDefPtr field,
-                             const Options& options);
-
-void DumpEnumValues(upb::EnumDefPtr desc, Output& output) {
-  std::vector<upb::EnumValDefPtr> values;
-  values.reserve(desc.value_count());
-  for (int i = 0; i < desc.value_count(); i++) {
-    values.push_back(desc.value(i));
-  }
-  std::sort(values.begin(), values.end(),
-            [](upb::EnumValDefPtr a, upb::EnumValDefPtr b) {
-              return a.number() < b.number();
-            });
-
-  for (size_t i = 0; i < values.size(); i++) {
-    auto value = values[i];
-    output("  $0 = $1", EnumValueSymbol(value), value.number());
-    if (i != values.size() - 1) {
-      output(",");
-    }
-    output("\n");
-  }
-}
-
-std::string GetFieldRep(const DefPoolPair& pools, upb::FieldDefPtr field);
-
-void GenerateExtensionInHeader(const DefPoolPair& pools, upb::FieldDefPtr ext,
-                               Output& output) {
-  output(
-      R"cc(
-        UPB_INLINE bool $0_has_$1(const struct $2* msg) {
-          return _upb_Message_HasExtensionField(msg, &$3);
-        }
-      )cc",
-      ExtensionIdentBase(ext), ext.name(), MessageName(ext.containing_type()),
-      ExtensionLayout(ext));
-
-  output(
-      R"cc(
-        UPB_INLINE void $0_clear_$1(struct $2* msg) {
-          _upb_Message_ClearExtensionField(msg, &$3);
-        }
-      )cc",
-      ExtensionIdentBase(ext), ext.name(), MessageName(ext.containing_type()),
-      ExtensionLayout(ext));
-
-  if (ext.IsSequence()) {
-    // TODO(b/259861668): We need generated accessors for repeated extensions.
-  } else {
-    output(
-        R"cc(
-          UPB_INLINE $0 $1_$2(const struct $3* msg) {
-            const upb_MiniTableExtension* ext = &$4;
-            UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-            UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == $5);
-            $0 default_val = $6;
-            $0 ret;
-            _upb_Message_GetExtensionField(msg, ext, &default_val, &ret);
-            return ret;
-          }
-        )cc",
-        CTypeConst(ext), ExtensionIdentBase(ext), ext.name(),
-        MessageName(ext.containing_type()), ExtensionLayout(ext),
-        GetFieldRep(pools, ext), FieldDefault(ext));
-    output(
-        R"cc(
-          UPB_INLINE void $1_set_$2(struct $3* msg, $0 val, upb_Arena* arena) {
-            const upb_MiniTableExtension* ext = &$4;
-            UPB_ASSUME(!upb_IsRepeatedOrMap(&ext->field));
-            UPB_ASSUME(_upb_MiniTableField_GetRep(&ext->field) == $5);
-            bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
-            UPB_ASSERT(ok);
-          }
-        )cc",
-        CTypeConst(ext), ExtensionIdentBase(ext), ext.name(),
-        MessageName(ext.containing_type()), ExtensionLayout(ext),
-        GetFieldRep(pools, ext));
-  }
-}
-
-void GenerateMessageFunctionsInHeader(upb::MessageDefPtr message,
-                                      const Options& options, Output& output) {
-  // TODO(b/235839510): The generated code here does not check the return values
-  // from upb_Encode(). How can we even fix this without breaking other things?
-  output(
-      R"cc(
-        UPB_INLINE $0* $0_new(upb_Arena* arena) {
-          return ($0*)_upb_Message_New($1, arena);
-        }
-        UPB_INLINE $0* $0_parse(const char* buf, size_t size, upb_Arena* arena) {
-          $0* ret = $0_new(arena);
-          if (!ret) return NULL;
-          if (upb_Decode(buf, size, ret, $1, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-            return NULL;
-          }
-          return ret;
-        }
-        UPB_INLINE $0* $0_parse_ex(const char* buf, size_t size,
-                                   const upb_ExtensionRegistry* extreg,
-                                   int options, upb_Arena* arena) {
-          $0* ret = $0_new(arena);
-          if (!ret) return NULL;
-          if (upb_Decode(buf, size, ret, $1, extreg, options, arena) !=
-              kUpb_DecodeStatus_Ok) {
-            return NULL;
-          }
-          return ret;
-        }
-        UPB_INLINE char* $0_serialize(const $0* msg, upb_Arena* arena, size_t* len) {
-          char* ptr;
-          (void)upb_Encode(msg, $1, 0, arena, &ptr, len);
-          return ptr;
-        }
-        UPB_INLINE char* $0_serialize_ex(const $0* msg, int options,
-                                         upb_Arena* arena, size_t* len) {
-          char* ptr;
-          (void)upb_Encode(msg, $1, options, arena, &ptr, len);
-          return ptr;
-        }
-      )cc",
-      MessageName(message), MessageMiniTableRef(message, options));
-}
-
-void GenerateOneofInHeader(upb::OneofDefPtr oneof, const DefPoolPair& pools,
-                           absl::string_view msg_name, const Options& options,
-                           Output& output) {
-  std::string fullname = ToCIdent(oneof.full_name());
-  output("typedef enum {\n");
-  for (int j = 0; j < oneof.field_count(); j++) {
-    upb::FieldDefPtr field = oneof.field(j);
-    output("  $0_$1 = $2,\n", fullname, field.name(), field.number());
-  }
-  output(
-      "  $0_NOT_SET = 0\n"
-      "} $0_oneofcases;\n",
-      fullname);
-  output(
-      R"cc(
-        UPB_INLINE $0_oneofcases $1_$2_case(const $1* msg) {
-          const upb_MiniTableField field = $3;
-          return ($0_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field);
-        }
-      )cc",
-      fullname, msg_name, oneof.name(),
-      FieldInitializer(pools, oneof.field(0), options));
-}
-
-void GenerateHazzer(upb::FieldDefPtr field, const DefPoolPair& pools,
-                    absl::string_view msg_name,
-                    const NameToFieldDefMap& field_names,
-                    const Options& options, Output& output) {
-  std::string resolved_name = ResolveFieldName(field, field_names);
-  if (field.has_presence()) {
-    output(
-        R"cc(
-          UPB_INLINE bool $0_has_$1(const $0* msg) {
-            const upb_MiniTableField field = $2;
-            return _upb_Message_HasNonExtensionField(msg, &field);
-          }
-        )cc",
-        msg_name, resolved_name, FieldInitializer(pools, field, options));
-  } else if (field.IsMap()) {
-    // Do nothing.
-  } else if (field.IsSequence()) {
-    // TODO(b/259616267): remove.
-    output(
-        R"cc(
-          UPB_INLINE bool $0_has_$1(const $0* msg) {
-            size_t size;
-            $0_$1(msg, &size);
-            return size != 0;
-          }
-        )cc",
-        msg_name, resolved_name);
-  }
-}
-
-void GenerateClear(upb::FieldDefPtr field, const DefPoolPair& pools,
-                   absl::string_view msg_name,
-                   const NameToFieldDefMap& field_names, const Options& options,
-                   Output& output) {
-  if (field == field.containing_type().map_key() ||
-      field == field.containing_type().map_value()) {
-    // Cannot be cleared.
-    return;
-  }
-  std::string resolved_name = ResolveFieldName(field, field_names);
-  output(
-      R"cc(
-        UPB_INLINE void $0_clear_$1($0* msg) {
-          const upb_MiniTableField field = $2;
-          _upb_Message_ClearNonExtensionField(msg, &field);
-        }
-      )cc",
-      msg_name, resolved_name, FieldInitializer(pools, field, options));
-}
-
-void GenerateMapGetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                        absl::string_view msg_name,
-                        const NameToFieldDefMap& field_names,
-                        const Options& options, Output& output) {
-  std::string resolved_name = ResolveFieldName(field, field_names);
-  output(
-      R"cc(
-        UPB_INLINE size_t $0_$1_size(const $0* msg) {
-          const upb_MiniTableField field = $2;
-          const upb_Map* map = upb_Message_GetMap(msg, &field);
-          return map ? _upb_Map_Size(map) : 0;
-        }
-      )cc",
-      msg_name, resolved_name, FieldInitializer(pools, field, options));
-  output(
-      R"cc(
-        UPB_INLINE bool $0_$1_get(const $0* msg, $2 key, $3* val) {
-          const upb_MiniTableField field = $4;
-          const upb_Map* map = upb_Message_GetMap(msg, &field);
-          if (!map) return false;
-          return _upb_Map_Get(map, &key, $5, val, $6);
-        }
-      )cc",
-      msg_name, resolved_name, MapKeyCType(field), MapValueCType(field),
-      FieldInitializer(pools, field, options), MapKeySize(field, "key"),
-      MapValueSize(field, "*val"));
-  output(
-      R"cc(
-        UPB_INLINE $0 $1_$2_next(const $1* msg, size_t* iter) {
-          const upb_MiniTableField field = $3;
-          const upb_Map* map = upb_Message_GetMap(msg, &field);
-          if (!map) return NULL;
-          return ($0)_upb_map_next(map, iter);
-        }
-      )cc",
-      CTypeConst(field), msg_name, resolved_name,
-      FieldInitializer(pools, field, options));
-}
-
-void GenerateMapEntryGetters(upb::FieldDefPtr field, absl::string_view msg_name,
-                             Output& output) {
-  output(
-      R"cc(
-        UPB_INLINE $0 $1_$2(const $1* msg) {
-          $3 ret;
-          _upb_msg_map_$2(msg, &ret, $4);
-          return ret;
-        }
-      )cc",
-      CTypeConst(field), msg_name, field.name(), CType(field),
-      field.ctype() == kUpb_CType_String ? "0" : "sizeof(ret)");
-}
-
-void GenerateRepeatedGetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                             absl::string_view msg_name,
-                             const NameToFieldDefMap& field_names,
-                             const Options& options, Output& output) {
-  // Generate getter returning first item and size.
-  //
-  // Example:
-  //   UPB_INLINE const struct Bar* const* name(const Foo* msg, size_t* size)
-  output(
-      R"cc(
-        UPB_INLINE $0 const* $1_$2(const $1* msg, size_t* size) {
-          const upb_MiniTableField field = $3;
-          const upb_Array* arr = upb_Message_GetArray(msg, &field);
-          if (arr) {
-            if (size) *size = arr->size;
-            return ($0 const*)_upb_array_constptr(arr);
-          } else {
-            if (size) *size = 0;
-            return NULL;
-          }
-        }
-      )cc",
-      CTypeConst(field),                       // $0
-      msg_name,                                // $1
-      ResolveFieldName(field, field_names),    // $2
-      FieldInitializer(pools, field, options)  // #3
-  );
-  // Generate private getter returning array or NULL for immutable and upb_Array
-  // for mutable.
-  //
-  // Example:
-  //   UPB_INLINE const upb_Array* _name_upbarray(size_t* size)
-  //   UPB_INLINE upb_Array* _name_mutable_upbarray(size_t* size)
-  output(
-      R"cc(
-        UPB_INLINE const upb_Array* _$1_$2_$4(const $1* msg, size_t* size) {
-          const upb_MiniTableField field = $3;
-          const upb_Array* arr = upb_Message_GetArray(msg, &field);
-          if (size) {
-            *size = arr ? arr->size : 0;
-          }
-          return arr;
-        }
-        UPB_INLINE upb_Array* _$1_$2_$5(const $1* msg, size_t* size, upb_Arena* arena) {
-          const upb_MiniTableField field = $3;
-          upb_Array* arr = upb_Message_GetOrCreateMutableArray(
-              (upb_Message*)msg, &field, arena);
-          if (size) {
-            *size = arr ? arr->size : 0;
-          }
-          return arr;
-        }
-      )cc",
-      CTypeConst(field),                        // $0
-      msg_name,                                 // $1
-      ResolveFieldName(field, field_names),     // $2
-      FieldInitializer(pools, field, options),  // $3
-      kRepeatedFieldArrayGetterPostfix,         // $4
-      kRepeatedFieldMutableArrayGetterPostfix   // $5
-  );
-}
-
-void GenerateScalarGetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                           absl::string_view msg_name,
-                           const NameToFieldDefMap& field_names,
-                           const Options& Options, Output& output) {
-  std::string field_name = ResolveFieldName(field, field_names);
-  output(
-      R"cc(
-        UPB_INLINE $0 $1_$2(const $1* msg) {
-          $0 default_val = $3;
-          $0 ret;
-          const upb_MiniTableField field = $4;
-          _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-          return ret;
-        }
-      )cc",
-      CTypeConst(field), msg_name, field_name, FieldDefault(field),
-      FieldInitializer(pools, field, Options));
-}
-
-void GenerateGetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                     absl::string_view msg_name,
-                     const NameToFieldDefMap& field_names,
-                     const Options& options, Output& output) {
-  if (field.IsMap()) {
-    GenerateMapGetters(field, pools, msg_name, field_names, options, output);
-  } else if (UPB_DESC(MessageOptions_map_entry)(
-                 field.containing_type().options())) {
-    GenerateMapEntryGetters(field, msg_name, output);
-  } else if (field.IsSequence()) {
-    GenerateRepeatedGetters(field, pools, msg_name, field_names, options,
-                            output);
-  } else {
-    GenerateScalarGetters(field, pools, msg_name, field_names, options, output);
-  }
-}
-
-void GenerateMapSetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                        absl::string_view msg_name,
-                        const NameToFieldDefMap& field_names,
-                        const Options& options, Output& output) {
-  std::string resolved_name = ResolveFieldName(field, field_names);
-  output(
-      R"cc(
-        UPB_INLINE void $0_$1_clear($0* msg) {
-          const upb_MiniTableField field = $2;
-          upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-          if (!map) return;
-          _upb_Map_Clear(map);
-        }
-      )cc",
-      msg_name, resolved_name, FieldInitializer(pools, field, options));
-  output(
-      R"cc(
-        UPB_INLINE bool $0_$1_set($0* msg, $2 key, $3 val, upb_Arena* a) {
-          const upb_MiniTableField field = $4;
-          upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, $5, $6, a);
-          return _upb_Map_Insert(map, &key, $5, &val, $6, a) !=
-                 kUpb_MapInsertStatus_OutOfMemory;
-        }
-      )cc",
-      msg_name, resolved_name, MapKeyCType(field), MapValueCType(field),
-      FieldInitializer(pools, field, options), MapKeySize(field, "key"),
-      MapValueSize(field, "val"));
-  output(
-      R"cc(
-        UPB_INLINE bool $0_$1_delete($0* msg, $2 key) {
-          const upb_MiniTableField field = $3;
-          upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-          if (!map) return false;
-          return _upb_Map_Delete(map, &key, $4, NULL);
-        }
-      )cc",
-      msg_name, resolved_name, MapKeyCType(field),
-      FieldInitializer(pools, field, options), MapKeySize(field, "key"));
-  output(
-      R"cc(
-        UPB_INLINE $0 $1_$2_nextmutable($1* msg, size_t* iter) {
-          const upb_MiniTableField field = $3;
-          upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field);
-          if (!map) return NULL;
-          return ($0)_upb_map_next(map, iter);
-        }
-      )cc",
-      CType(field), msg_name, resolved_name,
-      FieldInitializer(pools, field, options));
-}
-
-void GenerateRepeatedSetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                             absl::string_view msg_name,
-                             const NameToFieldDefMap& field_names,
-                             const Options& options, Output& output) {
-  std::string resolved_name = ResolveFieldName(field, field_names);
-  output(
-      R"cc(
-        UPB_INLINE $0* $1_mutable_$2($1* msg, size_t* size) {
-          upb_MiniTableField field = $3;
-          upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-          if (arr) {
-            if (size) *size = arr->size;
-            return ($0*)_upb_array_ptr(arr);
-          } else {
-            if (size) *size = 0;
-            return NULL;
-          }
-        }
-      )cc",
-      CType(field), msg_name, resolved_name,
-      FieldInitializer(pools, field, options));
-  output(
-      R"cc(
-        UPB_INLINE $0* $1_resize_$2($1* msg, size_t size, upb_Arena* arena) {
-          upb_MiniTableField field = $3;
-          return ($0*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-        }
-      )cc",
-      CType(field), msg_name, resolved_name,
-      FieldInitializer(pools, field, options));
-  if (field.ctype() == kUpb_CType_Message) {
-    output(
-        R"cc(
-          UPB_INLINE struct $0* $1_add_$2($1* msg, upb_Arena* arena) {
-            upb_MiniTableField field = $4;
-            upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-            if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-              return NULL;
-            }
-            struct $0* sub = (struct $0*)_upb_Message_New($3, arena);
-            if (!arr || !sub) return NULL;
-            _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-            return sub;
-          }
-        )cc",
-        MessageName(field.message_type()), msg_name, resolved_name,
-        MessageMiniTableRef(field.message_type(), options),
-        FieldInitializer(pools, field, options));
-  } else {
-    output(
-        R"cc(
-          UPB_INLINE bool $1_add_$2($1* msg, $0 val, upb_Arena* arena) {
-            upb_MiniTableField field = $3;
-            upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-            if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-              return false;
-            }
-            _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-            return true;
-          }
-        )cc",
-        CType(field), msg_name, resolved_name,
-        FieldInitializer(pools, field, options));
-  }
-}
-
-void GenerateNonRepeatedSetters(upb::FieldDefPtr field,
-                                const DefPoolPair& pools,
-                                absl::string_view msg_name,
-                                const NameToFieldDefMap& field_names,
-                                const Options& options, Output& output) {
-  if (field == field.containing_type().map_key()) {
-    // Key cannot be mutated.
-    return;
-  }
-
-  std::string field_name = ResolveFieldName(field, field_names);
-
-  if (field == field.containing_type().map_value()) {
-    output(R"cc(
-             UPB_INLINE void $0_set_$1($0 *msg, $2 value) {
-               _upb_msg_map_set_value(msg, &value, $3);
-             }
-           )cc",
-           msg_name, field_name, CType(field),
-           field.ctype() == kUpb_CType_String ? "0"
-                                              : "sizeof(" + CType(field) + ")");
-  } else {
-    output(R"cc(
-             UPB_INLINE void $0_set_$1($0 *msg, $2 value) {
-               const upb_MiniTableField field = $3;
-               _upb_Message_SetNonExtensionField(msg, &field, &value);
-             }
-           )cc",
-           msg_name, field_name, CType(field),
-           FieldInitializer(pools, field, options));
-  }
-
-  // Message fields also have a Msg_mutable_foo() accessor that will create
-  // the sub-message if it doesn't already exist.
-  if (field.ctype() == kUpb_CType_Message &&
-      !UPB_DESC(MessageOptions_map_entry)(field.containing_type().options())) {
-    output(
-        R"cc(
-          UPB_INLINE struct $0* $1_mutable_$2($1* msg, upb_Arena* arena) {
-            struct $0* sub = (struct $0*)$1_$2(msg);
-            if (sub == NULL) {
-              sub = (struct $0*)_upb_Message_New($3, arena);
-              if (sub) $1_set_$2(msg, sub);
-            }
-            return sub;
-          }
-        )cc",
-        MessageName(field.message_type()), msg_name, field_name,
-        MessageMiniTableRef(field.message_type(), options));
-  }
-}
-
-void GenerateSetters(upb::FieldDefPtr field, const DefPoolPair& pools,
-                     absl::string_view msg_name,
-                     const NameToFieldDefMap& field_names,
-                     const Options& options, Output& output) {
-  if (field.IsMap()) {
-    GenerateMapSetters(field, pools, msg_name, field_names, options, output);
-  } else if (field.IsSequence()) {
-    GenerateRepeatedSetters(field, pools, msg_name, field_names, options,
-                            output);
-  } else {
-    GenerateNonRepeatedSetters(field, pools, msg_name, field_names, options,
-                               output);
-  }
-}
-
-void GenerateMessageInHeader(upb::MessageDefPtr message,
-                             const DefPoolPair& pools, const Options& options,
-                             Output& output) {
-  output("/* $0 */\n\n", message.full_name());
-  std::string msg_name = ToCIdent(message.full_name());
-  if (!UPB_DESC(MessageOptions_map_entry)(message.options())) {
-    GenerateMessageFunctionsInHeader(message, options, output);
-  }
-
-  for (int i = 0; i < message.real_oneof_count(); i++) {
-    GenerateOneofInHeader(message.oneof(i), pools, msg_name, options, output);
-  }
-
-  auto field_names = CreateFieldNameMap(message);
-  for (auto field : FieldNumberOrder(message)) {
-    GenerateClear(field, pools, msg_name, field_names, options, output);
-    GenerateGetters(field, pools, msg_name, field_names, options, output);
-    GenerateHazzer(field, pools, msg_name, field_names, options, output);
-  }
-
-  output("\n");
-
-  for (auto field : FieldNumberOrder(message)) {
-    GenerateSetters(field, pools, msg_name, field_names, options, output);
-  }
-
-  output("\n");
-}
-
-void ForwardDeclareMiniTableInit(upb::MessageDefPtr message,
-                                 const Options& options, Output& output) {
-  if (options.bootstrap) {
-    output("extern const upb_MiniTable* $0();\n", MessageInitName(message));
-  } else {
-    output("extern const upb_MiniTable $0;\n", MessageInitName(message));
-  }
-}
-
-void WriteHeader(const DefPoolPair& pools, upb::FileDefPtr file,
-                 const Options& options, Output& output) {
-  EmitFileWarning(file.name(), output);
-  output(
-      "#ifndef $0_UPB_H_\n"
-      "#define $0_UPB_H_\n\n"
-      "#include \"upb/generated_code_support.h\"\n",
-      ToPreproc(file.name()));
-
-  for (int i = 0; i < file.public_dependency_count(); i++) {
-    if (i == 0) {
-      output("/* Public Imports. */\n");
-    }
-    output("#include \"$0\"\n", HeaderFilename(file.public_dependency(i)));
-    if (i == file.public_dependency_count() - 1) {
-      output("\n");
-    }
-  }
-
-  output(
-      "// Must be last. \n"
-      "#include \"upb/port/def.inc\"\n"
-      "\n"
-      "#ifdef __cplusplus\n"
-      "extern \"C\" {\n"
-      "#endif\n"
-      "\n");
-
-  const std::vector<upb::MessageDefPtr> this_file_messages =
-      SortedMessages(file);
-  const std::vector<upb::FieldDefPtr> this_file_exts = SortedExtensions(file);
-
-  // Forward-declare types defined in this file.
-  for (auto message : this_file_messages) {
-    output("typedef struct $0 $0;\n", ToCIdent(message.full_name()));
-  }
-  for (auto message : this_file_messages) {
-    ForwardDeclareMiniTableInit(message, options, output);
-  }
-  for (auto ext : this_file_exts) {
-    output("extern const upb_MiniTableExtension $0;\n", ExtensionLayout(ext));
-  }
-
-  // Forward-declare types not in this file, but used as submessages.
-  // Order by full name for consistent ordering.
-  std::map<std::string, upb::MessageDefPtr> forward_messages;
-
-  for (auto message : this_file_messages) {
-    for (int i = 0; i < message.field_count(); i++) {
-      upb::FieldDefPtr field = message.field(i);
-      if (field.ctype() == kUpb_CType_Message &&
-          field.file() != field.message_type().file()) {
-        forward_messages[field.message_type().full_name()] =
-            field.message_type();
-      }
-    }
-  }
-  for (auto ext : this_file_exts) {
-    if (ext.file() != ext.containing_type().file()) {
-      forward_messages[ext.containing_type().full_name()] =
-          ext.containing_type();
-    }
-  }
-  for (const auto& pair : forward_messages) {
-    output("struct $0;\n", MessageName(pair.second));
-  }
-  for (const auto& pair : forward_messages) {
-    ForwardDeclareMiniTableInit(pair.second, options, output);
-  }
-
-  if (!this_file_messages.empty()) {
-    output("\n");
-  }
-
-  std::vector<upb::EnumDefPtr> this_file_enums = SortedEnums(file);
-
-  for (auto enumdesc : this_file_enums) {
-    output("typedef enum {\n");
-    DumpEnumValues(enumdesc, output);
-    output("} $0;\n\n", ToCIdent(enumdesc.full_name()));
-  }
-
-  output("\n");
-
-  if (file.syntax() == kUpb_Syntax_Proto2) {
-    for (const auto enumdesc : this_file_enums) {
-      if (options.bootstrap) {
-        output("extern const upb_MiniTableEnum* $0();\n", EnumInit(enumdesc));
-      } else {
-        output("extern const upb_MiniTableEnum $0;\n", EnumInit(enumdesc));
-      }
-    }
-  }
-
-  output("\n");
-  for (auto message : this_file_messages) {
-    GenerateMessageInHeader(message, pools, options, output);
-  }
-
-  for (auto ext : this_file_exts) {
-    GenerateExtensionInHeader(pools, ext, output);
-  }
-
-  output("extern const upb_MiniTableFile $0;\n\n", FileLayoutName(file));
-
-  if (absl::string_view(file.name()) == "google/protobuf/descriptor.proto" ||
-      absl::string_view(file.name()) == "net/proto2/proto/descriptor.proto") {
-    // This is gratuitously inefficient with how many times it rebuilds
-    // MessageLayout objects for the same message. But we only do this for one
-    // proto (descriptor.proto) so we don't worry about it.
-    upb::MessageDefPtr max32_message;
-    upb::MessageDefPtr max64_message;
-    size_t max32 = 0;
-    size_t max64 = 0;
-    for (const auto message : this_file_messages) {
-      if (absl::EndsWith(message.name(), "Options")) {
-        size_t size32 = pools.GetMiniTable32(message)->size;
-        size_t size64 = pools.GetMiniTable64(message)->size;
-        if (size32 > max32) {
-          max32 = size32;
-          max32_message = message;
-        }
-        if (size64 > max64) {
-          max64 = size64;
-          max64_message = message;
-        }
-      }
-    }
-
-    output("/* Max size 32 is $0 */\n", max32_message.full_name());
-    output("/* Max size 64 is $0 */\n", max64_message.full_name());
-    output("#define _UPB_MAXOPT_SIZE UPB_SIZE($0, $1)\n\n", max32, max64);
-  }
-
-  output(
-      "#ifdef __cplusplus\n"
-      "}  /* extern \"C\" */\n"
-      "#endif\n"
-      "\n"
-      "#include \"upb/port/undef.inc\"\n"
-      "\n"
-      "#endif  /* $0_UPB_H_ */\n",
-      ToPreproc(file.name()));
-}
-
-typedef std::pair<std::string, uint64_t> TableEntry;
-
-uint32_t GetWireTypeForField(upb::FieldDefPtr field) {
-  if (field.packed()) return kUpb_WireType_Delimited;
-  switch (field.type()) {
-    case kUpb_FieldType_Double:
-    case kUpb_FieldType_Fixed64:
-    case kUpb_FieldType_SFixed64:
-      return kUpb_WireType_64Bit;
-    case kUpb_FieldType_Float:
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-      return kUpb_WireType_32Bit;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_Bool:
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Enum:
-    case kUpb_FieldType_SInt32:
-    case kUpb_FieldType_SInt64:
-      return kUpb_WireType_Varint;
-    case kUpb_FieldType_Group:
-      return kUpb_WireType_StartGroup;
-    case kUpb_FieldType_Message:
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes:
-      return kUpb_WireType_Delimited;
-  }
-  UPB_UNREACHABLE();
-}
-
-uint32_t MakeTag(uint32_t field_number, uint32_t wire_type) {
-  return field_number << 3 | wire_type;
-}
-
-size_t WriteVarint32ToArray(uint64_t val, char* buf) {
-  size_t i = 0;
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    buf[i++] = byte;
-  } while (val);
-  return i;
-}
-
-uint64_t GetEncodedTag(upb::FieldDefPtr field) {
-  uint32_t wire_type = GetWireTypeForField(field);
-  uint32_t unencoded_tag = MakeTag(field.number(), wire_type);
-  char tag_bytes[10] = {0};
-  WriteVarint32ToArray(unencoded_tag, tag_bytes);
-  uint64_t encoded_tag = 0;
-  memcpy(&encoded_tag, tag_bytes, sizeof(encoded_tag));
-  // TODO: byte-swap for big endian.
-  return encoded_tag;
-}
-
-int GetTableSlot(upb::FieldDefPtr field) {
-  uint64_t tag = GetEncodedTag(field);
-  if (tag > 0x7fff) {
-    // Tag must fit within a two-byte varint.
-    return -1;
-  }
-  return (tag & 0xf8) >> 3;
-}
-
-bool TryFillTableEntry(const DefPoolPair& pools, upb::FieldDefPtr field,
-                       TableEntry& ent) {
-  const upb_MiniTable* mt = pools.GetMiniTable64(field.containing_type());
-  const upb_MiniTableField* mt_f =
-      upb_MiniTable_FindFieldByNumber(mt, field.number());
-  std::string type = "";
-  std::string cardinality = "";
-  switch (upb_MiniTableField_Type(mt_f)) {
-    case kUpb_FieldType_Bool:
-      type = "b1";
-      break;
-    case kUpb_FieldType_Enum:
-      if (upb_MiniTableField_IsClosedEnum(mt_f)) {
-        // We don't have the means to test proto2 enum fields for valid values.
-        return false;
-      }
-      [[fallthrough]];
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_UInt32:
-      type = "v4";
-      break;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-      type = "v8";
-      break;
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-    case kUpb_FieldType_Float:
-      type = "f4";
-      break;
-    case kUpb_FieldType_Fixed64:
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_Double:
-      type = "f8";
-      break;
-    case kUpb_FieldType_SInt32:
-      type = "z4";
-      break;
-    case kUpb_FieldType_SInt64:
-      type = "z8";
-      break;
-    case kUpb_FieldType_String:
-      type = "s";
-      break;
-    case kUpb_FieldType_Bytes:
-      type = "b";
-      break;
-    case kUpb_FieldType_Message:
-      type = "m";
-      break;
-    default:
-      return false;  // Not supported yet.
-  }
-
-  switch (upb_FieldMode_Get(mt_f)) {
-    case kUpb_FieldMode_Map:
-      return false;  // Not supported yet (ever?).
-    case kUpb_FieldMode_Array:
-      if (mt_f->mode & kUpb_LabelFlags_IsPacked) {
-        cardinality = "p";
-      } else {
-        cardinality = "r";
-      }
-      break;
-    case kUpb_FieldMode_Scalar:
-      if (mt_f->presence < 0) {
-        cardinality = "o";
-      } else {
-        cardinality = "s";
-      }
-      break;
-  }
-
-  uint64_t expected_tag = GetEncodedTag(field);
-
-  // Data is:
-  //
-  //                  48                32                16                 0
-  // |--------|--------|--------|--------|--------|--------|--------|--------|
-  // |   offset (16)   |case offset (16) |presence| submsg |  exp. tag (16)  |
-  // |--------|--------|--------|--------|--------|--------|--------|--------|
-  //
-  // - |presence| is either hasbit index or field number for oneofs.
-
-  uint64_t data = static_cast<uint64_t>(mt_f->offset) << 48 | expected_tag;
-
-  if (field.IsSequence()) {
-    // No hasbit/oneof-related fields.
-  }
-  if (field.real_containing_oneof()) {
-    uint64_t case_offset = ~mt_f->presence;
-    if (case_offset > 0xffff || field.number() > 0xff) return false;
-    data |= field.number() << 24;
-    data |= case_offset << 32;
-  } else {
-    uint64_t hasbit_index = 63;  // No hasbit (set a high, unused bit).
-    if (mt_f->presence) {
-      hasbit_index = mt_f->presence;
-      if (hasbit_index > 31) return false;
-    }
-    data |= hasbit_index << 24;
-  }
-
-  if (field.ctype() == kUpb_CType_Message) {
-    uint64_t idx = mt_f->UPB_PRIVATE(submsg_index);
-    if (idx > 255) return false;
-    data |= idx << 16;
-
-    std::string size_ceil = "max";
-    size_t size = SIZE_MAX;
-    if (field.message_type().file() == field.file()) {
-      // We can only be guaranteed the size of the sub-message if it is in the
-      // same file as us.  We could relax this to increase the speed of
-      // cross-file sub-message parsing if we are comfortable requiring that
-      // users compile all messages at the same time.
-      const upb_MiniTable* sub_mt = pools.GetMiniTable64(field.message_type());
-      size = sub_mt->size + 8;
-    }
-    std::vector<size_t> breaks = {64, 128, 192, 256};
-    for (auto brk : breaks) {
-      if (size <= brk) {
-        size_ceil = std::to_string(brk);
-        break;
-      }
-    }
-    ent.first = absl::Substitute("upb_p$0$1_$2bt_max$3b", cardinality, type,
-                                 expected_tag > 0xff ? "2" : "1", size_ceil);
-
-  } else {
-    ent.first = absl::Substitute("upb_p$0$1_$2bt", cardinality, type,
-                                 expected_tag > 0xff ? "2" : "1");
-  }
-  ent.second = data;
-  return true;
-}
-
-std::vector<TableEntry> FastDecodeTable(upb::MessageDefPtr message,
-                                        const DefPoolPair& pools) {
-  std::vector<TableEntry> table;
-  for (const auto field : FieldHotnessOrder(message)) {
-    TableEntry ent;
-    int slot = GetTableSlot(field);
-    // std::cerr << "table slot: " << field->number() << ": " << slot << "\n";
-    if (slot < 0) {
-      // Tag can't fit in the table.
-      continue;
-    }
-    if (!TryFillTableEntry(pools, field, ent)) {
-      // Unsupported field type or offset, hasbit index, etc. doesn't fit.
-      continue;
-    }
-    while ((size_t)slot >= table.size()) {
-      size_t size = std::max(static_cast<size_t>(1), table.size() * 2);
-      table.resize(size, TableEntry{"_upb_FastDecoder_DecodeGeneric", 0});
-    }
-    if (table[slot].first != "_upb_FastDecoder_DecodeGeneric") {
-      // A hotter field already filled this slot.
-      continue;
-    }
-    table[slot] = ent;
-  }
-  return table;
-}
-
-std::string ArchDependentSize(int64_t size32, int64_t size64) {
-  if (size32 == size64) return absl::StrCat(size32);
-  return absl::Substitute("UPB_SIZE($0, $1)", size32, size64);
-}
-
-std::string GetFieldRep(const upb_MiniTableField* field32,
-                        const upb_MiniTableField* field64) {
-  switch (_upb_MiniTableField_GetRep(field32)) {
-    case kUpb_FieldRep_1Byte:
-      return "kUpb_FieldRep_1Byte";
-      break;
-    case kUpb_FieldRep_4Byte: {
-      if (_upb_MiniTableField_GetRep(field64) == kUpb_FieldRep_4Byte) {
-        return "kUpb_FieldRep_4Byte";
-      } else {
-        assert(_upb_MiniTableField_GetRep(field64) == kUpb_FieldRep_8Byte);
-        return "UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)";
-      }
-      break;
-    }
-    case kUpb_FieldRep_StringView:
-      return "kUpb_FieldRep_StringView";
-      break;
-    case kUpb_FieldRep_8Byte:
-      return "kUpb_FieldRep_8Byte";
-      break;
-  }
-  UPB_UNREACHABLE();
-}
-
-std::string GetFieldRep(const DefPoolPair& pools, upb::FieldDefPtr field) {
-  return GetFieldRep(pools.GetField32(field), pools.GetField64(field));
-}
-
-// Returns the field mode as a string initializer.
-//
-// We could just emit this as a number (and we may yet go in that direction) but
-// for now emitting symbolic constants gives this better readability and
-// debuggability.
-std::string GetModeInit(const upb_MiniTableField* field32,
-                        const upb_MiniTableField* field64) {
-  std::string ret;
-  uint8_t mode32 = field32->mode;
-  switch (mode32 & kUpb_FieldMode_Mask) {
-    case kUpb_FieldMode_Map:
-      ret = "(int)kUpb_FieldMode_Map";
-      break;
-    case kUpb_FieldMode_Array:
-      ret = "(int)kUpb_FieldMode_Array";
-      break;
-    case kUpb_FieldMode_Scalar:
-      ret = "(int)kUpb_FieldMode_Scalar";
-      break;
-    default:
-      break;
-  }
-
-  if (mode32 & kUpb_LabelFlags_IsPacked) {
-    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsPacked");
-  }
-
-  if (mode32 & kUpb_LabelFlags_IsExtension) {
-    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsExtension");
-  }
-
-  if (mode32 & kUpb_LabelFlags_IsAlternate) {
-    absl::StrAppend(&ret, " | (int)kUpb_LabelFlags_IsAlternate");
-  }
-
-  absl::StrAppend(&ret, " | ((int)", GetFieldRep(field32, field64),
-                  " << kUpb_FieldRep_Shift)");
-  return ret;
-}
-
-std::string FieldInitializer(upb::FieldDefPtr field,
-                             const upb_MiniTableField* field64,
-                             const upb_MiniTableField* field32,
-                             const Options& options) {
-  if (options.bootstrap) {
-    ABSL_CHECK(!field.is_extension());
-    return absl::Substitute(
-        "*upb_MiniTable_FindFieldByNumber($0, $1)",
-        MessageMiniTableRef(field.containing_type(), options), field.number());
-  } else {
-    return absl::Substitute(
-        "{$0, $1, $2, $3, $4, $5}", field64->number,
-        ArchDependentSize(field32->offset, field64->offset),
-        ArchDependentSize(field32->presence, field64->presence),
-        field64->UPB_PRIVATE(submsg_index) == kUpb_NoSub
-            ? "kUpb_NoSub"
-            : absl::StrCat(field64->UPB_PRIVATE(submsg_index)).c_str(),
-        field64->UPB_PRIVATE(descriptortype), GetModeInit(field32, field64));
-  }
-}
-
-std::string FieldInitializer(const DefPoolPair& pools, upb::FieldDefPtr field,
-                             const Options& options) {
-  return FieldInitializer(field, pools.GetField64(field),
-                          pools.GetField32(field), options);
-}
-
-// Writes a single field into a .upb.c source file.
-void WriteMessageField(upb::FieldDefPtr field,
-                       const upb_MiniTableField* field64,
-                       const upb_MiniTableField* field32,
-                       const Options& options, Output& output) {
-  output("  $0,\n", FieldInitializer(field, field64, field32, options));
-}
-
-std::string GetSub(upb::FieldDefPtr field) {
-  if (auto message_def = field.message_type()) {
-    return absl::Substitute("{.submsg = &$0}", MessageInitName(message_def));
-  }
-
-  if (auto enum_def = field.enum_subdef()) {
-    if (enum_def.is_closed()) {
-      return absl::Substitute("{.subenum = &$0}", EnumInit(enum_def));
-    }
-  }
-
-  return std::string("{.submsg = NULL}");
-}
-
-// Writes a single message into a .upb.c source file.
-void WriteMessage(upb::MessageDefPtr message, const DefPoolPair& pools,
-                  const Options& options, Output& output) {
-  std::string msg_name = ToCIdent(message.full_name());
-  std::string fields_array_ref = "NULL";
-  std::string submsgs_array_ref = "NULL";
-  std::string subenums_array_ref = "NULL";
-  const upb_MiniTable* mt_32 = pools.GetMiniTable32(message);
-  const upb_MiniTable* mt_64 = pools.GetMiniTable64(message);
-  std::map<int, std::string> subs;
-
-  for (int i = 0; i < mt_64->field_count; i++) {
-    const upb_MiniTableField* f = &mt_64->fields[i];
-    uint32_t index = f->UPB_PRIVATE(submsg_index);
-    if (index != kUpb_NoSub) {
-      auto pair =
-          subs.emplace(index, GetSub(message.FindFieldByNumber(f->number)));
-      ABSL_CHECK(pair.second);
-    }
-  }
-
-  if (!subs.empty()) {
-    std::string submsgs_array_name = msg_name + "_submsgs";
-    submsgs_array_ref = "&" + submsgs_array_name + "[0]";
-    output("static const upb_MiniTableSub $0[$1] = {\n", submsgs_array_name,
-           subs.size());
-
-    int i = 0;
-    for (const auto& pair : subs) {
-      ABSL_CHECK(pair.first == i++);
-      output("  $0,\n", pair.second);
-    }
-
-    output("};\n\n");
-  }
-
-  if (mt_64->field_count > 0) {
-    std::string fields_array_name = msg_name + "__fields";
-    fields_array_ref = "&" + fields_array_name + "[0]";
-    output("static const upb_MiniTableField $0[$1] = {\n", fields_array_name,
-           mt_64->field_count);
-    for (int i = 0; i < mt_64->field_count; i++) {
-      WriteMessageField(message.FindFieldByNumber(mt_64->fields[i].number),
-                        &mt_64->fields[i], &mt_32->fields[i], options, output);
-    }
-    output("};\n\n");
-  }
-
-  std::vector<TableEntry> table;
-  uint8_t table_mask = -1;
-
-  table = FastDecodeTable(message, pools);
-
-  if (table.size() > 1) {
-    assert((table.size() & (table.size() - 1)) == 0);
-    table_mask = (table.size() - 1) << 3;
-  }
-
-  std::string msgext = "kUpb_ExtMode_NonExtendable";
-
-  if (message.extension_range_count()) {
-    if (UPB_DESC(MessageOptions_message_set_wire_format)(message.options())) {
-      msgext = "kUpb_ExtMode_IsMessageSet";
-    } else {
-      msgext = "kUpb_ExtMode_Extendable";
-    }
-  }
-
-  output("const upb_MiniTable $0 = {\n", MessageInitName(message));
-  output("  $0,\n", submsgs_array_ref);
-  output("  $0,\n", fields_array_ref);
-  output("  $0, $1, $2, $3, UPB_FASTTABLE_MASK($4), $5,\n",
-         ArchDependentSize(mt_32->size, mt_64->size), mt_64->field_count,
-         msgext, mt_64->dense_below, table_mask, mt_64->required_count);
-  if (!table.empty()) {
-    output("  UPB_FASTTABLE_INIT({\n");
-    for (const auto& ent : table) {
-      output("    {0x$1, &$0},\n", ent.first,
-             absl::StrCat(absl::Hex(ent.second, absl::kZeroPad16)));
-    }
-    output("  })\n");
-  }
-  output("};\n\n");
-}
-
-void WriteEnum(upb::EnumDefPtr e, Output& output) {
-  std::string values_init = "{\n";
-  const upb_MiniTableEnum* mt = e.mini_table();
-  uint32_t value_count = (mt->mask_limit / 32) + mt->value_count;
-  for (uint32_t i = 0; i < value_count; i++) {
-    absl::StrAppend(&values_init, "                0x", absl::Hex(mt->data[i]),
-                    ",\n");
-  }
-  values_init += "    }";
-
-  output(
-      R"cc(
-        const upb_MiniTableEnum $0 = {
-            $1,
-            $2,
-            $3,
-        };
-      )cc",
-      EnumInit(e), mt->mask_limit, mt->value_count, values_init);
-  output("\n");
-}
-
-int WriteEnums(const DefPoolPair& pools, upb::FileDefPtr file, Output& output) {
-  if (file.syntax() != kUpb_Syntax_Proto2) return 0;
-
-  std::vector<upb::EnumDefPtr> this_file_enums = SortedEnums(file);
-
-  for (const auto e : this_file_enums) {
-    WriteEnum(e, output);
-  }
-
-  if (!this_file_enums.empty()) {
-    output("static const upb_MiniTableEnum *$0[$1] = {\n", kEnumsInit,
-           this_file_enums.size());
-    for (const auto e : this_file_enums) {
-      output("  &$0,\n", EnumInit(e));
-    }
-    output("};\n");
-    output("\n");
-  }
-
-  return this_file_enums.size();
-}
-
-int WriteMessages(const DefPoolPair& pools, upb::FileDefPtr file,
-                  const Options& options, Output& output) {
-  std::vector<upb::MessageDefPtr> file_messages = SortedMessages(file);
-
-  if (file_messages.empty()) return 0;
-
-  for (auto message : file_messages) {
-    WriteMessage(message, pools, options, output);
-  }
-
-  output("static const upb_MiniTable *$0[$1] = {\n", kMessagesInit,
-         file_messages.size());
-  for (auto message : file_messages) {
-    output("  &$0,\n", MessageInitName(message));
-  }
-  output("};\n");
-  output("\n");
-  return file_messages.size();
-}
-
-void WriteExtension(upb::FieldDefPtr ext, const DefPoolPair& pools,
-                    const Options& options, Output& output) {
-  output("$0,\n", FieldInitializer(pools, ext, options));
-  output("  &$0,\n", MessageInitName(ext.containing_type()));
-  output("  $0,\n", GetSub(ext));
-}
-
-int WriteExtensions(const DefPoolPair& pools, upb::FileDefPtr file,
-                    const Options& options, Output& output) {
-  auto exts = SortedExtensions(file);
-
-  if (exts.empty()) return 0;
-
-  // Order by full name for consistent ordering.
-  std::map<std::string, upb::MessageDefPtr> forward_messages;
-
-  for (auto ext : exts) {
-    forward_messages[ext.containing_type().full_name()] = ext.containing_type();
-    if (ext.message_type()) {
-      forward_messages[ext.message_type().full_name()] = ext.message_type();
-    }
-  }
-
-  for (const auto& decl : forward_messages) {
-    ForwardDeclareMiniTableInit(decl.second, options, output);
-  }
-
-  for (auto ext : exts) {
-    output("const upb_MiniTableExtension $0 = {\n  ", ExtensionLayout(ext));
-    WriteExtension(ext, pools, options, output);
-    output("\n};\n");
-  }
-
-  output(
-      "\n"
-      "static const upb_MiniTableExtension *$0[$1] = {\n",
-      kExtensionsInit, exts.size());
-
-  for (auto ext : exts) {
-    output("  &$0,\n", ExtensionLayout(ext));
-  }
-
-  output(
-      "};\n"
-      "\n");
-  return exts.size();
-}
-
-void WriteMiniTableSource(const DefPoolPair& pools, upb::FileDefPtr file,
-                          const Options& options, Output& output) {
-  EmitFileWarning(file.name(), output);
-
-  output(
-      "#include <stddef.h>\n"
-      "#include \"upb/generated_code_support.h\"\n"
-      "#include \"$0\"\n",
-      HeaderFilename(file));
-
-  for (int i = 0; i < file.dependency_count(); i++) {
-    output("#include \"$0\"\n", HeaderFilename(file.dependency(i)));
-  }
-
-  output(
-      "\n"
-      "// Must be last.\n"
-      "#include \"upb/port/def.inc\"\n"
-      "\n");
-
-  int msg_count = WriteMessages(pools, file, options, output);
-  int ext_count = WriteExtensions(pools, file, options, output);
-  int enum_count = WriteEnums(pools, file, output);
-
-  output("const upb_MiniTableFile $0 = {\n", FileLayoutName(file));
-  output("  $0,\n", msg_count ? kMessagesInit : "NULL");
-  output("  $0,\n", enum_count ? kEnumsInit : "NULL");
-  output("  $0,\n", ext_count ? kExtensionsInit : "NULL");
-  output("  $0,\n", msg_count);
-  output("  $0,\n", enum_count);
-  output("  $0,\n", ext_count);
-  output("};\n\n");
-
-  output("#include \"upb/port/undef.inc\"\n");
-  output("\n");
-}
-
-void WriteMessageMiniDescriptorInitializer(upb::MessageDefPtr msg,
-                                           const Options& options,
-                                           Output& output) {
-  Output resolve_calls;
-  for (int i = 0; i < msg.field_count(); i++) {
-    upb::FieldDefPtr field = msg.field(i);
-    if (!field.message_type() && !field.enum_subdef()) continue;
-    if (field.message_type()) {
-      resolve_calls(
-          "upb_MiniTable_SetSubMessage(mini_table, "
-          "(upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, "
-          "$0), $1);\n  ",
-          field.number(), MessageMiniTableRef(field.message_type(), options));
-    } else if (field.enum_subdef() && field.enum_subdef().is_closed()) {
-      resolve_calls(
-          "upb_MiniTable_SetSubEnum(mini_table, "
-          "(upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, "
-          "$0), $1);\n  ",
-          field.number(), EnumMiniTableRef(field.enum_subdef(), options));
-    }
-  }
-
-  output(
-      R"cc(
-        const upb_MiniTable* $0() {
-          static upb_MiniTable* mini_table = NULL;
-          static const char* mini_descriptor = "$1";
-          if (mini_table) return mini_table;
-          mini_table =
-              upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
-                                  upb_BootstrapArena(), NULL);
-          $2return mini_table;
-        }
-      )cc",
-      MessageInitName(msg), msg.MiniDescriptorEncode(), resolve_calls.output());
-  output("\n");
-}
-
-void WriteEnumMiniDescriptorInitializer(upb::EnumDefPtr enum_def,
-                                        const Options& options,
-                                        Output& output) {
-  output(
-      R"cc(
-        const upb_MiniTableEnum* $0() {
-          static const upb_MiniTableEnum* mini_table = NULL;
-          static const char* mini_descriptor = "$1";
-          if (mini_table) return mini_table;
-          mini_table =
-              upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
-                                      upb_BootstrapArena(), NULL);
-          return mini_table;
-        }
-      )cc",
-      EnumInitName(enum_def), enum_def.MiniDescriptorEncode());
-  output("\n");
-}
-
-void WriteMiniDescriptorSource(const DefPoolPair& pools, upb::FileDefPtr file,
-                               const Options& options, Output& output) {
-  output(
-      "#include <stddef.h>\n"
-      "#include \"upb/generated_code_support.h\"\n"
-      "#include \"$0\"\n\n",
-      HeaderFilename(file));
-
-  for (int i = 0; i < file.dependency_count(); i++) {
-    output("#include \"$0\"\n", HeaderFilename(file.dependency(i)));
-  }
-
-  output(
-      R"cc(
-        static upb_Arena* upb_BootstrapArena() {
-          static upb_Arena* arena = NULL;
-          if (!arena) arena = upb_Arena_New();
-          return arena;
-        }
-      )cc");
-
-  output("\n");
-
-  for (const auto msg : SortedMessages(file)) {
-    WriteMessageMiniDescriptorInitializer(msg, options, output);
-  }
-
-  for (const auto msg : SortedEnums(file)) {
-    WriteEnumMiniDescriptorInitializer(msg, options, output);
-  }
-}
-
-void WriteSource(const DefPoolPair& pools, upb::FileDefPtr file,
-                 const Options& options, Output& output) {
-  if (options.bootstrap) {
-    WriteMiniDescriptorSource(pools, file, options, output);
-  } else {
-    WriteMiniTableSource(pools, file, options, output);
-  }
-}
-
-void GenerateFile(const DefPoolPair& pools, upb::FileDefPtr file,
-                  const Options& options, Plugin* plugin) {
-  Output h_output;
-  WriteHeader(pools, file, options, h_output);
-  plugin->AddOutputFile(HeaderFilename(file), h_output.output());
-
-  Output c_output;
-  WriteSource(pools, file, options, c_output);
-  plugin->AddOutputFile(SourceFilename(file), c_output.output());
-}
-
-bool ParseOptions(Plugin* plugin, Options* options) {
-  for (const auto& pair : ParseGeneratorParameter(plugin->parameter())) {
-    if (pair.first == "bootstrap_upb") {
-      options->bootstrap = true;
-    } else {
-      plugin->SetError(absl::Substitute("Unknown parameter: $0", pair.first));
-      return false;
-    }
-  }
-
-  return true;
-}
-
-absl::string_view ToStringView(upb_StringView str) {
-  return absl::string_view(str.data, str.size);
-}
-
-}  // namespace
-
-}  // namespace upbc
-
-int main(int argc, char** argv) {
-  upbc::DefPoolPair pools;
-  upbc::Plugin plugin;
-  upbc::Options options;
-  if (!ParseOptions(&plugin, &options)) return 0;
-  plugin.GenerateFilesRaw([&](const UPB_DESC(FileDescriptorProto) * file_proto,
-                              bool generate) {
-    upb::Status status;
-    upb::FileDefPtr file = pools.AddFile(file_proto, &status);
-    if (!file) {
-      absl::string_view name =
-          upbc::ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto));
-      ABSL_LOG(FATAL) << "Couldn't add file " << name
-                      << " to DefPool: " << status.error_message();
-    }
-    if (generate) GenerateFile(pools, file, options, &plugin);
-  });
-  return 0;
-}
diff --git a/third_party/upb/upbc/protoc-gen-upbdefs.cc b/third_party/upb/upbc/protoc-gen-upbdefs.cc
deleted file mode 100644
index 2d781a67a6e50..0000000000000
--- a/third_party/upb/upbc/protoc-gen-upbdefs.cc
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) 2009-2021, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-
-#include "google/protobuf/descriptor.upb.h"
-#include "upb/reflection/def.hpp"
-#include "upb/util/def_to_proto.h"
-#include "upbc/common.h"
-#include "upbc/file_layout.h"
-#include "upbc/plugin.h"
-
-namespace upbc {
-namespace {
-
-std::string DefInitSymbol(upb::FileDefPtr file) {
-  return ToCIdent(file.name()) + "_upbdefinit";
-}
-
-static std::string DefHeaderFilename(upb::FileDefPtr file) {
-  return StripExtension(file.name()) + ".upbdefs.h";
-}
-
-static std::string DefSourceFilename(upb::FileDefPtr file) {
-  return StripExtension(file.name()) + ".upbdefs.c";
-}
-
-void GenerateMessageDefAccessor(upb::MessageDefPtr d, Output& output) {
-  output("UPB_INLINE const upb_MessageDef *$0_getmsgdef(upb_DefPool *s) {\n",
-         ToCIdent(d.full_name()));
-  output("  _upb_DefPool_LoadDefInit(s, &$0);\n", DefInitSymbol(d.file()));
-  output("  return upb_DefPool_FindMessageByName(s, \"$0\");\n", d.full_name());
-  output("}\n");
-  output("\n");
-}
-
-void WriteDefHeader(upb::FileDefPtr file, Output& output) {
-  EmitFileWarning(file.name(), output);
-
-  output(
-      "#ifndef $0_UPBDEFS_H_\n"
-      "#define $0_UPBDEFS_H_\n\n"
-      "#include \"upb/reflection/def.h\"\n"
-      "#include \"upb/reflection/def_pool_internal.h\"\n"
-      "#include \"upb/port/def.inc\"\n"
-      "#ifdef __cplusplus\n"
-      "extern \"C\" {\n"
-      "#endif\n\n",
-      ToPreproc(file.name()));
-
-  output("#include \"upb/reflection/def.h\"\n");
-  output("\n");
-  output("#include \"upb/port/def.inc\"\n");
-  output("\n");
-
-  output("extern _upb_DefPool_Init $0;\n", DefInitSymbol(file));
-  output("\n");
-
-  for (auto msg : SortedMessages(file)) {
-    GenerateMessageDefAccessor(msg, output);
-  }
-
-  output(
-      "#ifdef __cplusplus\n"
-      "}  /* extern \"C\" */\n"
-      "#endif\n"
-      "\n"
-      "#include \"upb/port/undef.inc\"\n"
-      "\n"
-      "#endif  /* $0_UPBDEFS_H_ */\n",
-      ToPreproc(file.name()));
-}
-
-void WriteDefSource(upb::FileDefPtr file, Output& output) {
-  EmitFileWarning(file.name(), output);
-
-  output("#include \"upb/reflection/def.h\"\n");
-  output("#include \"$0\"\n", DefHeaderFilename(file));
-  output("#include \"$0\"\n", HeaderFilename(file));
-  output("\n");
-
-  for (int i = 0; i < file.dependency_count(); i++) {
-    output("extern _upb_DefPool_Init $0;\n", DefInitSymbol(file.dependency(i)));
-  }
-
-  upb::Arena arena;
-  google_protobuf_FileDescriptorProto* file_proto =
-      upb_FileDef_ToProto(file.ptr(), arena.ptr());
-  size_t serialized_size;
-  const char* serialized = google_protobuf_FileDescriptorProto_serialize(
-      file_proto, arena.ptr(), &serialized_size);
-  absl::string_view file_data(serialized, serialized_size);
-
-  output("static const char descriptor[$0] = {", serialized_size);
-
-  // C90 only guarantees that strings can be up to 509 characters, and some
-  // implementations have limits here (for example, MSVC only allows 64k:
-  // https://docs.microsoft.com/en-us/cpp/error-messages/compiler-errors-1/fatal-error-c1091.
-  // So we always emit an array instead of a string.
-  for (size_t i = 0; i < serialized_size;) {
-    for (size_t j = 0; j < 25 && i < serialized_size; ++i, ++j) {
-      output("'$0', ", absl::CEscape(file_data.substr(i, 1)));
-    }
-    output("\n");
-  }
-  output("};\n\n");
-
-  output("static _upb_DefPool_Init *deps[$0] = {\n",
-         file.dependency_count() + 1);
-  for (int i = 0; i < file.dependency_count(); i++) {
-    output("  &$0,\n", DefInitSymbol(file.dependency(i)));
-  }
-  output("  NULL\n");
-  output("};\n");
-  output("\n");
-
-  output("_upb_DefPool_Init $0 = {\n", DefInitSymbol(file));
-  output("  deps,\n");
-  output("  &$0,\n", FileLayoutName(file));
-  output("  \"$0\",\n", file.name());
-  output("  UPB_STRINGVIEW_INIT(descriptor, $0)\n", file_data.size());
-  output("};\n");
-}
-
-void GenerateFile(upb::FileDefPtr file, Plugin* plugin) {
-  Output h_def_output;
-  WriteDefHeader(file, h_def_output);
-  plugin->AddOutputFile(DefHeaderFilename(file), h_def_output.output());
-
-  Output c_def_output;
-  WriteDefSource(file, c_def_output);
-  plugin->AddOutputFile(DefSourceFilename(file), c_def_output.output());
-}
-
-}  // namespace
-}  // namespace upbc
-
-int main(int argc, char** argv) {
-  upbc::Plugin plugin;
-  if (!plugin.parameter().empty()) {
-    plugin.SetError(
-        absl::StrCat("Expected no parameters, got: ", plugin.parameter()));
-    return 0;
-  }
-  plugin.GenerateFiles(
-      [&](upb::FileDefPtr file) { upbc::GenerateFile(file, &plugin); });
-  return 0;
-}
diff --git a/third_party/upb/upbc/protoc-gen-upbdev.cc b/third_party/upb/upbc/protoc-gen-upbdev.cc
deleted file mode 100644
index 5f7262294f3cb..0000000000000
--- a/third_party/upb/upbc/protoc-gen-upbdev.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2009-2022, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <iostream>
-#include <string>
-
-#include "google/protobuf/compiler/plugin.upb.h"
-#include "upbc/subprocess.h"
-#include "upbc/upbdev.h"
-
-static constexpr char kDefaultPlugin[] = "protoc_dart_plugin";
-
-int main() {
-  upb_Arena* a = upb_Arena_New();
-  upb_Status status;
-  upb_Status_Clear(&status);
-
-  // Read (binary) stdin into a string.
-  const std::string input = {std::istreambuf_iterator<char>(std::cin),
-                             std::istreambuf_iterator<char>()};
-
-  // Parse the request.
-  auto inner_request = google_protobuf_compiler_CodeGeneratorRequest_parse(
-      input.c_str(), input.size(), a);
-
-  // Check the request for a plugin name.
-  std::string plugin = kDefaultPlugin;
-  if (google_protobuf_compiler_CodeGeneratorRequest_has_parameter(inner_request)) {
-    auto param = google_protobuf_compiler_CodeGeneratorRequest_parameter(inner_request);
-    plugin = std::string(param.data, param.size);
-  }
-
-  // Wrap the request inside a upbc_CodeGeneratorRequest and JSON-encode it.
-  const upb_StringView sv =
-      upbdev_ProcessInput(input.data(), input.size(), a, &status);
-  if (!upb_Status_IsOk(&status)) {
-    std::cerr << status.msg << std::endl;
-    return -1;
-  }
-
-  // Launch the subprocess.
-  upbc::Subprocess subprocess;
-  subprocess.Start(plugin, upbc::Subprocess::SEARCH_PATH);
-
-  // Exchange JSON strings with the subprocess.
-  const std::string json_request = std::string(sv.data, sv.size);
-  std::string json_response, error;
-  const bool ok = subprocess.Communicate(json_request, &json_response, &error);
-  if (!ok) {
-    // Dump the JSON request to stderr if we can't launch the next plugin.
-    std::cerr << json_request << std::endl;
-    return -1;
-  }
-
-  // Decode, serialize, and write the JSON response.
-  upbdev_ProcessOutput(json_response.data(), json_response.size(), a, &status);
-  if (!upb_Status_IsOk(&status)) {
-    std::cerr << status.msg << std::endl;
-    return -1;
-  }
-
-  upb_Arena_Free(a);
-  return 0;
-}
diff --git a/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.c b/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.c
deleted file mode 100644
index 1590f35fab65d..0000000000000
--- a/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <stddef.h>
-#include "upb/generated_code_support.h"
-#include "google/protobuf/compiler/plugin.upb.h"
-
-#include "google/protobuf/descriptor.upb.h"
-static upb_Arena* upb_BootstrapArena() {
-  static upb_Arena* arena = NULL;
-  if (!arena) arena = upb_Arena_New();
-  return arena;
-}
-
-const upb_MiniTable* google_protobuf_compiler_Version_msg_init() {
-  static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$(((1";
-  if (mini_table) return mini_table;
-  mini_table =
-      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
-                          upb_BootstrapArena(), NULL);
-  return mini_table;
-}
-
-const upb_MiniTable* google_protobuf_compiler_CodeGeneratorRequest_msg_init() {
-  static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$E13kG";
-  if (mini_table) return mini_table;
-  mini_table =
-      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
-                          upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 15), google_protobuf_FileDescriptorProto_msg_init());
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_compiler_Version_msg_init());
-  return mini_table;
-}
-
-const upb_MiniTable* google_protobuf_compiler_CodeGeneratorResponse_msg_init() {
-  static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$1,lG";
-  if (mini_table) return mini_table;
-  mini_table =
-      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
-                          upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 15), google_protobuf_compiler_CodeGeneratorResponse_File_msg_init());
-  return mini_table;
-}
-
-const upb_MiniTable* google_protobuf_compiler_CodeGeneratorResponse_File_msg_init() {
-  static upb_MiniTable* mini_table = NULL;
-  static const char* mini_descriptor = "$11l13";
-  if (mini_table) return mini_table;
-  mini_table =
-      upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
-                          upb_BootstrapArena(), NULL);
-  upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 16), google_protobuf_GeneratedCodeInfo_msg_init());
-  return mini_table;
-}
-
-const upb_MiniTableEnum* google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init() {
-  static const upb_MiniTableEnum* mini_table = NULL;
-  static const char* mini_descriptor = "!$";
-  if (mini_table) return mini_table;
-  mini_table =
-      upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),
-                              upb_BootstrapArena(), NULL);
-  return mini_table;
-}
diff --git a/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.h b/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.h
deleted file mode 100644
index be35a4295a1c7..0000000000000
--- a/third_party/upb/upbc/stage0/google/protobuf/compiler/plugin.upb.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/compiler/plugin.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_
-
-#include "upb/generated_code_support.h"
-
-// Must be last. 
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct google_protobuf_compiler_Version google_protobuf_compiler_Version;
-typedef struct google_protobuf_compiler_CodeGeneratorRequest google_protobuf_compiler_CodeGeneratorRequest;
-typedef struct google_protobuf_compiler_CodeGeneratorResponse google_protobuf_compiler_CodeGeneratorResponse;
-typedef struct google_protobuf_compiler_CodeGeneratorResponse_File google_protobuf_compiler_CodeGeneratorResponse_File;
-extern const upb_MiniTable* google_protobuf_compiler_Version_msg_init();
-extern const upb_MiniTable* google_protobuf_compiler_CodeGeneratorRequest_msg_init();
-extern const upb_MiniTable* google_protobuf_compiler_CodeGeneratorResponse_msg_init();
-extern const upb_MiniTable* google_protobuf_compiler_CodeGeneratorResponse_File_msg_init();
-struct google_protobuf_FileDescriptorProto;
-struct google_protobuf_GeneratedCodeInfo;
-extern const upb_MiniTable* google_protobuf_FileDescriptorProto_msg_init();
-extern const upb_MiniTable* google_protobuf_GeneratedCodeInfo_msg_init();
-
-typedef enum {
-  google_protobuf_compiler_CodeGeneratorResponse_FEATURE_NONE = 0,
-  google_protobuf_compiler_CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL = 1
-} google_protobuf_compiler_CodeGeneratorResponse_Feature;
-
-
-extern const upb_MiniTableEnum* google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init();
-
-/* google.protobuf.compiler.Version */
-
-UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_new(upb_Arena* arena) {
-  return (google_protobuf_compiler_Version*)_upb_Message_New(google_protobuf_compiler_Version_msg_init(), arena);
-}
-UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_compiler_Version* ret = google_protobuf_compiler_Version_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_Version_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_compiler_Version* ret = google_protobuf_compiler_Version_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_Version_msg_init(), extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_compiler_Version_serialize(const google_protobuf_compiler_Version* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_Version_msg_init(), 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_compiler_Version_serialize_ex(const google_protobuf_compiler_Version* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_Version_msg_init(), options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_compiler_Version_clear_major(google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 1);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_compiler_Version_major(const google_protobuf_compiler_Version* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 1);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_Version_has_major(const google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 1);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_Version_clear_minor(google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 2);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_compiler_Version_minor(const google_protobuf_compiler_Version* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 2);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_Version_has_minor(const google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 2);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_Version_clear_patch(google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 3);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE int32_t google_protobuf_compiler_Version_patch(const google_protobuf_compiler_Version* msg) {
-  int32_t default_val = (int32_t)0;
-  int32_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 3);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_Version_has_patch(const google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 3);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_Version_clear_suffix(google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 4);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_Version_suffix(const google_protobuf_compiler_Version* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 4);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_Version_has_suffix(const google_protobuf_compiler_Version* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 4);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_compiler_Version_set_major(google_protobuf_compiler_Version *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 1);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_Version_set_minor(google_protobuf_compiler_Version *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 2);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_Version_set_patch(google_protobuf_compiler_Version *msg, int32_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 3);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_Version_set_suffix(google_protobuf_compiler_Version *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_Version_msg_init(), 4);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-
-/* google.protobuf.compiler.CodeGeneratorRequest */
-
-UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compiler_CodeGeneratorRequest_new(upb_Arena* arena) {
-  return (google_protobuf_compiler_CodeGeneratorRequest*)_upb_Message_New(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), arena);
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compiler_CodeGeneratorRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorRequest* ret = google_protobuf_compiler_CodeGeneratorRequest_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorRequest_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compiler_CodeGeneratorRequest_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorRequest* ret = google_protobuf_compiler_CodeGeneratorRequest_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorRequest_msg_init(), extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorRequest_serialize(const google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorRequest_serialize_ex(const google_protobuf_compiler_CodeGeneratorRequest* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorRequest_msg_init(), options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 1);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView const* google_protobuf_compiler_CodeGeneratorRequest_file_to_generate(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 1);
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_file_to_generate(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  size_t size;
-  google_protobuf_compiler_CodeGeneratorRequest_file_to_generate(msg, &size);
-  return size != 0;
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_parameter(google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 2);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorRequest_parameter(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 2);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_parameter(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 2);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_compiler_version(google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 3);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_compiler_Version* google_protobuf_compiler_CodeGeneratorRequest_compiler_version(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const google_protobuf_compiler_Version* default_val = NULL;
-  const google_protobuf_compiler_Version* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 3);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_compiler_version(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 3);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 15);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_FileDescriptorProto* const* google_protobuf_compiler_CodeGeneratorRequest_proto_file(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 15);
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const struct google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_proto_file(const google_protobuf_compiler_CodeGeneratorRequest* msg) {
-  size_t size;
-  google_protobuf_compiler_CodeGeneratorRequest_proto_file(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE upb_StringView* google_protobuf_compiler_CodeGeneratorRequest_mutable_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 1);
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (upb_StringView*)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE upb_StringView* google_protobuf_compiler_CodeGeneratorRequest_resize_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 1);
-  return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_add_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_StringView val, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 1);
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return false;
-  }
-  _upb_Array_Set(arr, arr->size - 1, &val, sizeof(val));
-  return true;
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_set_parameter(google_protobuf_compiler_CodeGeneratorRequest *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 2);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_set_compiler_version(google_protobuf_compiler_CodeGeneratorRequest *msg, google_protobuf_compiler_Version* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 3);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_compiler_Version* google_protobuf_compiler_CodeGeneratorRequest_mutable_compiler_version(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena) {
-  struct google_protobuf_compiler_Version* sub = (struct google_protobuf_compiler_Version*)google_protobuf_compiler_CodeGeneratorRequest_compiler_version(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_compiler_Version*)_upb_Message_New(google_protobuf_compiler_Version_msg_init(), arena);
-    if (sub) google_protobuf_compiler_CodeGeneratorRequest_set_compiler_version(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_mutable_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 15);
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (struct google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_resize_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 15);
-  return (struct google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_compiler_CodeGeneratorRequest_add_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorRequest_msg_init(), 15);
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(google_protobuf_FileDescriptorProto_msg_init(), arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.compiler.CodeGeneratorResponse */
-
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compiler_CodeGeneratorResponse_new(upb_Arena* arena) {
-  return (google_protobuf_compiler_CodeGeneratorResponse*)_upb_Message_New(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), arena);
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compiler_CodeGeneratorResponse_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorResponse* ret = google_protobuf_compiler_CodeGeneratorResponse_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorResponse_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compiler_CodeGeneratorResponse_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorResponse* ret = google_protobuf_compiler_CodeGeneratorResponse_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorResponse_msg_init(), extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_serialize(const google_protobuf_compiler_CodeGeneratorResponse* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_serialize_ex(const google_protobuf_compiler_CodeGeneratorResponse* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorResponse_msg_init(), options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_error(google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 1);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_error(const google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 1);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_error(const google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 1);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_supported_features(google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 2);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE uint64_t google_protobuf_compiler_CodeGeneratorResponse_supported_features(const google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  uint64_t default_val = (uint64_t)0ull;
-  uint64_t ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 2);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_supported_features(const google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 2);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_file(google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 15);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const google_protobuf_compiler_CodeGeneratorResponse_File* const* google_protobuf_compiler_CodeGeneratorResponse_file(const google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 15);
-  const upb_Array* arr = upb_Message_GetArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (const google_protobuf_compiler_CodeGeneratorResponse_File* const*)_upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_file(const google_protobuf_compiler_CodeGeneratorResponse* msg) {
-  size_t size;
-  google_protobuf_compiler_CodeGeneratorResponse_file(msg, &size);
-  return size != 0;
-}
-
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_error(google_protobuf_compiler_CodeGeneratorResponse *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 1);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_supported_features(google_protobuf_compiler_CodeGeneratorResponse *msg, uint64_t value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 2);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File** google_protobuf_compiler_CodeGeneratorResponse_mutable_file(google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 15);
-  upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
-  if (arr) {
-    if (size) *size = arr->size;
-    return (google_protobuf_compiler_CodeGeneratorResponse_File**)_upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File** google_protobuf_compiler_CodeGeneratorResponse_resize_file(google_protobuf_compiler_CodeGeneratorResponse* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 15);
-  return (google_protobuf_compiler_CodeGeneratorResponse_File**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena);
-}
-UPB_INLINE struct google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_add_file(google_protobuf_compiler_CodeGeneratorResponse* msg, upb_Arena* arena) {
-  upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_msg_init(), 15);
-  upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
-  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
-    return NULL;
-  }
-  struct google_protobuf_compiler_CodeGeneratorResponse_File* sub = (struct google_protobuf_compiler_CodeGeneratorResponse_File*)_upb_Message_New(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), arena);
-  if (!arr || !sub) return NULL;
-  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
-  return sub;
-}
-
-/* google.protobuf.compiler.CodeGeneratorResponse.File */
-
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_File_new(upb_Arena* arena) {
-  return (google_protobuf_compiler_CodeGeneratorResponse_File*)_upb_Message_New(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), arena);
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_File_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorResponse_File* ret = google_protobuf_compiler_CodeGeneratorResponse_File_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_File_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_compiler_CodeGeneratorResponse_File* ret = google_protobuf_compiler_CodeGeneratorResponse_File_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_File_serialize(const google_protobuf_compiler_CodeGeneratorResponse_File* msg, upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 0, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_File_serialize_ex(const google_protobuf_compiler_CodeGeneratorResponse_File* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  char* ptr;
-  (void)upb_Encode(msg, google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), options, arena, &ptr, len);
-  return ptr;
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_name(google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 1);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_name(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 1);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_name(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 1);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_insertion_point(google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 2);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_insertion_point(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 2);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_insertion_point(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 2);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_content(google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 15);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_content(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  upb_StringView default_val = upb_StringView_FromString("");
-  upb_StringView ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 15);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_content(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 15);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 16);
-  _upb_Message_ClearNonExtensionField(msg, &field);
-}
-UPB_INLINE const struct google_protobuf_GeneratedCodeInfo* google_protobuf_compiler_CodeGeneratorResponse_File_generated_code_info(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const struct google_protobuf_GeneratedCodeInfo* default_val = NULL;
-  const struct google_protobuf_GeneratedCodeInfo* ret;
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 16);
-  _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
-  return ret;
-}
-UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_generated_code_info(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 16);
-  return _upb_Message_HasNonExtensionField(msg, &field);
-}
-
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_name(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 1);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_insertion_point(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 2);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_content(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 15);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File *msg, struct google_protobuf_GeneratedCodeInfo* value) {
-  const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google_protobuf_compiler_CodeGeneratorResponse_File_msg_init(), 16);
-  _upb_Message_SetNonExtensionField(msg, &field, &value);
-}
-UPB_INLINE struct google_protobuf_GeneratedCodeInfo* google_protobuf_compiler_CodeGeneratorResponse_File_mutable_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File* msg, upb_Arena* arena) {
-  struct google_protobuf_GeneratedCodeInfo* sub = (struct google_protobuf_GeneratedCodeInfo*)google_protobuf_compiler_CodeGeneratorResponse_File_generated_code_info(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_GeneratedCodeInfo*)_upb_Message_New(google_protobuf_GeneratedCodeInfo_msg_init(), arena);
-    if (sub) google_protobuf_compiler_CodeGeneratorResponse_File_set_generated_code_info(msg, sub);
-  }
-  return sub;
-}
-
-extern const upb_MiniTableFile google_protobuf_compiler_plugin_proto_upb_file_layout;
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  /* GOOGLE_PROTOBUF_COMPILER_PLUGIN_PROTO_UPB_H_ */
diff --git a/third_party/upb/upbc/subprocess.cc b/third_party/upb/upbc/subprocess.cc
deleted file mode 100644
index f11fe58fb09b7..0000000000000
--- a/third_party/upb/upbc/subprocess.cc
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Shamelessly copied from the protobuf compiler's subprocess.cc
-// except this version passes strings instead of Messages.
-
-#include "upbc/subprocess.h"
-
-#include <algorithm>
-#include <cstring>
-#include <iostream>
-
-#ifndef _MSVC_LANG
-#include <errno.h>
-#include <signal.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#endif
-
-#include "absl/log/absl_log.h"
-#include "absl/strings/substitute.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-namespace upbc {
-
-namespace {
-char* portable_strdup(const char* s) {
-  char* ns = (char*)malloc(strlen(s) + 1);
-  if (ns != nullptr) {
-    strcpy(ns, s);
-  }
-  return ns;
-}
-}  // namespace
-
-#ifdef _WIN32
-
-static void CloseHandleOrDie(HANDLE handle) {
-  if (!CloseHandle(handle)) {
-    ABSL_LOG(FATAL) << "CloseHandle: "
-                    << Subprocess::Win32ErrorMessage(GetLastError());
-  }
-}
-
-Subprocess::Subprocess()
-    : process_start_error_(ERROR_SUCCESS),
-      child_handle_(nullptr),
-      child_stdin_(nullptr),
-      child_stdout_(nullptr) {}
-
-Subprocess::~Subprocess() {
-  if (child_stdin_ != nullptr) {
-    CloseHandleOrDie(child_stdin_);
-  }
-  if (child_stdout_ != nullptr) {
-    CloseHandleOrDie(child_stdout_);
-  }
-}
-
-void Subprocess::Start(const std::string& program, SearchMode search_mode) {
-  // Create the pipes.
-  HANDLE stdin_pipe_read;
-  HANDLE stdin_pipe_write;
-  HANDLE stdout_pipe_read;
-  HANDLE stdout_pipe_write;
-
-  if (!CreatePipe(&stdin_pipe_read, &stdin_pipe_write, nullptr, 0)) {
-    ABSL_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
-  }
-  if (!CreatePipe(&stdout_pipe_read, &stdout_pipe_write, nullptr, 0)) {
-    ABSL_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // Make child side of the pipes inheritable.
-  if (!SetHandleInformation(stdin_pipe_read, HANDLE_FLAG_INHERIT,
-                            HANDLE_FLAG_INHERIT)) {
-    ABSL_LOG(FATAL) << "SetHandleInformation: "
-                    << Win32ErrorMessage(GetLastError());
-  }
-  if (!SetHandleInformation(stdout_pipe_write, HANDLE_FLAG_INHERIT,
-                            HANDLE_FLAG_INHERIT)) {
-    ABSL_LOG(FATAL) << "SetHandleInformation: "
-                    << Win32ErrorMessage(GetLastError());
-  }
-
-  // Setup STARTUPINFO to redirect handles.
-  STARTUPINFOA startup_info;
-  ZeroMemory(&startup_info, sizeof(startup_info));
-  startup_info.cb = sizeof(startup_info);
-  startup_info.dwFlags = STARTF_USESTDHANDLES;
-  startup_info.hStdInput = stdin_pipe_read;
-  startup_info.hStdOutput = stdout_pipe_write;
-  startup_info.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
-  if (startup_info.hStdError == INVALID_HANDLE_VALUE) {
-    ABSL_LOG(FATAL) << "GetStdHandle: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // Invoking cmd.exe allows for '.bat' files from the path as well as '.exe'.
-  // Using a malloc'ed string because CreateProcess() can mutate its second
-  // parameter.
-  char* command_line =
-      portable_strdup(("cmd.exe /c \"" + program + "\"").c_str());
-
-  // Create the process.
-  PROCESS_INFORMATION process_info;
-
-  if (CreateProcessA((search_mode == SEARCH_PATH) ? nullptr : program.c_str(),
-                     (search_mode == SEARCH_PATH) ? command_line : nullptr,
-                     nullptr,  // process security attributes
-                     nullptr,  // thread security attributes
-                     TRUE,     // inherit handles?
-                     0,        // obscure creation flags
-                     nullptr,  // environment (inherit from parent)
-                     nullptr,  // current directory (inherit from parent)
-                     &startup_info, &process_info)) {
-    child_handle_ = process_info.hProcess;
-    CloseHandleOrDie(process_info.hThread);
-    child_stdin_ = stdin_pipe_write;
-    child_stdout_ = stdout_pipe_read;
-  } else {
-    process_start_error_ = GetLastError();
-    CloseHandleOrDie(stdin_pipe_write);
-    CloseHandleOrDie(stdout_pipe_read);
-  }
-
-  CloseHandleOrDie(stdin_pipe_read);
-  CloseHandleOrDie(stdout_pipe_write);
-  free(command_line);
-}
-
-bool Subprocess::Communicate(const std::string& input_data,
-                             std::string* output_data, std::string* error) {
-  if (process_start_error_ != ERROR_SUCCESS) {
-    *error = Win32ErrorMessage(process_start_error_);
-    return false;
-  }
-
-  GOOGLE_CHECK(child_handle_ != nullptr) << "Must call Start() first.";
-
-  int input_pos = 0;
-
-  while (child_stdout_ != nullptr) {
-    HANDLE handles[2];
-    int handle_count = 0;
-
-    if (child_stdin_ != nullptr) {
-      handles[handle_count++] = child_stdin_;
-    }
-    if (child_stdout_ != nullptr) {
-      handles[handle_count++] = child_stdout_;
-    }
-
-    DWORD wait_result =
-        WaitForMultipleObjects(handle_count, handles, FALSE, INFINITE);
-
-    HANDLE signaled_handle = nullptr;
-    if (wait_result >= WAIT_OBJECT_0 &&
-        wait_result < WAIT_OBJECT_0 + handle_count) {
-      signaled_handle = handles[wait_result - WAIT_OBJECT_0];
-    } else if (wait_result == WAIT_FAILED) {
-      ABSL_LOG(FATAL) << "WaitForMultipleObjects: "
-                      << Win32ErrorMessage(GetLastError());
-    } else {
-      ABSL_LOG(FATAL) << "WaitForMultipleObjects: Unexpected return code: "
-                      << wait_result;
-    }
-
-    if (signaled_handle == child_stdin_) {
-      DWORD n;
-      if (!WriteFile(child_stdin_, input_data.data() + input_pos,
-                     input_data.size() - input_pos, &n, nullptr)) {
-        // Child closed pipe.  Presumably it will report an error later.
-        // Pretend we're done for now.
-        input_pos = input_data.size();
-      } else {
-        input_pos += n;
-      }
-
-      if (input_pos == input_data.size()) {
-        // We're done writing.  Close.
-        CloseHandleOrDie(child_stdin_);
-        child_stdin_ = nullptr;
-      }
-    } else if (signaled_handle == child_stdout_) {
-      char buffer[4096];
-      DWORD n;
-
-      if (!ReadFile(child_stdout_, buffer, sizeof(buffer), &n, nullptr)) {
-        // We're done reading.  Close.
-        CloseHandleOrDie(child_stdout_);
-        child_stdout_ = nullptr;
-      } else {
-        output_data->append(buffer, n);
-      }
-    }
-  }
-
-  if (child_stdin_ != nullptr) {
-    // Child did not finish reading input before it closed the output.
-    // Presumably it exited with an error.
-    CloseHandleOrDie(child_stdin_);
-    child_stdin_ = nullptr;
-  }
-
-  DWORD wait_result = WaitForSingleObject(child_handle_, INFINITE);
-
-  if (wait_result == WAIT_FAILED) {
-    ABSL_LOG(FATAL) << "WaitForSingleObject: "
-                    << Win32ErrorMessage(GetLastError());
-  } else if (wait_result != WAIT_OBJECT_0) {
-    ABSL_LOG(FATAL) << "WaitForSingleObject: Unexpected return code: "
-                    << wait_result;
-  }
-
-  DWORD exit_code;
-  if (!GetExitCodeProcess(child_handle_, &exit_code)) {
-    ABSL_LOG(FATAL) << "GetExitCodeProcess: "
-                    << Win32ErrorMessage(GetLastError());
-  }
-
-  CloseHandleOrDie(child_handle_);
-  child_handle_ = nullptr;
-
-  if (exit_code != 0) {
-    *error = absl::Substitute("Plugin failed with status code $0.", exit_code);
-    return false;
-  }
-
-  return true;
-}
-
-std::string Subprocess::Win32ErrorMessage(DWORD error_code) {
-  char* message;
-
-  // WTF?
-  FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-                     FORMAT_MESSAGE_IGNORE_INSERTS,
-                 nullptr, error_code,
-                 MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                 (LPSTR)&message,  // NOT A BUG!
-                 0, nullptr);
-
-  std::string result = message;
-  LocalFree(message);
-  return result;
-}
-
-// ===================================================================
-
-#else  // _WIN32
-
-Subprocess::Subprocess()
-    : child_pid_(-1), child_stdin_(-1), child_stdout_(-1) {}
-
-Subprocess::~Subprocess() {
-  if (child_stdin_ != -1) {
-    close(child_stdin_);
-  }
-  if (child_stdout_ != -1) {
-    close(child_stdout_);
-  }
-}
-
-void Subprocess::Start(const std::string& program, SearchMode search_mode) {
-  // Note that we assume that there are no other threads, thus we don't have to
-  // do crazy stuff like using socket pairs or avoiding libc locks.
-
-  // [0] is read end, [1] is write end.
-  int stdin_pipe[2];
-  int stdout_pipe[2];
-
-  int p0 = pipe(stdin_pipe);
-  int p1 = pipe(stdout_pipe);
-  UPB_ASSERT(p0 != -1);
-  UPB_ASSERT(p1 != -1);
-
-  char* argv[2] = {portable_strdup(program.c_str()), nullptr};
-
-  child_pid_ = fork();
-  if (child_pid_ == -1) {
-    std::cerr << "fork: " << strerror(errno);
-  } else if (child_pid_ == 0) {
-    // We are the child.
-    dup2(stdin_pipe[0], STDIN_FILENO);
-    dup2(stdout_pipe[1], STDOUT_FILENO);
-
-    close(stdin_pipe[0]);
-    close(stdin_pipe[1]);
-    close(stdout_pipe[0]);
-    close(stdout_pipe[1]);
-
-    switch (search_mode) {
-      case SEARCH_PATH:
-        execvp(argv[0], argv);
-        break;
-      case EXACT_NAME:
-        execv(argv[0], argv);
-        break;
-    }
-
-    // Write directly to STDERR_FILENO to avoid stdio code paths that may do
-    // stuff that is unsafe here.
-    int ignored;
-    ignored = write(STDERR_FILENO, argv[0], strlen(argv[0]));
-    const char* message =
-        ": program not found or is not executable\n"
-        "Please specify a program using absolute path or make sure "
-        "the program is available in your PATH system variable\n";
-    ignored = write(STDERR_FILENO, message, strlen(message));
-    (void)ignored;
-
-    // Must use _exit() rather than exit() to avoid flushing output buffers
-    // that will also be flushed by the parent.
-    _exit(1);
-  } else {
-    free(argv[0]);
-
-    close(stdin_pipe[0]);
-    close(stdout_pipe[1]);
-
-    child_stdin_ = stdin_pipe[1];
-    child_stdout_ = stdout_pipe[0];
-  }
-}
-
-bool Subprocess::Communicate(const std::string& input_data,
-                             std::string* output_data, std::string* error) {
-  if (child_stdin_ == -1) {
-    std::cerr << "Must call Start() first." << std::endl;
-    UPB_ASSERT(child_stdin_ != -1);
-  }
-
-  // The "sighandler_t" typedef is GNU-specific, so define our own.
-  typedef void SignalHandler(int);
-
-  // Make sure SIGPIPE is disabled so that if the child dies it doesn't kill us.
-  SignalHandler* old_pipe_handler = signal(SIGPIPE, SIG_IGN);
-
-  int input_pos = 0;
-  int max_fd = std::max(child_stdin_, child_stdout_);
-
-  while (child_stdout_ != -1) {
-    fd_set read_fds;
-    fd_set write_fds;
-    FD_ZERO(&read_fds);
-    FD_ZERO(&write_fds);
-    if (child_stdout_ != -1) {
-      FD_SET(child_stdout_, &read_fds);
-    }
-    if (child_stdin_ != -1) {
-      FD_SET(child_stdin_, &write_fds);
-    }
-
-    if (select(max_fd + 1, &read_fds, &write_fds, nullptr, nullptr) < 0) {
-      if (errno == EINTR) {
-        // Interrupted by signal.  Try again.
-        continue;
-      } else {
-        std::cerr << "select: " << strerror(errno) << std::endl;
-        UPB_ASSERT(0);
-      }
-    }
-
-    if (child_stdin_ != -1 && FD_ISSET(child_stdin_, &write_fds)) {
-      int n = write(child_stdin_, input_data.data() + input_pos,
-                    input_data.size() - input_pos);
-      if (n < 0) {
-        // Child closed pipe.  Presumably it will report an error later.
-        // Pretend we're done for now.
-        input_pos = input_data.size();
-      } else {
-        input_pos += n;
-      }
-
-      if (input_pos == (int)input_data.size()) {
-        // We're done writing.  Close.
-        close(child_stdin_);
-        child_stdin_ = -1;
-      }
-    }
-
-    if (child_stdout_ != -1 && FD_ISSET(child_stdout_, &read_fds)) {
-      char buffer[4096];
-      int n = read(child_stdout_, buffer, sizeof(buffer));
-
-      if (n > 0) {
-        output_data->append(buffer, (size_t)n);
-      } else {
-        // We're done reading.  Close.
-        close(child_stdout_);
-        child_stdout_ = -1;
-      }
-    }
-  }
-
-  if (child_stdin_ != -1) {
-    // Child did not finish reading input before it closed the output.
-    // Presumably it exited with an error.
-    close(child_stdin_);
-    child_stdin_ = -1;
-  }
-
-  int status;
-  while (waitpid(child_pid_, &status, 0) == -1) {
-    if (errno != EINTR) {
-      std::cerr << "waitpid: " << strerror(errno) << std::endl;
-      UPB_ASSERT(0);
-    }
-  }
-
-  // Restore SIGPIPE handling.
-  signal(SIGPIPE, old_pipe_handler);
-
-  if (WIFEXITED(status)) {
-    if (WEXITSTATUS(status) != 0) {
-      int error_code = WEXITSTATUS(status);
-      *error =
-          absl::Substitute("Plugin failed with status code $0.", error_code);
-      return false;
-    }
-  } else if (WIFSIGNALED(status)) {
-    int signal = WTERMSIG(status);
-    *error = absl::Substitute("Plugin killed by signal $0.", signal);
-    return false;
-  } else {
-    *error = "Neither WEXITSTATUS nor WTERMSIG is true?";
-    return false;
-  }
-
-  return true;
-}
-
-#endif  // !_WIN32
-
-}  // namespace upbc
diff --git a/third_party/upb/upbc/subprocess.h b/third_party/upb/upbc/subprocess.h
deleted file mode 100644
index 14276d13208ee..0000000000000
--- a/third_party/upb/upbc/subprocess.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Shamelessly copied from the protobuf compiler's subprocess.h
-// except this version passes strings instead of Messages.
-
-#ifndef THIRD_PARTY_UPB_UPBC_H_
-#define THIRD_PARTY_UPB_UPBC_H_
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN  // right...
-#endif
-#include <windows.h>
-#else  // _WIN32
-#include <sys/types.h>
-#include <unistd.h>
-#endif  // !_WIN32
-#include <string>
-
-namespace upbc {
-
-// Utility class for launching sub-processes.
-class Subprocess {
- public:
-  Subprocess();
-  ~Subprocess();
-
-  enum SearchMode {
-    SEARCH_PATH,  // Use PATH environment variable.
-    EXACT_NAME    // Program is an exact file name; don't use the PATH.
-  };
-
-  // Start the subprocess.  Currently we don't provide a way to specify
-  // arguments as protoc plugins don't have any.
-  void Start(const std::string& program, SearchMode search_mode);
-
-  // Pipe the input message to the subprocess's stdin, then close the pipe.
-  // Meanwhile, read from the subprocess's stdout and copy into *output.
-  // All this is done carefully to avoid deadlocks.
-  // Returns true if successful.  On any sort of error, returns false and sets
-  // *error to a description of the problem.
-  bool Communicate(const std::string& input_data, std::string* output_data,
-                   std::string* error);
-
-#ifdef _WIN32
-  // Given an error code, returns a human-readable error message.  This is
-  // defined here so that CommandLineInterface can share it.
-  static std::string Win32ErrorMessage(DWORD error_code);
-#endif
-
- private:
-#ifdef _WIN32
-  DWORD process_start_error_;
-  HANDLE child_handle_;
-
-  // The file handles for our end of the child's pipes.  We close each and
-  // set it to NULL when no longer needed.
-  HANDLE child_stdin_;
-  HANDLE child_stdout_;
-
-#else  // _WIN32
-  pid_t child_pid_;
-
-  // The file descriptors for our end of the child's pipes.  We close each and
-  // set it to -1 when no longer needed.
-  int child_stdin_;
-  int child_stdout_;
-
-#endif  // !_WIN32
-};
-
-}  // namespace upbc
-
-#endif  // THIRD_PARTY_UPB_UPBC_H_
diff --git a/third_party/upb/upbc/upbc_so.c b/third_party/upb/upbc/upbc_so.c
deleted file mode 100644
index e43b0aeef2159..0000000000000
--- a/third_party/upb/upbc/upbc_so.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// These headers form a spanning tree for the upbc defs needed by FFI layers.
-
-#include "upbc/upbdev.h"
diff --git a/third_party/upb/upbc/upbdev.c b/third_party/upb/upbc/upbdev.c
deleted file mode 100644
index a88fedb252d4a..0000000000000
--- a/third_party/upb/upbc/upbdev.c
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) 2009-2022, Google LLC
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in the
-//       documentation and/or other materials provided with the distribution.
-//     * Neither the name of Google LLC nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "upbc/upbdev.h"
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#else  // _WIN32
-#include <unistd.h>
-#endif  // !_WIN32
-
-#include "google/protobuf/compiler/plugin.upb.h"
-#include "google/protobuf/compiler/plugin.upbdefs.h"
-#include "upb/base/status.h"
-#include "upb/json/decode.h"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.h"
-#include "upbc/code_generator_request.h"
-#include "upbc/code_generator_request.upb.h"
-#include "upbc/code_generator_request.upbdefs.h"
-
-static google_protobuf_compiler_CodeGeneratorResponse* upbc_JsonDecode(
-    const char* data, size_t size, upb_Arena* arena, upb_Status* status) {
-  google_protobuf_compiler_CodeGeneratorResponse* response =
-      google_protobuf_compiler_CodeGeneratorResponse_new(arena);
-
-  upb_DefPool* s = upb_DefPool_New();
-  const upb_MessageDef* m = google_protobuf_compiler_CodeGeneratorResponse_getmsgdef(s);
-
-  (void)upb_JsonDecode(data, size, response, m, s, 0, arena, status);
-  if (!upb_Status_IsOk(status)) return NULL;
-
-  upb_DefPool_Free(s);
-
-  return response;
-}
-
-static upb_StringView upbc_JsonEncode(const upbc_CodeGeneratorRequest* request,
-                                      upb_Arena* arena, upb_Status* status) {
-  upb_StringView out = {.data = NULL, .size = 0};
-
-  upb_DefPool* s = upb_DefPool_New();
-  const upb_MessageDef* m = upbc_CodeGeneratorRequest_getmsgdef(s);
-  const int options = upb_JsonEncode_FormatEnumsAsIntegers;
-
-  out.size = upb_JsonEncode(request, m, s, options, NULL, 0, status);
-  if (!upb_Status_IsOk(status)) goto done;
-
-  char* data = (char*)upb_Arena_Malloc(arena, out.size + 1);
-
-  (void)upb_JsonEncode(request, m, s, options, data, out.size + 1, status);
-  if (!upb_Status_IsOk(status)) goto done;
-
-  out.data = (const char*)data;
-
-done:
-  upb_DefPool_Free(s);
-  return out;
-}
-
-upb_StringView upbdev_ProcessInput(const char* buf, size_t size,
-                                   upb_Arena* arena, upb_Status* status) {
-  upb_StringView out = {.data = NULL, .size = 0};
-
-  google_protobuf_compiler_CodeGeneratorRequest* inner_request =
-      google_protobuf_compiler_CodeGeneratorRequest_parse(buf, size, arena);
-
-  const upbc_CodeGeneratorRequest* outer_request =
-      upbc_MakeCodeGeneratorRequest(inner_request, arena, status);
-  if (!upb_Status_IsOk(status)) return out;
-
-  return upbc_JsonEncode(outer_request, arena, status);
-}
-
-upb_StringView upbdev_ProcessOutput(const char* buf, size_t size,
-                                    upb_Arena* arena, upb_Status* status) {
-  upb_StringView out = {.data = NULL, .size = 0};
-
-  const google_protobuf_compiler_CodeGeneratorResponse* response =
-      upbc_JsonDecode(buf, size, arena, status);
-  if (!upb_Status_IsOk(status)) return out;
-
-  out.data = google_protobuf_compiler_CodeGeneratorResponse_serialize(response, arena,
-                                                             &out.size);
-  return out;
-}
-
-void upbdev_ProcessStdout(const char* buf, size_t size, upb_Arena* arena,
-                          upb_Status* status) {
-  const upb_StringView sv = upbdev_ProcessOutput(buf, size, arena, status);
-  if (!upb_Status_IsOk(status)) return;
-
-  const char* ptr = sv.data;
-  size_t len = sv.size;
-  while (len) {
-    int n = write(1, ptr, len);
-    if (n > 0) {
-      ptr += n;
-      len -= n;
-    }
-  }
-}
-
-upb_Arena* upbdev_Arena_New() { return upb_Arena_New(); }
-
-void upbdev_Status_Clear(upb_Status* status) { upb_Status_Clear(status); }
diff --git a/third_party/upb/upbc/upbdev.h b/third_party/upb/upbc/upbdev.h
deleted file mode 100644
index d6e8d62761c04..0000000000000
--- a/third_party/upb/upbc/upbdev.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2009-2022, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef UPBC_UPBDEV_H_
-#define UPBC_UPBDEV_H_
-
-#include "upb/base/status.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-
-// Must be last.
-#include "upb/port/def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Consume |buf|, deserialize it to a Code_Generator_Request proto, construct a
-// upbc_Code_Generator_Request, and return it as a JSON-encoded string.
-UPB_API upb_StringView upbdev_ProcessInput(const char* buf, size_t size,
-                                           upb_Arena* arena,
-                                           upb_Status* status);
-
-// Decode |buf| from JSON, serialize to wire format, and return it.
-UPB_API upb_StringView upbdev_ProcessOutput(const char* buf, size_t size,
-                                            upb_Arena* arena,
-                                            upb_Status* status);
-
-// Decode |buf| from JSON, serialize to wire format, and write it to stdout.
-UPB_API void upbdev_ProcessStdout(const char* buf, size_t size,
-                                  upb_Arena* arena, upb_Status* status);
-
-// The following wrappers allow the protoc plugins to call the above functions
-// without pulling in the entire pb_runtime library.
-UPB_API upb_Arena* upbdev_Arena_New();
-UPB_API void upbdev_Status_Clear(upb_Status* status);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include "upb/port/undef.inc"
-
-#endif  // UPBC_UPBDEV_H_
diff --git a/third_party/utf8_range/BUILD.bazel b/third_party/utf8_range/BUILD.bazel
index 361baf0d014f4..8582f1bdc4838 100644
--- a/third_party/utf8_range/BUILD.bazel
+++ b/third_party/utf8_range/BUILD.bazel
@@ -21,7 +21,6 @@ filegroup(
     ],
     visibility = [
         "@com_google_protobuf//:__subpackages__",
-        "@upb//:__subpackages__",
     ],
 )
 
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index b0c1c41e83152..c56456c2bdec0 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -89,9 +89,9 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/interoptest/grpc_interop_ruby.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_ruby@sha256:7b044d6848f82234dba81b38d8eca220b608f830f93b42932df59ed6fe20b24d",
     "tools/dockerfile/interoptest/lb_interop_fake_servers.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/lb_interop_fake_servers@sha256:b89a51dd9147e1293f50ee64dd719fce5929ca7894d3770a3d80dbdecb99fd52",
     "tools/dockerfile/test/android_ndk.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/android_ndk@sha256:64ffc5d1e117172ca4dda89720087616830996181192de25fe10e03a88f0b3e5",
-    "tools/dockerfile/test/bazel.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel@sha256:023fdfd072e278d4129f2c8f8564f6697e767c9847aae8c9411ea853f3faaa6f",
-    "tools/dockerfile/test/bazel_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64@sha256:1b7200c85ba8bc10529e1867a27ee81ad303ec8c8efec8bbc5863b4ee8ac6d03",
-    "tools/dockerfile/test/binder_transport_apk.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk@sha256:38c1da5544c717ef0e3d3492833b0fd1ce5c70fbe71eea8a9bfb0ab0b1217f1b",
+    "tools/dockerfile/test/bazel.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel@sha256:32bde2dcb2087f2a32afab59e4dfedf7e8c76a52c69881f63a239d311f0e5ecf",
+    "tools/dockerfile/test/bazel_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64@sha256:3b087387c44dee405c1b80d6ff50994e6d8e90a4ef67cc94b4291f1a29c0ef41",
+    "tools/dockerfile/test/binder_transport_apk.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk@sha256:bf60a187cd2ce1abe8b4f32ae6479040a72ca6aa789cd5ab509f60ceb37a41f9",
     "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:b2e5c47d986312ea0850e2f2e696b45d23ee0aabceea161d31e28559e19ec4a5",
     "tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:f2019edf9f2afd5042567f11afb1aa78a789fc9acdcce5ee0c14cc11f6830ed7",
@@ -112,5 +112,5 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:d3951aeadf43e3bee6adc5b86d26cdaf0b9d1b5baf790d7b2530d1c197adc9f8",
     "tools/dockerfile/test/ruby_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_arm64@sha256:7e77cf17e2e8657f4cc23ac9f93630bf13213fff961799e0f16dae17cd45cf6d",
     "tools/dockerfile/test/ruby_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_x64@sha256:e4cb502caccf2db733268ce2ddc951fda8a9df2f7f53d6b74523c33d40c83006",
-    "tools/dockerfile/test/sanity.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/sanity@sha256:49745399fdef994b033fd8a5cad293d822ac25289770b7c342e34e781ff41590",
+    "tools/dockerfile/test/sanity.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/sanity@sha256:f1f5ca30491698f793cae75d5989cb53887d159800aef662cf7e6c3df6f86a88",
 }
diff --git a/tools/bazelify_tests/test/supported_bazel_versions.bzl b/tools/bazelify_tests/test/supported_bazel_versions.bzl
index 25ab1155b82d4..f9b527e82b091 100644
--- a/tools/bazelify_tests/test/supported_bazel_versions.bzl
+++ b/tools/bazelify_tests/test/supported_bazel_versions.bzl
@@ -17,6 +17,5 @@ This file is generated from the supported_bazel_versions.bzl.template
 """
 
 SUPPORTED_BAZEL_VERSIONS = [
-    "6.3.2",
-    "5.4.1",
+    "6.4.0",
 ]
diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py
index ec36e9d0c9e7e..f8bd3595482cb 100755
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@@ -99,10 +99,10 @@ def __init__(
 # For that we need mapping from external repo name to a corresponding
 # path to a git submodule.
 EXTERNAL_SOURCE_PREFIXES = {
-    "@upb": "third_party/upb",
     "@utf8_range": "third_party/utf8_range",
     "@com_googlesource_code_re2": "third_party/re2",
     "@com_google_googletest": "third_party/googletest",
+    "@com_google_protobuf": "third_party/upb",
     "@zlib": "third_party/zlib",
 }
 
@@ -183,7 +183,7 @@ def _extract_rules_from_bazel_xml(xml_tree):
                 "cc_proto_library",
                 "cc_proto_gen_validate",
                 "proto_library",
-                "upb_proto_library",
+                "upb_c_proto_library",
                 "upb_proto_reflection_library",
                 "alias",
                 "bind",
@@ -277,6 +277,9 @@ def _extract_sources(bazel_rule: BuildMetadata) -> List[str]:
     """Gets list of source files from a bazel rule"""
     result = []
     for src in bazel_rule["srcs"]:
+        # Skip .proto files from the protobuf repo
+        if src.startswith("@com_google_protobuf//") and src.endswith(".proto"):
+            continue
         if src.endswith(".cc") or src.endswith(".c") or src.endswith(".proto"):
             source_file_maybe = _try_extract_source_file_path(src)
             if source_file_maybe:
@@ -565,9 +568,9 @@ def _get_transitive_protos(bazel_rules, t):
 
 def _expand_upb_proto_library_rules(bazel_rules):
     # Expand the .proto files from UPB proto library rules into the pre-generated
-    # upb.h and upb.c files.
-    GEN_UPB_ROOT = "//:src/core/ext/upb-generated/"
-    GEN_UPBDEFS_ROOT = "//:src/core/ext/upbdefs-generated/"
+    # upb files.
+    GEN_UPB_ROOT = "//:src/core/ext/upb-gen/"
+    GEN_UPBDEFS_ROOT = "//:src/core/ext/upbdefs-gen/"
     EXTERNAL_LINKS = [
         ("@com_google_protobuf//", "src/"),
         ("@com_google_googleapis//", ""),
@@ -589,14 +592,14 @@ def _expand_upb_proto_library_rules(bazel_rules):
                     'upb rule "{0}" should have 1 proto dependency but has'
                     ' "{1}"'.format(name, deps)
                 )
-            # deps is not properly fetched from bazel query for upb_proto_library target
+            # deps is not properly fetched from bazel query for upb_c_proto_library target
             # so add the upb dependency manually
             bazel_rule["deps"] = [
                 "//external:upb_lib",
                 "//external:upb_lib_descriptor",
                 "//external:upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
             ]
-            # populate the upb_proto_library rule with pre-generated upb headers
+            # populate the upb_c_proto_library rule with pre-generated upb headers
             # and sources using proto_rule
             protos = _get_transitive_protos(bazel_rules, deps[0])
             if len(protos) == 0:
@@ -630,18 +633,20 @@ def _expand_upb_proto_library_rules(bazel_rules):
                         )
                     )
 
-                ext = (
-                    ".upb"
+                extensions = (
+                    # There is no longer a .upb.c extension.
+                    [".upb.h", ".upb_minitable.h", ".upb_minitable.c"]
                     if gen_func == "grpc_upb_proto_library"
-                    else ".upbdefs"
+                    else [".upbdefs.h", ".upbdefs.c"]
                 )
                 root = (
                     GEN_UPB_ROOT
                     if gen_func == "grpc_upb_proto_library"
                     else GEN_UPBDEFS_ROOT
                 )
-                srcs.append(root + proto_src_file.replace(".proto", ext + ".c"))
-                hdrs.append(root + proto_src_file.replace(".proto", ext + ".h"))
+                for ext in extensions:
+                    srcs.append(root + proto_src_file.replace(".proto", ext))
+                    hdrs.append(root + proto_src_file.replace(".proto", ext))
             bazel_rule["srcs"] = srcs
             bazel_rule["hdrs"] = hdrs
 
@@ -665,13 +670,15 @@ def _patch_grpc_proto_library_rules(bazel_rules):
 def _patch_descriptor_upb_proto_library(bazel_rules):
     # The upb's descriptor_upb_proto library doesn't reference the generated descriptor.proto
     # sources explicitly, so we add them manually.
-    bazel_rule = bazel_rules.get("@upb//:descriptor_upb_proto", None)
+    bazel_rule = bazel_rules.get(
+        "@com_google_protobuf//upb:descriptor_upb_proto", None
+    )
     if bazel_rule:
         bazel_rule["srcs"].append(
-            ":src/core/ext/upb-generated/google/protobuf/descriptor.upb.c"
+            ":src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c"
         )
         bazel_rule["hdrs"].append(
-            ":src/core/ext/upb-generated/google/protobuf/descriptor.upb.h"
+            ":src/core/ext/upb-gen/google/protobuf/descriptor.upb.h"
         )
 
 
@@ -1060,22 +1067,22 @@ def _detect_and_print_issues(build_yaml_like: BuildYaml) -> None:
         "build": "all",
         "_RENAME": "address_sorting",
     },
-    "@upb//:upb": {
+    "@com_google_protobuf//upb:upb": {
         "language": "c",
         "build": "all",
         "_RENAME": "upb",
     },
-    "@upb//:collections": {
+    "@com_google_protobuf//upb/collections:collections": {
         "language": "c",
         "build": "all",
         "_RENAME": "upb_collections_lib",
     },
-    "@upb//:json": {
+    "@com_google_protobuf//upb/json:json": {
         "language": "c",
         "build": "all",
         "_RENAME": "upb_json_lib",
     },
-    "@upb//:textformat": {
+    "@com_google_protobuf//upb/text:text": {
         "language": "c",
         "build": "all",
         "_RENAME": "upb_textformat_lib",
@@ -1297,7 +1304,7 @@ def _detect_and_print_issues(build_yaml_like: BuildYaml) -> None:
     # The ^ is needed to differentiate proto_library from go_proto_library
     'deps(kind("^proto_library", @envoy_api//envoy/...))',
     # Make sure we have source info for all the targets that _expand_upb_proto_library_rules artificially adds
-    # as upb_proto_library dependencies.
+    # as upb_c_proto_library dependencies.
     'deps("//external:upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me")',
 ]
 
diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index 9ddd588bb37a9..e7905a40c9552 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -28,8 +28,6 @@ fi
 
 cd `dirname $0`/../..
 
-tools/distrib/fix_build_deps.py
-
 echo "Generating build_autogenerated.yaml from bazel BUILD file"
 rm -f build_autogenerated.yaml
 python3 tools/buildgen/extract_metadata_from_bazel_xml.py
diff --git a/tools/codegen/core/experiments_compiler.py b/tools/codegen/core/experiments_compiler.py
index 0e61422f28a30..403bfbb69bb9c 100644
--- a/tools/codegen/core/experiments_compiler.py
+++ b/tools/codegen/core/experiments_compiler.py
@@ -198,6 +198,7 @@ def __init__(self, attributes):
         self._default = {}
         self._additional_constraints = {}
         self._test_tags = []
+        self._requires = set()
 
         if "allow_in_fuzzing_config" in attributes:
             self._allow_in_fuzzing_config = attributes[
@@ -207,6 +208,9 @@ def __init__(self, attributes):
         if "test_tags" in attributes:
             self._test_tags = attributes["test_tags"]
 
+        for requirement in attributes.get("requires", []):
+            self._requires.add(requirement)
+
     def IsValid(self, check_expiry=False):
         if self._error:
             return False
@@ -244,6 +248,8 @@ def AddRolloutSpecification(
                 " experiment: %s" % self._name
             )
             return False
+        for requirement in rollout_attributes.get("requires", []):
+            self._requires.add(requirement)
         if "default" not in rollout_attributes:
             print(
                 "ERROR: no default for experiment %s"
@@ -310,7 +316,7 @@ def __init__(
         self._final_define = final_define
         self._platforms_define = platforms_define
         self._bzl_list_for_defaults = bzl_list_for_defaults
-        self._experiment_definitions = {}
+        self._experiment_definitions = collections.OrderedDict()
         self._experiment_rollouts = {}
 
     def AddExperimentDefinition(self, experiment_definition):
@@ -344,6 +350,27 @@ def AddRolloutSpecification(self, rollout_attributes):
             self._defaults, self._platforms_define, rollout_attributes
         )
 
+    def _FinalizeExperiments(self):
+        queue = collections.OrderedDict()
+        for name, exp in self._experiment_definitions.items():
+            queue[name] = exp._requires
+        done = set()
+        final = collections.OrderedDict()
+        while queue:
+            take = None
+            for name, requires in queue.items():
+                if requires.issubset(done):
+                    take = name
+                    break
+            if take is None:
+                print("ERROR: circular dependency in experiments")
+                return False
+            done.add(take)
+            final[take] = self._experiment_definitions[take]
+            del queue[take]
+        self._experiment_definitions = final
+        return True
+
     def _GenerateExperimentsHdrForPlatform(self, platform, file_desc):
         for _, exp in self._experiment_definitions.items():
             define_fmt = self._final_define[exp.default(platform)]
@@ -363,6 +390,7 @@ def _GenerateExperimentsHdrForPlatform(self, platform, file_desc):
             )
 
     def GenerateExperimentsHdr(self, output_file, mode):
+        assert self._FinalizeExperiments()
         with open(output_file, "w") as H:
             PutCopyright(H, "//")
             PutBanner(
@@ -463,6 +491,18 @@ def _GenerateExperimentsSrcForPlatform(self, platform, mode, file_desc):
                 file=file_desc,
             )
             have_defaults.add(self._defaults[exp.default(platform)])
+            if exp._requires:
+                print(
+                    "const uint8_t required_experiments_%s[] = {%s};"
+                    % (
+                        exp.name,
+                        ",".join(
+                            f"static_cast<uint8_t>(grpc_core::kExperimentId{SnakeToPascal(name)})"
+                            for name in sorted(exp._requires)
+                        ),
+                    ),
+                    file=file_desc,
+                )
         if "kDefaultForDebugOnly" in have_defaults:
             print("#ifdef NDEBUG", file=file_desc)
             if "kDefaultForDebugOnly" in have_defaults:
@@ -487,11 +527,15 @@ def _GenerateExperimentsSrcForPlatform(self, platform, mode, file_desc):
         )
         for _, exp in self._experiment_definitions.items():
             print(
-                "  {%s, description_%s, additional_constraints_%s, %s, %s},"
+                "  {%s, description_%s, additional_constraints_%s, %s, %d, %s, %s},"
                 % (
                     ToCStr(exp.name),
                     exp.name,
                     exp.name,
+                    f"required_experiments_{exp.name}"
+                    if exp._requires
+                    else "nullptr",
+                    len(exp._requires),
                     self._defaults[exp.default(platform)],
                     "true" if exp.allow_in_fuzzing_config else "false",
                 ),
@@ -502,6 +546,7 @@ def _GenerateExperimentsSrcForPlatform(self, platform, mode, file_desc):
         print("}  // namespace grpc_core", file=file_desc)
 
     def GenerateExperimentsSrc(self, output_file, header_file_path, mode):
+        assert self._FinalizeExperiments()
         with open(output_file, "w") as C:
             PutCopyright(C, "//")
             PutBanner(
@@ -510,7 +555,15 @@ def GenerateExperimentsSrc(self, output_file, header_file_path, mode):
                 "//",
             )
 
+            any_requires = False
+            for _, exp in self._experiment_definitions.items():
+                if exp._requires:
+                    any_requires = True
+                    break
+
             print("#include <grpc/support/port_platform.h>", file=C)
+            if any_requires:
+                print("#include <stdint.h>", file=C)
             print(f'#include "{header_file_path}"', file=C)
             print(file=C)
             print("#ifndef GRPC_EXPERIMENTS_ARE_FINAL", file=C)
@@ -540,6 +593,7 @@ def _GenTestExperimentsExpectedValues(self, platform):
         return defs
 
     def GenTest(self, output_file):
+        assert self._FinalizeExperiments()
         with open(output_file, "w") as C:
             PutCopyright(C, "//")
             PutBanner(
@@ -567,6 +621,7 @@ def GenTest(self, output_file):
             print(_EXPERIMENTS_TEST_SKELETON(defs, test_body), file=C)
 
     def GenExperimentsBzl(self, mode, output_file):
+        assert self._FinalizeExperiments()
         if self._bzl_list_for_defaults is None:
             return
 
@@ -610,6 +665,19 @@ def GenExperimentsBzl(self, mode, output_file):
                 file=B,
             )
 
+            print(file=B)
+            if mode == "test":
+                print("TEST_EXPERIMENT_ENABLES = {", file=B)
+            else:
+                print("EXPERIMENT_ENABLES = {", file=B)
+            for name, exp in self._experiment_definitions.items():
+                enables = exp._requires.copy()
+                enables.add(name)
+                print(
+                    f"    \"{name}\": \"{','.join(sorted(enables))}\",", file=B
+                )
+            print("}", file=B)
+
             print(file=B)
             if mode == "test":
                 print("TEST_EXPERIMENTS = {", file=B)
diff --git a/tools/codegen/core/gen_upb_api.sh b/tools/codegen/core/gen_upb_api.sh
index d62fb9b967db3..7d72cb2ca929b 100755
--- a/tools/codegen/core/gen_upb_api.sh
+++ b/tools/codegen/core/gen_upb_api.sh
@@ -20,15 +20,15 @@ cd $(dirname $0)/../../..
 bazel=`pwd`/tools/bazel
 
 if [ $# -eq 0 ]; then
-  UPB_OUTPUT_DIR=$PWD/src/core/ext/upb-generated
-  UPBDEFS_OUTPUT_DIR=$PWD/src/core/ext/upbdefs-generated
+  UPB_OUTPUT_DIR=$PWD/src/core/ext/upb-gen
+  UPBDEFS_OUTPUT_DIR=$PWD/src/core/ext/upbdefs-gen
   rm -rf $UPB_OUTPUT_DIR
   rm -rf $UPBDEFS_OUTPUT_DIR
   mkdir -p $UPB_OUTPUT_DIR
   mkdir -p $UPBDEFS_OUTPUT_DIR
 else
-  UPB_OUTPUT_DIR=$1/upb-generated
-  UPBDEFS_OUTPUT_DIR=$1/upbdefs-generated
+  UPB_OUTPUT_DIR=$1/upb-gen
+  UPBDEFS_OUTPUT_DIR=$1/upbdefs-gen
   mkdir $UPB_OUTPUT_DIR
   mkdir $UPBDEFS_OUTPUT_DIR
 fi
diff --git a/tools/codegen/core/gen_upb_api_from_bazel_xml.py b/tools/codegen/core/gen_upb_api_from_bazel_xml.py
index 663154fe03196..4fe35bd197d33 100755
--- a/tools/codegen/core/gen_upb_api_from_bazel_xml.py
+++ b/tools/codegen/core/gen_upb_api_from_bazel_xml.py
@@ -25,14 +25,16 @@
 #     deps = ["//src/proto/grpc/health/v1:health_proto_descriptor"],
 #   )
 #
-# this will generate these upb source files at src/core/ext/upb-generated.
+# this will generate these upb source files at src/core/ext/upb-gen.
 #
-#   src/proto/grpc/health/v1/health.upb.c
 #   src/proto/grpc/health/v1/health.upb.h
+#   src/proto/grpc/health/v1/health.upb_minitable.h
+#   src/proto/grpc/health/v1/health.upb_minitable.c
 
 import argparse
 import collections
 import os
+import re
 import shutil
 import subprocess
 import xml.etree.ElementTree
@@ -103,7 +105,7 @@ def read_upb_bazel_rules():
         if elem.tag == "rule"
         and elem.attrib["class"]
         in [
-            "upb_proto_library",
+            "upb_c_proto_library",
             "upb_proto_reflection_library",
         ]
     ]
@@ -127,7 +129,7 @@ def read_upb_bazel_rules():
         dep_rules[dep_rule.name] = dep_rule
     # add proto files to upb rules transitively
     for rule in rules:
-        if not rule.type.startswith("upb_proto_"):
+        if not rule.type.startswith("upb_"):
             continue
         if len(rule.deps) == 1:
             rule.proto_files.extend(
@@ -146,8 +148,21 @@ def get_upb_path(proto_path, ext):
     return proto_path.replace(":", "/").replace(".proto", ext)
 
 
-def get_bazel_bin_root_path(elink):
+def get_bazel_bin_root_path(elink, file):
     BAZEL_BIN_ROOT = "bazel-bin/"
+    if elink[0] == "@com_google_protobuf//":
+        name = re.search("google/protobuf/([a-z_]*)\.", file).group(1)
+        result = os.path.join(
+            BAZEL_BIN_ROOT,
+            "external",
+            elink[0].replace("@", "").replace("//", ""),
+            "src",
+            "google",
+            "protobuf",
+            "_virtual_imports",
+            "%s_proto" % name,
+        )
+        return os.path.join(result, file)
     if elink[0].startswith("@"):
         # external
         result = os.path.join(
@@ -157,10 +172,10 @@ def get_bazel_bin_root_path(elink):
         )
         if elink[1]:
             result = os.path.join(result, elink[1])
-        return result
+        return os.path.join(result, file)
     else:
         # internal
-        return BAZEL_BIN_ROOT
+        return os.path.join(BAZEL_BIN_ROOT, file)
 
 
 def get_external_link(file):
@@ -181,11 +196,12 @@ def get_external_link(file):
 def copy_upb_generated_files(rules, args):
     files = {}
     for rule in rules:
-        if rule.type == "upb_proto_library":
-            frag = ".upb"
+        if rule.type == "upb_c_proto_library":
+            # There is no .upb.c.
+            extensions = [".upb.h", ".upb_minitable.h", ".upb_minitable.c"]
             output_dir = args.upb_out
         else:
-            frag = ".upbdefs"
+            extensions = [".upbdefs.h", ".upbdefs.c"]
             output_dir = args.upbdefs_out
         for proto_file in rule.proto_files:
             elink = get_external_link(proto_file)
@@ -196,9 +212,9 @@ def copy_upb_generated_files(rules, args):
                     ' "{1}"'.format(proto_file, prefix_to_strip)
                 )
             proto_file = proto_file[len(prefix_to_strip) :]
-            for ext in (".h", ".c"):
-                file = get_upb_path(proto_file, frag + ext)
-                src = os.path.join(get_bazel_bin_root_path(elink), file)
+            for ext in extensions:
+                file = get_upb_path(proto_file, ext)
+                src = get_bazel_bin_root_path(elink, file)
                 dst = os.path.join(output_dir, file)
                 files[src] = dst
     for src, dst in files.items():
@@ -214,12 +230,12 @@ def copy_upb_generated_files(rules, args):
 parser.add_argument("--verbose", default=False, action="store_true")
 parser.add_argument(
     "--upb_out",
-    default="src/core/ext/upb-generated",
+    default="src/core/ext/upb-gen",
     help="Output directory for upb targets",
 )
 parser.add_argument(
     "--upbdefs_out",
-    default="src/core/ext/upbdefs-generated",
+    default="src/core/ext/upbdefs-gen",
     help="Output directory for upbdefs targets",
 )
 
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py
index 0a61e0853503a..11f8b565b944b 100755
--- a/tools/distrib/check_copyright.py
+++ b/tools/distrib/check_copyright.py
@@ -290,9 +290,10 @@ def replace_copyright(license_text, file_text, filename):
     # Skip check for upb generated code.
     if (
         filename.endswith(".upb.h")
-        or filename.endswith(".upb.c")
         or filename.endswith(".upbdefs.h")
         or filename.endswith(".upbdefs.c")
+        or filename.endswith(".upb_minitable.h")
+        or filename.endswith(".upb_minitable.c")
     ):
         continue
     ext = os.path.splitext(filename)[1]
diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py
index b42b53b065fc7..a7e50c698dc95 100755
--- a/tools/distrib/check_include_guards.py
+++ b/tools/distrib/check_include_guards.py
@@ -253,9 +253,10 @@ def check(self, fpath, fix):
     # Skip check for upb generated code.
     if (
         filename.endswith(".upb.h")
-        or filename.endswith(".upb.c")
         or filename.endswith(".upbdefs.h")
         or filename.endswith(".upbdefs.c")
+        or filename.endswith(".upb_minitable.h")
+        or filename.endswith(".upb_minitable.c")
     ):
         continue
     ok = ok and validator.check(filename, args.fix)
diff --git a/tools/distrib/check_namespace_qualification.py b/tools/distrib/check_namespace_qualification.py
index bb409f04422ef..6634d8b8830f2 100755
--- a/tools/distrib/check_namespace_qualification.py
+++ b/tools/distrib/check_namespace_qualification.py
@@ -119,7 +119,6 @@ def check(self, fpath, fix):
     # Skip check for upb generated code and ignored files.
     if (
         filename.endswith(".upb.h")
-        or filename.endswith(".upb.c")
         or filename.endswith(".upbdefs.h")
         or filename.endswith(".upbdefs.c")
         or filename in IGNORED_FILES
diff --git a/tools/distrib/check_upb_output.sh b/tools/distrib/check_upb_output.sh
index f3697c0937ecd..c7e5228b114cd 100755
--- a/tools/distrib/check_upb_output.sh
+++ b/tools/distrib/check_upb_output.sh
@@ -15,11 +15,11 @@
 
 set -ex
 
-readonly UPB_GENERATED_SRC=src/core/ext/upb-generated
-readonly UPBDEFS_GENERATED_SRC=src/core/ext/upbdefs-generated
+readonly UPB_GENERATED_SRC=src/core/ext/upb-gen
+readonly UPBDEFS_GENERATED_SRC=src/core/ext/upbdefs-gen
 readonly UPB_TMP_OUTPUT="$(mktemp -d)"
 
 tools/codegen/core/gen_upb_api.sh "$UPB_TMP_OUTPUT"
 
-diff -rq "$UPB_GENERATED_SRC" "$UPB_TMP_OUTPUT/upb-generated"
-diff -rq "$UPBDEFS_GENERATED_SRC" "$UPB_TMP_OUTPUT/upbdefs-generated"
+diff -rq "$UPB_GENERATED_SRC" "$UPB_TMP_OUTPUT/upb-gen"
+diff -rq "$UPBDEFS_GENERATED_SRC" "$UPB_TMP_OUTPUT/upbdefs-gen"
diff --git a/tools/distrib/clang_format_code.sh b/tools/distrib/clang_format_code.sh
index e52a3f25dac20..0a0672c428599 100755
--- a/tools/distrib/clang_format_code.sh
+++ b/tools/distrib/clang_format_code.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
+set -e
 
 # change to root directory
 cd $(dirname $0)/../..
diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py
deleted file mode 100755
index e5e42d1095044..0000000000000
--- a/tools/distrib/fix_build_deps.py
+++ /dev/null
@@ -1,684 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2022 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.
-
-import argparse
-import collections
-from doctest import SKIP
-import multiprocessing
-import os
-import re
-import sys
-
-import run_buildozer
-
-# find our home
-ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../.."))
-os.chdir(ROOT)
-
-vendors = collections.defaultdict(list)
-scores = collections.defaultdict(int)
-avoidness = collections.defaultdict(int)
-consumes = {}
-no_update = set()
-buildozer_commands = []
-original_deps = {}
-original_external_deps = {}
-skip_headers = collections.defaultdict(set)
-
-# TODO(ctiller): ideally we wouldn't hardcode a bunch of paths here.
-# We can likely parse out BUILD files from dependencies to generate this index.
-EXTERNAL_DEPS = {
-    "absl/algorithm/container.h": "absl/algorithm:container",
-    "absl/base/attributes.h": "absl/base:core_headers",
-    "absl/base/call_once.h": "absl/base",
-    # TODO(ctiller) remove this
-    "absl/base/internal/endian.h": "absl/base:endian",
-    "absl/base/thread_annotations.h": "absl/base:core_headers",
-    "absl/container/flat_hash_map.h": "absl/container:flat_hash_map",
-    "absl/container/flat_hash_set.h": "absl/container:flat_hash_set",
-    "absl/container/inlined_vector.h": "absl/container:inlined_vector",
-    "absl/cleanup/cleanup.h": "absl/cleanup",
-    "absl/debugging/failure_signal_handler.h": (
-        "absl/debugging:failure_signal_handler"
-    ),
-    "absl/debugging/stacktrace.h": "absl/debugging:stacktrace",
-    "absl/debugging/symbolize.h": "absl/debugging:symbolize",
-    "absl/flags/flag.h": "absl/flags:flag",
-    "absl/flags/marshalling.h": "absl/flags:marshalling",
-    "absl/flags/parse.h": "absl/flags:parse",
-    "absl/functional/any_invocable.h": "absl/functional:any_invocable",
-    "absl/functional/bind_front.h": "absl/functional:bind_front",
-    "absl/functional/function_ref.h": "absl/functional:function_ref",
-    "absl/hash/hash.h": "absl/hash",
-    "absl/memory/memory.h": "absl/memory",
-    "absl/meta/type_traits.h": "absl/meta:type_traits",
-    "absl/numeric/int128.h": "absl/numeric:int128",
-    "absl/random/random.h": "absl/random",
-    "absl/random/bit_gen_ref.h": "absl/random:bit_gen_ref",
-    "absl/random/mocking_bit_gen.h": "absl/random:mocking_bit_gen",
-    "absl/random/distributions.h": "absl/random:distributions",
-    "absl/random/uniform_int_distribution.h": "absl/random:distributions",
-    "absl/status/status.h": "absl/status",
-    "absl/status/statusor.h": "absl/status:statusor",
-    "absl/strings/ascii.h": "absl/strings",
-    "absl/strings/cord.h": "absl/strings:cord",
-    "absl/strings/escaping.h": "absl/strings",
-    "absl/strings/match.h": "absl/strings",
-    "absl/strings/numbers.h": "absl/strings",
-    "absl/strings/str_cat.h": "absl/strings",
-    "absl/strings/str_format.h": "absl/strings:str_format",
-    "absl/strings/str_join.h": "absl/strings",
-    "absl/strings/str_replace.h": "absl/strings",
-    "absl/strings/str_split.h": "absl/strings",
-    "absl/strings/string_view.h": "absl/strings",
-    "absl/strings/strip.h": "absl/strings",
-    "absl/strings/substitute.h": "absl/strings",
-    "absl/synchronization/mutex.h": "absl/synchronization",
-    "absl/synchronization/notification.h": "absl/synchronization",
-    "absl/time/clock.h": "absl/time",
-    "absl/time/time.h": "absl/time",
-    "absl/types/optional.h": "absl/types:optional",
-    "absl/types/span.h": "absl/types:span",
-    "absl/types/variant.h": "absl/types:variant",
-    "absl/utility/utility.h": "absl/utility",
-    "address_sorting/address_sorting.h": "address_sorting",
-    "google/cloud/opentelemetry/resource_detector.h": "google_cloud_cpp:opentelemetry",
-    "opentelemetry/common/attribute_value.h": "otel/api",
-    "opentelemetry/common/key_value_iterable.h": "otel/api",
-    "opentelemetry/nostd/function_ref.h": "otel/api",
-    "opentelemetry/nostd/string_view.h": "otel/api",
-    "opentelemetry/context/context.h": "otel/api",
-    "opentelemetry/metrics/meter.h": "otel/api",
-    "opentelemetry/metrics/meter_provider.h": "otel/api",
-    "opentelemetry/metrics/provider.h": "otel/api",
-    "opentelemetry/metrics/sync_instruments.h": "otel/api",
-    "opentelemetry/nostd/shared_ptr.h": "otel/api",
-    "opentelemetry/nostd/unique_ptr.h": "otel/api",
-    "opentelemetry/sdk/metrics/meter_provider.h": "otel/sdk/src/metrics",
-    "opentelemetry/sdk/common/attribute_utils.h": "otel/sdk:headers",
-    "opentelemetry/sdk/resource/resource.h": "otel/sdk:headers",
-    "opentelemetry/sdk/resource/resource_detector.h": "otel/sdk:headers",
-    "opentelemetry/sdk/resource/semantic_conventions.h": "otel/sdk:headers",
-    "ares.h": "cares",
-    "fuzztest/fuzztest.h": ["fuzztest", "fuzztest_main"],
-    "google/api/monitored_resource.pb.h": (
-        "google/api:monitored_resource_cc_proto"
-    ),
-    "google/devtools/cloudtrace/v2/tracing.grpc.pb.h": (
-        "googleapis_trace_grpc_service"
-    ),
-    "google/logging/v2/logging.grpc.pb.h": "googleapis_logging_grpc_service",
-    "google/logging/v2/logging.pb.h": "googleapis_logging_cc_proto",
-    "google/logging/v2/log_entry.pb.h": "googleapis_logging_cc_proto",
-    "google/monitoring/v3/metric_service.grpc.pb.h": (
-        "googleapis_monitoring_grpc_service"
-    ),
-    "gmock/gmock.h": "gtest",
-    "gtest/gtest.h": "gtest",
-    "opencensus/exporters/stats/stackdriver/stackdriver_exporter.h": (
-        "opencensus-stats-stackdriver_exporter"
-    ),
-    "opencensus/exporters/trace/stackdriver/stackdriver_exporter.h": (
-        "opencensus-trace-stackdriver_exporter"
-    ),
-    "opencensus/trace/context_util.h": "opencensus-trace-context_util",
-    "opencensus/trace/propagation/grpc_trace_bin.h": (
-        "opencensus-trace-propagation"
-    ),
-    "opencensus/tags/context_util.h": "opencensus-tags-context_util",
-    "opencensus/trace/span_context.h": "opencensus-trace-span_context",
-    "openssl/base.h": "libssl",
-    "openssl/bio.h": "libssl",
-    "openssl/bn.h": "libcrypto",
-    "openssl/buffer.h": "libcrypto",
-    "openssl/crypto.h": "libcrypto",
-    "openssl/digest.h": "libssl",
-    "openssl/engine.h": "libcrypto",
-    "openssl/err.h": "libcrypto",
-    "openssl/evp.h": "libcrypto",
-    "openssl/hmac.h": "libcrypto",
-    "openssl/mem.h": "libcrypto",
-    "openssl/param_build.h": "libcrypto",
-    "openssl/pem.h": "libcrypto",
-    "openssl/rsa.h": "libcrypto",
-    "openssl/sha.h": "libcrypto",
-    "openssl/ssl.h": "libssl",
-    "openssl/tls1.h": "libssl",
-    "openssl/x509.h": "libcrypto",
-    "openssl/x509v3.h": "libcrypto",
-    "re2/re2.h": "re2",
-    "upb/arena.h": "upb_lib",
-    "upb/base/string_view.h": "upb_lib",
-    "upb/collections/map.h": "upb_collections_lib",
-    "upb/def.h": "upb_lib",
-    "upb/json_encode.h": "upb_json_lib",
-    "upb/mem/arena.h": "upb_lib",
-    "upb/text_encode.h": "upb_textformat_lib",
-    "upb/def.hpp": "upb_reflection",
-    "upb/upb.h": "upb_lib",
-    "upb/upb.hpp": "upb_lib",
-    "xxhash.h": "xxhash",
-    "zlib.h": "madler_zlib",
-}
-
-INTERNAL_DEPS = {
-    "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h": (
-        "//test/core/event_engine/fuzzing_event_engine"
-    ),
-    "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h": "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
-    "test/core/experiments/test_experiments.h": "//test/core/experiments:test_experiments_lib",
-    "google/api/expr/v1alpha1/syntax.upb.h": "google_api_expr_v1alpha1_syntax_upb",
-    "google/rpc/status.upb.h": "google_rpc_status_upb",
-    "google/protobuf/any.upb.h": "protobuf_any_upb",
-    "google/protobuf/duration.upb.h": "protobuf_duration_upb",
-    "google/protobuf/struct.upb.h": "protobuf_struct_upb",
-    "google/protobuf/timestamp.upb.h": "protobuf_timestamp_upb",
-    "google/protobuf/wrappers.upb.h": "protobuf_wrappers_upb",
-    "grpc/status.h": "grpc_public_hdrs",
-    "src/proto/grpc/channelz/channelz.grpc.pb.h": (
-        "//src/proto/grpc/channelz:channelz_proto"
-    ),
-    "src/proto/grpc/core/stats.pb.h": "//src/proto/grpc/core:stats_proto",
-    "src/proto/grpc/health/v1/health.upb.h": "grpc_health_upb",
-    "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h": (
-        "//src/proto/grpc/lb/v1:load_reporter_proto"
-    ),
-    "src/proto/grpc/lb/v1/load_balancer.upb.h": "grpc_lb_upb",
-    "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h": (
-        "//src/proto/grpc/reflection/v1alpha:reflection_proto"
-    ),
-    "src/proto/grpc/gcp/transport_security_common.upb.h": "alts_upb",
-    "src/proto/grpc/gcp/handshaker.upb.h": "alts_upb",
-    "src/proto/grpc/gcp/altscontext.upb.h": "alts_upb",
-    "src/proto/grpc/lookup/v1/rls.upb.h": "rls_upb",
-    "src/proto/grpc/lookup/v1/rls_config.upb.h": "rls_config_upb",
-    "src/proto/grpc/lookup/v1/rls_config.upbdefs.h": "rls_config_upbdefs",
-    "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h": (
-        "//src/proto/grpc/testing/xds/v3:csds_proto"
-    ),
-    "xds/data/orca/v3/orca_load_report.upb.h": "xds_orca_upb",
-    "xds/service/orca/v3/orca.upb.h": "xds_orca_service_upb",
-    "xds/type/v3/typed_struct.upb.h": "xds_type_upb",
-}
-
-
-class FakeSelects:
-    def config_setting_group(self, **kwargs):
-        pass
-
-
-num_cc_libraries = 0
-num_opted_out_cc_libraries = 0
-parsing_path = None
-
-
-# Convert the source or header target to a relative path.
-def _get_filename(name, parsing_path):
-    filename = "%s%s" % (
-        (
-            parsing_path + "/"
-            if (parsing_path and not name.startswith("//"))
-            else ""
-        ),
-        name,
-    )
-    filename = filename.replace("//:", "")
-    filename = filename.replace("//src/core:", "src/core/")
-    filename = filename.replace(
-        "//src/cpp/ext/filters/census:", "src/cpp/ext/filters/census/"
-    )
-    return filename
-
-
-def grpc_cc_library(
-    name,
-    hdrs=[],
-    public_hdrs=[],
-    srcs=[],
-    select_deps=None,
-    tags=[],
-    deps=[],
-    external_deps=[],
-    proto=None,
-    **kwargs,
-):
-    global args
-    global num_cc_libraries
-    global num_opted_out_cc_libraries
-    global parsing_path
-    assert parsing_path is not None
-    name = "//%s:%s" % (parsing_path, name)
-    num_cc_libraries += 1
-    if select_deps or "nofixdeps" in tags:
-        if args.whats_left and not select_deps and "nofixdeps" not in tags:
-            num_opted_out_cc_libraries += 1
-            print("Not opted in: {}".format(name))
-        no_update.add(name)
-    scores[name] = len(public_hdrs + hdrs)
-    # avoid_dep is the internal way of saying prefer something else
-    # we add grpc_avoid_dep to allow internal grpc-only stuff to avoid each
-    # other, whilst not biasing dependent projects
-    if "avoid_dep" in tags or "grpc_avoid_dep" in tags:
-        avoidness[name] += 10
-    if proto:
-        proto_hdr = "%s%s" % (
-            (parsing_path + "/" if parsing_path else ""),
-            proto.replace(".proto", ".pb.h"),
-        )
-        skip_headers[name].add(proto_hdr)
-
-    for hdr in hdrs + public_hdrs:
-        vendors[_get_filename(hdr, parsing_path)].append(name)
-    inc = set()
-    original_deps[name] = frozenset(deps)
-    original_external_deps[name] = frozenset(external_deps)
-    for src in hdrs + public_hdrs + srcs:
-        for line in open(_get_filename(src, parsing_path)):
-            m = re.search(r"^#include <(.*)>", line)
-            if m:
-                inc.add(m.group(1))
-            m = re.search(r'^#include "(.*)"', line)
-            if m:
-                inc.add(m.group(1))
-    consumes[name] = list(inc)
-
-
-def grpc_proto_library(name, srcs, **kwargs):
-    global parsing_path
-    assert parsing_path is not None
-    name = "//%s:%s" % (parsing_path, name)
-    for src in srcs:
-        proto_hdr = src.replace(".proto", ".pb.h")
-        vendors[_get_filename(proto_hdr, parsing_path)].append(name)
-
-
-def buildozer(cmd, target):
-    buildozer_commands.append("%s|%s" % (cmd, target))
-
-
-def buildozer_set_list(name, values, target, via=""):
-    if not values:
-        buildozer("remove %s" % name, target)
-        return
-    adjust = via if via else name
-    buildozer(
-        "set %s %s" % (adjust, " ".join('"%s"' % s for s in values)), target
-    )
-    if via:
-        buildozer("remove %s" % name, target)
-        buildozer("rename %s %s" % (via, name), target)
-
-
-def score_edit_distance(proposed, existing):
-    """Score a proposed change primarily by edit distance"""
-    sum = 0
-    for p in proposed:
-        if p not in existing:
-            sum += 1
-    for e in existing:
-        if e not in proposed:
-            sum += 1
-    return sum
-
-
-def total_score(proposal):
-    return sum(scores[dep] for dep in proposal)
-
-
-def total_avoidness(proposal):
-    return sum(avoidness[dep] for dep in proposal)
-
-
-def score_list_size(proposed, existing):
-    """Score a proposed change primarily by number of dependencies"""
-    return len(proposed)
-
-
-def score_best(proposed, existing):
-    """Score a proposed change primarily by dependency score"""
-    return 0
-
-
-SCORERS = {
-    "edit_distance": score_edit_distance,
-    "list_size": score_list_size,
-    "best": score_best,
-}
-
-parser = argparse.ArgumentParser(description="Fix build dependencies")
-parser.add_argument(
-    "targets", nargs="*", default=[], help="targets to fix (empty => all)"
-)
-parser.add_argument(
-    "--score",
-    type=str,
-    default="edit_distance",
-    help="scoring function to use: one of " + ", ".join(SCORERS.keys()),
-)
-parser.add_argument(
-    "--whats_left",
-    action="store_true",
-    default=False,
-    help="show what is left to opt in",
-)
-parser.add_argument(
-    "--explain",
-    action="store_true",
-    default=False,
-    help="try to explain some decisions",
-)
-parser.add_argument(
-    "--why",
-    type=str,
-    default=None,
-    help="with --explain, target why a given dependency is needed",
-)
-args = parser.parse_args()
-
-for dirname in [
-    "",
-    "src/core",
-    "src/cpp/ext/gcp",
-    "src/cpp/ext/csm",
-    "src/cpp/ext/otel",
-    "test/core/backoff",
-    "test/core/experiments",
-    "test/core/uri",
-    "test/core/util",
-    "test/core/end2end",
-    "test/core/event_engine",
-    "test/core/filters",
-    "test/core/promise",
-    "test/core/resource_quota",
-    "test/core/transport/chaotic_good",
-    "fuzztest",
-    "fuzztest/core/channel",
-]:
-    parsing_path = dirname
-    exec(
-        open("%sBUILD" % (dirname + "/" if dirname else ""), "r").read(),
-        {
-            "load": lambda filename, *args: None,
-            "licenses": lambda licenses: None,
-            "package": lambda **kwargs: None,
-            "exports_files": lambda files, visibility=None: None,
-            "bool_flag": lambda **kwargs: None,
-            "config_setting": lambda **kwargs: None,
-            "selects": FakeSelects(),
-            "python_config_settings": lambda **kwargs: None,
-            "grpc_cc_binary": grpc_cc_library,
-            "grpc_cc_library": grpc_cc_library,
-            "grpc_cc_test": grpc_cc_library,
-            "grpc_core_end2end_test": lambda **kwargs: None,
-            "grpc_fuzzer": grpc_cc_library,
-            "grpc_fuzz_test": grpc_cc_library,
-            "grpc_proto_fuzzer": grpc_cc_library,
-            "grpc_proto_library": grpc_proto_library,
-            "select": lambda d: d["//conditions:default"],
-            "glob": lambda files: None,
-            "grpc_end2end_tests": lambda: None,
-            "grpc_upb_proto_library": lambda name, **kwargs: None,
-            "grpc_upb_proto_reflection_library": lambda name, **kwargs: None,
-            "grpc_generate_one_off_targets": lambda: None,
-            "grpc_generate_one_off_internal_targets": lambda: None,
-            "grpc_package": lambda **kwargs: None,
-            "filegroup": lambda name, **kwargs: None,
-            "sh_library": lambda name, **kwargs: None,
-        },
-        {},
-    )
-    parsing_path = None
-
-if args.whats_left:
-    print(
-        "{}/{} libraries are opted in".format(
-            num_cc_libraries - num_opted_out_cc_libraries, num_cc_libraries
-        )
-    )
-
-
-def make_relative_path(dep, lib):
-    if lib is None:
-        return dep
-    lib_path = lib[: lib.rfind(":") + 1]
-    if dep.startswith(lib_path):
-        return dep[len(lib_path) :]
-    return dep
-
-
-if args.whats_left:
-    print(
-        "{}/{} libraries are opted in".format(
-            num_cc_libraries - num_opted_out_cc_libraries, num_cc_libraries
-        )
-    )
-
-
-# Keeps track of all possible sets of dependencies that could satify the
-# problem. (models the list monad in Haskell!)
-class Choices:
-    def __init__(self, library, substitutions):
-        self.library = library
-        self.to_add = []
-        self.to_remove = []
-        self.substitutions = substitutions
-
-    def add_one_of(self, choices, trigger):
-        if not choices:
-            return
-        choices = sum(
-            [self.apply_substitutions(choice) for choice in choices], []
-        )
-        if args.explain and (args.why is None or args.why in choices):
-            print(
-                "{}: Adding one of {} for {}".format(
-                    self.library, choices, trigger
-                )
-            )
-        self.to_add.append(
-            tuple(
-                make_relative_path(choice, self.library) for choice in choices
-            )
-        )
-
-    def add(self, choice, trigger):
-        self.add_one_of([choice], trigger)
-
-    def remove(self, remove):
-        for remove in self.apply_substitutions(remove):
-            self.to_remove.append(make_relative_path(remove, self.library))
-
-    def apply_substitutions(self, dep):
-        if dep in self.substitutions:
-            return self.substitutions[dep]
-        return [dep]
-
-    def best(self, scorer):
-        choices = set()
-        choices.add(frozenset())
-
-        for add in sorted(set(self.to_add), key=lambda x: (len(x), x)):
-            new_choices = set()
-            for append_choice in add:
-                for choice in choices:
-                    new_choices.add(choice.union([append_choice]))
-            choices = new_choices
-        for remove in sorted(set(self.to_remove)):
-            new_choices = set()
-            for choice in choices:
-                new_choices.add(choice.difference([remove]))
-            choices = new_choices
-
-        best = None
-
-        def final_scorer(x):
-            return (total_avoidness(x), scorer(x), total_score(x))
-
-        for choice in choices:
-            if best is None or final_scorer(choice) < final_scorer(best):
-                best = choice
-        return best
-
-
-def make_library(library):
-    error = False
-    hdrs = sorted(consumes[library])
-    # we need a little trickery here since grpc_base has channel.cc, which calls grpc_init
-    # which is in grpc, which is illegal but hard to change
-    # once EventEngine lands we can clean this up
-    deps = Choices(
-        library,
-        {"//:grpc_base": ["//:grpc", "//:grpc_unsecure"]}
-        if library.startswith("//test/")
-        else {},
-    )
-    external_deps = Choices(None, {})
-    for hdr in hdrs:
-        if hdr in skip_headers[library]:
-            continue
-
-        if hdr == "systemd/sd-daemon.h":
-            continue
-
-        if hdr == "src/core/lib/profiling/stap_probes.h":
-            continue
-
-        if hdr.startswith("src/libfuzzer/"):
-            continue
-
-        if hdr == "grpc/grpc.h" and library.startswith("//test:"):
-            # not the root build including grpc.h ==> //:grpc
-            deps.add_one_of(["//:grpc", "//:grpc_unsecure"], hdr)
-            continue
-
-        if hdr in INTERNAL_DEPS:
-            dep = INTERNAL_DEPS[hdr]
-            if isinstance(dep, list):
-                for d in dep:
-                    deps.add(d, hdr)
-            else:
-                if not ("//" in dep):
-                    dep = "//:" + dep
-                deps.add(dep, hdr)
-            continue
-
-        if hdr in vendors:
-            deps.add_one_of(vendors[hdr], hdr)
-            continue
-
-        if "include/" + hdr in vendors:
-            deps.add_one_of(vendors["include/" + hdr], hdr)
-            continue
-
-        if "." not in hdr:
-            # assume a c++ system include
-            continue
-
-        if hdr in EXTERNAL_DEPS:
-            if isinstance(EXTERNAL_DEPS[hdr], list):
-                for dep in EXTERNAL_DEPS[hdr]:
-                    external_deps.add(dep, hdr)
-            else:
-                external_deps.add(EXTERNAL_DEPS[hdr], hdr)
-            continue
-
-        if hdr.startswith("opencensus/"):
-            trail = hdr[len("opencensus/") :]
-            trail = trail[: trail.find("/")]
-            external_deps.add("opencensus-" + trail, hdr)
-            continue
-
-        if hdr.startswith("envoy/"):
-            path, file = os.path.split(hdr)
-            file = file.split(".")
-            path = path.split("/")
-            dep = "_".join(path[:-1] + [file[1]])
-            deps.add(dep, hdr)
-            continue
-
-        if hdr.startswith("google/protobuf/") and not hdr.endswith(".upb.h"):
-            external_deps.add("protobuf_headers", hdr)
-            continue
-
-        if "/" not in hdr:
-            # assume a system include
-            continue
-
-        is_sys_include = False
-        for sys_path in [
-            "sys",
-            "arpa",
-            "gperftools",
-            "netinet",
-            "linux",
-            "android",
-            "mach",
-            "net",
-            "CoreFoundation",
-        ]:
-            if hdr.startswith(sys_path + "/"):
-                is_sys_include = True
-                break
-        if is_sys_include:
-            # assume a system include
-            continue
-
-        print(
-            "# ERROR: can't categorize header: %s used by %s" % (hdr, library)
-        )
-        error = True
-
-    deps.remove(library)
-
-    deps = sorted(
-        deps.best(lambda x: SCORERS[args.score](x, original_deps[library]))
-    )
-    external_deps = sorted(
-        external_deps.best(
-            lambda x: SCORERS[args.score](x, original_external_deps[library])
-        )
-    )
-
-    return (library, error, deps, external_deps)
-
-
-def main() -> None:
-    update_libraries = []
-    for library in sorted(consumes.keys()):
-        if library in no_update:
-            continue
-        if args.targets and library not in args.targets:
-            continue
-        update_libraries.append(library)
-    with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as p:
-        updated_libraries = p.map(make_library, update_libraries, 1)
-
-    error = False
-    for library, lib_error, deps, external_deps in updated_libraries:
-        if lib_error:
-            error = True
-            continue
-        buildozer_set_list("external_deps", external_deps, library, via="deps")
-        buildozer_set_list("deps", deps, library)
-
-    run_buildozer.run_buildozer(buildozer_commands)
-
-    if error:
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/distrib/iwyu.sh b/tools/distrib/iwyu.sh
deleted file mode 100755
index 9a00fde2b4d38..0000000000000
--- a/tools/distrib/iwyu.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/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.
-
-echo "NOTE: to automagically apply fixes, invoke with --fix"
-
-set -ex
-
-# change to root directory
-cd $(dirname $0)/../..
-REPO_ROOT=$(pwd)
-
-# grep targets with manual tag, which is not included in a result of bazel build using ...
-# let's get a list of them using query command and pass it to gen_compilation_database.py
-export MANUAL_TARGETS=$(bazel query 'attr("tags", "manual", tests(//test/cpp/...))' | grep -v _on_ios)
-
-# generate a clang compilation database for all C/C++ sources in the repo.
-tools/distrib/gen_compilation_database.py \
-  --include_headers \
-  --ignore_system_headers \
-  --dedup_targets \
-  "//:*" \
-  "//src/core/..." \
-  "//src/cpp/ext/csm/..." \
-  "//src/cpp/ext/gcp/..." \
-  "//src/cpp/ext/otel/..." \
-  "//src/compiler/..." \
-  "//test/core/..." \
-  "//test/cpp/..." \
-  "//fuzztest/..." \
-  $MANUAL_TARGETS
-
-# run iwyu against the checked out codebase
-# when modifying the checked-out files, the current user will be impersonated
-# so that the updated files don't end up being owned by "root".
-if [ "$IWYU_SKIP_DOCKER" == "" ]
-then
-  # build iwyu docker image
-  docker build -t grpc_iwyu tools/dockerfile/grpc_iwyu
-
-  docker run \
-    -e TEST="$TEST" \
-    -e CHANGED_FILES="$CHANGED_FILES" \
-    -e IWYU_ROOT="/local-code" \
-    --rm=true \
-    -v "${REPO_ROOT}":/local-code \
-    -v "${HOME/.cache/bazel}":"${HOME/.cache/bazel}" \
-    --user "$(id -u):$(id -g)" \
-    -t grpc_iwyu /iwyu.sh "$@"
-else
-  IWYU_ROOT="${REPO_ROOT}" tools/dockerfile/grpc_iwyu/iwyu.sh
-fi
diff --git a/tools/distrib/iwyu_mappings.imp b/tools/distrib/iwyu_mappings.imp
deleted file mode 100644
index 3f993a9aee5fd..0000000000000
--- a/tools/distrib/iwyu_mappings.imp
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    { include: ["<ext/alloc_traits.h>", "private", "<vector>", "public"] },
-    { include: ["<netinet/in.h>", "public", "\"src/core/lib/iomgr/sockaddr.h\"", "public"]},
-    { include: ["<sys/socket.h>", "public", "\"src/core/lib/iomgr/sockaddr.h\"", "public"]},
-    { include: ["<openssl/base.h>", "private", "<openssl/crypto.h>", "public"] },
-    { include: ["<openssl/digest.h>", "private", "<openssl/evp.h>", "public"] },
-    # workaround: https://github.com/include-what-you-use/include-what-you-use/issues/908
-    { symbol: ["std::max", "private", "<algorithm>", "public" ] },
-] 
diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py
index 3dc8f9c9c16ed..7c78587c40ebd 100644
--- a/tools/distrib/python/grpc_version.py
+++ b/tools/distrib/python/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
-PROTOBUF_VERSION = '3.24.3'
+VERSION = '1.61.0.dev0'
+PROTOBUF_VERSION = '3.25.0'
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index 3947a282f6af9..f7f3637710ec1 100644
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
-PROTOBUF_VERSION = '3.24.3'
+VERSION = '1.61.0.dev0'
+PROTOBUF_VERSION = '3.25.0'
diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index c0fedbb958ab5..edb4c940321cf 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -193,6 +193,7 @@
     'third_party/protobuf/src/google/protobuf/compiler/java/generator.cc',
     'third_party/protobuf/src/google/protobuf/compiler/java/generator_factory.cc',
     'third_party/protobuf/src/google/protobuf/compiler/java/helpers.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/java/java_features.pb.cc',
     'third_party/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc',
     'third_party/protobuf/src/google/protobuf/compiler/java/map_field.cc',
     'third_party/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc',
@@ -239,12 +240,16 @@
     'third_party/protobuf/src/google/protobuf/compiler/retention.cc',
     'third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/accessors.cc',
-    'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_bytes.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_message.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_string.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/context.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/generator.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/message.cc',
     'third_party/protobuf/src/google/protobuf/compiler/rust/naming.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/rust/oneof.cc',
+    'third_party/protobuf/src/google/protobuf/compiler/rust/relative_path.cc',
     'third_party/protobuf/src/google/protobuf/compiler/subprocess.cc',
     'third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc',
     'third_party/protobuf/src/google/protobuf/cpp_features.pb.cc',
@@ -315,4 +320,4 @@
 ]
 PROTO_INCLUDE='third_party/protobuf/src'
 
-PROTOBUF_SUBMODULE_VERSION="b2b7a51158418f41cff0520894836c15b1738721"
+PROTOBUF_SUBMODULE_VERSION="6b5d8db01fe47478e8d400f550e797e6230d464e"
diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py
index c8140d3a0bced..008611094fc1f 100644
--- a/tools/distrib/python/xds_protos/grpc_version.py
+++ b/tools/distrib/python/xds_protos/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.60.0.dev0'
-PROTOBUF_VERSION = '3.24.3'
+VERSION = '1.61.0.dev0'
+PROTOBUF_VERSION = '3.25.0'
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 f67a9937f75b8..56503164a2c6d 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
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
+set -e
 
 # directories to run against
 DIRS="examples/cpp examples/android/binder src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/ruby src/objective-c tools/distrib/python src/python/grpcio_observability"
@@ -35,9 +35,10 @@ do
     files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob \
     -and -not -name '*.generated.*' \
     -and -not -name '*.upb.h' \
-    -and -not -name '*.upb.c' \
     -and -not -name '*.upbdefs.h' \
     -and -not -name '*.upbdefs.c' \
+    -and -not -name '*.upb_minitable.h' \
+    -and -not -name '*.upb_minitable.c' \
     -and -not -name '*.pb.h' \
     -and -not -name '*.pb.c' \
     -and -not -name '*.pb.cc' \
@@ -60,11 +61,13 @@ if [ -n "$CHANGED_FILES" ]; then
   files=$(comm -12 <(echo $files | tr ' ' '\n' | sort -u) <(echo $CHANGED_FILES | tr ' ' '\n' | sort -u))
 fi
 
+files=`echo $files | sort -R`
+
 FILES_PER_PROCESS="$(expr $(echo "$files" | grep -o '\n' | wc -l) / $CPU_COUNT + 1)"
 
 if [ "$TEST" == "" ]
 then
-  echo $files | xargs -P $CPU_COUNT -n $FILES_PER_PROCESS $CLANG_FORMAT -i --verbose
+  echo $files | xargs -P $CPU_COUNT -n $FILES_PER_PROCESS $CLANG_FORMAT -i
 else
   ok=yes
   for file in $files
diff --git a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh
index 1e606638ec86a..81c90600422e9 100755
--- a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh
+++ b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh
@@ -24,6 +24,6 @@ cd ${CLANG_TIDY_ROOT}
 cat compile_commands.json | jq -r '.[].file' \
   | grep -E "(^include/|^src/core/|^src/cpp/|^test/core/|^test/cpp/)" \
   | grep -v -E "src/core/lib/debug/stats_data" \
-  | grep -v -E "/upb-generated/|/upbdefs-generated/" \
+  | grep -v -E "/upb-gen/|/upbdefs-gen/" \
   | sort \
   | xargs tools/distrib/run_clang_tidy.py "$@"
diff --git a/tools/dockerfile/grpc_iwyu/Dockerfile b/tools/dockerfile/grpc_iwyu/Dockerfile
deleted file mode 100644
index 01b9a2d3a4aee..0000000000000
--- a/tools/dockerfile/grpc_iwyu/Dockerfile
+++ /dev/null
@@ -1,28 +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.
-
-# Docker file for running IWYU.
-# Updated: 2022-11-03
-
-FROM silkeh/clang:16-bullseye
-
-# Install prerequisites for the iwyu script
-RUN apt-get update && apt-get install -y python3 jq git cmake python zlib1g-dev libtinfo-dev libclang-16-dev && apt-get clean
-ADD iwyu.sh /
-
-# When running locally, we'll be impersonating the current user, so we need
-# to make the script runnable by everyone.
-RUN chmod a+rx /iwyu.sh
-
-CMD ["echo 'Run with tools/distrib/iwyu.sh'"]
diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh
deleted file mode 100755
index 776e79c5213d1..0000000000000
--- a/tools/dockerfile/grpc_iwyu/iwyu.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-# Copyright 2017 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 -x
-
-cd ${IWYU_ROOT}
-
-export PATH=${PATH}:${IWYU_ROOT}/iwyu_build/bin
-
-# number of CPUs available
-CPU_COUNT=`nproc`
-
-rm -rf iwyu || true
-git clone https://github.com/include-what-you-use/include-what-you-use.git iwyu
-
-###############################################################################
-#
-#   BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!
-#
-#   Changing the version of iwyu can bring along subtle changes.
-#   You *must* test the new version of iwyu:
-#   1. run it on the entire codebase before submitting
-#   2. UPLOAD A CHANGE THAT SHOULD BE BROKEN AFTER SUBMISSION OF THIS CHANGE
-#   ensure that the broken change is caught by the new version of iwyu
-#
-#   BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!  BEWARE!
-#
-###############################################################################
-
-# latest commit on the clang_16 branch
-cd ${IWYU_ROOT}/iwyu
-git checkout 7301b1fc88e5e16d8df73aecea55037d9c0a371b
-if [ $? -ne 0 ]; then
-  echo "Failed to checkout iwyu commit"
-  exit 1
-fi
-mkdir -p ${IWYU_ROOT}/iwyu_build
-cd ${IWYU_ROOT}/iwyu_build
-cmake -G "Unix Makefiles" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ROOT_DIR=/usr/lib/llvm-16 ${IWYU_ROOT}/iwyu
-if [ $? -ne 0 ]; then
-  echo "Failed to cmake iwyu"
-  exit 1
-fi
-make -j $CPU_COUNT
-if [ $? -ne 0 ]; then
-  echo "Failed to make iwyu"
-  exit 1
-fi
-cd ${IWYU_ROOT}
-
-cat compile_commands.json                            \
-  | sed "s/ -DNDEBUG//g"                             \
-  | sed "s/ -std=c\\+\\+14/ -std=c++17/g"            \
-  | sed "s,\"file\": \",\"file\": \"${IWYU_ROOT}/,g" \
-  > compile_commands_for_iwyu.json
-
-export ENABLED_MODULES='
-  src/core/ext
-  src/core/lib
-  src/cpp
-  src/python/grpcio_observability
-  test/core
-  fuzztest
-'
-
-export DISABLED_MODULES='
-  src/core/lib/gpr
-  src/core/lib/iomgr
-  src/core/ext/transport/binder
-  test/core/alts
-  test/core/iomgr
-  test/core/security
-  test/core/tsi
-  test/core/transport/binder
-'
-
-export INCLUSION_REGEX=`echo $ENABLED_MODULES | sed 's/ /|/g' | sed 's,\\(.*\\),^(\\1)/,g'`
-export EXCLUSION_REGEX=`echo $DISABLED_MODULES | sed 's/ /|/g' | sed 's,\\(.*\\),^(\\1)/,g'`
-
-# figure out which files to include
-cat compile_commands.json | jq -r '.[].file'                                     \
-  | grep -E $INCLUSION_REGEX                                                     \
-  | grep -v -E "/upb-generated/|/upbdefs-generated/"                             \
-  | grep -v -E $EXCLUSION_REGEX                                                  \
-  | grep -v src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h \
-  | grep -v test/core/end2end/end2end_tests.cc                                   \
-  | sort                                                                         \
-  > iwyu_files0.txt
-
-cat iwyu_files0.txt                    \
-  | xargs -d '\n' ls -1df 2> /dev/null \
-  > iwyu_files.txt                     \
-  || true
-
-echo '#!/bin/sh
-${IWYU_ROOT}/iwyu/iwyu_tool.py -p compile_commands_for_iwyu.json $1       \
-    -- -Xiwyu --no_fwd_decls                                              \
-       -Xiwyu --update_comments                                           \
-       -Xiwyu --mapping_file=${IWYU_ROOT}/tools/distrib/iwyu_mappings.imp \
-  | grep -v -E "port_platform.h"                                          \
-  | grep -v -E "repeated_ptr_field.h"                                     \
-  | grep -v -E "repeated_field.h"                                         \
-  | grep -v -E "^(- )?namespace "                                         \
-  > iwyu/iwyu.`echo $1 | sha1sum`.out
-' > iwyu/run_iwyu_on.sh
-chmod +x iwyu/run_iwyu_on.sh
-
-# run iwyu, filtering out changes to port_platform.h
-xargs -n 1 -P $CPU_COUNT -a iwyu_files.txt ${IWYU_ROOT}/iwyu/run_iwyu_on.sh
-
-cat iwyu/iwyu.*.out > iwyu.out
-
-# apply the suggested changes
-${IWYU_ROOT}/iwyu/fix_includes.py \
-  --nocomments                    \
-  --nosafe_headers                \
-  --ignore_re='^(include/.*|src/core/lib/security/credentials/tls/grpc_tls_credentials_options\.h|external/.*)' \
-  < iwyu.out                      \
-  | grep 'IWYU edited 0 files on your behalf'
-
-if [ $? -ne 0 ] 
-then
-    echo "Iwyu edited some files. Here is the diff of files edited by iwyu:"
-    git --no-pager diff
-    # Exit with a non zero error code to ensure sanity checks fail accordingly.
-    exit 1
-fi
diff --git a/tools/dockerfile/test/bazel.current_version b/tools/dockerfile/test/bazel.current_version
index ff91869296b4c..972682e15220c 100644
--- a/tools/dockerfile/test/bazel.current_version
+++ b/tools/dockerfile/test/bazel.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/bazel:c8658dbcb51352d5e9c5d9f15282835e45d5ce80@sha256:023fdfd072e278d4129f2c8f8564f6697e767c9847aae8c9411ea853f3faaa6f
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/bazel:cacad91746cd598d8756de89b912be291de1f019@sha256:32bde2dcb2087f2a32afab59e4dfedf7e8c76a52c69881f63a239d311f0e5ecf
\ No newline at end of file
diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile
index 5175c12232f48..c52f8313cbb3e 100644
--- a/tools/dockerfile/test/bazel/Dockerfile
+++ b/tools/dockerfile/test/bazel/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get -y install \
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 6.3.2
+ENV BAZEL_VERSION 6.4.0
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/bazel_arm64.current_version b/tools/dockerfile/test/bazel_arm64.current_version
index 242040883df1b..71008d44e604f 100644
--- a/tools/dockerfile/test/bazel_arm64.current_version
+++ b/tools/dockerfile/test/bazel_arm64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64:b80154c9d14839d4e387155401c5204f2cc09262@sha256:1b7200c85ba8bc10529e1867a27ee81ad303ec8c8efec8bbc5863b4ee8ac6d03
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64:2638335cbe0cbd8f77c54affdf0e4b36f7741785@sha256:3b087387c44dee405c1b80d6ff50994e6d8e90a4ef67cc94b4291f1a29c0ef41
\ No newline at end of file
diff --git a/tools/dockerfile/test/bazel_arm64/Dockerfile b/tools/dockerfile/test/bazel_arm64/Dockerfile
index 104994c57014c..afc341b6ad975 100644
--- a/tools/dockerfile/test/bazel_arm64/Dockerfile
+++ b/tools/dockerfile/test/bazel_arm64/Dockerfile
@@ -97,7 +97,7 @@ RUN apt-get update && apt-get -y install libc++-dev clang && apt-get clean
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 6.3.2
+ENV BAZEL_VERSION 6.4.0
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/binder_transport_apk.current_version b/tools/dockerfile/test/binder_transport_apk.current_version
index caf0273c2cae5..439b81ec9dd5f 100644
--- a/tools/dockerfile/test/binder_transport_apk.current_version
+++ b/tools/dockerfile/test/binder_transport_apk.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk:86b356231e6878000efa10a7d471ab7b332a92de@sha256:38c1da5544c717ef0e3d3492833b0fd1ce5c70fbe71eea8a9bfb0ab0b1217f1b
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk:783671f597502a2dc3ebf190d52d55be70836a33@sha256:bf60a187cd2ce1abe8b4f32ae6479040a72ca6aa789cd5ab509f60ceb37a41f9
\ No newline at end of file
diff --git a/tools/dockerfile/test/binder_transport_apk/Dockerfile b/tools/dockerfile/test/binder_transport_apk/Dockerfile
index d82114053d949..c0644d3285b81 100644
--- a/tools/dockerfile/test/binder_transport_apk/Dockerfile
+++ b/tools/dockerfile/test/binder_transport_apk/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get -y install \
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 6.3.2
+ENV BAZEL_VERSION 6.4.0
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/sanity.current_version b/tools/dockerfile/test/sanity.current_version
index d8f6ffe1e74b1..776c3d349be7b 100644
--- a/tools/dockerfile/test/sanity.current_version
+++ b/tools/dockerfile/test/sanity.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:4df7e77523dc402f423cb024d8ae9693b562cba1@sha256:49745399fdef994b033fd8a5cad293d822ac25289770b7c342e34e781ff41590
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:091d8e85bebb7b9f089178ae96435926cdc82fb8@sha256:f1f5ca30491698f793cae75d5989cb53887d159800aef662cf7e6c3df6f86a88
\ No newline at end of file
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile
index bdd6c4d55b4ef..e45bdfc00261c 100644
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@@ -111,7 +111,7 @@ RUN apt-get update && apt-get install -y jq git cmake zlib1g-dev libtinfo-dev li
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 6.3.2
+ENV BAZEL_VERSION 6.4.0
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 63dbd86188350..42eec93cf59fe 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0-dev
+PROJECT_NUMBER         = 1.61.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index d8fa3fdab89ac..21666ae9e51b2 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0-dev
+PROJECT_NUMBER         = 1.61.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1336,632 +1336,795 @@ src/core/ext/transport/inproc/inproc_transport.cc \
 src/core/ext/transport/inproc/inproc_transport.h \
 src/core/ext/transport/inproc/legacy_inproc_transport.cc \
 src/core/ext/transport/inproc/legacy_inproc_transport.h \
-src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h \
-src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
-src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h \
-src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
-src/core/ext/upb-generated/envoy/annotations/resource.upb.h \
-src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
-src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h \
-src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c \
-src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h \
-src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c \
-src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h \
-src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c \
-src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h \
-src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c \
-src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h \
-src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c \
-src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h \
-src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
-src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h \
-src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h \
-src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c \
-src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h \
-src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c \
-src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h \
-src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c \
-src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h \
-src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
-src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h \
-src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
-src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h \
-src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
-src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h \
-src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c \
-src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h \
-src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c \
-src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h \
-src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c \
-src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h \
-src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
-src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h \
-src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
-src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/http.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/percent.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/range.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h \
-src/core/ext/upb-generated/google/api/annotations.upb.c \
-src/core/ext/upb-generated/google/api/annotations.upb.h \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h \
-src/core/ext/upb-generated/google/api/http.upb.c \
-src/core/ext/upb-generated/google/api/http.upb.h \
-src/core/ext/upb-generated/google/api/httpbody.upb.c \
-src/core/ext/upb-generated/google/api/httpbody.upb.h \
-src/core/ext/upb-generated/google/protobuf/any.upb.c \
-src/core/ext/upb-generated/google/protobuf/any.upb.h \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \
-src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-src/core/ext/upb-generated/google/protobuf/duration.upb.h \
-src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-src/core/ext/upb-generated/google/protobuf/empty.upb.h \
-src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-src/core/ext/upb-generated/google/protobuf/struct.upb.h \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.h \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.h \
-src/core/ext/upb-generated/google/rpc/status.upb.c \
-src/core/ext/upb-generated/google/rpc/status.upb.h \
-src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c \
-src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h \
-src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
-src/core/ext/upb-generated/udpa/annotations/migrate.upb.h \
-src/core/ext/upb-generated/udpa/annotations/security.upb.c \
-src/core/ext/upb-generated/udpa/annotations/security.upb.h \
-src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
-src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h \
-src/core/ext/upb-generated/udpa/annotations/status.upb.c \
-src/core/ext/upb-generated/udpa/annotations/status.upb.h \
-src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
-src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
-src/core/ext/upb-generated/validate/validate.upb.c \
-src/core/ext/upb-generated/validate/validate.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/security.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/security.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/status.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/status.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h \
-src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
-src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
-src/core/ext/upb-generated/xds/core/v3/cidr.upb.c \
-src/core/ext/upb-generated/xds/core/v3/cidr.upb.h \
-src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
-src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h \
-src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
-src/core/ext/upb-generated/xds/core/v3/context_params.upb.h \
-src/core/ext/upb-generated/xds/core/v3/extension.upb.c \
-src/core/ext/upb-generated/xds/core/v3/extension.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
-src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h \
-src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
-src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h \
-src/core/ext/upb-generated/xds/type/v3/cel.upb.c \
-src/core/ext/upb-generated/xds/type/v3/cel.upb.h \
-src/core/ext/upb-generated/xds/type/v3/range.upb.c \
-src/core/ext/upb-generated/xds/type/v3/range.upb.h \
-src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c \
-src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h \
-src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
-src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \
-src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c \
-src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h \
-src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
-src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h \
+src/core/ext/upb-gen/envoy/annotations/resource.upb.h \
+src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c \
+src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h \
+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/pick_first/v3/pick_first.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h \
+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/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.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/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 \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h \
+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/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/http.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/range.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h \
+src/core/ext/upb-gen/google/api/annotations.upb.h \
+src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+src/core/ext/upb-gen/google/api/annotations.upb_minitable.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h \
+src/core/ext/upb-gen/google/api/http.upb.h \
+src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+src/core/ext/upb-gen/google/api/http.upb_minitable.h \
+src/core/ext/upb-gen/google/api/httpbody.upb.h \
+src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c \
+src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/any.upb.h \
+src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb.h \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/duration.upb.h \
+src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/empty.upb.h \
+src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/struct.upb.h \
+src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb.h \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb.h \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h \
+src/core/ext/upb-gen/google/rpc/status.upb.h \
+src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+src/core/ext/upb-gen/google/rpc/status.upb_minitable.h \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c \
+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.c \
+src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb.h \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/security.upb.h \
+src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/status.upb.h \
+src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb.h \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h \
+src/core/ext/upb-gen/validate/validate.upb.h \
+src/core/ext/upb-gen/validate/validate.upb_minitable.c \
+src/core/ext/upb-gen/validate/validate.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/authority.upb.h \
+src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb.h \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb.h \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/extension.upb.h \
+src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h \
+src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h \
+src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c \
+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.c \
+src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/cel.upb.h \
+src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/range.upb.h \
+src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
+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.c \
+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/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 \
+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.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/http.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/http.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h \
+src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h \
+src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c \
+src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h \
+src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
+src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h \
+src/core/ext/upbdefs-gen/validate/validate.upbdefs.c \
+src/core/ext/upbdefs-gen/validate/validate.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h \
+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/ext/xds/certificate_provider_store.cc \
 src/core/ext/xds/certificate_provider_store.h \
 src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@@ -2102,7 +2265,6 @@ src/core/lib/event_engine/forkable.cc \
 src/core/lib/event_engine/forkable.h \
 src/core/lib/event_engine/grpc_polled_fd.h \
 src/core/lib/event_engine/handle_containers.h \
-src/core/lib/event_engine/memory_allocator.cc \
 src/core/lib/event_engine/memory_allocator_factory.h \
 src/core/lib/event_engine/nameser.h \
 src/core/lib/event_engine/poller.h \
@@ -2119,6 +2281,8 @@ src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
 src/core/lib/event_engine/posix_engine/internal_errqueue.h \
 src/core/lib/event_engine/posix_engine/lockfree_event.cc \
 src/core/lib/event_engine/posix_engine/lockfree_event.h \
+src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
+src/core/lib/event_engine/posix_engine/native_dns_resolver.h \
 src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
 src/core/lib/event_engine/posix_engine/posix_endpoint.h \
 src/core/lib/event_engine/posix_engine/posix_engine.cc \
@@ -2145,6 +2309,7 @@ src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h \
+src/core/lib/event_engine/ref_counted_dns_resolver_interface.h \
 src/core/lib/event_engine/resolved_address.cc \
 src/core/lib/event_engine/resolved_address_internal.h \
 src/core/lib/event_engine/shim.cc \
@@ -2169,6 +2334,8 @@ src/core/lib/event_engine/trace.cc \
 src/core/lib/event_engine/trace.h \
 src/core/lib/event_engine/utils.cc \
 src/core/lib/event_engine/utils.h \
+src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
+src/core/lib/event_engine/windows/grpc_polled_fd_windows.h \
 src/core/lib/event_engine/windows/iocp.cc \
 src/core/lib/event_engine/windows/iocp.h \
 src/core/lib/event_engine/windows/win_socket.cc \
@@ -2228,6 +2395,7 @@ src/core/lib/gprpp/cpp_impl_of.h \
 src/core/lib/gprpp/crash.cc \
 src/core/lib/gprpp/crash.h \
 src/core/lib/gprpp/debug_location.h \
+src/core/lib/gprpp/directory_reader.h \
 src/core/lib/gprpp/dual_ref_counted.h \
 src/core/lib/gprpp/env.h \
 src/core/lib/gprpp/examine_stack.cc \
@@ -2252,6 +2420,7 @@ src/core/lib/gprpp/overload.h \
 src/core/lib/gprpp/packed_table.h \
 src/core/lib/gprpp/per_cpu.cc \
 src/core/lib/gprpp/per_cpu.h \
+src/core/lib/gprpp/posix/directory_reader.cc \
 src/core/lib/gprpp/posix/env.cc \
 src/core/lib/gprpp/posix/stat.cc \
 src/core/lib/gprpp/posix/thd.cc \
@@ -2281,6 +2450,7 @@ src/core/lib/gprpp/type_list.h \
 src/core/lib/gprpp/unique_type_name.h \
 src/core/lib/gprpp/validation_errors.cc \
 src/core/lib/gprpp/validation_errors.h \
+src/core/lib/gprpp/windows/directory_reader.cc \
 src/core/lib/gprpp/windows/env.cc \
 src/core/lib/gprpp/windows/stat.cc \
 src/core/lib/gprpp/windows/thd.cc \
@@ -2489,6 +2659,7 @@ src/core/lib/promise/race.h \
 src/core/lib/promise/seq.h \
 src/core/lib/promise/sleep.cc \
 src/core/lib/promise/sleep.h \
+src/core/lib/promise/status_flag.h \
 src/core/lib/promise/trace.cc \
 src/core/lib/promise/trace.h \
 src/core/lib/promise/try_seq.h \
@@ -2850,8 +3021,6 @@ src/cpp/util/status.cc \
 src/cpp/util/string_ref.cc \
 src/cpp/util/time_cc.cc \
 third_party/upb/upb/generated_code_support.h \
-third_party/upb/upb/port/def.inc \
-third_party/upb/upb/port/undef.inc \
 third_party/xxhash/xxhash.h
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core
index 91c4e7c623f94..6dac1787b7116 100644
--- a/tools/doxygen/Doxyfile.core
+++ b/tools/doxygen/Doxyfile.core
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 36.0.0
+PROJECT_NUMBER         = 37.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8b99cea7ea0e0..b7b1ae5bf255a 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 36.0.0
+PROJECT_NUMBER         = 37.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1111,632 +1111,795 @@ src/core/ext/transport/inproc/inproc_transport.cc \
 src/core/ext/transport/inproc/inproc_transport.h \
 src/core/ext/transport/inproc/legacy_inproc_transport.cc \
 src/core/ext/transport/inproc/legacy_inproc_transport.h \
-src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h \
-src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c \
-src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h \
-src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
-src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h \
-src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
-src/core/ext/upb-generated/envoy/annotations/resource.upb.h \
-src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
-src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h \
-src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c \
-src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h \
-src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
-src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h \
-src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c \
-src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h \
-src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c \
-src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
-src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h \
-src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
-src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h \
-src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c \
-src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h \
-src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c \
-src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h \
-src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c \
-src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h \
-src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
-src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h \
-src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
-src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h \
-src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.h \
-src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c \
-src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.h \
-src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c \
-src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h \
-src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c \
-src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h \
-src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
-src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h \
-src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c \
-src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c \
-src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c \
-src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h \
-src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
-src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h \
-src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
-src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h \
-src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
-src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h \
-src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c \
-src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h \
-src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c \
-src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.h \
-src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c \
-src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h \
-src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
-src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h \
-src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
-src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h \
-src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
-src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/http.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/http_status.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/percent.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/range.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h \
-src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c \
-src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.h \
-src/core/ext/upb-generated/google/api/annotations.upb.c \
-src/core/ext/upb-generated/google/api/annotations.upb.h \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
-src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h \
-src/core/ext/upb-generated/google/api/http.upb.c \
-src/core/ext/upb-generated/google/api/http.upb.h \
-src/core/ext/upb-generated/google/api/httpbody.upb.c \
-src/core/ext/upb-generated/google/api/httpbody.upb.h \
-src/core/ext/upb-generated/google/protobuf/any.upb.c \
-src/core/ext/upb-generated/google/protobuf/any.upb.h \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \
-src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-src/core/ext/upb-generated/google/protobuf/duration.upb.h \
-src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-src/core/ext/upb-generated/google/protobuf/empty.upb.h \
-src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-src/core/ext/upb-generated/google/protobuf/struct.upb.h \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-src/core/ext/upb-generated/google/protobuf/timestamp.upb.h \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-src/core/ext/upb-generated/google/protobuf/wrappers.upb.h \
-src/core/ext/upb-generated/google/rpc/status.upb.c \
-src/core/ext/upb-generated/google/rpc/status.upb.h \
-src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c \
-src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c \
-src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.h \
-src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
-src/core/ext/upb-generated/udpa/annotations/migrate.upb.h \
-src/core/ext/upb-generated/udpa/annotations/security.upb.c \
-src/core/ext/upb-generated/udpa/annotations/security.upb.h \
-src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
-src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h \
-src/core/ext/upb-generated/udpa/annotations/status.upb.c \
-src/core/ext/upb-generated/udpa/annotations/status.upb.h \
-src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
-src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
-src/core/ext/upb-generated/validate/validate.upb.c \
-src/core/ext/upb-generated/validate/validate.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/security.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/security.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/status.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/status.upb.h \
-src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c \
-src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.h \
-src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
-src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
-src/core/ext/upb-generated/xds/core/v3/cidr.upb.c \
-src/core/ext/upb-generated/xds/core/v3/cidr.upb.h \
-src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
-src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h \
-src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
-src/core/ext/upb-generated/xds/core/v3/context_params.upb.h \
-src/core/ext/upb-generated/xds/core/v3/extension.upb.c \
-src/core/ext/upb-generated/xds/core/v3/extension.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
-src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
-src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h \
-src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
-src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.h \
-src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c \
-src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.h \
-src/core/ext/upb-generated/xds/type/v3/cel.upb.c \
-src/core/ext/upb-generated/xds/type/v3/cel.upb.h \
-src/core/ext/upb-generated/xds/type/v3/range.upb.c \
-src/core/ext/upb-generated/xds/type/v3/range.upb.h \
-src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c \
-src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h \
-src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c \
-src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/http.upbdefs.h \
-src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c \
-src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h \
-src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
-src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h \
-src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
-src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h \
-src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c \
-src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.h \
-src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
-src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
-src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
-src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h \
-src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
-src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c \
+src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c \
+src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h \
+src/core/ext/upb-gen/envoy/annotations/resource.upb.h \
+src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c \
+src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c \
+src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c \
+src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h \
+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/pick_first/v3/pick_first.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h \
+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/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.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/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 \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h \
+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/common.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
+src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/http.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/range.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c \
+src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h \
+src/core/ext/upb-gen/google/api/annotations.upb.h \
+src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+src/core/ext/upb-gen/google/api/annotations.upb_minitable.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c \
+src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h \
+src/core/ext/upb-gen/google/api/http.upb.h \
+src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+src/core/ext/upb-gen/google/api/http.upb_minitable.h \
+src/core/ext/upb-gen/google/api/httpbody.upb.h \
+src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c \
+src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/any.upb.h \
+src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb.h \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/duration.upb.h \
+src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/empty.upb.h \
+src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/struct.upb.h \
+src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb.h \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb.h \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h \
+src/core/ext/upb-gen/google/rpc/status.upb.h \
+src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+src/core/ext/upb-gen/google/rpc/status.upb_minitable.h \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c \
+src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c \
+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.c \
+src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c \
+src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb.h \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/security.upb.h \
+src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/status.upb.h \
+src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb.h \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c \
+src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h \
+src/core/ext/upb-gen/validate/validate.upb.h \
+src/core/ext/upb-gen/validate/validate.upb_minitable.c \
+src/core/ext/upb-gen/validate/validate.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c \
+src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/authority.upb.h \
+src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb.h \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb.h \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/extension.upb.h \
+src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c \
+src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h \
+src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h \
+src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c \
+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.c \
+src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/cel.upb.h \
+src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/range.upb.h \
+src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c \
+src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
+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.c \
+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/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 \
+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.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/http.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/http.upbdefs.h \
+src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c \
+src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h \
+src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
+src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h \
+src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h \
+src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c \
+src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h \
+src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
+src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h \
+src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c \
+src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h \
+src/core/ext/upbdefs-gen/validate/validate.upbdefs.c \
+src/core/ext/upbdefs-gen/validate/validate.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h \
+src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
+src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h \
+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/ext/xds/certificate_provider_store.cc \
 src/core/ext/xds/certificate_provider_store.h \
 src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@@ -1878,7 +2041,6 @@ src/core/lib/event_engine/forkable.cc \
 src/core/lib/event_engine/forkable.h \
 src/core/lib/event_engine/grpc_polled_fd.h \
 src/core/lib/event_engine/handle_containers.h \
-src/core/lib/event_engine/memory_allocator.cc \
 src/core/lib/event_engine/memory_allocator_factory.h \
 src/core/lib/event_engine/nameser.h \
 src/core/lib/event_engine/poller.h \
@@ -1895,6 +2057,8 @@ src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
 src/core/lib/event_engine/posix_engine/internal_errqueue.h \
 src/core/lib/event_engine/posix_engine/lockfree_event.cc \
 src/core/lib/event_engine/posix_engine/lockfree_event.h \
+src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
+src/core/lib/event_engine/posix_engine/native_dns_resolver.h \
 src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
 src/core/lib/event_engine/posix_engine/posix_endpoint.h \
 src/core/lib/event_engine/posix_engine/posix_engine.cc \
@@ -1921,6 +2085,7 @@ src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc \
 src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h \
+src/core/lib/event_engine/ref_counted_dns_resolver_interface.h \
 src/core/lib/event_engine/resolved_address.cc \
 src/core/lib/event_engine/resolved_address_internal.h \
 src/core/lib/event_engine/shim.cc \
@@ -1945,6 +2110,8 @@ src/core/lib/event_engine/trace.cc \
 src/core/lib/event_engine/trace.h \
 src/core/lib/event_engine/utils.cc \
 src/core/lib/event_engine/utils.h \
+src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
+src/core/lib/event_engine/windows/grpc_polled_fd_windows.h \
 src/core/lib/event_engine/windows/iocp.cc \
 src/core/lib/event_engine/windows/iocp.h \
 src/core/lib/event_engine/windows/win_socket.cc \
@@ -2006,6 +2173,7 @@ src/core/lib/gprpp/cpp_impl_of.h \
 src/core/lib/gprpp/crash.cc \
 src/core/lib/gprpp/crash.h \
 src/core/lib/gprpp/debug_location.h \
+src/core/lib/gprpp/directory_reader.h \
 src/core/lib/gprpp/dual_ref_counted.h \
 src/core/lib/gprpp/env.h \
 src/core/lib/gprpp/examine_stack.cc \
@@ -2030,6 +2198,7 @@ src/core/lib/gprpp/overload.h \
 src/core/lib/gprpp/packed_table.h \
 src/core/lib/gprpp/per_cpu.cc \
 src/core/lib/gprpp/per_cpu.h \
+src/core/lib/gprpp/posix/directory_reader.cc \
 src/core/lib/gprpp/posix/env.cc \
 src/core/lib/gprpp/posix/stat.cc \
 src/core/lib/gprpp/posix/thd.cc \
@@ -2059,6 +2228,7 @@ src/core/lib/gprpp/type_list.h \
 src/core/lib/gprpp/unique_type_name.h \
 src/core/lib/gprpp/validation_errors.cc \
 src/core/lib/gprpp/validation_errors.h \
+src/core/lib/gprpp/windows/directory_reader.cc \
 src/core/lib/gprpp/windows/env.cc \
 src/core/lib/gprpp/windows/stat.cc \
 src/core/lib/gprpp/windows/thd.cc \
@@ -2268,6 +2438,7 @@ src/core/lib/promise/race.h \
 src/core/lib/promise/seq.h \
 src/core/lib/promise/sleep.cc \
 src/core/lib/promise/sleep.h \
+src/core/lib/promise/status_flag.h \
 src/core/lib/promise/trace.cc \
 src/core/lib/promise/trace.h \
 src/core/lib/promise/try_seq.h \
@@ -2573,8 +2744,6 @@ src/core/tsi/transport_security_grpc.cc \
 src/core/tsi/transport_security_grpc.h \
 src/core/tsi/transport_security_interface.h \
 third_party/upb/upb/generated_code_support.h \
-third_party/upb/upb/port/def.inc \
-third_party/upb/upb/port/undef.inc \
 third_party/xxhash/xxhash.h
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/tools/doxygen/Doxyfile.objc b/tools/doxygen/Doxyfile.objc
index 91af4390c3cdc..3fff76f4afe44 100644
--- a/tools/doxygen/Doxyfile.objc
+++ b/tools/doxygen/Doxyfile.objc
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0-dev
+PROJECT_NUMBER         = 1.61.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/tools/doxygen/Doxyfile.objc.internal b/tools/doxygen/Doxyfile.objc.internal
index fcd6f45dc1d93..14320b033a7e5 100644
--- a/tools/doxygen/Doxyfile.objc.internal
+++ b/tools/doxygen/Doxyfile.objc.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0-dev
+PROJECT_NUMBER         = 1.61.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/tools/doxygen/Doxyfile.php b/tools/doxygen/Doxyfile.php
index 296e31698b2d7..1299b7e96c453 100644
--- a/tools/doxygen/Doxyfile.php
+++ b/tools/doxygen/Doxyfile.php
@@ -40,7 +40,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.60.0-dev
+PROJECT_NUMBER         = 1.61.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
index 15951cccc756e..a8da8a9fae6a0 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
@@ -131,9 +131,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )
 
 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
 
 # # go
 configLangArgs8core+=( -l go )
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
index f62d9920b72a4..c3b99af80ebb6 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh
@@ -125,9 +125,9 @@ configLangArgs32core+=( -l c++ )
 runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" )
 
 # dotnet
-configLangArgs8core+=( -l dotnet )
-configLangArgs32core+=( -l dotnet )
-runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
+# configLangArgs8core+=( -l dotnet )
+# configLangArgs32core+=( -l dotnet )
+# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" )
 
 # # go
 configLangArgs8core+=( -l go )
diff --git a/tools/internal_ci/linux/grpc_iwyu.cfg b/tools/internal_ci/linux/grpc_iwyu.cfg
deleted file mode 100644
index 33fbbd68bad00..0000000000000
--- a/tools/internal_ci/linux/grpc_iwyu.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 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_run_tests_matrix.sh"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "RUN_TESTS_FLAGS"
-  value: "-f basictests linux iwyu --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results"
-}
diff --git a/tools/internal_ci/linux/pull_request/grpc_fork_asan.cfg b/tools/internal_ci/linux/pull_request/grpc_fork_asan.cfg
new file mode 100644
index 0000000000000..855c5f390f6cb
--- /dev/null
+++ b/tools/internal_ci/linux/pull_request/grpc_fork_asan.cfg
@@ -0,0 +1,41 @@
+# Copyright 2022 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.
+
+# 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_bazel_rbe.sh"
+timeout_mins: 90
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
+
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/resultstore_api_key"
+
+bazel_setting {
+  # In order for Kokoro to recognize this as a bazel build and publish the bazel resultstore link,
+  # the bazel_setting section needs to be present and "upsalite_frontend_address" needs to be
+  # set. The rest of configuration from bazel_setting is unused (we configure everything when bazel
+  # command is invoked).
+  upsalite_frontend_address: "https://source.cloud.google.com"
+}
+
+env_vars {
+  # flags will be passed to bazel invocation
+  key: "BAZEL_FLAGS"
+  value: "--config=asan --test_tag_filter=fork_test --config=fork_support"
+}
diff --git a/tools/internal_ci/linux/pull_request/grpc_iwyu.cfg b/tools/internal_ci/linux/pull_request/grpc_iwyu.cfg
deleted file mode 100644
index 4d7fcecc9a6ca..0000000000000
--- a/tools/internal_ci/linux/pull_request/grpc_iwyu.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 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_run_tests_matrix.sh"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "RUN_TESTS_FLAGS"
-  value: "-f basictests linux iwyu --inner_jobs 16 -j 1 --internal_ci"
-}
diff --git a/tools/internal_ci/windows/pull_request/grpc_distribtests_cpp_dll.cfg b/tools/internal_ci/windows/pull_request/grpc_distribtests_cpp_dll.cfg
index b673e13ba11f5..32cb3c2544d16 100644
--- a/tools/internal_ci/windows/pull_request/grpc_distribtests_cpp_dll.cfg
+++ b/tools/internal_ci/windows/pull_request/grpc_distribtests_cpp_dll.cfg
@@ -15,7 +15,7 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/windows/grpc_distribtests_standalone.bat"
+build_file: "grpc/tools/internal_ci/windows/grpc_distribtests_cpp_dll.bat"
 timeout_mins: 120
 action {
   define_artifacts {
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index a1829341fd483..836485bdb6949 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -430,6 +430,7 @@ def __init__(self, patch=[], runtimes=[], testcases_file=None):
             ("v1.56.0", ReleaseInfo()),
             ("v1.57.2", ReleaseInfo()),
             ("v1.58.0", ReleaseInfo()),
+            ("v1.59.1", ReleaseInfo()),
         ]
     ),
     "python": OrderedDict(
diff --git a/tools/profiling/memory/memory_diff.py b/tools/profiling/memory/memory_diff.py
index f235b42dba9f4..1285781a329c7 100755
--- a/tools/profiling/memory/memory_diff.py
+++ b/tools/profiling/memory/memory_diff.py
@@ -79,6 +79,10 @@
         rb"xds server channel memory usage: ([0-9\.]+) bytes per channel",
         float,
     ),
+    "channel_multi_address/xds_client": (
+        rb"xds multi_address client channel memory usage: ([0-9\.]+) bytes per channel",
+        float,
+    ),
 }
 
 _SCENARIOS = {
@@ -89,6 +93,10 @@
 _BENCHMARKS = {
     "call": ["--benchmark_names=call", "--size=50000"],
     "channel": ["--benchmark_names=channel", "--size=10000"],
+    "channel_multi_address": [
+        "--benchmark_names=channel_multi_address",
+        "--size=10000",
+    ],
 }
 
 
@@ -110,6 +118,8 @@ def _run():
                 # TODO(chenancy) Remove when minstack is implemented for channel
                 if name == "channel" and scenario == "minstack":
                     continue
+                if name == "channel_multi_address" and not use_xds:
+                    continue
                 argv = (
                     ["bazel-bin/test/core/memory_usage/memory_usage_test"]
                     + benchmark_args
diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py
index 4e4671c259174..e32acb2a700a6 100644
--- a/tools/run_tests/artifacts/artifact_targets.py
+++ b/tools/run_tests/artifacts/artifact_targets.py
@@ -223,7 +223,7 @@ def build_jobspec(self, inner_jobs=None):
                     "32" if self.arch == "x86" else "64",
                 ],
                 environ=environ,
-                timeout_seconds=45 * 60,
+                timeout_seconds=60 * 60 * 2,
                 use_workspace=True,
             )
         else:
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index f664988cf5518..6b2a8024173cf 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2113,6 +2113,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": "client_fork_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
@@ -2183,6 +2205,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": "client_transport_error_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -2757,6 +2803,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": "directory_reader_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -4917,6 +4987,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": "inter_activity_latch_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -6787,6 +6881,26 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "posix"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "posix_event_engine_native_dns_test",
+    "platforms": [
+      "linux",
+      "posix"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
@@ -6927,6 +7041,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": "promise_mutex_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
@@ -7071,6 +7209,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": "query_extensions_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -9525,6 +9687,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": "status_flag_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -10661,6 +10847,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": "tls_credentials_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py
index 808bc0a30bf84..064dbf3328d3c 100755
--- a/tools/run_tests/run_performance_tests.py
+++ b/tools/run_tests/run_performance_tests.py
@@ -21,8 +21,8 @@
 import itertools
 import json
 import os
-import pipes
 import re
+import shlex
 import sys
 import time
 
@@ -121,7 +121,7 @@ def create_scenario_jobspec(
     if bq_result_table:
         cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table
     cmd += "tools/run_tests/performance/run_qps_driver.sh "
-    cmd += "--scenarios_json=%s " % pipes.quote(
+    cmd += "--scenarios_json=%s " % shlex.quote(
         json.dumps({"scenarios": [scenario_json]})
     )
     cmd += "--scenario_result_file=scenario_result.json "
@@ -135,7 +135,7 @@ def create_scenario_jobspec(
         user_at_host = "%s@%s" % (_REMOTE_HOST_USERNAME, remote_host)
         cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (
             user_at_host,
-            pipes.quote(cmd),
+            shlex.quote(cmd),
         )
 
     return jobset.JobSpec(
@@ -157,7 +157,7 @@ def create_quit_jobspec(workers, remote_host=None):
         user_at_host = "%s@%s" % (_REMOTE_HOST_USERNAME, remote_host)
         cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (
             user_at_host,
-            pipes.quote(cmd),
+            shlex.quote(cmd),
         )
 
     return jobset.JobSpec(
@@ -192,7 +192,7 @@ def create_netperf_jobspec(
         user_at_host = "%s@%s" % (_REMOTE_HOST_USERNAME, client_host)
         cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (
             user_at_host,
-            pipes.quote(cmd),
+            shlex.quote(cmd),
         )
 
     return jobset.JobSpec(
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 64d2cfcbeb01c..091817a065a97 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -26,10 +26,10 @@
 import multiprocessing
 import os
 import os.path
-import pipes
 import platform
 import random
 import re
+import shlex
 import socket
 import subprocess
 import sys
@@ -479,7 +479,7 @@ def test_specs(self):
                         cmdline = [binary] + target["args"]
                         shortname = target.get(
                             "shortname",
-                            " ".join(pipes.quote(arg) for arg in cmdline),
+                            " ".join(shlex.quote(arg) for arg in cmdline),
                         )
                         shortname += shortname_ext
                         out.append(
@@ -1304,7 +1304,6 @@ def __str__(self):
     "objc": ObjCLanguage(),
     "sanity": Sanity("sanity_tests.yaml"),
     "clang-tidy": Sanity("clang_tidy_tests.yaml"),
-    "iwyu": Sanity("iwyu_tests.yaml"),
 }
 
 _MSBUILD_CONFIG = {
diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py
index 7de023c572771..bf3358e19e832 100755
--- a/tools/run_tests/sanity/check_bazel_workspace.py
+++ b/tools/run_tests/sanity/check_bazel_workspace.py
@@ -47,7 +47,6 @@
 _TWISTED_CONSTANTLY_DEP_NAME = "com_github_twisted_constantly"
 
 _GRPC_DEP_NAMES = [
-    "upb",
     "boringssl",
     "zlib",
     "com_google_protobuf",
@@ -84,7 +83,6 @@
 ]
 
 _GRPC_BAZEL_ONLY_DEPS = [
-    "upb",  # third_party/upb is checked in locally
     "rules_cc",
     "com_google_absl",
     "com_google_fuzztest",
diff --git a/tools/run_tests/sanity/check_do_not_submit.sh b/tools/run_tests/sanity/check_do_not_submit.sh
deleted file mode 100755
index 6e0438cd5cb67..0000000000000
--- a/tools/run_tests/sanity/check_do_not_submit.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/bash
-# 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.
-#
-# Checks if any file contains "DO NOT SUBMIT"
-
-cd "$(dirname "$0")/../../.." || exit 1
-git grep -Irn 'DO NOT SUBMIT' -- \
-  './*' \
-  ':!*check_do_not_submit.sh' \
-  ':!third_party/'
-test $? -eq 1 || exit 1
diff --git a/tools/run_tests/sanity/check_include_style.py b/tools/run_tests/sanity/check_include_style.py
index 840102fd48642..e8a1cf59893d2 100755
--- a/tools/run_tests/sanity/check_include_style.py
+++ b/tools/run_tests/sanity/check_include_style.py
@@ -42,7 +42,6 @@ def check_include_style(directory_root):
             # Skip check for upb generated code.
             if (
                 filename.endswith(".upb.h")
-                or filename.endswith(".upb.c")
                 or filename.endswith(".upbdefs.h")
                 or filename.endswith(".upbdefs.c")
             ):
diff --git a/tools/run_tests/sanity/check_port_platform.py b/tools/run_tests/sanity/check_port_platform.py
index 9f5d0f55db251..b5d7b85796d02 100755
--- a/tools/run_tests/sanity/check_port_platform.py
+++ b/tools/run_tests/sanity/check_port_platform.py
@@ -39,9 +39,10 @@ def check_port_platform_inclusion(directory_root, legal_list):
             # Skip check for upb generated code.
             if (
                 filename.endswith(".upb.h")
-                or filename.endswith(".upb.c")
                 or filename.endswith(".upbdefs.h")
                 or filename.endswith(".upbdefs.c")
+                or filename.endswith(".upb_minitable.h")
+                or filename.endswith(".upb_minitable.c")
             ):
                 continue
             with open(path) as f:
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index bf7a862ed49b5..38b1cb4e201c7 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -35,7 +35,7 @@ third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92
 third_party/googletest 2dd1c131950043a8ad5ab0d2dda0e0970596586a
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
-third_party/protobuf b2b7a51158418f41cff0520894836c15b1738721
+third_party/protobuf 6b5d8db01fe47478e8d400f550e797e6230d464e
 third_party/protoc-gen-validate fab737efbb4b4d03e7c771393708f75594b121e4
 third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1
 third_party/xds e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7
diff --git a/tools/run_tests/sanity/iwyu_tests.yaml b/tools/run_tests/sanity/iwyu_tests.yaml
deleted file mode 100644
index 2c9c7836d7fbd..0000000000000
--- a/tools/run_tests/sanity/iwyu_tests.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- script: tools/distrib/iwyu.sh
-  cpu_cost: 1000
diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml
index 439891f75bf06..6c4494b00c284 100644
--- a/tools/run_tests/sanity/sanity_tests.yaml
+++ b/tools/run_tests/sanity/sanity_tests.yaml
@@ -6,7 +6,6 @@
 - script: tools/run_tests/sanity/check_buildifier.sh
 - script: tools/run_tests/sanity/check_cache_mk.sh
 - script: tools/run_tests/sanity/check_deprecated_grpc++.py
-- script: tools/run_tests/sanity/check_do_not_submit.sh
 - script: tools/run_tests/sanity/check_illegal_terms.sh
 - script: tools/run_tests/sanity/check_port_platform.py
 - script: tools/run_tests/sanity/check_include_style.py
diff --git a/tools/run_tests/xds_k8s_test_driver/bin/run_ping_pong.py b/tools/run_tests/xds_k8s_test_driver/bin/run_ping_pong.py
index c321e3899077e..d811a16a378f3 100755
--- a/tools/run_tests/xds_k8s_test_driver/bin/run_ping_pong.py
+++ b/tools/run_tests/xds_k8s_test_driver/bin/run_ping_pong.py
@@ -79,6 +79,7 @@ def get_client_rpc_stats(
 
 
 def run_ping_pong(test_client: _XdsTestClient, num_rpcs: int):
+    test_client.wait_for_active_xds_channel()
     test_client.wait_for_server_channel_ready()
     lb_stats = get_client_rpc_stats(test_client, num_rpcs)
     for backend, rpcs_count in lb_stats.rpcs_by_peer.items():
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py b/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py
index 05bd08ab6f2a6..33e48d760092a 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/api.py
@@ -501,7 +501,7 @@ def _delete_resource(
             return True
         except _HttpError as error:
             if error.resp and error.resp.status == 404:
-                logger.info("%s not deleted since it does not exist", full_name)
+                logger.debug("%s not deleted since it doesn't exist", full_name)
             else:
                 logger.warning("Failed to delete %s, %r", full_name, error)
         return False
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py b/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py
index 93ed60d25fc23..b06a1007b4ef1 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py
@@ -565,8 +565,8 @@ def _delete_resource(
             return True
         except googleapiclient.errors.HttpError as error:
             if error.resp and error.resp.status == 404:
-                logger.info(
-                    'Resource %s "%s" not deleted since it does not exist',
+                logger.debug(
+                    "Resource %s %s not deleted since it doesn't exist",
                     resource_type,
                     resource_name,
                 )
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/test_app/client_app.py b/tools/run_tests/xds_k8s_test_driver/framework/test_app/client_app.py
index 38184fad9a2e7..35cabd9b907cd 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/test_app/client_app.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/test_app/client_app.py
@@ -318,11 +318,13 @@ def find_active_xds_channel(
                     channel, **rpc_params
                 )
                 logger.info(
-                    "[%s] Detected successful calls to xDS control plane: %s",
+                    "[%s] Detected successful calls to xDS control plane %s,"
+                    " channel: %s",
                     self.hostname,
                     xds_server_uri,
+                    _ChannelzServiceClient.channel_repr(channel),
                 )
-            except self.NotFound as e:
+            except self.NotFound:
                 # Otherwise, keep searching.
                 continue
 
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
index da17961d5f443..3df9bd19a253e 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
@@ -582,20 +582,32 @@ def _delete_gamma_route(self, name, wait_for_deletion=True):
         logger.info("Deleting HTTPRoute %s", name)
         try:
             self.k8s_namespace.delete_gamma_route(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info("HTTPRoute %s deletion failed: %s", name, e)
+        except k8s.NotFound:
+            logger.debug(
+                "HTTPRoute %s not deleted since it doesn't exist", name
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning("HTTPRoute %s deletion failed: %s", name, e)
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_get_gamma_route_deleted(name)
-        logger.debug("HTTPRoute %s deleted", name)
+        logger.info("HTTPRoute %s deleted", name)
 
     def _delete_session_affinity_policy(self, name, wait_for_deletion=True):
         logger.info("Deleting GCPSessionAffinityPolicy %s", name)
         try:
             self.k8s_namespace.delete_session_affinity_policy(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info(
+        except k8s.NotFound:
+            logger.debug(
+                "GCPSessionAffinityPolicy %s not deleted since it"
+                " doesn't exist",
+                name,
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning(
                 "GCPSessionAffinityPolicy %s deletion failed: %s", name, e
             )
             return
@@ -604,14 +616,21 @@ def _delete_session_affinity_policy(self, name, wait_for_deletion=True):
             self.k8s_namespace.wait_for_get_session_affinity_policy_deleted(
                 name
             )
-        logger.debug("GCPSessionAffinityPolicy %s deleted", name)
+        logger.info("GCPSessionAffinityPolicy %s deleted", name)
 
     def _delete_session_affinity_filter(self, name, wait_for_deletion=True):
         logger.info("Deleting GCPSessionAffinityFilter %s", name)
         try:
             self.k8s_namespace.delete_session_affinity_filter(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info(
+        except k8s.NotFound:
+            logger.debug(
+                "GCPSessionAffinityFilter %s not deleted since it"
+                " doesn't exist",
+                name,
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning(
                 "GCPSessionAffinityFilter %s deletion failed: %s", name, e
             )
             return
@@ -620,71 +639,95 @@ def _delete_session_affinity_filter(self, name, wait_for_deletion=True):
             self.k8s_namespace.wait_for_get_session_affinity_filter_deleted(
                 name
             )
-        logger.debug("GCPSessionAffinityFilter %s deleted", name)
+        logger.info("GCPSessionAffinityFilter %s deleted", name)
 
     def _delete_backend_policy(self, name, wait_for_deletion=True):
         logger.info("Deleting GCPBackendPolicy %s", name)
         try:
             self.k8s_namespace.delete_backend_policy(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info("GGCPBackendPolicy %s deletion failed: %s", name, e)
+        except k8s.NotFound:
+            logger.debug(
+                "GGCPBackendPolicy %s not deleted since it doesn't exist", name
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning("GGCPBackendPolicy %s deletion failed: %s", name, e)
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_get_backend_policy_deleted(name)
-        logger.debug("GCPBackendPolicy %s deleted", name)
+        logger.info("GCPBackendPolicy %s deleted", name)
 
     def _delete_deployment(self, name, wait_for_deletion=True):
         logger.info("Deleting deployment %s", name)
         self.stop_pod_dependencies()
         try:
             self.k8s_namespace.delete_deployment(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info("Deployment %s deletion failed: %s", name, e)
+        except k8s.NotFound:
+            logger.debug(
+                "Deployment %s not deleted since it doesn't exist", name
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning("Deployment %s deletion failed: %s", name, e)
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_deployment_deleted(name)
-        logger.debug("Deployment %s deleted", name)
+        logger.info("Deployment %s deleted", name)
 
     def _delete_service(self, name, wait_for_deletion=True):
         logger.info("Deleting service %s", name)
         try:
             self.k8s_namespace.delete_service(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info("Service %s deletion failed: %s", name, e)
+        except k8s.NotFound:
+            logger.debug("Service %s not deleted since it doesn't exist", name)
+            return
+        except retryers.RetryError as e:
+            logger.warning("Service %s deletion failed: %s", name, e)
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_service_deleted(name)
 
-        logger.debug("Service %s deleted", name)
+        logger.info("Service %s deleted", name)
 
     def _delete_service_account(self, name, wait_for_deletion=True):
         logger.info("Deleting service account %s", name)
         try:
             self.k8s_namespace.delete_service_account(name)
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info("Service account %s deletion failed: %s", name, e)
+        except k8s.NotFound:
+            logger.debug(
+                "Service account %s not deleted since it doesn't exist", name
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning("Service account %s deletion failed: %s", name, e)
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_service_account_deleted(name)
-        logger.debug("Service account %s deleted", name)
+        logger.info("Service account %s deleted", name)
 
     def delete_namespace(self, wait_for_deletion=True):
         logger.info("Deleting namespace %s", self.k8s_namespace.name)
         try:
             self.k8s_namespace.delete()
-        except (retryers.RetryError, k8s.NotFound) as e:
-            logger.info(
+        except k8s.NotFound:
+            logger.debug(
+                "Namespace %s not deleted since it doesn't exist",
+                self.k8s_namespace.name,
+            )
+            return
+        except retryers.RetryError as e:
+            logger.warning(
                 "Namespace %s deletion failed: %s", self.k8s_namespace.name, e
             )
             return
 
         if wait_for_deletion:
             self.k8s_namespace.wait_for_namespace_deleted()
-        logger.debug("Namespace %s deleted", self.k8s_namespace.name)
+        logger.info("Namespace %s deleted", self.k8s_namespace.name)
 
     def _wait_deployment_with_available_replicas(self, name, count=1, **kwargs):
         logger.info(
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_gamma_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_gamma_testcase.py
index ab8d652949462..0d86a15bb768d 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/xds_gamma_testcase.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_gamma_testcase.py
@@ -130,6 +130,8 @@ def startTestClient(
         # To compensate for this, we double the timeout for GAMMA tests.
         return self._start_test_client(
             server_target,
-            wait_for_active_channel_timeout=datetime.timedelta(minutes=10),
+            wait_for_server_channel_ready_timeout=datetime.timedelta(
+                minutes=10
+            ),
             **kwargs,
         )
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py
index b3779e3842b4a..55743de13b2e6 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py
@@ -739,6 +739,30 @@ def cleanup(self):
             force=self.force_cleanup, force_namespace=self.force_cleanup
         )
 
+    def _start_test_client(
+        self,
+        server_target: str,
+        *,
+        wait_for_active_ads: bool = True,
+        wait_for_server_channel_ready: bool = True,
+        wait_for_active_ads_timeout: Optional[_timedelta] = None,
+        wait_for_server_channel_ready_timeout: Optional[_timedelta] = None,
+        **kwargs,
+    ) -> XdsTestClient:
+        test_client = self.client_runner.run(
+            server_target=server_target, **kwargs
+        )
+        if wait_for_active_ads:
+            test_client.wait_for_active_xds_channel(
+                xds_server_uri=self.xds_server_uri,
+                timeout=wait_for_active_ads_timeout,
+            )
+        if wait_for_server_channel_ready:
+            test_client.wait_for_server_channel_ready(
+                timeout=wait_for_server_channel_ready_timeout,
+            )
+        return test_client
+
 
 class RegularXdsKubernetesTestCase(IsolatedXdsKubernetesTestCase):
     """Regular test case base class for testing PSM features in isolation."""
@@ -822,26 +846,6 @@ def startTestClient(
     ) -> XdsTestClient:
         return self._start_test_client(test_server.xds_uri, **kwargs)
 
-    def _start_test_client(
-        self,
-        server_target: str,
-        *,
-        wait_for_active_ads_timeout: Optional[_timedelta] = None,
-        wait_for_active_channel_timeout: Optional[_timedelta] = None,
-        **kwargs,
-    ) -> XdsTestClient:
-        test_client = self.client_runner.run(
-            server_target=server_target, **kwargs
-        )
-        test_client.wait_for_active_xds_channel(
-            xds_server_uri=self.xds_server_uri,
-            timeout=wait_for_active_ads_timeout,
-        )
-        test_client.wait_for_server_channel_ready(
-            timeout=wait_for_active_channel_timeout,
-        )
-        return test_client
-
 
 class AppNetXdsKubernetesTestCase(RegularXdsKubernetesTestCase):
     td: TrafficDirectorAppNetManager
@@ -964,12 +968,12 @@ def startSecureTestClient(
         wait_for_server_channel_ready=True,
         **kwargs,
     ) -> XdsTestClient:
-        test_client = self.client_runner.run(
-            server_target=test_server.xds_uri, secure_mode=True, **kwargs
+        return self._start_test_client(
+            server_target=test_server.xds_uri,
+            wait_for_server_channel_ready=wait_for_server_channel_ready,
+            secure_mode=True,
+            **kwargs,
         )
-        if wait_for_server_channel_ready:
-            test_client.wait_for_server_channel_ready()
-        return test_client
 
     def assertTestAppSecurity(
         self,
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py
index ba07e8e8d4c97..25ef9ee9a6b79 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py
@@ -479,6 +479,9 @@ def run(self, result: unittest.TestResult = None) -> None:
             super().run(result)
 
     def test_client_config(self):
+        self.test_client.wait_for_active_xds_channel(
+            xds_server_uri=GcpResourceManager().xds_server_uri,
+        )
         retryer = retryers.constant_retryer(
             wait_fixed=datetime.timedelta(
                 seconds=_URL_MAP_PROPAGATE_CHECK_INTERVAL_SEC